CM-729: added user upload and sort by date created DESC (#50)

* CM-729: added individual upload history dialog * CM-729: added adjustments to the frontend * CM-729: added improvements for history dialog upload
openimis · Feb 27, 2024 · f9f3d6a · f9f3d6a
1 parent b7faace
commit f9f3d6a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -78,6 +78,7 @@ const UPLOAD_HISTORY_FULL_PROJECTION = () => [
   'uuid',
   'workflow',
   'dataUpload {uuid, dateCreated, dateUpdated, sourceName, sourceType, status, error }',
+  'userCreated {username}',
 ];
 
 export function fetchIndividualEnrollmentSummary(params) {

diff --git a/src/components/dialogs/IndividualsHistoryUploadDialog.js b/src/components/dialogs/IndividualsHistoryUploadDialog.js
@@ -60,7 +60,9 @@ function IndividualsUploadHistoryDialog({
 
   useEffect(() => {
     if (isOpen) {
-      const params = [];
+      const params = [
+        'orderBy: ["-dateCreated"]',
+      ];
       fetchUploadHistory(params);
     }
   }, [isOpen]);
@@ -85,8 +87,8 @@ function IndividualsUploadHistoryDialog({
             top: '50%',
             left: '50%',
             transform: 'translate(-50%,-50%)',
-            width: '75%',
-            maxWidth: '75%',
+            width: '85%',
+            maxWidth: '85%',
           },
         }}
       >
@@ -141,6 +143,13 @@ function IndividualsUploadHistoryDialog({
                         'individual.upload.uploadHistoryTable.status',
                       )}
                     </TableCell>
+                    <TableCell>
+                      {formatMessage(
+                        intl,
+                        'individual',
+                        'individual.upload.uploadHistoryTable.userCreated',
+                      )}
+                    </TableCell>
                     <TableCell>
                       {formatMessage(
                         intl,
@@ -170,6 +179,9 @@ function IndividualsUploadHistoryDialog({
                       <TableCell>
                         { item.dataUpload.status}
                       </TableCell>
+                      <TableCell>
+                        {item.userCreated.username}
+                      </TableCell>
                       <TableCell>
                         <CollapsableErrorList errors={item.dataUpload.error} />
                       </TableCell>

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -44,7 +44,8 @@
         "status": "Status",
         "error": "Error",
         "buttonLabel": "UPLOAD HISTORY",
-        "label": "Upload History Table"
+        "label": "Upload History Table",
+        "userCreated": "User Created"
       }
     },
     "enrollment": {