Add "created by" column and "last edited by" field

Author: yousefa00

api/src/api/notes.js

@@ -121,6 +121,7 @@ router.get(
       'metaData.referencedMembers': 1,
       'metaData.access.viewableBy': 1,
       'metaData.access.editableBy': 1,
+      'metaData.versionHistory': 1,
     };
 
     const notes = await Note.find(
@@ -141,6 +142,7 @@ router.get(
       ...note.metaData.access.viewableBy,
       ...note.metaData.access.editableBy,
       ...note.metaData.referencedMembers,
+      ...note.metaData.versionHistory.map((e) => e.memberID),
     ]);
     const uniqueMemberIds = [...new Set(memberIds)];
     const formattedMembers = await memberFromId(uniqueMemberIds);
@@ -156,6 +158,14 @@ router.get(
       note.metaData.referencedMembers = note.metaData.referencedMembers.map(
         (member) => formattedMembers[member],
       );
+      note.metaData.versionHistory = note.metaData.versionHistory.map(
+        (versionChange) => ({
+          ...versionChange,
+          member: formattedMembers[versionChange.memberID],
+        }),
+      );
+      
+      note.createdBy = note.metaData.versionHistory[0].member.name;
     });
 
     res.status(200).json({

client/src/App.jsx

@@ -44,16 +44,10 @@ const App = () => {
             </Route>
           </Switch>
         </Route>
-        <PrivateRoute
-          path={Routes.NOTE_PAGE}
-          authed={user !== null}
-          component={<Note user={user} />}
-        />
-        <PrivateRoute
-          path={Routes.NOTES}
-          authed={user !== null}
-          component={<Notes />}
-        />
+        <Route path={Routes.NOTE_PAGE}>
+          {user ? <Note user={user} /> : <Login />}
+        </Route>
+        <Route path={Routes.NOTES}>{user ? <Notes /> : <Login />}</Route>
         <Route exact path={Routes.DEFAULT}>
           {user ? <Home user={user} /> : <Login />}
         </Route>

client/src/css/Note.css

@@ -61,3 +61,7 @@ div.editor-toolbar {
 div.editor-toolbar > *:not(:first-child) {
   margin-left: 8px !important;
 }
+
+#last-edited-text {
+  margin-top: 8px;
+}

client/src/pages/Note.jsx

@@ -115,6 +115,7 @@ const Note = ({ user }: NoteProps): Node => {
   const [viewableBy, setViewableBy] = useState([]);
   const [editableBy, setEditableBy] = useState([]);
   const [encryptNote, setEncryptNote] = useState(true);
+  const [lastVersion, setLastVersion] = useState(null);
 
   // TODO: Implement safety guards for leaving an edited form
   // We can use a window.confirm() here or a semantic modal instead
@@ -151,6 +152,7 @@ const Note = ({ user }: NoteProps): Node => {
                 editableBy: currentEditableBy,
                 viewableBy: currentViewableBy,
               },
+              versionHistory,
             },
             content,
             encrypt,
@@ -163,6 +165,7 @@ const Note = ({ user }: NoteProps): Node => {
           setViewableBy(currentViewableBy.map((m) => m.memberId));
           setEditableBy(currentEditableBy.map((m) => m.memberId));
           setEncryptNote(encrypt);
+          setLastVersion(versionHistory[versionHistory.length - 1]);
 
           // check if current user is in editor list
           if (
@@ -290,13 +293,10 @@ const Note = ({ user }: NoteProps): Node => {
       .then((res) => {
         setSubmitState(SUBMIT_STATE.success);
         setIsFetching(false);
+        console.log(res);
+        history.push(`/notes/${res.data.data._id}`);
         return res;
       })
-      .then(
-        (res) =>
-          res?.data?.result?._id &&
-          history.push(`/notes/${res.data.result._id}`),
-      )
       .catch(() => setSubmitState(SUBMIT_STATE.error));
   };
 
@@ -511,6 +511,14 @@ const Note = ({ user }: NoteProps): Node => {
                 {submitState === SUBMIT_STATE.success && (
                   <Message color="green" content="Successfully submitted!" />
                 )}
+                {lastVersion && (
+                  <div id="last-edited-text">
+                    <p>{`Last edited by ${
+                      members.find((m) => m.key == lastVersion.memberID)
+                        ?.text ?? ''
+                    } on ${new Date(lastVersion.date).toDateString()}`}</p>
+                  </div>
+                )}
               </Grid.Column>
             </Grid>
           </Form>

client/src/utils/tableHelpers.js

@@ -174,4 +174,8 @@ export const notesColumnDefs = Object.freeze([
     field: 'metaData.referencedMembers',
     valueFormatter: membersFormatter,
   },
+  {
+    headerName: 'Created By',
+    field: 'createdBy',
+  },
 ]);