xchem#16 create init snapshot and restore from given snapshot

pavol-brunclik-m2ms · Mar 26, 2020 · 1d4c854 · 1d4c854
1 parent 7de76b8
commit 1d4c854
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/js/components/projects/addProjectDetail/index.js b/js/components/projects/addProjectDetail/index.js
@@ -54,7 +54,7 @@ export const AddProjectDetail = memo(() => {
 
   return (
     <>
-      <Typography variant="h3">Add Project Detail</Typography>
+      <Typography variant="h3">Project Details</Typography>
       <Formik
         initialValues={{
           title: '',
@@ -73,15 +73,14 @@ export const AddProjectDetail = memo(() => {
         }}
         onSubmit={values => {
           const data = {
-            ...values,
-            author: {
-              username: DJANGO_CONTEXT['username'],
-              email: DJANGO_CONTEXT['email']
-            },
-            tags
+            title: values.title,
+            description: values.description,
+            target: targetId,
+            author: DJANGO_CONTEXT['pk'] || null,
+            tags: JSON.stringify(tags)
           };
           dispatch(setProjectModalIsLoading(true));
-          api({ url: `${base_url}/api/project`, method: METHOD.POST, data })
+          api({ url: `${base_url}/api/session-projects/`, method: METHOD.POST, data })
             .then(response => {
               const projectID = response.data.id;
               dispatch(setCurrentProjectProperty('projectID', projectID));

diff --git a/js/components/snapshot/modals/newSnapshotForm.js b/js/components/snapshot/modals/newSnapshotForm.js
@@ -1,5 +1,9 @@
 import React, { memo, useState } from 'react';
+import { Typography } from '@material-ui/core';
+import { useSelector } from 'react-redux';
 
 export const NewSnapshotForm = memo(() => {
-  return;
+  const snapshotID = useSelector(state => state.projectReducers.currentSnapshot.id);
+  // TODO if exists children of existing snapshot, create branch
+  return <Typography variant="h3">Snapshot details</Typography>;
 });
diff --git a/js/components/snapshot/modals/newSnapshotModal.js b/js/components/snapshot/modals/newSnapshotModal.js
@@ -2,18 +2,14 @@ import React, { memo } from 'react';
 import Modal from '../../common/Modal';
 import { useDispatch, useSelector } from 'react-redux';
 import { setOpenSnapshotSavingDialog } from '../redux/actions';
-import { Typography } from '@material-ui/core';
+import { NewSnapshotForm } from './newSnapshotForm';
 import { AddProjectDetail } from '../../projects/addProjectDetail';
-import { useRouteMatch } from 'react-router-dom';
 
 export const NewSnapshotModal = memo(({}) => {
   const dispatch = useDispatch();
   const openSavingDialog = useSelector(state => state.snapshotReducers.openSavingDialog);
   const dialogCurrentStep = useSelector(state => state.snapshotReducers.dialogCurrentStep);
-  const currectProject = useSelector(state => state.projectReducers.currentProject);
-  let match = useRouteMatch();
-
-  const projectId = (match && match.params && match.params.projectId) || (currectProject && currectProject.projectID);
+  const projectID = useSelector(state => state.projectReducers.currentProject.projectID);
 
   const handleCloseModal = () => {
     dispatch(setOpenSnapshotSavingDialog(false));
@@ -22,9 +18,8 @@ export const NewSnapshotModal = memo(({}) => {
   return (
     <>
       <Modal open={openSavingDialog} onClose={handleCloseModal}>
-        {projectId && <Typography variant="h3">Save Session</Typography>}
-        {!projectId && dialogCurrentStep === 0 && <AddProjectDetail />}
-        {!projectId && dialogCurrentStep === 1 && <AddProjectDetail />}
+        {!projectID && dialogCurrentStep === 0 && <AddProjectDetail />}
+        {projectID && <NewSnapshotForm />}
       </Modal>
     </>
   );