From d869dbe97b4856a01fa9090b55d10647e9578f94 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 10 Dec 2024 13:23:07 -0800 Subject: [PATCH] IO-3020 IO-3036 Transition enum to function to render correctly. --- .../bills-list-table/bills-list-table.component.jsx | 2 +- .../job-audit-trail/job-audit-trail.component.jsx | 2 +- .../job-bills-total/job-bills-total.component.jsx | 2 +- .../components/job-lifecycle/job-lifecycle.component.jsx | 2 +- .../jobs-documents-gallery.component.jsx | 4 ++-- .../labor-allocations-table.component.jsx | 4 ++-- .../schedule-calendar-header-graph.component.jsx | 2 +- .../schedule-calendar-header.component.jsx | 4 ++-- .../schedule-job-modal/schedule-job-modal.component.jsx | 2 +- .../time-ticket-list/time-ticket-list.component.jsx | 2 +- client/src/components/upsell/upsell.component.jsx | 6 ++++-- .../accounting-payables/accounting-payables.container.jsx | 2 +- .../accounting-payments/accounting-payments.container.jsx | 2 +- .../accounting-receivables.container.jsx | 2 +- client/src/pages/bills/bills.page.container.jsx | 2 +- .../contract-create/contract-create.page.container.jsx | 2 +- .../contract-detail/contract-detail.page.container.jsx | 2 +- client/src/pages/contracts/contracts.page.container.jsx | 2 +- .../courtesy-car-create.page.container.jsx | 2 +- .../pages/courtesy-cars/courtesy-cars.page.container.jsx | 2 +- client/src/pages/dashboard/dashboard.container.jsx | 2 +- client/src/pages/export-logs/export-logs.page.container.jsx | 2 +- .../src/pages/jobs-deliver/jobs-delivery.page.container.jsx | 2 +- client/src/pages/jobs-intake/jobs-intake.page.container.jsx | 2 +- .../src/pages/payments-all/payments-all.container.page.jsx | 2 +- .../pages/production-board/production-board.container.jsx | 2 +- client/src/pages/scoreboard/scoreboard.page.container.jsx | 2 +- client/src/pages/shift-clock/shift-clock.page.jsx | 2 +- client/src/pages/shop-csi/shop-csi.container.page.jsx | 2 +- client/src/pages/tech/tech.page.component.jsx | 2 +- .../src/pages/temporary-docs/temporary-docs.container.jsx | 2 +- client/src/pages/time-tickets/time-tickets.container.jsx | 2 +- .../src/pages/tt-approvals/tt-approvals.page.container.jsx | 2 +- client/src/translations/i18n.js | 2 +- 34 files changed, 40 insertions(+), 38 deletions(-) diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx index ee239088c..503751268 100644 --- a/client/src/components/bills-list-table/bills-list-table.component.jsx +++ b/client/src/components/bills-list-table/bills-list-table.component.jsx @@ -240,7 +240,7 @@ export function BillsListTableComponent({ onChange={handleTableChange} locale={{ ...(!hasBillsAccess && { - emptyText: + emptyText: }) }} /> diff --git a/client/src/components/job-audit-trail/job-audit-trail.component.jsx b/client/src/components/job-audit-trail/job-audit-trail.component.jsx index 6c19dc3e6..5332b709b 100644 --- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx +++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx @@ -147,7 +147,7 @@ export function JobAuditTrail({ bodyshop, currentUser, jobId }) { {!hasAuditAccess && ( - + )} diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx index 8f762db4e..77b90cb9f 100644 --- a/client/src/components/job-bills-total/job-bills-total.component.jsx +++ b/client/src/components/job-bills-total/job-bills-total.component.jsx @@ -336,7 +336,7 @@ export function JobBillsTotalComponent({ {!hasBillsAccess && ( - + )} diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx index bfe7f5593..ad779b858 100644 --- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx +++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx @@ -139,7 +139,7 @@ export function JobLifecycleComponent({ job, statuses, ...rest }) { style={{ width: "100%" }} > - +
- + )} @@ -152,7 +152,7 @@ function JobsDocumentsComponent({ {hasMediaAccess && !hasMobileAccess && ( - + )} diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx index 4145084f5..57be0b072 100644 --- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx +++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx @@ -206,7 +206,7 @@ export function LaborAllocationsTable({ ...(!hasTimeTicketAccess && { emptyText: ( - + ) }) @@ -249,7 +249,7 @@ export function LaborAllocationsTable({ ...(!hasTimeTicketAccess && { emptyText: ( - + ) }) diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx index b9da880a7..7c81df1e4 100644 --- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx +++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx @@ -48,7 +48,7 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) { {loadData?.expectedJobCount} - + - +
); @@ -130,7 +130,7 @@ export function ScheduleCalendarHeaderComponent({ )} - + diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx index abd918d69..98764040c 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx @@ -139,7 +139,7 @@ export function ScheduleJobModalComponent({ ))} {smartOptions.length > 1 && hasSmartSchedulingAccess && ( - + )} diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 2fcf5fa0e..c29648f17 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -364,7 +364,7 @@ export function TimeTicketList({ ...(!hasTimeTicketsAccess && { emptyText: ( - + ) }) diff --git a/client/src/components/upsell/upsell.component.jsx b/client/src/components/upsell/upsell.component.jsx index bcdbdb93f..704959ba8 100644 --- a/client/src/components/upsell/upsell.component.jsx +++ b/client/src/components/upsell/upsell.component.jsx @@ -18,6 +18,8 @@ import "./upsell.styles.scss"; export default function UpsellComponent({ featureName, subFeatureName, upsell, disableMask }) { const { t } = useTranslation(); const resultProps = upsell || upsellEnum[featureName][subFeatureName]; + + console.trace("***LOG ~ file: upsell.component.jsx:22 ~ UpsellComponent ~ resultProps:", resultProps); const componentRef = useRef(null); useEffect(() => { @@ -64,7 +66,7 @@ export function UpsellMaskWrapper({ children, upsell, featureName, subFeatureNam ); } //This is kept in this function as pulling it out into it's own util/enum prevents passing JSX as an `extra` prop -export const upsellEnum = { +export const upsellEnum = () => ({ bills: { autoreconcile: { //icon: null, @@ -233,4 +235,4 @@ export const upsellEnum = { extra: } } -}; +}); diff --git a/client/src/pages/accounting-payables/accounting-payables.container.jsx b/client/src/pages/accounting-payables/accounting-payables.container.jsx index 8e41bee46..4e9b0dcfd 100644 --- a/client/src/pages/accounting-payables/accounting-payables.container.jsx +++ b/client/src/pages/accounting-payables/accounting-payables.container.jsx @@ -63,7 +63,7 @@ export function AccountingPayablesContainer({ bodyshop, setBreadcrumbs, setSelec featureName="export" noauth={ - + } > diff --git a/client/src/pages/accounting-payments/accounting-payments.container.jsx b/client/src/pages/accounting-payments/accounting-payments.container.jsx index ef57983b1..e3c01885d 100644 --- a/client/src/pages/accounting-payments/accounting-payments.container.jsx +++ b/client/src/pages/accounting-payments/accounting-payments.container.jsx @@ -61,7 +61,7 @@ export function AccountingPaymentsContainer({ bodyshop, setBreadcrumbs, setSelec featureName="export" noauth={ - + } > diff --git a/client/src/pages/accounting-receivables/accounting-receivables.container.jsx b/client/src/pages/accounting-receivables/accounting-receivables.container.jsx index cfbb07393..830eb6cfa 100644 --- a/client/src/pages/accounting-receivables/accounting-receivables.container.jsx +++ b/client/src/pages/accounting-receivables/accounting-receivables.container.jsx @@ -66,7 +66,7 @@ export function AccountingReceivablesContainer({ bodyshop, setBreadcrumbs, setSe featureName="export" noauth={ - + } > diff --git a/client/src/pages/bills/bills.page.container.jsx b/client/src/pages/bills/bills.page.container.jsx index b437bfcb0..5398cb87b 100644 --- a/client/src/pages/bills/bills.page.container.jsx +++ b/client/src/pages/bills/bills.page.container.jsx @@ -59,7 +59,7 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="bills" noauth={ - + } > diff --git a/client/src/pages/contract-create/contract-create.page.container.jsx b/client/src/pages/contract-create/contract-create.page.container.jsx index 3f974789e..c2ab7358e 100644 --- a/client/src/pages/contract-create/contract-create.page.container.jsx +++ b/client/src/pages/contract-create/contract-create.page.container.jsx @@ -125,7 +125,7 @@ export function ContractCreatePageContainer({ bodyshop, setBreadcrumbs, setSelec featureName="courtesycars" noauth={ - + } > diff --git a/client/src/pages/contract-detail/contract-detail.page.container.jsx b/client/src/pages/contract-detail/contract-detail.page.container.jsx index 67931a32f..911acde91 100644 --- a/client/src/pages/contract-detail/contract-detail.page.container.jsx +++ b/client/src/pages/contract-detail/contract-detail.page.container.jsx @@ -113,7 +113,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set featureName="courtesycars" noauth={ - + } > diff --git a/client/src/pages/contracts/contracts.page.container.jsx b/client/src/pages/contracts/contracts.page.container.jsx index 72bc9baf3..4652b30be 100644 --- a/client/src/pages/contracts/contracts.page.container.jsx +++ b/client/src/pages/contracts/contracts.page.container.jsx @@ -62,7 +62,7 @@ export function ContractsPageContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="courtesycars" noauth={ - + } > diff --git a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx index 4951d9391..451a32ea9 100644 --- a/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx +++ b/client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx @@ -73,7 +73,7 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect featureName="courtesycars" noauth={ - + } > diff --git a/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx b/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx index a69ff2cff..ebbd2c0b6 100644 --- a/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx +++ b/client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx @@ -40,7 +40,7 @@ export function CourtesyCarsPageContainer({ setBreadcrumbs, setSelectedHeader }) featureName="courtesycars" noauth={ - + } > diff --git a/client/src/pages/dashboard/dashboard.container.jsx b/client/src/pages/dashboard/dashboard.container.jsx index be31cb289..fd1b76e45 100644 --- a/client/src/pages/dashboard/dashboard.container.jsx +++ b/client/src/pages/dashboard/dashboard.container.jsx @@ -38,7 +38,7 @@ export function ExportsLogPageContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="dashboard" noauth={ - + } > diff --git a/client/src/pages/export-logs/export-logs.page.container.jsx b/client/src/pages/export-logs/export-logs.page.container.jsx index 99babd14b..05fbe9426 100644 --- a/client/src/pages/export-logs/export-logs.page.container.jsx +++ b/client/src/pages/export-logs/export-logs.page.container.jsx @@ -38,7 +38,7 @@ export function ExportsLogPageContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="export" noauth={ - + } > diff --git a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx index 0f85dc3b0..077c83398 100644 --- a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx +++ b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx @@ -66,7 +66,7 @@ export function JobsDeliverContainer({ bodyshop, setBreadcrumbs, setSelectedHead featureName="checklist" noauth={ - + } > diff --git a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx index 5c5ed10b2..54a8a561d 100644 --- a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx +++ b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx @@ -69,7 +69,7 @@ export function JobsIntakeContainer({ bodyshop, setBreadcrumbs, setSelectedHeade featureName="checklist" noauth={ - + } > diff --git a/client/src/pages/payments-all/payments-all.container.page.jsx b/client/src/pages/payments-all/payments-all.container.page.jsx index 4ae5a8d4c..2b67c4737 100644 --- a/client/src/pages/payments-all/payments-all.container.page.jsx +++ b/client/src/pages/payments-all/payments-all.container.page.jsx @@ -64,7 +64,7 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) { featureName="payments" noauth={ - + } z diff --git a/client/src/pages/production-board/production-board.container.jsx b/client/src/pages/production-board/production-board.container.jsx index 1e0ec112b..0e80a5dd4 100644 --- a/client/src/pages/production-board/production-board.container.jsx +++ b/client/src/pages/production-board/production-board.container.jsx @@ -44,7 +44,7 @@ export function ProductionBoardContainer({ setBreadcrumbs, bodyshop, setSelected featureName="visualboard" noauth={ - + } > diff --git a/client/src/pages/scoreboard/scoreboard.page.container.jsx b/client/src/pages/scoreboard/scoreboard.page.container.jsx index 2587bd7fa..7e15cae75 100644 --- a/client/src/pages/scoreboard/scoreboard.page.container.jsx +++ b/client/src/pages/scoreboard/scoreboard.page.container.jsx @@ -71,7 +71,7 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="scoreboard" noauth={ - + } > diff --git a/client/src/pages/shift-clock/shift-clock.page.jsx b/client/src/pages/shift-clock/shift-clock.page.jsx index 2609f3cdd..1e8ed0609 100644 --- a/client/src/pages/shift-clock/shift-clock.page.jsx +++ b/client/src/pages/shift-clock/shift-clock.page.jsx @@ -11,7 +11,7 @@ export default function ShiftClock() { featureName="timetickets" noauth={ - + } > diff --git a/client/src/pages/shop-csi/shop-csi.container.page.jsx b/client/src/pages/shop-csi/shop-csi.container.page.jsx index 2ab87a11e..fe6e6cf02 100644 --- a/client/src/pages/shop-csi/shop-csi.container.page.jsx +++ b/client/src/pages/shop-csi/shop-csi.container.page.jsx @@ -56,7 +56,7 @@ export function ShopCsiContainer({ bodyshop, setBreadcrumbs, setSelectedHeader } featureName="csi" noauth={ - + } > diff --git a/client/src/pages/tech/tech.page.component.jsx b/client/src/pages/tech/tech.page.component.jsx index f2e12cc1e..5f66bb970 100644 --- a/client/src/pages/tech/tech.page.component.jsx +++ b/client/src/pages/tech/tech.page.component.jsx @@ -87,7 +87,7 @@ export function TechPage({ technician }) { featureName="techconsole" noauth={ - + } > diff --git a/client/src/pages/temporary-docs/temporary-docs.container.jsx b/client/src/pages/temporary-docs/temporary-docs.container.jsx index 08179c656..44d848230 100644 --- a/client/src/pages/temporary-docs/temporary-docs.container.jsx +++ b/client/src/pages/temporary-docs/temporary-docs.container.jsx @@ -44,7 +44,7 @@ export function TempDocumentsContainer({ setBreadcrumbs, setSelectedHeader }) { featureName="media" noauth={ - + } > diff --git a/client/src/pages/time-tickets/time-tickets.container.jsx b/client/src/pages/time-tickets/time-tickets.container.jsx index e137509ee..f1492a9d9 100644 --- a/client/src/pages/time-tickets/time-tickets.container.jsx +++ b/client/src/pages/time-tickets/time-tickets.container.jsx @@ -78,7 +78,7 @@ export function TimeTicketsContainer({ bodyshop, setBreadcrumbs, setSelectedHead featureName="timetickets" noauth={ - + } > diff --git a/client/src/pages/tt-approvals/tt-approvals.page.container.jsx b/client/src/pages/tt-approvals/tt-approvals.page.container.jsx index feab5457f..530a04503 100644 --- a/client/src/pages/tt-approvals/tt-approvals.page.container.jsx +++ b/client/src/pages/tt-approvals/tt-approvals.page.container.jsx @@ -44,7 +44,7 @@ export function TtApprovalsPage({ setBreadcrumbs, setSelectedHeader }) { featureName="timetickets" noauth={ - + } > diff --git a/client/src/translations/i18n.js b/client/src/translations/i18n.js index 6a4059fca..db77ab567 100644 --- a/client/src/translations/i18n.js +++ b/client/src/translations/i18n.js @@ -18,7 +18,7 @@ i18n .use(initReactI18next) .init( { - ns: ["translation"], + //ns: ["translation"], resources, //lng: "en", detection: {},