IO-2630 Adjust for oRow selection

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

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

@@ -24,7 +24,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
   const handleTableChange = (pagination, filters, sorter) => {
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
-
+  
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -44,15 +44,6 @@ 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}`}>
@@ -76,15 +67,9 @@ 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),
     },
 
     {

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -95,15 +95,13 @@ export function PartsQueueListComponent({ bodyshop }) {
   };
 
   const handleOnRowClick = (record) => {
-    if (record) {
-      if (record.id) {
-        history.push({
-          search: queryString.stringify({
-            ...searchParams,
-            selected: record.id,
-          }),
-        });
-      }
+    if (record?.id) {
+      history.replace({
+        search: queryString.stringify({
+          ...searchParams,
+          selected: record.id,
+        }),
+      });
     }
   };
 
@@ -350,6 +348,13 @@ export function PartsQueueListComponent({ bodyshop }) {
           selectedRowKeys: [selected],
           type: "radio",
         }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: (event) => {
+              handleOnRowClick(record);
+            },
+          };
+        }}
       />
     </Card>
   );

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

@@ -7,9 +7,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { alphaSort, statusSort } from "../../utils/sorters";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -47,10 +45,6 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       title: t("jobs.fields.owner"),
       dataIndex: "owner",
       key: "owner",
-      sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-      sortOrder:
-        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
       render: (text, record) => (
         <Link to={`/manage/owners/${record.owner.id}`}>
           <OwnerNameDisplay ownerObject={record} />
@@ -69,15 +63,9 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
       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),
     },
 
     {

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

@@ -4,9 +4,8 @@ import queryString from "query-string";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
-import { pageLimit } from "../../utils/config";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
-import { alphaSort } from './../../utils/sorters';
+import {pageLimit} from "../../utils/config";
 export default function VehiclesListComponent({
   loading,
   vehicles,
@@ -32,8 +31,6 @@ 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>
@@ -54,10 +51,8 @@ export default function VehiclesListComponent({
     },
     {
       title: t("vehicles.fields.plate_no"),
-      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,
+      dataIndex: "plate",
+      key: "plate",
       render: (text, record) => {
         return (
           <span>{`${record.plate_st || ""} | ${record.plate_no || ""}`}</span>

client/src/graphql/vehicles.queries.js

@@ -31,7 +31,6 @@ export const QUERY_VEHICLE_BY_ID = gql`
       jobs(order_by: { date_open: desc }) {
         id
         ro_number
-        ownr_co_nm
         ownr_fn
         ownr_ln
         owner {