Merged in feature/IO-2760-IDS-for-headers (pull request #1429)

- Add Additional tags (prettier also fixed some double spaced imports)
This commit is contained in:
Dave Richer
2024-04-19 17:32:04 +00:00
2 changed files with 59 additions and 44 deletions

View File

@@ -1,25 +1,25 @@
import { useSplitTreatments } from '@splitsoftware/splitio-react'; import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Button, Card, Tabs } from 'antd'; import { Button, Card, Tabs } from "antd";
import React from 'react'; import React from "react";
import { useTranslation } from 'react-i18next'; import { useTranslation } from "react-i18next";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import ShopInfoGeneral from './shop-info.general.component'; import ShopInfoGeneral from "./shop-info.general.component";
import ShopInfoIntakeChecklistComponent from './shop-info.intake.component'; import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
import ShopInfoLaborRates from './shop-info.laborrates.component'; import ShopInfoLaborRates from "./shop-info.laborrates.component";
import ShopInfoOrderStatusComponent from './shop-info.orderstatus.component'; import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
import ShopInfoPartsScan from './shop-info.parts-scan'; import ShopInfoPartsScan from "./shop-info.parts-scan";
import ShopInfoRbacComponent from './shop-info.rbac.component'; import ShopInfoRbacComponent from "./shop-info.rbac.component";
import ShopInfoResponsibilityCenterComponent from './shop-info.responsibilitycenters.component'; import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
import ShopInfoROStatusComponent from './shop-info.rostatus.component'; import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
import ShopInfoSchedulingComponent from './shop-info.scheduling.component'; import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
import ShopInfoSpeedPrint from './shop-info.speedprint.component'; import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
import { useLocation, useNavigate } from 'react-router-dom'; import { useLocation, useNavigate } from "react-router-dom";
import ShopInfoTaskPresets from './shop-info.task-presets.component'; import ShopInfoTaskPresets from "./shop-info.task-presets.component";
import queryString from 'query-string'; import queryString from "query-string";
import InstanceRenderManager from '../../utils/instanceRenderMgr'; import InstanceRenderManager from "../../utils/instanceRenderMgr";
import ShopInfoRoGuard from './shop-info.roguard.component'; import ShopInfoRoGuard from "./shop-info.roguard.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop
@@ -47,44 +47,52 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
{ {
key: "general", key: "general",
label: t("bodyshop.labels.shopinfo"), label: t("bodyshop.labels.shopinfo"),
children: <ShopInfoGeneral form={form} /> children: <ShopInfoGeneral form={form} />,
id: "tab-shop-general"
}, },
{ {
key: "speedprint", key: "speedprint",
label: t("bodyshop.labels.speedprint"), label: t("bodyshop.labels.speedprint"),
children: <ShopInfoSpeedPrint form={form} /> children: <ShopInfoSpeedPrint form={form} />,
id: "tab-shop-speedprint"
}, },
{ {
key: "rbac", key: "rbac",
label: t("bodyshop.labels.rbac"), label: t("bodyshop.labels.rbac"),
children: <ShopInfoRbacComponent form={form} /> children: <ShopInfoRbacComponent form={form} />,
id: "tab-shop-rbac"
}, },
{ {
key: "roStatus", key: "roStatus",
label: t("bodyshop.labels.jobstatuses"), label: t("bodyshop.labels.jobstatuses"),
children: <ShopInfoROStatusComponent form={form} /> children: <ShopInfoROStatusComponent form={form} />,
id: "tab-shop-rostatus"
}, },
{ {
key: "scheduling", key: "scheduling",
label: t("bodyshop.labels.scheduling"), label: t("bodyshop.labels.scheduling"),
children: <ShopInfoSchedulingComponent form={form} /> children: <ShopInfoSchedulingComponent form={form} />,
id: "tab-shop-scheduling"
}, },
{ {
key: "orderStatus", key: "orderStatus",
label: t("bodyshop.labels.orderstatuses"), label: t("bodyshop.labels.orderstatuses"),
children: <ShopInfoOrderStatusComponent form={form} /> children: <ShopInfoOrderStatusComponent form={form} />,
id: "tab-shop-orderstatus"
}, },
{ {
key: "responsibilityCenters", key: "responsibilityCenters",
label: t("bodyshop.labels.responsibilitycenters.title"), label: t("bodyshop.labels.responsibilitycenters.title"),
children: <ShopInfoResponsibilityCenterComponent form={form} /> children: <ShopInfoResponsibilityCenterComponent form={form} />,
id: "tab-shop-responsibilitycenters"
}, },
...InstanceRenderManager({ ...InstanceRenderManager({
imex: [ imex: [
{ {
key: "checklists", key: "checklists",
label: t("bodyshop.labels.checklists"), label: t("bodyshop.labels.checklists"),
children: <ShopInfoIntakeChecklistComponent form={form} /> children: <ShopInfoIntakeChecklistComponent form={form} />,
id: "tab-shop-checklists"
} }
], ],
rome: "USE_IMEX", rome: "USE_IMEX",
@@ -93,14 +101,16 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
{ {
key: "laborrates", key: "laborrates",
label: t("bodyshop.labels.laborrates"), label: t("bodyshop.labels.laborrates"),
children: <ShopInfoLaborRates form={form} /> children: <ShopInfoLaborRates form={form} />,
id: "tab-shop-laborrates"
}, },
...(CriticalPartsScanning.treatment === "on" ...(CriticalPartsScanning.treatment === "on"
? [ ? [
{ {
key: "partsscan", key: "partsscan",
label: t("bodyshop.labels.partsscan"), label: t("bodyshop.labels.partsscan"),
children: <ShopInfoPartsScan form={form} /> children: <ShopInfoPartsScan form={form} />,
id: "tab-shop-partsscan"
} }
] ]
: []), : []),
@@ -109,21 +119,23 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
{ {
key: "task-presets", key: "task-presets",
label: t("bodyshop.labels.task-presets"), label: t("bodyshop.labels.task-presets"),
children: <ShopInfoTaskPresets form={form} /> children: <ShopInfoTaskPresets form={form} />,
id: "tab-shop-task-presets"
} }
] ]
: []), : []),
...InstanceRenderManager({ ...InstanceRenderManager({
imex: [ imex: [
{ {
key: 'roguard', key: "roguard",
label: t('bodyshop.labels.roguard.title'), label: t("bodyshop.labels.roguard.title"),
children: <ShopInfoRoGuard form={form} />, children: <ShopInfoRoGuard form={form} />,
}, id: "tab-shop-roguard"
], }
rome: 'USE_IMEX', ],
promanager: [], rome: "USE_IMEX",
}), promanager: []
})
]; ];
return ( return (
<Card <Card

View File

@@ -20,18 +20,21 @@ export default function JobsCreateComponent({ form }) {
const steps = [ const steps = [
{ {
title: t("jobs.labels.create.vehicleinfo"), title: t("jobs.labels.create.vehicleinfo"),
id: "step-job-vehicleinfo",
content: <JobsCreateVehicleInfoContainer form={form} />, content: <JobsCreateVehicleInfoContainer form={form} />,
validation: !!state.vehicle.new || !!state.vehicle.selectedid || !!state.vehicle.none, validation: !!state.vehicle.new || !!state.vehicle.selectedid || !!state.vehicle.none,
error: t("vehicles.errors.selectexistingornew") error: t("vehicles.errors.selectexistingornew")
}, },
{ {
title: t("jobs.labels.create.ownerinfo"), title: t("jobs.labels.create.ownerinfo"),
id: "step-job-ownerinfo",
content: <JobsCreateOwnerInfoContainer />, content: <JobsCreateOwnerInfoContainer />,
validation: !!state.owner.new || !!state.owner.selectedid, validation: !!state.owner.new || !!state.owner.selectedid,
error: t("owners.errors.selectexistingornew") error: t("owners.errors.selectexistingornew")
}, },
{ {
title: t("jobs.labels.create.jobinfo"), title: t("jobs.labels.create.jobinfo"),
id: "step-job-jobinfo",
content: <JobsCreateJobsInfo form={form} selected={pageIndex === 2} /> content: <JobsCreateJobsInfo form={form} selected={pageIndex === 2} />
} }
]; ];