Merge branch 'master_v.0.3' into #14

m2ms · Mar 19, 2020 · 674ebde · 674ebde
2 parents e5758f7 + 4778b68
commit 674ebde
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/js/components/landing/Landing.js b/js/components/landing/Landing.js
@@ -15,7 +15,7 @@ import { resetCurrentCompoundsSettings } from '../preview/compounds/redux/action
 import { resetProjectsReducer } from '../projects/redux/actions';
 
 const Landing = memo(
-  ({ resetSelectionState, resetTargetState, resetCurrentCompoundsSettings, resetProjectsReducer }) => {
+  ({ resetSelectionState, resetTargetState, resetCurrentCompoundsSettings, resetProjectsReducer, history }) => {
     const { setSnackBarTitle } = useContext(HeaderContext);
     const [loginText, setLoginText] = useState("You're logged in as " + DJANGO_CONTEXT['username']);
 
@@ -54,7 +54,7 @@ const Landing = memo(
         </Grid>
         <Grid item xs={8}>
           {/*<SessionList />*/}
-          <Projects />
+          <Projects history={history} />
         </Grid>
       </Grid>
     );

diff --git a/js/components/preview/Preview.js b/js/components/preview/Preview.js
@@ -63,7 +63,7 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
-const Preview = memo(({ isStateLoaded, headerHeight }) => {
+const Preview = memo(({ isStateLoaded, headerHeight, match }) => {
   const classes = useStyles();
   const theme = useTheme();
 

diff --git a/js/components/preview/withLoadingProtein.js b/js/components/preview/withLoadingProtein.js
@@ -18,7 +18,7 @@ export const withLoadingProtein = WrappedComponent => {
       shouldLoadProtein(nglViewList, isStateLoaded, projectId);
     }, [isStateLoaded, nglViewList, projectId, shouldLoadProtein]);
 
-    return <WrappedComponent isStateLoaded={isStateLoaded} {...rest} />;
+    return <WrappedComponent isStateLoaded={isStateLoaded} {...rest} match={match} />;
   });
 
   function mapStateToProps(state) {

diff --git a/js/components/projects/index.js b/js/components/projects/index.js
@@ -163,7 +163,7 @@ export const Projects = memo(({}) => {
           </TableFooter>
         </Table>
       </Panel>
-      <ProjectModal />
+      <ProjectModal history={history} />
     </>
   );
 });
diff --git a/js/components/projects/projectModal/index.js b/js/components/projects/projectModal/index.js
@@ -107,6 +107,7 @@ export const ProjectModal = memo(({}) => {
               const tags = response.data.tags;
 
               dispatch(setCurrentProject({ projectID, authorID, title, description, targetID, tags }));
+
               // create project_target relationShip on BE
               history.push(`${URLS.projects}${projectID}`);
             })

diff --git a/js/components/target/withUpdatingTarget.js b/js/components/target/withUpdatingTarget.js
@@ -48,7 +48,7 @@ export const withUpdatingTarget = WrappedContainer => {
       } else if (target_on === undefined) {
         return <HandleUnrecognisedTarget />;
       } else {
-        return <WrappedContainer {...rest} />;
+        return <WrappedContainer {...rest} match={match} />;
       }
     }
   );