clean up and fix bug

Author: ricokahler

src/client/routes/degree-manager/degree-manager.tsx

@@ -20,7 +20,6 @@ const { Slide, Slides } = createSlides();
 interface DegreeEditorProps {
   locationPathname: string;
   masteredDegrees: Model.MasteredDegree.Model[];
-  onCreateDegree: (degreeName: string) => void;
   onMasteredDegreeClick: (masteredDegreeId: string) => void;
 }
 interface DegreeEditorState {

src/client/routes/degree-manager/index.ts

@@ -11,31 +11,7 @@ const Container = Model.store.connect({
     locationPathname: history.location.pathname,
     masteredDegrees: Model.MasteredDegrees.getAsArray(state.masteredDegrees),
   }),
-  mapDispatchToProps: dispatch => ({
-    onCreateDegree: (degreeName: string) => {
-      dispatch(state => {
-        const newDegreeId = ObjectId();
-        const lastPosition = Model.MasteredDegrees.getLastPosition(state.masteredDegrees);
-        const newDegree = Model.MasteredDegree.createNewMasteredDegree(
-          degreeName,
-          lastPosition,
-          newDegreeId,
-        );
-
-        setTimeout(() => {
-          // TODO: this is kind of a hack
-          history.push(`/degree-manager/${newDegreeId}`);
-        }, 100);
-
-        return {
-          ...state,
-          masteredDegrees: Model.MasteredDegrees.addMasteredDegree(
-            state.masteredDegrees,
-            newDegree,
-          ),
-        };
-      });
-    },
+  mapDispatchToProps: () => ({
     onMasteredDegreeClick: (masteredDegreeId: string) => {
       history.push(`/degree-manager/${masteredDegreeId}`);
     },

src/server/degrees.ts

@@ -9,13 +9,25 @@ degrees.get('/', async (req, res) => {
   const { degrees } = await dbConnection;
   const allDegrees = await degrees.find({}).toArray();
 
-  const combinedDegrees = allDegrees.reduce(
-    (combined, next) => {
-      combined[next.id] = next;
-      return combined;
-    },
-    {} as any,
-  );
+  const combinedDegrees = allDegrees
+    .map(degree =>
+      Object.entries(degree)
+        .filter(([prop]) => prop === '_id')
+        .reduce(
+          (degree, [key, value]) => {
+            degree[key] = value;
+            return degree;
+          },
+          {} as any,
+        ),
+    )
+    .reduce(
+      (combined, next) => {
+        combined[next.id] = next;
+        return combined;
+      },
+      {} as any,
+    );
 
   res.json(combinedDegrees);