From 0d4072ab176dd360e1a72537c941ed83f1dc641e Mon Sep 17 00:00:00 2001 From: Delucse <46593742+Delucse@users.noreply.github.com> Date: Tue, 1 Dec 2020 19:05:14 +0100 Subject: [PATCH] redirection to home if no share or gallery content is available --- src/components/Home.js | 14 ++++++++++++-- src/components/WorkspaceFunc.js | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/Home.js b/src/components/Home.js index a28618e..432ec06 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -87,12 +87,22 @@ class Home extends Component { this.setState({progress: true}); axios.get(`${process.env.REACT_APP_BLOCKLY_API}/${param}/${id}`) .then(res => { - this.props.workspaceName(res.data[param].name ? res.data[param].name : res.data[param].title); - this.setState({ projectToLoad: res.data[param], progress: false }); + var data = param === 'share' ? 'content' : param; + if(res.data[data]){ + this.props.workspaceName(res.data[data].name ? res.data[data].name : res.data[data].title); + this.setState({ projectToLoad: res.data[data], progress: false }); + } + else { + this.props.workspaceName(createNameId()); + this.setState({ progress: false }); + this.props.history.push('/'); + } }) .catch(err => { // TODO: this.setState({ progress: false, snackbar: true, key: Date.now(), message: `Fehler beim Aufrufen des angeforderten Programms. Versuche es noch einmal.`, type: 'error' }); + this.props.workspaceName(createNameId()); + this.props.history.push('/'); window.scrollTo(0, 0); }); } diff --git a/src/components/WorkspaceFunc.js b/src/components/WorkspaceFunc.js index 6417191..ae3af26 100644 --- a/src/components/WorkspaceFunc.js +++ b/src/components/WorkspaceFunc.js @@ -332,7 +332,7 @@ class WorkspaceFunc extends Component { : this.state.share ?