sort pulication requests in descending date order (#1014)

Co-authored-by: Shayan Khan <[email protected]>
TACC · Dec 10, 2024 · 761c23d · 761c23d
1 parent 7787b4a
commit 761c23d
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 18 deletions.
diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesPublicationRequestModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesPublicationRequestModal.jsx
@@ -13,10 +13,23 @@ const DataFilesPublicationRequestModal = () => {
   const { publicationRequests } =
     useSelector((state) => state.files.modalProps.publicationRequest) || [];
 
+  const compareFn = (req1, req2) => {
+    // sort more recent requests first
+    const date1 = new Date(req1.created_at);
+    const date2 = new Date(req2.created_at);
+    if (date1 < date2) {
+      return 1;
+    }
+    if (date1 > date2) {
+      return -1;
+    }
+    return 0;
+  };
+
   useEffect(() => {
     const data = {};
 
-    publicationRequests?.forEach((request, index) => {
+    publicationRequests?.sort(compareFn).forEach((request, index) => {
       const publicationRequestDataObj = {
         Status: request.status,
         Reviewers: request.reviewers.reduce((acc, reviewer, index) => {
@@ -27,6 +40,7 @@ const DataFilesPublicationRequestModal = () => {
           );
         }, ''),
         Submitted: formatDateTime(new Date(request.created_at)),
+        _order: index,
       };
 
       const heading = `Publication Request ${index + 1}`;

diff --git a/client/src/components/_common/DescriptionList/DescriptionList.jsx b/client/src/components/_common/DescriptionList/DescriptionList.jsx
@@ -33,26 +33,45 @@ const DescriptionList = ({ className, data, density, direction }) => {
     shouldTruncateValues ? 'value-truncated' : ''
   }`;
 
+  const compareFn = (entry1, entry2) => {
+    const [, val1] = entry1;
+    const [, val2] = entry2;
+    if ((val1._order ?? 0) < (val2._order ?? 0)) {
+      return -1;
+    }
+    if ((val1._order ?? 0) > (val2._order ?? 0)) {
+      return 1;
+    }
+    return 0;
+  };
+
   return (
     <dl className={`${className} ${containerStyleNames}`} data-testid="list">
-      {Object.entries(data).map(([key, value]) => (
-        <React.Fragment key={key}>
-          <dt className={styles.key} data-testid="key">
-            {key}
-          </dt>
-          {Array.isArray(value) ? (
-            value.map((val) => (
-              <dd className={valueClassName} data-testid="value" key={uuidv4()}>
-                {val}
+      {Object.entries(data)
+        .sort(compareFn)
+        .filter(([key, _]) => !key.startsWith('_'))
+        .map(([key, value]) => (
+          <React.Fragment key={key}>
+            <dt className={styles.key} data-testid="key">
+              {key}
+            </dt>
+            {Array.isArray(value) ? (
+              value.map((val) => (
+                <dd
+                  className={valueClassName}
+                  data-testid="value"
+                  key={uuidv4()}
+                >
+                  {val}
+                </dd>
+              ))
+            ) : (
+              <dd className={valueClassName} data-testid="value">
+                {value}
               </dd>
-            ))
-          ) : (
-            <dd className={valueClassName} data-testid="value">
-              {value}
-            </dd>
-          )}
-        </React.Fragment>
-      ))}
+            )}
+          </React.Fragment>
+        ))}
     </dl>
   );
 };