Merge pull request #565 from Terralego/sort-list-view

Add source & report status filtering on list view
Terralego · Feb 5, 2024 · da72cc9 · da72cc9
2 parents edd80c9 + 3f414c0
commit da72cc9
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -350,7 +350,8 @@
       "refresh": {
         "accepted": "Refresh accepted",
         "notAllowed": "Refresh not possible"
-      }
+      },
+      "updated": "Last update"
     },
     "edit": {
       "refresh": "Refresh data",

diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json
@@ -402,7 +402,8 @@
       "refresh": {
         "accepted": "Actualisation acceptée",
         "notAllowed": "Actualisation impossible"
-      }
+      },
+      "updated": "Dernière mise à jour"
     },
     "edit": {
       "refresh": "Actualiser les données",

diff --git a/src/modules/RA/DataSource/index.js b/src/modules/RA/DataSource/index.js
@@ -66,3 +66,18 @@ export const scrTypes = {
   [EPSG3857]: 'EPSG:3857 - WGS 84 / Pseudo-Mercator',
 };
 export const fieldSCRChoices = typesToChoices(scrTypes);
+
+export const sourceStatusTypes = {
+  0: 'datasource.refreshStatus.syncNeeded',
+  1: 'datasource.refreshStatus.pending',
+  2: 'datasource.refreshStatus.done',
+};
+export const sourceStatusChoices = typesToChoices(sourceStatusTypes);
+
+export const reportStatusTypes = {
+  0: 'datasource.refreshStatus.success',
+  1: 'datasource.refreshStatus.error',
+  2: 'datasource.refreshStatus.warning',
+  3: 'datasource.refreshStatus.pending',
+};
+export const reportStatusChoices = typesToChoices(reportStatusTypes);
diff --git a/src/modules/RA/DataSource/views/List.js b/src/modules/RA/DataSource/views/List.js
@@ -16,6 +16,8 @@ import {
   geomTypeChoices,
   sourceTypes,
   sourceTypeChoices,
+  sourceStatusChoices,
+  reportStatusChoices,
 } from '..';
 import CommonBulkActionButtons
   from '../../../../components/react-admin/CommonBulkActionButtons';
@@ -39,6 +41,16 @@ const ListFilters = props => (
       label="datasource.form.geometry"
       choices={geomTypeChoices}
     />
+    <SelectInput
+      source="status"
+      label="datasource.form.status"
+      choices={sourceStatusChoices}
+    />
+    <SelectInput
+      source="report__status"
+      label="datasource.form.report.title"
+      choices={reportStatusChoices}
+    />
   </Filter>
 );
 
@@ -74,6 +86,12 @@ export const DataSourceList = props => (
             <StatusChip sourceId={id} status={{ status, report }} />
         }
       />
+      <FunctionField
+        source="updated_at"
+        label="datasource.form.updated"
+        render={({ updated_at: updatedAt }) => new Date(updatedAt).toLocaleDateString()}
+      />
+
       <CustomCloneButton endpoint={RES_DATASOURCE} label="" />
     </Datagrid>
   </List>