Merge pull request #67 from tsully/testfolder

Final release 3.0 clean-up

Author: andrewjcho84

server/__tests__/projects.test.js __tests__/projects.test.jsserver/__tests__/projects.test.js renamed to __tests__/projects.test.js

@@ -22,12 +22,22 @@ const ComponentPanelRoutingItem: React.FC<{}> = () => {
   const [route, setRoute] = useState(navigableComponents[0]);
 
   // TODO: Add a useMemo so that this isn't recalculated on every render
-  const routeId = state.components.find(comp => comp.name === route).id;
+  let routeId;
+  // check if the component in the drop down still references an existing component
+  const referencedComponent = state.components.find(
+    comp => comp.name === route
+  );
+  // if so, set the route id for that component to the id of the referenced compnent
+  if (referencedComponent) routeId = referencedComponent.id;
+  // otherwise, set the component name and and id to the root component
+  else {
+    setRoute(state.components[0].name);
+    routeId = 1;
+  }
 
   const handleRouteChange = event => {
     setRoute(event.target.value);
   };
-  
 
   // useDrag hook allows components in left panel to be drag source
 

server/__tests__/users.test.js __tests__/users.test.jsserver/__tests__/users.test.js renamed to __tests__/users.test.js

@@ -164,7 +164,7 @@ const ProjectManager = () => {
       ) : null}
       {!state.name && state.isLoggedIn ? (
         <p style={{ color: 'white' }}>
-          Project will not be saved until it is named!!!
+          Select "Save project as" to create and save a project
         </p>
       ) : null}
 

app/src/components/left/ComponentPanelRoutingItem.tsx

@@ -66,7 +66,6 @@ export const deleteProject = (project: any): Promise<Object> => {
   })
     .then(res => res.json())
     .then(data => {
-      console.log('deleted project at end of fetch', data);
       return data;
     })
     .catch(err => console.log(`Error deleting project ${err}`));

app/src/components/right/ProjectManager.tsx

@@ -55,7 +55,6 @@ projectController.getProjects = (req, res, next) => {
 // delete project from database **currently not integrated into app**
 
 projectController.deleteProject = (req, res, next) => {
-  console.log('In delete projects controller');
   // pull project name and userId from req.body
   const { name, userId } = req.body;
   Projects.findOneAndDelete({ name, userId }, (err, deleted) => {