fixed delete using _id instead of name so duplicate named projects are now selectively deleted

Author: dentonwong

app/src/components/App.tsx

@@ -30,8 +30,6 @@ export const App = (): JSX.Element => {
     //setToggleAttempt(!toggleAttempt);
   }, []);
 
-  useEffect(()=>{console.log(state)}, [state])
-
   // following useEffect runs on first mount
   useEffect(() => {
     console.log('state.isLoggedIn', state.isLoggedIn)

app/src/components/marketplace/MarketplaceCard.tsx

@@ -14,7 +14,7 @@ import {
 } from '@mui/material';
 
 import { MoreVert } from '@mui/icons-material';
-import React from 'react';
+import React, { useEffect } from 'react';
 import imageSrc from '../../../../resources/marketplace_images/marketplace_image.png';
 import { red } from '@mui/material/colors';
 import axios from 'axios';
@@ -50,10 +50,11 @@ const MarketplaceCard = ({proj} :{proj: Project}) => {
   const handleClone = async () => { // creates a copy of the project 
     const docId = proj._id;
     const response = await axios.get(`/cloneProject/${docId}`, { params: { username: window.localStorage.getItem('username') } });//passing in username as a query param is query params
-    const project = response.data.project;
+    const project = response.data;
+    console.log('handleClone project', response.data)
     alert('Project cloned!');
     setAnchorEl(null);
-    return project;
+    return {_id: project._id, name: project.name, published: project.published, ...project.project};
   };
 
   const handleCloneOpen = async() => {
@@ -66,6 +67,8 @@ const MarketplaceCard = ({proj} :{proj: Project}) => {
   };
 
 
+
+
   return (
     <>
       <Card

app/src/components/right/DeleteProjects.tsx

@@ -39,8 +39,9 @@ function ProjectsDialog(props: ProjectDialogProps) {
   // If new project selected, close and set value to new project name
   const handleDelete = (value: string) => {
     const selectedProject = projects.filter(
-      (project: any) => project.name === value
-    )[0];
+      (project: any) => project._id === value
+      )[0];
+    console.log('deleting this one', selectedProject)
     deleteProject(selectedProject);
     localforage.removeItem(window.localStorage.getItem('ssid'));
     dispatch(setInitialState(initialState))
@@ -59,7 +60,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
         {projects.filter((project: any) => project.forked === undefined || project.forked === false).map((project: any, index: number) => (
           <ListItem
             button
-            onClick={() => handleDelete(project.name)}
+            onClick={() => handleDelete(project._id)}
             key={index}
           >
             <ListItemAvatar>
@@ -76,7 +77,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
         {projects.filter((project: any) => project.forked === true).map((project: any, index: number) => (
           <ListItem
             button
-            onClick={() => handleDelete(project.name)}
+            onClick={() => handleDelete(project._id)}
             key={index}
           >
             <ListItemAvatar>

app/src/components/top/NavBar.tsx

@@ -65,8 +65,6 @@ const NavBar = () => {
   };
 
   const handlePublish = () => {
-    console.log('projectName', projectName)
-    console.log('state.name', state.name)
     if (state.isLoggedIn === true && projectName === '') {
       setInvalidProjectName(true);
       setPublishModalOpen(true);

app/src/helperFunctions/projectGetSaveDel.ts

@@ -26,7 +26,7 @@ export const getProjects = (): Promise<any> => {
       return data;
     })
     .catch((err) => console.log(`Error getting project ${err}`));
-  return projects;
+  return projects;//returns an array of projects with _id, name, project
 };
 
 export const saveProject = (
@@ -53,7 +53,7 @@ export const saveProject = (
   })
     .then((res) => res.json())
     .then((data) => {
-      return {_id: data._id, name: data.name, published:data.published, ...data.project}; //passing up what is needed for the global appstateslice
+      return {_id: data._id, name: data.name, published: data.published, ...data.project}; //passing up what is needed for the global appstateslice
     })
     .catch((err) => console.log(`Error saving project ${err}`));
   return project;//returns _id in addition to the project object from the document
@@ -130,7 +130,7 @@ export const unpublishProject = (
 
 export const deleteProject = (project: any): Promise<Object> => {
   const body = JSON.stringify({
-    name: project.name,
+    _id: project._id,
     userId: window.localStorage.getItem('ssid')
   });
   const deletedProject = fetch(`${serverURL}/deleteProject`, {
@@ -143,7 +143,7 @@ export const deleteProject = (project: any): Promise<Object> => {
   })
     .then((res) => res.json())
     .then((data) => {
-      return data;
+      return {_id: data._id, name: data.name, published:data.published, ...data.project};
     })
     .catch((err) => console.log(`Error deleting project ${err}`));
   return deletedProject;

server/controllers/projectController.ts

@@ -68,8 +68,8 @@ const projectController: ProjectController = {
   // delete project from database **currently not integrated into app**
   deleteProject: (req, res, next) => {
     // pull project name and userId from req.body
-    const { name, userId } = req.body;
-    Projects.findOneAndDelete({ name, userId }, null, (err, deleted) => {
+    const { _id, userId } = req.body;
+    Projects.findOneAndDelete({ _id, userId }, null, (err, deleted) => {
       if (err) {
         return next({
           log: `Error in projectController.deleteProject: ${err}`,