From cf852435b12bd7146b59e03f40cf81f970751d7b Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Thu, 30 May 2024 17:36:07 -0700 Subject: [PATCH 1/4] Sorting vehicles --- .../src/features/manageVehicles/components/list/Columns.tsx | 4 ++++ .../src/features/manageVehicles/components/list/List.tsx | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/features/manageVehicles/components/list/Columns.tsx b/frontend/src/features/manageVehicles/components/list/Columns.tsx index fd40cc5ef..91680c09d 100644 --- a/frontend/src/features/manageVehicles/components/list/Columns.tsx +++ b/frontend/src/features/manageVehicles/components/list/Columns.tsx @@ -7,19 +7,23 @@ const CommonVehicleColumnDefinition: MRT_ColumnDef[] = [ { accessorKey: "unitNumber", header: "Unit #", + enableSorting: true, }, { accessorKey: "make", header: "Make", + enableSorting: true, }, { accessorKey: "vin", header: "VIN", + enableSorting: true, }, { accessorKey: "plate", header: "Plate", filterVariant: "multi-select", + enableSorting: true, }, ]; diff --git a/frontend/src/features/manageVehicles/components/list/List.tsx b/frontend/src/features/manageVehicles/components/list/List.tsx index 94bc6154b..79a651e3a 100644 --- a/frontend/src/features/manageVehicles/components/list/List.tsx +++ b/frontend/src/features/manageVehicles/components/list/List.tsx @@ -220,13 +220,14 @@ export const List = memo( columns: newColumns, initialState: { ...defaultTableInitialStateOptions, + sorting: [{ id: "createdDateTime", desc: true }], }, state: { ...defaultTableStateOptions, isLoading: isPending, showAlertBanner: isError, showProgressBars: isFetching, - sorting: [{ id: "createdDateTime", desc: true }], + // sorting: [{ id: "createdDateTime", desc: true }], columnVisibility: { powerUnitId: false, trailerId: false }, rowSelection: rowSelection, }, @@ -240,6 +241,8 @@ export const List = memo( } }, onRowSelectionChange: setRowSelection, + enableMultiSort: true, + enableSorting: true, renderEmptyRowsFallback: () => , renderRowActions: useCallback( ({ row }: { row: MRT_Row }) => ( From d1bb14222c3629020e236fc8ac35c1df0466965f Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Tue, 18 Jun 2024 11:30:55 -0700 Subject: [PATCH 2/4] remove commented block --- frontend/src/features/manageVehicles/components/list/List.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/features/manageVehicles/components/list/List.tsx b/frontend/src/features/manageVehicles/components/list/List.tsx index 79a651e3a..29a9786cf 100644 --- a/frontend/src/features/manageVehicles/components/list/List.tsx +++ b/frontend/src/features/manageVehicles/components/list/List.tsx @@ -227,7 +227,6 @@ export const List = memo( isLoading: isPending, showAlertBanner: isError, showProgressBars: isFetching, - // sorting: [{ id: "createdDateTime", desc: true }], columnVisibility: { powerUnitId: false, trailerId: false }, rowSelection: rowSelection, }, From fc29bcbfb1ceead412e01d940595702c55f030c6 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 19 Jun 2024 16:49:31 -0700 Subject: [PATCH 3/4] Sorting working --- frontend/package-lock.json | 40 +++++++++---------- .../components/list/Columns.tsx | 5 --- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e795d9bd2..37a030e3e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3892,11 +3892,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -5299,9 +5299,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -9362,9 +9362,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "engines": { "node": ">=10.0.0" @@ -11900,11 +11900,11 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -12962,9 +12962,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "requires": { "to-regex-range": "^5.0.1" } @@ -15832,9 +15832,9 @@ "dev": true }, "ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "requires": {} }, diff --git a/frontend/src/features/manageVehicles/components/list/Columns.tsx b/frontend/src/features/manageVehicles/components/list/Columns.tsx index 91680c09d..bfc1c19f4 100644 --- a/frontend/src/features/manageVehicles/components/list/Columns.tsx +++ b/frontend/src/features/manageVehicles/components/list/Columns.tsx @@ -7,23 +7,18 @@ const CommonVehicleColumnDefinition: MRT_ColumnDef[] = [ { accessorKey: "unitNumber", header: "Unit #", - enableSorting: true, }, { accessorKey: "make", header: "Make", - enableSorting: true, }, { accessorKey: "vin", header: "VIN", - enableSorting: true, }, { accessorKey: "plate", header: "Plate", - filterVariant: "multi-select", - enableSorting: true, }, ]; From e480f520a2fec1fe8fc753daaf45c570a7ab0f00 Mon Sep 17 00:00:00 2001 From: Krishnan Subramanian Date: Wed, 19 Jun 2024 16:51:21 -0700 Subject: [PATCH 4/4] enableMultisort --- frontend/src/features/manageVehicles/components/list/List.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/features/manageVehicles/components/list/List.tsx b/frontend/src/features/manageVehicles/components/list/List.tsx index bbfe545cd..9a17965e8 100644 --- a/frontend/src/features/manageVehicles/components/list/List.tsx +++ b/frontend/src/features/manageVehicles/components/list/List.tsx @@ -241,7 +241,6 @@ export const List = memo( }, onRowSelectionChange: setRowSelection, enableMultiSort: true, - enableSorting: true, renderEmptyRowsFallback: () => , renderRowActions: useCallback( ({ row }: { row: MRT_Row }) => (