IO-2514 Only Unique items in Menu

client/src/components/contract-cars/contract-cars.component.jsx

@@ -35,15 +35,6 @@ export default function ContractsCarsComponent({
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => <div>{t(record.status)}</div>,
     },
-    {
-      title: t("courtesycars.fields.readiness"),
-      dataIndex: "readiness",
-      key: "readiness",
-      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
-      sortOrder:
-        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
-      render: (text, record) => t(record.readiness),
-    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -7,7 +7,6 @@ import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
-import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -214,12 +213,6 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
-          label={t("courtesycars.fields.readiness")}
-          name="readiness"
-        >
-          <CourtesyCarReadiness />
-        </Form.Item>
         <div>
           <Form.Item
             label={t("courtesycars.fields.nextservicekm")}

client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx

@@ -1,35 +0,0 @@
-import { Select } from "antd";
-import React, { forwardRef, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-const { Option } = Select;
-
-const CourtesyCarReadinessComponent = ({ value, onChange }, ref) => {
-  const [option, setOption] = useState(value);
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (value !== option && onChange) {
-      onChange(option);
-    }
-  }, [value, option, onChange]);
-
-  return (
-    <Select
-      allowClear
-      ref={ref}
-      value={option}
-      style={{
-        width: 100,
-      }}
-      onChange={setOption}
-    >
-      <Option value="courtesycars.readiness.ready">
-        {t("courtesycars.readiness.ready")}
-      </Option>
-      <Option value="courtesycars.readiness.notready">
-        {t("courtesycars.readiness.notready")}
-      </Option>
-    </Select>
-  );
-};
-export default forwardRef(CourtesyCarReadinessComponent);

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -91,26 +91,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         );
       },
     },
-    {
-      title: t("courtesycars.fields.readiness"),
-      dataIndex: "readiness",
-      key: "readiness",
-      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
-      filters: [
-        {
-          text: t("courtesycars.readiness.ready"),
-          value: "courtesycars.readiness.ready",
-        },
-        {
-          text: t("courtesycars.readiness.notready"),
-          value: "courtesycars.readiness.notready",
-        },
-      ],
-      onFilter: (value, record) => value.includes(record.readiness),
-      sortOrder:
-        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
-      render: (text, record) => t(record.readiness),
-    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",
@@ -151,36 +131,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "plate" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.fuel"),
-      dataIndex: "fuel",
-      key: "fuel",
-      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
-      sortOrder:
-        state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
-      render: (text, record) => {
-        switch (record.fuel) {
-          case 100:
-            return t("courtesycars.labels.fuel.full");
-          case 88:
-            return t("courtesycars.labels.fuel.78");
-          case 63:
-            return t("courtesycars.labels.fuel.58");
-          case 50:
-            return t("courtesycars.labels.fuel.12");
-          case 38:
-            return t("courtesycars.labels.fuel.34");
-          case 25:
-            return t("courtesycars.labels.fuel.14");
-          case 13:
-            return t("courtesycars.labels.fuel.18");
-          case 0:
-            return t("courtesycars.labels.fuel.empty");
-          default:
-            return record.fuel;
-        }
-      },
-    },
     {
       title: t("courtesycars.labels.outwith"),
       dataIndex: "outwith",

client/src/components/production-list-columns/production-list-columns.add.component.jsx

@@ -1,7 +1,7 @@
-import React from "react";
 import { Button, Dropdown, Menu } from "antd";
-import dataSource from "./production-list-columns.data";
+import React from "react";
 import { useTranslation } from "react-i18next";
+import dataSource from "./production-list-columns.data";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,6 +24,7 @@ export function ProductionColumnsComponent({
   columnState,
   technician,
   bodyshop,
+  data,
   tableState,
 }) {
   const [columns, setColumns] = columnState;
@@ -36,6 +37,7 @@ export function ProductionColumnsComponent({
         bodyshop,
         technician,
         state: tableState,
+        data: data,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
       }).filter((i) => i.key === e.key),
     ]);
@@ -46,6 +48,7 @@ export function ProductionColumnsComponent({
     technician,
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+    data: data,
   });
   const menu = (
     <Menu

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,4 +1,4 @@
-import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
+import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
 import { Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
@@ -6,6 +6,7 @@ import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -25,7 +26,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 
-const r = ({ technician, state, activeStatuses, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -536,6 +537,36 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
+    {
+      title: i18n.t("jobs.labels.estimator"),
+      dataIndex: "estimator",
+      key: "estimator",
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
+          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
+      filters:
+        (data &&
+          data
+            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "N/A",
+                value: [s],
+              };
+            })) ||
+        [],
+      onFilter: (value, record) =>
+        value.includes(
+          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
+        ),
+      render: (text, record) =>
+        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
+    },
 
     //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
     // {

client/src/components/production-list-table/production-list-table-view-select.component.jsx

@@ -24,6 +24,7 @@ export function ProductionListTable({
   technician,
   currentUser,
   state,
+  data,
   setColumns,
   setState,
 }) {
@@ -41,6 +42,7 @@ export function ProductionListTable({
               bodyshop,
               technician,
               state,
+              data: data,
               activeStatuses: bodyshop.md_ro_statuses.active_statuses,
             }).find((e) => e.key === k.key),
             width: k.width,
@@ -95,6 +97,7 @@ export function ProductionListTable({
           ...ProductionListColumns({
             technician,
             state,
+            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width,

client/src/components/production-list-table/production-list-table.component.jsx

@@ -10,7 +10,7 @@ import {
   Statistic,
   Table,
 } from "antd";
-import React, { useMemo, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -79,6 +79,7 @@ export function ProductionListTable({
             bodyshop,
             technician,
             state,
+            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width ?? 100,
@@ -87,6 +88,33 @@ export function ProductionListTable({
       []
   );
 
+  useEffect(() => {
+    const newColumns =
+      (state &&
+        matchingColumnConfig &&
+        matchingColumnConfig.columns.columnKeys.map((k) => {
+          return {
+            ...ProductionListColumns({
+              bodyshop,
+              technician,
+              state,
+              data: data,
+              activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+            }).find((e) => e.key === k.key),
+            width: k.width ?? 100,
+          };
+        })) ||
+      [];
+    setColumns(newColumns);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    //state,
+    matchingColumnConfig,
+    bodyshop,
+    technician,
+    data,
+  ]); //State removed from dependency array as it causes race condition when removing columns from table view and is not needed.
+
   const handleTableChange = (pagination, filters, sorter) => {
     setState({
       ...state,
@@ -104,7 +132,8 @@ export function ProductionListTable({
 
   const removeColumn = (e) => {
     const { key } = e;
-    setColumns(columns.filter((i) => i.key !== key));
+    const newColumns = columns.filter((i) => i.key !== key);
+    setColumns(newColumns);
   };
 
   const handleResize =
@@ -227,6 +256,7 @@ export function ProductionListTable({
             <ProductionListColumnsAdd
               columnState={[columns, setColumns]}
               tableState={state}
+              data={data}
             />
             <ProductionListSaveConfigButton
               columns={columns}
@@ -237,6 +267,7 @@ export function ProductionListTable({
               state={state}
               setState={setState}
               setColumns={setColumns}
+              data={data}
             />
 
             <Input

client/src/graphql/courtesy-car.queries.js

@@ -30,15 +30,15 @@ export const QUERY_AVAILABLE_CC = gql`
       fuel
       id
       make
-      mileage
       model
+      plate
+      status
+      year
+      dailycost
+      mileage
       notes
       nextservicekm
       nextservicedate
-      plate
-      readiness
-      status
-      year
     }
   }
 `;
@@ -68,20 +68,19 @@ export const QUERY_ALL_CC = gql`
       insuranceexpires
       leaseenddate
       make
-      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
-      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
+      mileage
       cccontracts(
         where: { status: { _eq: "contracts.status.out" } }
         order_by: { contract_date: desc }
@@ -91,10 +90,10 @@ export const QUERY_ALL_CC = gql`
         scheduledreturn
         job {
           id
+          ro_number
           ownr_fn
           ownr_ln
           ownr_co_nm
-          ro_number
         }
       }
     }
@@ -120,20 +119,19 @@ export const QUERY_CC_BY_PK = gql`
       insuranceexpires
       leaseenddate
       make
-      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
-      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
+      mileage
       cccontracts_aggregate {
         aggregate {
           count(distinct: true)
@@ -141,20 +139,21 @@ export const QUERY_CC_BY_PK = gql`
       }
       cccontracts(offset: $offset, limit: $limit, order_by: $order) {
         agreementnumber
-        driver_fn
-        driver_ln
         id
+        status
+        start
+        scheduledreturn
         kmstart
         kmend
-        scheduledreturn
-        start
-        status
+        driver_ln
+        driver_fn
         job {
-          id
+          ro_number
+
           ownr_ln
           ownr_fn
           ownr_co_nm
-          ro_number
+          id
         }
       }
     }

client/src/graphql/jobs.queries.js

@@ -364,6 +364,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       employee_refinish
       employee_prep
       employee_csr
+      est_ct_fn
+      est_ct_ln
       suspended
       date_repairstarted
       joblines_status {

client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx

@@ -1,14 +1,11 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { Form, notification } from "antd";
 import moment from "moment";
-import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation, useParams } from "react-router-dom";
+import { useParams } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_CC_BY_PK, UPDATE_CC } from "../../graphql/courtesy-car.queries";
 import {
@@ -16,10 +13,13 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
-import { pageLimit } from "../../utils/config";
 import { CreateRecentItem } from "../../utils/create-recent-item";
-import UndefinedToNull from "./../../utils/undefinedtonull";
 import CourtesyCarDetailPageComponent from "./courtesy-car-detail.page.component";
+import NotFound from "../../components/not-found/not-found.component";
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import queryString from "query-string";
+import { useLocation } from "react-router-dom";
+import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -112,10 +112,7 @@ export function CourtesyCarDetailPageContainer({
     setSaveLoading(true);
 
     const result = await updateCourtesyCar({
-      variables: {
-        cc: { ...UndefinedToNull(values, ["readiness"]) },
-        ccId: ccId,
-      },
+      variables: { cc: { ...values }, ccId: ccId },
       refetchQueries: ["QUERY_CC_BY_PK"],
       awaitRefetchQueries: true,
     });

client/src/translations/en_us/common.json

@@ -785,7 +785,6 @@
 				"notes": "Notes",
 				"plate": "Plate Number",
 				"purchasedate": "Purchase Date",
-				"readiness": "Readiness",
 				"registrationexpires": "Registration Expires On",
 				"serviceenddate": "Usage End Date",
 				"servicestartdate": "Usage Start Date",
@@ -822,10 +821,6 @@
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."
-			},
-			"readiness": {
-				"notready": "Not Ready",
-				"ready": "Ready"
 			}
 		},
 		"csi": {

client/src/translations/es/common.json

@@ -785,7 +785,6 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
-				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -822,10 +821,6 @@
 			},
 			"successes": {
 				"saved": ""
-			},
-			"readiness": {
-				"notready": "",
-				"ready": ""
 			}
 		},
 		"csi": {

client/src/translations/fr/common.json

@@ -785,7 +785,6 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
-				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -822,10 +821,6 @@
 			},
 			"successes": {
 				"saved": ""
-			},
-			"readiness": {
-				"notready": "",
-				"ready": ""
 			}
 		},
 		"csi": {

hasura/metadata/tables.yaml

@@ -1388,62 +1388,60 @@
                 - active:
                     _eq: true
         columns:
-          - bodyshopid
-          - color
-          - created_at
-          - dailycost
-          - damage
-          - fleetnumber
-          - fuel
           - id
-          - insuranceexpires
-          - leaseenddate
-          - make
-          - mileage
-          - model
-          - nextservicedate
-          - nextservicekm
-          - notes
-          - plate
-          - purchasedate
-          - readiness
-          - registrationexpires
-          - serviceenddate
-          - servicestartdate
-          - status
+          - created_at
           - updated_at
-          - vin
+          - bodyshopid
+          - make
+          - model
           - year
+          - plate
+          - color
+          - vin
+          - fleetnumber
+          - purchasedate
+          - servicestartdate
+          - serviceenddate
+          - leaseenddate
+          - status
+          - nextservicekm
+          - nextservicedate
+          - damage
+          - notes
+          - fuel
+          - registrationexpires
+          - insuranceexpires
+          - dailycost
+          - mileage
   select_permissions:
     - role: user
       permission:
         columns:
-          - bodyshopid
-          - color
-          - created_at
-          - dailycost
-          - damage
-          - fleetnumber
-          - fuel
-          - id
           - insuranceexpires
           - leaseenddate
-          - make
-          - mileage
-          - model
           - nextservicedate
-          - nextservicekm
-          - notes
-          - plate
           - purchasedate
-          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
+          - dailycost
+          - fuel
+          - mileage
+          - nextservicekm
+          - color
+          - damage
+          - fleetnumber
+          - make
+          - model
+          - notes
+          - plate
           - status
-          - updated_at
           - vin
           - year
+          - created_at
+          - updated_at
+          - bodyshopid
+          - id
         filter:
           bodyshop:
             associations:
@@ -1458,32 +1456,31 @@
     - role: user
       permission:
         columns:
-          - bodyshopid
-          - color
-          - created_at
-          - dailycost
-          - damage
-          - fleetnumber
-          - fuel
-          - id
           - insuranceexpires
           - leaseenddate
-          - make
-          - mileage
-          - model
           - nextservicedate
-          - nextservicekm
-          - notes
-          - plate
           - purchasedate
-          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
+          - dailycost
+          - fuel
+          - mileage
+          - nextservicekm
+          - color
+          - damage
+          - fleetnumber
+          - make
+          - model
+          - notes
+          - plate
           - status
-          - updated_at
           - vin
           - year
+          - created_at
+          - updated_at
+          - bodyshopid
+          - id
         filter:
           bodyshop:
             associations:

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."courtesycars" add column "readiness" text
---  null;

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."courtesycars" add column "readiness" text
- null;