fix(projects): display action entry date instead of start date

access-ci-org · Oct 30, 2024 · 3601ddd · 3601ddd
1 parent dbaade2
commit 3601ddd
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/src/projects/helpers/apiSlice.js b/src/projects/helpers/apiSlice.js
@@ -137,7 +137,7 @@ const addRequest = (
         actionId,
         allowedOperations,
         detailAvailable,
-        date: (approvedStartDate || requestedStartDate || entryDate).split(
+        date: (entryDate || approvedStartDate || requestedStartDate).split(
           "T"
         )[0],
         deleteStatus: null,
@@ -162,8 +162,14 @@ const addRequest = (
       .filter((res) => res.isCredit || res.allocated > 0)
       .sort(sortResources),
     resourcesReason: "",
-    returnedForCorrections: actions.find((action) => action.returnedForCorrections) ? true : false,
-    returnedForCorrectionsNotes: actions.map((action) => action.adminComments).join(','),
+    returnedForCorrections: actions.find(
+      (action) => action.returnedForCorrections
+    )
+      ? true
+      : false,
+    returnedForCorrectionsNotes: actions
+      .map((action) => action.adminComments)
+      .join(","),
     showActionsModal: false,
     showConfirmModal: false,
     showResourcesModal: false,
@@ -809,16 +815,20 @@ export const apiSlice = createSlice({
         state.projectsList = action.payload.projectsList.map((project) => {
           const { grantNumber, requestMasterId, requests, status, title } =
             project;
-          const returnedForCorrections = project.requests.filter(r => r.actions.filter(a => a.returnedForCorrections).length > 0).length > 0
-          const projectStatus =
-            returnedForCorrections ? "Returned for Corrections" :
-            status ||
-            (requests &&
-              (requests.find(({ timeStatus }) => timeStatus == "current")
-                ? "Active"
-                : requests[0].timeStatus == "past"
-                ? "Inactive"
-                : requests[0].status));
+          const returnedForCorrections =
+            project.requests.filter(
+              (r) =>
+                r.actions.filter((a) => a.returnedForCorrections).length > 0
+            ).length > 0;
+          const projectStatus = returnedForCorrections
+            ? "Returned for Corrections"
+            : status ||
+              (requests &&
+                (requests.find(({ timeStatus }) => timeStatus == "current")
+                  ? "Active"
+                  : requests[0].timeStatus == "past"
+                  ? "Inactive"
+                  : requests[0].status));
           if (requests) addProject(state, project, projectStatus);
           return {
             grantNumber: grantNumber || requestMasterId,