- Merge release

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

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -44,6 +44,15 @@ function OwnerDetailJobsComponent({bodyshop, owner}) {
             title: t("jobs.fields.vehicle"),
             dataIndex: "vehicleid",
             key: "vehicleid",
+            sorter: (a, b) =>
+                alphaSort(
+                    `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+                        a.v_model_desc || ""
+                    }`,
+                    `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+                ),
+            sortOrder:
+                state.sortedInfo.columnKey === "vehicleid" && state.sortedInfo.order,
             render: (text, record) =>
                 record.vehicleid ? (
                     <Link to={`/manage/vehicles/${record.vehicleid}`}>
@@ -67,9 +76,15 @@ function OwnerDetailJobsComponent({bodyshop, owner}) {
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+            sorter: (a, b) =>
+                statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+            filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
+                text: status,
+                value: status,
+            })),
+            onFilter: (value, record) => value.includes(record.status),
         },
 
         {