From 2a1ec4eff3f18a3af132c1cdd1104011d5586412 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 6 Aug 2024 09:15:37 -0700 Subject: [PATCH 1/3] IO-2861 Disable Editing of Vendor and Invoice Number when In House Signed-off-by: Allan Carr --- .../bill-detail-edit/bill-detail-edit-component.jsx | 7 ++++--- client/src/components/bill-form/bill-form.component.jsx | 7 ++++--- client/src/components/bill-form/bill-form.container.jsx | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx index f5ce3d3d4..937ff9ce1 100644 --- a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx +++ b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx @@ -1,6 +1,6 @@ +import { PageHeader } from "@ant-design/pro-layout"; import { useMutation, useQuery } from "@apollo/client"; import { Button, Divider, Form, Popconfirm, Space } from "antd"; -import dayjs from "../../utils/day"; import queryString from "query-string"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; @@ -13,6 +13,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions"; import { setModalContext } from "../../redux/modals/modals.actions"; import { selectBodyshop } from "../../redux/user/user.selectors"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; +import dayjs from "../../utils/day"; import AlertComponent from "../alert/alert.component"; import BillFormContainer from "../bill-form/bill-form.container"; import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component"; @@ -22,7 +23,6 @@ import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-galler import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container"; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; import BillDetailEditReturn from "./bill-detail-edit-return.component"; -import { PageHeader } from "@ant-design/pro-layout"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop @@ -153,6 +153,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail if (!search.billid) return <>; //
{t("bills.labels.noneselected")}
; const exported = data && data.bills_by_pk && data.bills_by_pk.exported; + const isinhouse = data && data.bills_by_pk && data.bills_by_pk.isinhouse; return ( <> @@ -188,7 +189,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail } />
- + {t("general.labels.media")} {bodyshop.uselocalmediaserver ? ( - + Date: Tue, 6 Aug 2024 11:54:22 -0700 Subject: [PATCH 2/3] IO-2864 Adjust to LAET and LAUT adjustment to target both Rome and ProManager Signed-off-by: Allan Carr --- .../jobs-available-table.container.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx index 5e7681853..d9964d090 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx @@ -3,7 +3,6 @@ import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { Col, Row, notification } from "antd"; import Axios from "axios"; import _ from "lodash"; -import dayjs from "../../utils/day"; import queryString from "query-string"; import React, { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; @@ -24,6 +23,8 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto import AuditTrailMapping from "../../utils/AuditTrailMappings"; import confirmDialog from "../../utils/asyncConfirm"; import CriticalPartsScan from "../../utils/criticalPartsScan"; +import dayjs from "../../utils/day"; +import InstanceRenderManager from "../../utils/instanceRenderMgr"; import AlertComponent from "../alert/alert.component"; import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component"; import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container"; @@ -32,7 +33,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util"; import HeaderFields from "./jobs-available-supplement.headerfields"; import JobsAvailableTableComponent from "./jobs-available-table.component"; -import InstanceRenderManager from "../../utils/instanceRenderMgr"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -580,12 +580,13 @@ function ResolveCCCLineIssues(estData, bodyshop) { InstanceRenderManager({ executeFunction: true, args: [], - promanager: () => { + rome: () => { if (line.mod_lbr_ty === "LAET" || line.mod_lbr_ty === "LAUT") { // line.notes += ` | ET/UT Update (prev = ${line.mod_lbr_ty})`; line.mod_lbr_ty = "LAR"; } - } + }, + promanager: "USE_ROME" }); }); From 883043cde379ce594743f3a6ac598d370813d15a Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 6 Aug 2024 17:39:55 -0700 Subject: [PATCH 3/3] IO-2866 Add OP20 to masterdata Signed-off-by: Allan Carr --- .../1722990947416_add_op20_to_masterdata/down.sql | 9 +++++++++ .../1722990947416_add_op20_to_masterdata/up.sql | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 hasura/migrations/1722990947416_add_op20_to_masterdata/down.sql create mode 100644 hasura/migrations/1722990947416_add_op20_to_masterdata/up.sql diff --git a/hasura/migrations/1722990947416_add_op20_to_masterdata/down.sql b/hasura/migrations/1722990947416_add_op20_to_masterdata/down.sql new file mode 100644 index 000000000..c9f184e41 --- /dev/null +++ b/hasura/migrations/1722990947416_add_op20_to_masterdata/down.sql @@ -0,0 +1,9 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- UPDATE "public"."masterdata" +-- SET value = jsonb_set( +-- value::jsonb, +-- '{OP20}', +-- '{"desc": "REMOVE AND REINSTALL", "opcode": "OP20", "partcode": "PAE"}'::jsonb, +-- true +-- ); diff --git a/hasura/migrations/1722990947416_add_op20_to_masterdata/up.sql b/hasura/migrations/1722990947416_add_op20_to_masterdata/up.sql new file mode 100644 index 000000000..583e21e05 --- /dev/null +++ b/hasura/migrations/1722990947416_add_op20_to_masterdata/up.sql @@ -0,0 +1,7 @@ +UPDATE "public"."masterdata" +SET value = jsonb_set( + value::jsonb, + '{OP20}', + '{"desc": "REMOVE AND REINSTALL", "opcode": "OP20", "partcode": "PAE"}'::jsonb, + true +);