xchem#16 enable to remove project by logged in user

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

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/js/components/projects/index.js b/js/components/projects/index.js
@@ -22,7 +22,7 @@ import moment from 'moment';
 import { setProjectModalOpen } from './redux/actions';
 import { useDispatch, useSelector } from 'react-redux';
 import { ProjectModal } from './projectModal';
-import { loadListOfProjects, searchInProjects } from './redux/dispatchActions';
+import { loadListOfProjects, removeProject, searchInProjects } from './redux/dispatchActions';
 import { DJANGO_CONTEXT } from '../../utils/djangoContext';
 
 const useStyles = makeStyles(theme => ({
@@ -50,7 +50,7 @@ export const Projects = memo(({}) => {
       tags: JSON.parse(project.tags),
       target: project.target.title,
       createdAt: project.init_date,
-      author: project.author.email
+      author: (project.author && project.author.email) || '-'
     };
   });
 
@@ -143,7 +143,14 @@ export const Projects = memo(({}) => {
                 <TableCell align="left">{project.author}</TableCell>
                 <TableCell align="left">{moment(project.createdAt).format('LLL')}</TableCell>
                 <TableCell align="right">
-                  <IconButton>
+                  <IconButton
+                    disabled={DJANGO_CONTEXT['username'] === 'NOT_LOGGED_IN'}
+                    onClick={() =>
+                      dispatch(removeProject(project.id)).catch(error => {
+                        throw new Error(error);
+                      })
+                    }
+                  >
                     <Delete />
                   </IconButton>
                 </TableCell>

diff --git a/js/components/projects/redux/dispatchActions.js b/js/components/projects/redux/dispatchActions.js
@@ -68,6 +68,11 @@ export const searchInProjects = title => (dispatch, getState) => {
     dispatch(setListOfProjects((response && response.data && response.data.results) || []))
   );
 };
+export const removeProject = projectID => dispatch => {
+  return api({ url: `${base_url}/api/session-projects/${projectID}/`, method: METHOD.DELETE }).then(() =>
+    dispatch(loadListOfProjects())
+  );
+};
 
 export const loadSnapshotByProjectID = projectID => (dispatch, getState) => {
   return api({ url: `${base_url}/api/snapshots/?session_project=${projectID}&type=INIT` }).then(response => {

diff --git a/js/components/snapshot/modals/newSnapshotForm.js b/js/components/snapshot/modals/newSnapshotForm.js
@@ -3,7 +3,7 @@ import { Typography } from '@material-ui/core';
 import { useSelector } from 'react-redux';
 
 export const NewSnapshotForm = memo(() => {
-  const snapshotID = useSelector(state => state.projectReducers.currentSnapshot.id);
+  const currentSnapshot = useSelector(state => state.projectReducers.currentSnapshot);
   // TODO if exists children of existing snapshot, create branch
   return <Typography variant="h3">Snapshot details</Typography>;
 });