IO-2280 fixed query params in shop config

Release/2023 06 02

client/src/App/App.styles.scss

@@ -156,3 +156,11 @@
 td.ant-table-column-sort {
   background-color: transparent;
 }
+
+.ant-table-tbody > tr.ant-table-row:nth-child(2n) > td {
+  background-color: #f4f4f4;
+}
+
+.rowWithColor > td {
+  background-color: var(--bgColor) !important;
+}

client/src/components/header/header.component.jsx

@@ -311,7 +311,9 @@ function Header({
           icon={<SettingOutlined />}
         >
           <Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
-            <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+            <Link to="/manage/shop?tab=info">
+              {t("menus.header.shop_config")}
+            </Link>
           </Menu.Item>
           <Menu.Item key="dashboard" icon={<DashboardFilled />}>
             <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -29,6 +29,7 @@ import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import JobsDetaiLheaderCsi from "./jobs-detail-header-actions.csi.component";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsExportcustdataComponent from "./jobs-detail-header-actions.exportcustdata.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -461,54 +462,56 @@ export function JobsDetailHeaderActions({
       )}
       <JobsDetailHeaderActionsAddevent jobid={job.id} />
       {!jobRO && job.converted && (
-        <Menu.Item>
+        <RbacWrapper action="jobs:void" noauth>
-          <Popconfirm
+          <Menu.Item>
-            title={t("jobs.labels.voidjob")}
+            <Popconfirm
-            okText="Yes"
+              title={t("jobs.labels.voidjob")}
-            cancelText="No"
+              okText="Yes"
-            onClick={(e) => e.stopPropagation()}
+              cancelText="No"
-            onConfirm={async () => {
+              onClick={(e) => e.stopPropagation()}
-              //delete the job.
+              onConfirm={async () => {
-              const result = await voidJob({
+                //delete the job.
-                variables: {
+                const result = await voidJob({
-                  jobId: job.id,
+                  variables: {
-                  job: {
+                    jobId: job.id,
-                    status: bodyshop.md_ro_statuses.default_void,
+                    job: {
-                    voided: true,
+                      status: bodyshop.md_ro_statuses.default_void,
-                    scheduled_in: null,
+                      voided: true,
-                    scheduled_completion: null,
+                      scheduled_in: null,
-                    inproduction: false,
+                      scheduled_completion: null,
-                  },
+                      inproduction: false,
-                  note: [
-                    {
-                      jobid: job.id,
-                      created_by: currentUser.email,
-                      audit: true,
-                      text: t("jobs.labels.voidnote"),
                     },
-                  ],
+                    note: [
-                },
+                      {
-              });
+                        jobid: job.id,
+                        created_by: currentUser.email,
+                        audit: true,
+                        text: t("jobs.labels.voidnote"),
+                      },
+                    ],
+                  },
+                });
 
-              if (!!!result.errors) {
+                if (!!!result.errors) {
-                notification["success"]({
+                  notification["success"]({
-                  message: t("jobs.successes.voided"),
+                    message: t("jobs.successes.voided"),
-                });
+                  });
-                //go back to jobs list.
+                  //go back to jobs list.
-                history.push(`/manage/`);
+                  history.push(`/manage/`);
-              } else {
+                } else {
-                notification["error"]({
+                  notification["error"]({
-                  message: t("jobs.errors.voiding", {
+                    message: t("jobs.errors.voiding", {
-                    error: JSON.stringify(result.errors),
+                      error: JSON.stringify(result.errors),
-                  }),
+                    }),
-                });
+                  });
-              }
+                }
-            }}
+              }}
-            getPopupContainer={(trigger) => trigger.parentNode}
+              getPopupContainer={(trigger) => trigger.parentNode}
-          >
+            >
-            {t("menus.jobsactions.void")}
+              {t("menus.jobsactions.void")}
-          </Popconfirm>
+            </Popconfirm>
-        </Menu.Item>
+          </Menu.Item>
+        </RbacWrapper>
       )}
     </Menu>
   );

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

@@ -112,7 +112,9 @@ export function JobsList({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sorter: (a, b) =>
+        parseInt((a.ro_number || "0").replace(/\D/g, "")) -
+        parseInt((b.ro_number || "0").replace(/\D/g, "")),
       sortOrder:
         state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -23,17 +23,34 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
   const { id: jobId, job } = printCenterModal.context;
   const tempList = TemplateList("job", {});
   const { t } = useTranslation();
-  const JobsReportsList = Object.keys(tempList)
+
-    .map((key) => {
+  const JobsReportsList =
-      return tempList[key];
+    bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
-    })
+      ? Object.keys(tempList)
-    .filter(
+          .map((key) => {
-      (temp) =>
+            return tempList[key];
-        !temp.regions ||
+          })
-        (temp.regions && temp.regions[bodyshop.region_config]) ||
+          .filter(
-        (temp.regions &&
+            (temp) =>
-          bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
+              (!temp.regions ||
-    );
+                (temp.regions && temp.regions[bodyshop.region_config]) ||
+                (temp.regions &&
+                  bodyshop.region_config.includes(Object.keys(temp.regions)) ===
+                    true)) &&
+              (!temp.dms || temp.dms === false)
+          )
+      : Object.keys(tempList)
+          .map((key) => {
+            return tempList[key];
+          })
+          .filter(
+            (temp) =>
+              !temp.regions ||
+              (temp.regions && temp.regions[bodyshop.region_config]) ||
+              (temp.regions &&
+                bodyshop.region_config.includes(Object.keys(temp.regions)) ===
+                  true)
+          );
 
   const filteredJobsReportsList =
     search !== ""

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

@@ -246,11 +246,21 @@ export function ProductionListTable({
                 (x) => x.status === record.status
               );
 
-              if (!color) return null;
+              if (!color) {
+                if (index % 2 === 0)
+                  return {
+                    style: {
+                      backgroundColor: `rgb(236, 236, 236)`,
+                    },
+                  };
+
+                return null;
+              }
 
               return {
+                className: "rowWithColor",
                 style: {
-                  backgroundColor: `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
+                  "--bgColor": `rgb(${color.color.r},${color.color.g},${color.color.b},${color.color.a})`,
                 },
               };
             },

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -26,6 +26,8 @@ const ret = {
   "jobs:partsqueue": 4,
   "jobs:checklist-view": 2,
   "jobs:list-ready": 1,
+  "jobs:void": 5,
+
   "bills:enter": 2,
   "bills:view": 2,
   "bills:list": 2,

client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx

@@ -12,7 +12,8 @@ import "./schedule-calendar.styles.scss";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import { selectProblemJobs } from "../../redux/application/application.selectors";
 import { Alert, Collapse } from "antd";
-import { useTranslation } from "react-i18next";
+import { useTranslation, Trans } from "react-i18next";
+import { Link } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -66,10 +67,21 @@ export function ScheduleCalendarWrapperComponent({
               <Alert
                 key={problem.id}
                 type="error"
-                message={t("appointments.labels.dataconsistency", {
+                message={
-                  ro_number: problem.ro_number,
+                  <Trans
-                  code: problem.code,
+                    i18nKey="appointments.labels.dataconsistency"
-                })}
+                    components={[
+                      <Link
+                        to={`/manage/jobs/${problem.id}`}
+                        target="_blank"
+                      />,
+                    ]}
+                    values={{
+                      ro_number: problem.ro_number,
+                      code: problem.code,
+                    }}
+                  />
+                }
               />
             ))}
           </Collapse.Panel>
@@ -79,10 +91,18 @@ export function ScheduleCalendarWrapperComponent({
           <Alert
             key={problem.id}
             type="error"
-            message={t("appointments.labels.dataconsistency", {
+            message={
-              ro_number: problem.ro_number,
+              <Trans
-              code: problem.code,
+                i18nKey="appointments.labels.dataconsistency"
-            })}
+                components={[
+                  <Link to={`/manage/jobs/${problem.id}`} target="_blank" />,
+                ]}
+                values={{
+                  ro_number: problem.ro_number,
+                  code: problem.code,
+                }}
+              />
+            }
           />
         ))
       )}

client/src/components/shop-info/shop-info.component.jsx

@@ -52,7 +52,9 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
       <Tabs
         defaultActiveKey={search.subtab}
         onChange={(key) =>
-          history.push({ search: `?tab=${search.tab}&subtab=${key}` })
+          history.push({
+            search: `?tab=${search.tab}&subtab=${key}`,
+          })
         }
       >
         <Tabs.TabPane key="general" tab={t("bodyshop.labels.shopinfo")}>

client/src/components/shop-info/shop-info.rbac.component.jsx

@@ -1,12 +1,12 @@
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Form, InputNumber } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
-import { useTreatments } from "@splitsoftware/splitio-react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -316,6 +316,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.void")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:void"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.bills.enter")}
           rules={[

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx

@@ -33,6 +33,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           <JobSearchSelect
             convertedOnly={!bodyshop.tt_allow_post_to_invoiced}
             notExported={!bodyshop.tt_allow_post_to_invoiced}
+            notInvoiced={!bodyshop.tt_allow_post_to_invoiced}
           />
         </Form.Item>
 

client/src/pages/shop/shop.page.component.jsx

@@ -40,6 +40,10 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
     ]);
   }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);
 
+  useEffect(() => {
+    if (!search.tab) history.push({ search: "?tab=info" });
+  }, [history, search]);
+
   return (
     <RbacWrapper action="shop:config">
       <Tabs

client/src/translations/en_us/common.json

@@ -49,7 +49,7 @@
 				"blocked": "Blocked",
 				"cancelledappointment": "Canceled appointment for: ",
 				"completingjobs": "Completing Jobs",
-				"dataconsistency": "{{ro_number}} has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
+				"dataconsistency": "<0>{{ro_number}}</0> has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
 				"expectedjobs": "Expected Jobs in Production: ",
 				"expectedprodhrs": "Expected Production Hours:",
 				"history": "History",
@@ -405,7 +405,8 @@
 						"list-active": "Jobs -> List Active",
 						"list-all": "Jobs -> List All",
 						"list-ready": "Jobs -> List Ready",
-						"partsqueue": "Jobs -> Parts Queue"
+						"partsqueue": "Jobs -> Parts Queue",
+						"void": "Jobs -> Void"
 					},
 					"owners": {
 						"detail": "Owners -> Detail",

client/src/translations/es/common.json

@@ -405,7 +405,8 @@
 						"list-active": "",
 						"list-all": "",
 						"list-ready": "",
-						"partsqueue": ""
+						"partsqueue": "",
+						"void": ""
 					},
 					"owners": {
 						"detail": "",

client/src/translations/fr/common.json

@@ -405,7 +405,8 @@
 						"list-active": "",
 						"list-all": "",
 						"list-ready": "",
-						"partsqueue": ""
+						"partsqueue": "",
+						"void": ""
 					},
 					"owners": {
 						"detail": "",

client/src/utils/TemplateConstants.js

@@ -512,6 +512,7 @@ export const TemplateList = (type, context) => {
             key: "dms_posting_sheet",
             disabled: false,
             group: "financial",
+            dms: true,
           },
         }
       : {}),

server/cdk/cdk-job-export.js

@@ -729,9 +729,15 @@ async function InsertDmsVehicle(socket) {
             deliveryDate: moment()
               // .tz(socket.JobData.bodyshop.timezone)
               .format("YYYYMMDD"),
-            licensePlateNo: String(socket.JobData.plate_no)
+            licensePlateNo:
-              .replace(/([^\w]|_)/g, "")
+              socket.JobData.plate_no === null
-              .toUpperCase(),
+                ? null
+                : String(socket.JobData.plate_no).replace(/([^\w]|_)/g, "")
+                    .length === 0
+                ? null
+                : String(socket.JobData.plate_no)
+                    .replace(/([^\w]|_)/g, "")
+                    .toUpperCase(),
             make: socket.txEnvelope.dms_make,
             modelAbrev: socket.txEnvelope.dms_model,
             modelYear: socket.JobData.v_model_yr,