Merge pull request #207 from bcgov/SC3683

Fix sorting order using updated date
bcgov · May 31, 2024 · 8fd0c09 · 8fd0c09
2 parents ec89a9f + 97c9b86
commit 8fd0c09
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/frontend/src/components/object/ObjectTable.vue b/frontend/src/components/object/ObjectTable.vue
@@ -116,7 +116,10 @@ const loadLazyData = (event?: any) => {
       lazyParams.value?.filters?.meta.value //Header
     )
     .then((r: any) => {
-      tableData.value = r.data;
+      tableData.value = r.data.map((item: any) => ({
+        ...item,
+        updatedAt: item.updatedAt === null ? item.createdAt : item.updatedAt
+      }));
       totalRecords.value = +r?.headers['x-total-rows'];
       // add objects to store
       objectStore.setObjects(r.data);
@@ -125,7 +128,7 @@ const loadLazyData = (event?: any) => {
     })
     // add object permissions to store
     .then((objects: Array<COMSObjectDataSource>) => {
-      if(objects.length > 0) {
+      if (objects.length > 0) {
         permissionStore.fetchObjectPermissions({ objectId: objects.map((o: COMSObject) => o.id) });
       }
     });
@@ -294,7 +297,7 @@ const selectedFilters = (payload: any) => {
         sortable
       >
         <template #body="{ data }">
-          {{ formatDateLong(data.updatedAt ?? data.createdAt) }}
+          {{ formatDateLong(data.updatedAt) }}
         </template>
       </Column>
       <Column