[Reportings] Résolution du bug de tri du tableau par statut (#727)

- Relatif à #689
MTES-MCT · Aug 4, 2023 · beec902 · beec902
2 parents e11b33c + 50f179d
commit beec902
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/frontend/src/api/reportingsAPI.ts b/frontend/src/api/reportingsAPI.ts
@@ -16,14 +16,6 @@ const getStartDateFilter = startedAfterDateTime =>
   startedAfterDateTime && `startedAfterDateTime=${encodeURIComponent(startedAfterDateTime)}`
 const getEndDateFilter = startedBeforeDateTime =>
   startedBeforeDateTime && `startedBeforeDateTime=${encodeURIComponent(startedBeforeDateTime)}`
-const getReportingSourceFilter = reportingSource =>
-  reportingSource && `reportingSource=${encodeURIComponent(reportingSource)}`
-const getReportingStatusFilter = reportingStatus =>
-  reportingStatus && reportingStatus?.length > 0 && `reportingStatus=${encodeURIComponent(reportingStatus)}`
-const getReportingTypesFilter = reportingTypes =>
-  reportingTypes && reportingTypes?.length > 0 && `reportingTypes=${encodeURIComponent(reportingTypes)}`
-const getSeaFrontsFilter = seaFronts =>
-  seaFronts && seaFronts?.length > 0 && `seaFronts=${encodeURIComponent(seaFronts)}`
 
 const ReportingAdapter = createEntityAdapter<ReportingDetailed>()
 const initialState = ReportingAdapter.getInitialState()
@@ -59,11 +51,7 @@ export const reportingsAPI = createApi({
         [
           'reportings?',
           getStartDateFilter(filter?.startedAfterDateTime),
-          getEndDateFilter(filter?.startedBeforeDateTime),
-          getReportingSourceFilter(filter?.reportingSource),
-          getReportingStatusFilter(filter?.reportingStatus),
-          getReportingTypesFilter(filter?.reportingTypes),
-          getSeaFrontsFilter(filter?.seaFronts)
+          getEndDateFilter(filter?.startedBeforeDateTime)
         ]
           .filter(v => v)
           .join('&'),

diff --git a/frontend/src/features/Reportings/ReportingsList/Columns/index.tsx b/frontend/src/features/Reportings/ReportingsList/Columns/index.tsx
@@ -9,6 +9,8 @@ import { CellValidityTime } from '../CellValidityTime'
 import { getDateCell } from '../getDateCell'
 import { getReportType } from '../getReportType'
 
+import type { Row } from '@tanstack/react-table'
+
 export const Columns = [
   {
     accessorFn: row => row.reportingId,
@@ -73,8 +75,18 @@ export const Columns = [
     cell: ({ row }) => <CellStatus row={row} />,
     enableSorting: true,
     header: () => 'Statut',
-    id: 'status',
-    size: 110
+    id: 'isArchived',
+    size: 110,
+    sortingFn: (rowA: Row<any>, rowB: Row<any>, columnId: string) => {
+      if (rowA.original[columnId] > rowB.original[columnId]) {
+        return -1
+      }
+      if (rowB.original[columnId] > rowA.original[columnId]) {
+        return 1
+      }
+
+      return 1
+    }
   },
   {
     accessorFn: row => row.geom,