- Merge release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/vehicles-list/vehicles-list.component.jsx

@@ -6,6 +6,7 @@ import {useTranslation} from "react-i18next";
 import {Link, useLocation, useNavigate} from "react-router-dom";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import {pageLimit} from "../../utils/config";
+import { alphaSort } from '../../utils/sorters';
 
 export default function VehiclesListComponent({
                                                   loading,
@@ -32,6 +33,8 @@ export default function VehiclesListComponent({
             title: t("vehicles.fields.v_vin"),
             dataIndex: "v_vin",
             key: "v_vin",
+            sorter: (a, b) => alphaSort(a.v_vin, b.v_vin),
+            sortOrder: state.sortedInfo.columnKey === "v_vin" && state.sortedInfo.order,
             render: (text, record) => (
                 <Link to={"/manage/vehicles/" + record.id}>
                     <VehicleVinDisplay>{record.v_vin || "N/A"}</VehicleVinDisplay>
@@ -52,8 +55,10 @@ export default function VehiclesListComponent({
         },
         {
             title: t("vehicles.fields.plate_no"),
-            dataIndex: "plate",
-            key: "plate",
+            dataIndex: "plate_no",
+            key: "plate_no",
+            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
+            sortOrder: state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
             render: (text, record) => {
                 return (
                     <span>{`${record.plate_st || ""} | ${record.plate_no || ""}`}</span>