Merge branch 'assessment' into backend-connection

src/components/Tutorial/Assessment.js

@@ -34,7 +34,7 @@ class Assessment extends Component {
     return (
       <div style={{ width: '100%' }}>
         <Typography variant='h4' style={{ float: 'left', marginBottom: '5px', height: '40px', display: 'table' }}>{currentTask.headline}</Typography>
-        <div style={{ float: 'right', height: '40px' }}><WorkspaceFunc solutionCheck /></div>
+        <div style={{ float: 'right', height: '40px' }}><WorkspaceFunc assessment /></div>
         <Grid container spacing={2} style={{ marginBottom: '5px' }}>
           <Grid item xs={12} md={6} lg={8}>
             <BlocklyWindow

src/components/Tutorial/Tutorial.js

@@ -22,17 +22,14 @@ class Tutorial extends Component {
 
   componentDidMount() {
     this.props.getTutorial(this.props.match.params.tutorialId);
-    // this.props.tutorialId(Number(this.props.match.params.tutorialId));
   }
 
   componentDidUpdate(props, state) {
     if(this.props.tutorial && !this.props.isLoading && this.props.tutorial._id != this.props.match.params.tutorialId) {
       this.props.getTutorial(this.props.match.params.tutorialId);
-      // this.props.tutorialId(Number(this.props.match.params.tutorialId));
     }
     if(this.props.message.id === 'GET_TUTORIAL_FAIL'){
       alert(this.props.message.msg);
-      this.props.clearMessages();
     }
   }
 
@@ -48,7 +45,8 @@ class Tutorial extends Component {
     return (
       <div>
         {this.props.isLoading ? null :
-          !this.props.tutorial ? <NotFound button={{ title: 'Zurück zur Tutorials-Übersicht', link: '/tutorial' }} />
+          !this.props.tutorial ?
+            this.props.message.id === 'GET_TUTORIAL_FAIL' ? <NotFound button={{ title: 'Zurück zur Tutorials-Übersicht', link: '/tutorial' }} /> : null
             : (() => {
                 var tutorial = this.props.tutorial;
                 var steps = this.props.tutorial.steps;

src/components/Tutorial/TutorialHome.js

@@ -58,7 +58,6 @@ class TutorialHome extends Component {
   componentDidUpdate(props, state) {
     if(this.props.message.id === 'GET_TUTORIALS_FAIL'){
       alert(this.props.message.msg);
-      this.props.clearMessages();
     }
   }