Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ORV2-2332 Sort Vehicle Inventory #1440

Merged
merged 11 commits into from
Jun 20, 2024
Merged

ORV2-2332 Sort Vehicle Inventory #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf85243
Sorting vehicles
krishnan-aot May 31, 2024
675be01
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 4, 2024
8d4da4a
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 6, 2024
c9c0ea5
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 6, 2024
70d4d5c
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 18, 2024
d1bb142
remove commented block
krishnan-aot Jun 18, 2024
1509ed8
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 19, 2024
fc29bcb
Sorting working
krishnan-aot Jun 19, 2024
e480f52
enableMultisort
krishnan-aot Jun 19, 2024
fae0295
Merge remote-tracking branch 'origin/main' into srt
krishnan-aot Jun 20, 2024
15ae03a
Merge branch 'main' into srt
praju-aot Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion frontend/src/features/manageVehicles/components/list/Columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const CommonVehicleColumnDefinition: MRT_ColumnDef<Vehicle>[] = [
{
accessorKey: "plate",
header: "Plate",
filterVariant: "multi-select",
},
];

Expand Down
3 changes: 2 additions & 1 deletion frontend/src/features/manageVehicles/components/list/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ 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 }],
columnVisibility: { powerUnitId: false, trailerId: false },
rowSelection: rowSelection,
},
Expand All @@ -240,6 +240,7 @@ export const List = memo(
}
},
onRowSelectionChange: setRowSelection,
enableMultiSort: true,
renderEmptyRowsFallback: () => <NoRecordsFound />,
renderRowActions: useCallback(
({ row }: { row: MRT_Row<Vehicle> }) => (
Expand Down