Merge branch 'release/2023-01-27' into feature/america

client/src/components/global-search/global-search.component.jsx

@@ -1,6 +1,5 @@
 import { useLazyQuery } from "@apollo/client";
-import { LoadingOutlined } from "@ant-design/icons";
-import { AutoComplete, Divider, Space } from "antd";
+import { AutoComplete, Divider, Input, Space } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -9,7 +8,7 @@ import { GLOBAL_SEARCH_QUERY } from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
 import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
+  OwnerNameDisplayFunction
 } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 export default function GlobalSearch() {
@@ -178,13 +177,18 @@ export default function GlobalSearch() {
     <AutoComplete
       options={options}
       onSearch={handleSearch}
-      suffixIcon={loading && <LoadingOutlined spin />}
       defaultActiveFirstOption
-      placeholder={t("general.labels.globalsearch")}
-      allowClear
       onSelect={(val, opt) => {
         history.push(opt.label.props.to);
       }}
-    ></AutoComplete>
+    >
+      <Input.Search
+        size="large"
+        placeholder={t("general.labels.globalsearch")}
+        enterButton
+        allowClear
+        loading={loading}
+      />
+    </AutoComplete>
   );
 }

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -166,16 +166,16 @@ export function JobLinesUpsertModalComponent({
               name="ah_detail_line"
               valuePropName="checked"
               dependencies={["mod_lbr_ty"]}
+              initialValue={false}
               rules={[
                 ({ getFieldValue }) => ({
                   validator(rule, value) {
-                    console.log(
-                      value === true,
-                      ["LA1", "LA2", "LA3", "LA4", "LAU"].includes(
-                        getFieldValue("mod_lbr_ty")
-                      )
-                    );
-                    if (value === false) return Promise.resolve();
+                    if (
+                      value === false ||
+                      value === undefined ||
+                      value === null
+                    )
+                      return Promise.resolve();
                     if (
                       value === true &&
                       ["LA1", "LA2", "LA3", "LA4", "LAU"].includes(

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -43,14 +43,21 @@ export function JobsConvertButton({
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
-  const handleConvert = async (values) => {
+  const handleConvert = async ({ employee_csr, ...values }) => {
     if (parentFormIsFieldsTouched()) {
       alert(t("jobs.labels.savebeforeconversion"));
       return;
     }
     setLoading(true);
     const res = await mutationConvertJob({
-      variables: { jobId: job.id, ...values },
+      variables: {
+        jobId: job.id,
+        job: {
+          converted: true,
+          ...(bodyshop.enforce_conversion_csr ? { employee_csr } : {}),
+          ...values,
+        },
+      },
     });
 
     if (values.ca_gst_registrant) {

client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.js

@@ -4,11 +4,13 @@ import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import {
-  Legend, PolarAngleAxis,
+  Legend,
+  PolarAngleAxis,
   PolarGrid,
   PolarRadiusAxis,
-  Radar, RadarChart,
-  Tooltip
+  Radar,
+  RadarChart,
+  Tooltip,
 } from "recharts";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -20,6 +22,10 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
+  console.log(
+    "🚀 ~ file: schedule-calendar-header-graph.component.js:23 ~ ScheduleCalendarHeaderGraph ~ loadData",
+    loadData
+  );
   const { ssbuckets } = bodyshop;
   const { t } = useTranslation();
   const data = useMemo(() => {
@@ -44,6 +50,8 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
       <Space>
         {t("appointments.labels.expectedprodhrs")}
         <strong>{loadData?.expectedHours?.toFixed(1)}</strong>
+        {t("appointments.labels.expectedjobs")}
+        <strong>{loadData?.expectedJobCount}</strong>
       </Space>
       <RadarChart
         // cx={300}

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -85,7 +85,7 @@ export function TimeTicketList({
               text: (() => {
                 const emp = bodyshop.employees.find((e) => e.id === s);
 
-                return `${emp.first_name} ${emp.last_name}`;
+                return `${emp?.first_name} ${emp?.last_name}`;
               })(), //
               value: [s],
             };

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -131,6 +131,7 @@ const JobRelatedTicketsTable = ({
 
           return {
             id: `${item.jobKey}${costCenter}`,
+            costCenter,
             item,
             actHrs: actHrs.toFixed(1),
             prodHrs: prodHrs.toFixed(1),
@@ -151,7 +152,9 @@ const JobRelatedTicketsTable = ({
       sortOrder:
         state.sortedInfo.columnKey === "empname" && state.sortedInfo.order,
       render: (text, record) =>
-        `${record.item.employee.first_name} ${record.item.employee.last_name}`,
+        `${record.item.employee.first_name} ${record.item.employee.last_name} ${
+          record.costCenter ? `(${record.costCenter})` : ""
+        }`.trim(),
     },
     {
       title: t("timetickets.fields.actualhrs"),