admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Antd 4.24.x compatibility updates => Menu fixes.

Browse Source
This commit is contained in:
Patrick Fic
2023-01-17 19:14:31 -08:00
parent 713b3f4f6d
commit ef290e79b1
24 changed files with 1118 additions and 1008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/package.json
View File

@@ -12,7 +12,7 @@
"@sentry/tracing": "^7.28.1",
"@splitsoftware/splitio-react": "^1.6.0",
"@tanem/react-nprogress": "^5.0.8",
"antd": "^4.22.3",
"antd": "4.24.5",
"apollo-link-logger": "^2.0.0",
"axios": "^1.2.2",
"craco-less": "^2.0.0",

16
client/src/components/chat-presets/chat-presets.component.jsx
View File

@@ -16,19 +16,15 @@ const mapDispatchToProps = (dispatch) => ({
});
export function ChatPresetsComponent({ bodyshop, setMessage, className }) {
const menu = (
<Menu>
{bodyshop.md_messaging_presets.map((i, idx) => (
<Menu.Item onClick={() => setMessage(i.text)} key={idx}>
{i.label}
</Menu.Item>
))}
</Menu>
);
const menu = bodyshop.md_messaging_presets.map((i, idx) => ({
label: i.label,
key: idx,
onClick: () => setMessage(i.text),
}));
return (
<div className={className}>
<Dropdown trigger={["click"]} overlay={menu}>
<Dropdown trigger={["click"]} menu={{ items: menu }} placement="top">
<PlusCircleOutlined />
</Dropdown>
</div>

23
client/src/components/contracts-rates-change-button/contracts-rates-change-button.component.jsx
View File

@@ -13,25 +13,14 @@ const mapStateToProps = createStructuredSelector({
export function ContractsRatesChangeButton({ disabled, form, bodyshop }) {
const { t } = useTranslation();
const handleClick = ({ item, key, keyPath }) => {
const { label, ...rate } = item.props.value;
form.setFieldsValue(rate);
};
const menu = (
<div>
<Menu onClick={handleClick}>
{bodyshop.md_ccc_rates.map((rate, idx) => (
<Menu.Item value={rate} key={idx}>
{rate.label}
</Menu.Item>
))}
</Menu>
</div>
);
const menu = bodyshop.md_ccc_rates.map((rate, idx) => ({
onClick: () => form.setFieldsValue(rate),
key: idx,
label: rate.label,
}));
return (
<Dropdown overlay={menu} disabled={disabled}>
<Dropdown menu={{ items: menu }} disabled={disabled}>
<a
className="ant-dropdown-link"
href=" #"

23
client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx
View File

@@ -179,10 +179,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
</Button>
<Dropdown
trigger="click"
overlay={
<Menu>
<Menu.Item
onClick={() =>
menu={{
items: [
{
label: t(
"printcenter.courtesycarcontract.courtesy_car_inventory"
),
key: "cc_inv",
onClick: () =>
GenerateDocument(
{
name: TemplateList("courtesycar").courtesy_car_inventory
@@ -193,13 +197,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
},
{},
"p"
)
}
>
{t("printcenter.courtesycarcontract.courtesy_car_inventory")}
</Menu.Item>
</Menu>
}
),
},
],
}}
>
<Button>{t("general.labels.print")}</Button>
</Dropdown>

28
client/src/components/dashboard-grid/dashboard-grid.component.jsx
View File

@@ -117,17 +117,15 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
);
const existingLayoutKeys = state.items.map((i) => i.i);
const addComponentOverlay = (
<Menu onClick={handleAddComponent}>
{Object.keys(componentList).map((key) => (
<Menu.Item
key={key}
value={key}
disabled={existingLayoutKeys.includes(key)}
>
{componentList[key].label}
</Menu.Item>
))}
</Menu>
<Menu
onClick={handleAddComponent}
items={Object.keys(componentList).map((key) => ({
key: key,
value: key,
disabled: existingLayoutKeys.includes(key),
label: componentList[key].label,
}))}
></Menu>
);
if (error) return <AlertComponent message={error.message} type="error" />;
@@ -283,8 +281,12 @@ const createDashboardQuery = (state) => {
monthly_sales: jobs(where: {_and: [
{ voided: {_eq: false}},
{date_invoiced: {_gte: "${moment()
.startOf("month").startOf('day').toISOString()}"}}, {date_invoiced: {_lte: "${moment()
.endOf("month").endOf('day').toISOString()}"}}]}) {
.startOf("month")
.startOf("day")
.toISOString()}"}}, {date_invoiced: {_lte: "${moment()
.endOf("month")
.endOf("day")
.toISOString()}"}}]}) {
id
ro_number
date_invoiced

54
client/src/components/dms-post-form/dms-post-form.component.jsx
View File

@@ -277,36 +277,32 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
<div>
{t("jobs.fields.dms.payer.controlnumber")}{" "}
<Dropdown
overlay={
<Menu>
{bodyshop.cdk_configuration.controllist &&
bodyshop.cdk_configuration.controllist.map(
(key, idx) => (
<Menu.Item
key={idx}
onClick={() => {
form.setFieldsValue({
payers: form
.getFieldValue("payers")
.map((row, mapIndex) => {
if (index !== mapIndex)
return row;
menu={{
items:
bodyshop.cdk_configuration.controllist &&
bodyshop.cdk_configuration.controllist.map(
(key, idx) => ({
key: idx,
label: key.name,
onClick: () => {
form.setFieldsValue({
payers: form
.getFieldValue("payers")
.map((row, mapIndex) => {
if (index !== mapIndex)
return row;
return {
...row,
controlnumber:
key.controlnumber,
};
}),
});
}}
>
{key.name}
</Menu.Item>
)
)}
</Menu>
}
return {
...row,
controlnumber:
key.controlnumber,
};
}),
});
},
})
),
}}
>
<a href=" #" onClick={(e) => e.preventDefault()}>
<DownOutlined />

31
client/src/components/email-overlay/email-overlay.component.jsx
View File

@@ -57,20 +57,23 @@ export function EmailOverlayComponent({
const menu = (
<div>
<Menu onClick={handleClick}>
{bodyshop.employees
.filter((e) => e.user_email)
.map((e, idx) => (
<Menu.Item value={e.user_email} key={idx}>
{`${e.first_name} ${e.last_name}`}
</Menu.Item>
))}
{bodyshop.md_to_emails.map((e, idx) => (
<Menu.Item value={e.emails} key={idx + "group"}>
{e.label}
</Menu.Item>
))}
</Menu>
<Menu
onClick={handleClick}
items={[
...bodyshop.employees
.filter((e) => e.user_email)
.map((e, idx) => ({
value: e.user_email,
key: idx,
label: `${e.first_name} ${e.last_name}`,
})),
...bodyshop.md_to_emails.map((e, idx) => ({
value: e.emails,
key: idx + "group",
label: e.label,
})),
]}
/>
</div>
);

718
client/src/components/header/header.component.jsx
View File

@@ -106,304 +106,428 @@ function Header({
selectedKeys={[selectedHeader]}
onClick={handleMenuClick}
subMenuCloseDelay={0.3}
>
<Menu.Item key="home" icon={<HomeFilled />}>
<Link to="/manage">{t("menus.header.home")}</Link>
</Menu.Item>
<Menu.Item key="schedule" icon={<Icon component={FaCalendarAlt} />}>
<Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
</Menu.Item>
<Menu.SubMenu
key="jobssubmenu"
icon={<Icon component={FaCarCrash} />}
title={t("menus.header.jobs")}
>
<Menu.Item key="activejobs" icon={<FileFilled />}>
<Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
</Menu.Item>
<Menu.Item key="readyjobs" icon={<CheckCircleOutlined />}>
<Link to="/manage/jobs/ready">{t("menus.header.readyjobs")}</Link>
</Menu.Item>
<Menu.Item key="parts-queue" icon={<ToolFilled />}>
<Link to="/manage/partsqueue">{t("menus.header.parts-queue")}</Link>
</Menu.Item>
<Menu.Item key="availablejobs" icon={<ImportOutlined />}>
<Link to="/manage/available">
{t("menus.header.availablejobs")}
</Link>
</Menu.Item>
<Menu.Item key="newjob" icon={<FileAddOutlined />}>
<Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
</Menu.Item>
<Menu.Divider key="div1" />
<Menu.Item key="alljobs" icon={<UnorderedListOutlined />}>
<Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
</Menu.Item>
<Menu.Divider key="div2" />
<Menu.Item key="productionlist" icon={<ScheduleOutlined />}>
<Link to="/manage/production/list">
{t("menus.header.productionlist")}
</Link>
</Menu.Item>
<Menu.Item key="productionboard" icon={<Icon component={BsKanban} />}>
<Link to="/manage/production/board">
{t("menus.header.productionboard")}
</Link>
</Menu.Item>
<Menu.Divider key="div3" />
<Menu.Item key="scoreboard" icon={<LineChartOutlined />}>
<Link to="/manage/scoreboard">{t("menus.header.scoreboard")}</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
key="customers"
icon={<UserOutlined />}
title={t("menus.header.customers")}
>
<Menu.Item key="owners" icon={<TeamOutlined />}>
<Link to="/manage/owners">{t("menus.header.owners")}</Link>
</Menu.Item>
<Menu.Item key="vehicles" icon={<CarFilled />}>
<Link to="/manage/vehicles">{t("menus.header.vehicles")}</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
key="ccs"
icon={<CarFilled />}
title={t("menus.header.courtesycars")}
>
<Menu.Item key="courtesycarsall" icon={<CarFilled />}>
<Link to="/manage/courtesycars">
{t("menus.header.courtesycars-all")}
</Link>
</Menu.Item>
<Menu.Item key="contracts" icon={<FileFilled />}>
<Link to="/manage/courtesycars/contracts">
{t("menus.header.courtesycars-contracts")}
</Link>
</Menu.Item>
<Menu.Item key="newcontract" icon={<FileAddFilled />}>
<Link to="/manage/courtesycars/contracts/new">
{t("menus.header.courtesycars-newcontract")}
</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
key="accounting"
icon={<DollarCircleFilled />}
title={t("menus.header.accounting")}
>
<Menu.Item
key="bills"
icon={<Icon component={FaFileInvoiceDollar} />}
>
<Link to="/manage/bills">{t("menus.header.bills")}</Link>
</Menu.Item>
<Menu.Item
key="enterbills"
icon={<Icon component={GiPayMoney} />}
onClick={() => {
setBillEnterContext({
actions: {},
context: {},
});
}}
>
{t("menus.header.enterbills")}
</Menu.Item>
{Simple_Inventory.treatment === "on" && (
<>
<Menu.Divider key="div4" />
<Menu.Item
key="inventory"
icon={<Icon component={FaFileInvoiceDollar} />}
>
<Link to="/manage/inventory">
{t("menus.header.inventory")}
</Link>
</Menu.Item>
</>
)}
<Menu.Divider key="div7" />
<Menu.Item key="allpayments" icon={<BankFilled />}>
<Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
</Menu.Item>
<Menu.Item
key="enterpayments"
onClick={() => {
setPaymentContext({
actions: {},
context: null,
});
}}
icon={<Icon component={FaCreditCard} />}
>
{t("menus.header.enterpayment")}
</Menu.Item>
<Menu.Divider key="div5" />
<Menu.Item key="timetickets" icon={<FieldTimeOutlined />}>
<Link to="/manage/timetickets">
{t("menus.header.timetickets")}
</Link>
</Menu.Item>
<Menu.Item
key="entertimetickets"
icon={<Icon component={GiPlayerTime} />}
onClick={() => {
setTimeTicketContext({
actions: {},
context: {},
});
}}
>
{t("menus.header.entertimeticket")}
</Menu.Item>
<Menu.Divider key="div6" />
<Menu.SubMenu
key="accountingexport"
title={t("menus.header.export")}
icon={<ExportOutlined />}
>
<Menu.Item key="receivables">
<Link to="/manage/accounting/receivables">
{t("menus.header.accounting-receivables")}
</Link>
</Menu.Item>
{(!(
(bodyshop && bodyshop.cdk_dealerid) ||
(bodyshop && bodyshop.pbs_serialnumber)
) ||
DmsAp.treatment === "on") && (
<Menu.Item key="payables">
<Link to="/manage/accounting/payables">
{t("menus.header.accounting-payables")}
</Link>
</Menu.Item>
)}
{!(
(bodyshop && bodyshop.cdk_dealerid) ||
(bodyshop && bodyshop.pbs_serialnumber)
) && (
<Menu.Item key="payments">
<Link to="/manage/accounting/payments">
{t("menus.header.accounting-payments")}
</Link>
</Menu.Item>
)}
<Menu.Item key="export-logs">
<Link to="/manage/accounting/exportlogs">
{t("menus.header.export-logs")}
</Link>
</Menu.Item>
</Menu.SubMenu>
</Menu.SubMenu>
<Menu.Item key="phonebook" icon={<PhoneOutlined />}>
<Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
</Menu.Item>
<Menu.Item key="temporarydocs" icon={<PaperClipOutlined />}>
<Link to="/manage/temporarydocs">
{t("menus.header.temporarydocs")}
</Link>
</Menu.Item>
<Menu.SubMenu
key="shopsubmenu"
title={t("menus.header.shop")}
icon={<SettingOutlined />}
>
<Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
</Menu.Item>
<Menu.Item key="dashboard" icon={<DashboardFilled />}>
<Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>
</Menu.Item>
<Menu.Item
key="reportcenter"
icon={<BarChartOutlined />}
onClick={() => {
setReportCenterContext({
actions: {},
context: {},
});
}}
>
{t("menus.header.reportcenter")}
</Menu.Item>
<Menu.Item
key="shop-vendors"
icon={<Icon component={IoBusinessOutline} />}
>
<Link to="/manage/shop/vendors">
{t("menus.header.shop_vendors")}
</Link>
</Menu.Item>
<Menu.Item key="shop-csi" icon={<Icon component={RiSurveyLine} />}>
<Link to="/manage/shop/csi">{t("menus.header.shop_csi")}</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
key="user"
title={
currentUser.displayName ||
currentUser.email ||
t("general.labels.unknown")
}
>
<Menu.Item key="signout" danger onClick={() => signOutStart()}>
{t("user.actions.signout")}
</Menu.Item>
<Menu.Item
key="help"
onClick={() => {
window.open("https://help.imex.online/", "_blank");
}}
icon={<Icon component={QuestionCircleFilled} />}
>
{t("menus.header.help")}
</Menu.Item>
<Menu.Item
key="rescue"
onClick={() => {
window.open("https://imexrescue.com/", "_blank");
}}
>
{t("menus.header.rescueme")}
</Menu.Item>
<Menu.Item key="shiftclock">
<Link to="/manage/shiftclock">{t("menus.header.shiftclock")}</Link>
</Menu.Item>
<Menu.Item key="profile">
<Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
</Menu.Item>
items={[
{
// <Menu.SubMenu
// key="langselecter"
// title={
// <span>
// <GlobalOutlined />
// <span>{t("menus.currentuser.languageselector")}</span>
// </span>
// }
// >
// <Menu.Item actiontype="lang-select" key="en-US">
// {t("general.languages.english")}
// </Menu.Item>
// <Menu.Item actiontype="lang-select" key="fr-CA">
// {t("general.languages.french")}
// </Menu.Item>
// <Menu.Item actiontype="lang-select" key="es-MX">
// {t("general.languages.spanish")}
// </Menu.Item>
// </Menu.SubMenu>
}
</Menu.SubMenu>
<Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
{recentItems.map((i, idx) => (
<Menu.Item key={idx}>
<Link to={i.url}>{i.label}</Link>
</Menu.Item>
))}
</Menu.SubMenu>
</Menu>
key: "home",
icon: <HomeFilled />,
label: <Link to="/manage">{t("menus.header.home")}</Link>,
},
{
key: "schedule",
icon: <Icon component={FaCalendarAlt} />,
label: (
<Link to="/manage/schedule">{t("menus.header.schedule")}</Link>
),
},
{
key: "jobssubmenu",
icon: <Icon component={FaCarCrash} />,
label: t("menus.header.jobs"),
children: [
{
key: "activejobs",
icon: <FileFilled />,
label: (
<Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
),
},
{
key: "readyjobs",
icon: <CheckCircleOutlined />,
label: (
<Link to="/manage/jobs/ready">
{t("menus.header.readyjobs")}
</Link>
),
},
{
key: "parts-queue",
icon: <ToolFilled />,
label: (
<Link to="/manage/partsqueue">
{t("menus.header.parts-queue")}
</Link>
),
},
{
key: "availablejobs",
icon: <ImportOutlined />,
label: (
<Link to="/manage/available">
{t("menus.header.availablejobs")}
</Link>
),
},
{
key: "newjob",
icon: <FileAddOutlined />,
label: (
<Link to="/manage/jobs/new">{t("menus.header.newjob")}</Link>
),
},
{ type: "divider" },
{
key: "alljobs",
icon: <UnorderedListOutlined />,
label: (
<Link to="/manage/jobs/all">{t("menus.header.alljobs")}</Link>
),
},
{ type: "divider" },
{
key: "productionlist",
icon: <ScheduleOutlined />,
label: (
<Link to="/manage/production/list">
{t("menus.header.productionlist")}
</Link>
),
},
{
key: "productionboard",
icon: <Icon component={BsKanban} />,
label: (
<Link to="/manage/production/board">
{t("menus.header.productionboard")}
</Link>
),
},
{
type: "divider",
},
{
key: "scoreboard",
icon: <LineChartOutlined />,
label: (
<Link to="/manage/scoreboard">
{t("menus.header.scoreboard")}
</Link>
),
},
],
},
{
key: "customers",
icon: <UserOutlined />,
label: t("menus.header.customers"),
children: [
{
key: "owners",
icon: <TeamOutlined />,
label: (
<Link to="/manage/owners">{t("menus.header.owners")}</Link>
),
},
{
key: "vehicles",
icon: <CarFilled />,
label: (
<Link to="/manage/vehicles">
{t("menus.header.vehicles")}
</Link>
),
},
],
},
{
key: "ccs",
icon: <CarFilled />,
label: t("menus.header.courtesycars"),
children: [
{
key: "courtesycarsall",
icon: <CarFilled />,
label: (
<Link to="/manage/courtesycars">
{t("menus.header.courtesycars-all")}
</Link>
),
},
{
key: "contracts",
icon: <FileFilled />,
label: (
<Link to="/manage/courtesycars/contracts">
{t("menus.header.courtesycars-contracts")}
</Link>
),
},
{
key: "newcontract",
icon: <FileAddFilled />,
label: (
<Link to="/manage/courtesycars/contracts/new">
{t("menus.header.courtesycars-newcontract")}
</Link>
),
},
],
},
{
key: "accounting",
icon: <DollarCircleFilled />,
label: t("menus.header.accounting"),
children: [
{
key: "bills",
icon: <Icon component={FaFileInvoiceDollar} />,
label: (
<Link to="/manage/bills">{t("menus.header.bills")}</Link>
),
},
{
key: "enterbills",
icon: <Icon component={GiPayMoney} />,
onClick: () => {
setBillEnterContext({
actions: {},
context: {},
});
},
label: t("menus.header.enterbills"),
},
...(Simple_Inventory.treatment === "on"
? [
{
type: "divider",
},
{
key: "inventory",
icon: <Icon component={FaFileInvoiceDollar} />,
label: (
<Link to="/manage/inventory">
{t("menus.header.inventory")}
</Link>
),
},
]
: []),
{ type: "divider" },
{
key: "allpayments",
icon: <BankFilled />,
label: (
<Link to="/manage/payments">
{t("menus.header.allpayments")}
</Link>
),
},
{
key: "enterpayments",
onClick: () => {
setPaymentContext({
actions: {},
context: null,
});
},
icon: <Icon component={FaCreditCard} />,
label: t("menus.header.enterpayment"),
},
{ type: "divider" },
{
key: "timetickets",
icon: <FieldTimeOutlined />,
label: (
<Link to="/manage/timetickets">
{t("menus.header.timetickets")}
</Link>
),
},
{
key: "entertimetickets",
icon: <Icon component={GiPlayerTime} />,
onClick: () => {
setTimeTicketContext({
actions: {},
context: {},
});
},
label: t("menus.header.entertimeticket"),
},
{ type: "divider" },
{
key: "accountingexport",
icon: <ExportOutlined />,
label: t("menus.header.export"),
children: [
{
key: "receivables",
label: (
<Link to="/manage/accounting/receivables">
{t("menus.header.accounting-receivables")}
</Link>
),
},
...(!(
(bodyshop && bodyshop.cdk_dealerid) ||
(bodyshop && bodyshop.pbs_serialnumber)
) || DmsAp.treatment === "on"
? [
{
key: "payables",
label: (
<Link to="/manage/accounting/payables">
{t("menus.header.accounting-payables")}
</Link>
),
},
]
: []),
...(!(
(bodyshop && bodyshop.cdk_dealerid) ||
(bodyshop && bodyshop.pbs_serialnumber)
)
? [
{
key: "payments",
label: (
<Link to="/manage/accounting/payments">
{t("menus.header.accounting-payments")}
</Link>
),
},
]
: []),
{
key: "export-logs",
label: (
<Link to="/manage/accounting/exportlogs">
{t("menus.header.export-logs")}
</Link>
),
},
],
},
],
},
{
key: "phonebook",
icon: <PhoneOutlined />,
label: (
<Link to="/manage/phonebook">{t("menus.header.phonebook")}</Link>
),
},
{
key: "temporarydocs",
icon: <PaperClipOutlined />,
label: (
<Link to="/manage/temporarydocs">
{t("menus.header.temporarydocs")}
</Link>
),
},
{
key: "shopsubmenu",
icon: <SettingOutlined />,
label: t("menus.header.shop"),
children: [
{
key: "shop",
icon: <Icon component={GiSettingsKnobs} />,
label: (
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
),
},
{
key: "dashboard",
icon: <DashboardFilled />,
label: (
<Link to="/manage/dashboard">
{t("menus.header.dashboard")}
</Link>
),
},
{
key: "reportcenter",
icon: <BarChartOutlined />,
onClick: () => {
setReportCenterContext({
actions: {},
context: {},
});
},
label: t("menus.header.reportcenter"),
},
{
key: "shop-vendors",
icon: <Icon component={IoBusinessOutline} />,
label: (
<Link to="/manage/shop/vendors">
{t("menus.header.shop_vendors")}
</Link>
),
},
{
key: "shop-csi",
icon: <Icon component={RiSurveyLine} />,
label: (
<Link to="/manage/shop/csi">
{t("menus.header.shop_csi")}
</Link>
),
},
],
},
{
key: "user",
label:
currentUser.displayName ||
currentUser.email ||
t("general.labels.unknown"),
children: [
{
key: "signout",
danger: true,
onClick: () => signOutStart(),
label: t("user.actions.signout"),
},
{
key: "help",
icon: <Icon component={QuestionCircleFilled} />,
onClick: () => {
window.open("https://help.imex.online/", "_blank");
},
label: t("menus.header.help"),
},
{
key: "rescue",
onClick: () => {
window.open("https://imexrescue.com/", "_blank");
},
label: t("menus.header.rescueme"),
},
{
key: "shiftclock",
label: (
<Link to="/manage/shiftclock">
{t("menus.header.shiftclock")}
</Link>
),
},
{
key: "profile",
label: (
<Link to="/manage/profile">
{t("menus.currentuser.profile")}
</Link>
),
},
],
},
{
key: "recent",
label: <ClockCircleFilled />,
children: recentItems.map((i, idx) => ({
key: idx,
label: <Link to={i.url}>{i.label}</Link>,
})),
},
]}
></Menu>
</Layout.Header>
);
}

23
client/src/components/job-at-change/job-at-change.component.jsx
View File

@@ -37,18 +37,19 @@ export function JobAltTransportChange({ bodyshop, job }) {
});
}
};
const menu = (
<Menu selectedKeys={[job && job.alt_transport]} onClick={onClick}>
{bodyshop.appt_alt_transport &&
bodyshop.appt_alt_transport.map((alt) => (
<Menu.Item key={alt}>{alt}</Menu.Item>
))}
<Menu.Divider />
<Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
</Menu>
);
const menu = [
...(bodyshop.appt_alt_transport &&
bodyshop.appt_alt_transport.map((alt) => ({
key: alt,
label: alt,
value: alt,
onClick,
}))),
{ type: "divider" },
{ key: "null", label: t("general.actions.clear"), onClick },
];
return (
<Dropdown overlay={menu}>
<Dropdown menu={{ items: menu }}>
<a href=" #" onClick={(e) => e.preventDefault()}>
<DownOutlined />
</a>

28
client/src/components/job-at-change/schedule-event.color.component.jsx
View File

@@ -44,21 +44,23 @@ export function ScheduleEventColor({ bodyshop, event }) {
bodyshop.appt_colors.filter((color) => color.color.hex === event.color)[0]
?.label;
const menu = (
<Menu selectedKeys={[event.color]} onClick={onClick}>
{bodyshop.appt_colors &&
bodyshop.appt_colors.map((color) => (
<Menu.Item style={{ color: color.color.hex }} key={color.color.hex}>
{color.label}
</Menu.Item>
))}
<Menu.Divider />
<Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
</Menu>
);
const menu = {
items: [
...(bodyshop.appt_colors &&
bodyshop.appt_colors.map((color) => ({
style: { color: color.color.hex },
key: color.color.hex,
label: color.label,
}))),
{ type: "divider" },
{ key: "null", value: t("general.actions.clear") },
],
selectedKeys: [event.color],
onClick: onClick,
};
return (
<Dropdown overlay={menu}>
<Dropdown menu={menu}>
<a href=" #" onClick={(e) => e.preventDefault()}>
{selectedColor}
<DownOutlined />

36
client/src/components/job-at-change/schedule-event.component.jsx
View File

@@ -149,10 +149,12 @@ export function ScheduleEventComponent({
) : null}
{event.job ? (
<Dropdown
overlay={
<Menu>
<Menu.Item
onClick={() => {
menu={{
items: [
{
disabled: event.arrived,
label: t("general.labels.email"),
onClick: () => {
const Template = TemplateList("job").appointment_reminder;
GenerateDocument(
{
@@ -166,13 +168,12 @@ export function ScheduleEventComponent({
"e",
event.job && event.job.id
);
}}
disabled={event.arrived}
>
{t("general.labels.email")}
</Menu.Item>
<Menu.Item
onClick={() => {
},
},
{
label: t("general.labels.sms"),
disabled: event.arrived || !bodyshop.messagingservicesid,
onClick: () => {
const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
if (p && p.isValid()) {
openChatByPhone({
@@ -192,13 +193,10 @@ export function ScheduleEventComponent({
message: t("messaging.error.invalidphone"),
});
}
}}
disabled={event.arrived || !bodyshop.messagingservicesid}
>
{t("general.labels.sms")}
</Menu.Item>
</Menu>
}
},
},
],
}}
>
<Button>{t("appointments.actions.sendreminder")}</Button>
</Dropdown>
@@ -249,7 +247,7 @@ export function ScheduleEventComponent({
const RegularEvent = event.isintake ? (
<Space
wrap
size='small'
size="small"
style={{
backgroundColor:
event.color && event.color.hex ? event.color.hex : event.color,

27
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -103,7 +103,9 @@ export function JobLinesComponent({
fixed: "left",
key: "line_desc",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
onCell: (record) => ({ className: record.manual_line && "job-line-manual" }),
onCell: (record) => ({
className: record.manual_line && "job-line-manual",
}),
sortOrder:
state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
ellipsis: true,
@@ -405,16 +407,17 @@ export function JobLinesComponent({
}
};
const markMenu = (
<Menu onClick={handleMark}>
<Menu.Item key="PAA">{t("joblines.fields.part_types.PAA")}</Menu.Item>
<Menu.Item key="PAN">{t("joblines.fields.part_types.PAN")}</Menu.Item>
<Menu.Item key="PAL">{t("joblines.fields.part_types.PAL")}</Menu.Item>
<Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
<Menu.Divider />
<Menu.Item key="clear">{t("general.labels.clear")}</Menu.Item>
</Menu>
);
const markMenu = {
onClick: handleMark,
items: [
{ key: "PAA", label: t("joblines.fields.part_types.PAA") },
{ key: "PAN", label: t("joblines.fields.part_types.PAN") },
{ key: "PAL", label: t("joblines.fields.part_types.PAL") },
{ key: "PAS", label: t("joblines.fields.part_types.PAS") },
{ type: "divider" },
{ key: "clear", label: t("general.labels.clear") },
],
};
return (
<div>
@@ -544,7 +547,7 @@ export function JobLinesComponent({
>
<FilterFilled /> {t("jobs.actions.filterpartsonly")}
</Button>
<Dropdown overlay={markMenu} trigger={["click"]}>
<Dropdown menu={markMenu} trigger={["click"]}>
<Button>{t("jobs.actions.mark")}</Button>
</Dropdown>
<Button

18
client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx
View File

@@ -21,19 +21,17 @@ export function JoblinePresetButton({ bodyshop, form }) {
form.setFieldsValue(item);
};
const menu = (
<Menu>
{bodyshop.md_jobline_presets.map((i, idx) => (
<Menu.Item onClick={() => handleSelect(i)} key={idx}>
{i.label}
</Menu.Item>
))}
</Menu>
);
const menu = {
items: bodyshop.md_jobline_presets.map((i, idx) => ({
onClick: () => handleSelect(i),
key: idx,
label: i.label,
})),
};
return (
<div>
<Dropdown trigger={["click"]} overlay={menu}>
<Dropdown trigger={["click"]} menu={menu}>
<a
className="ant-dropdown-link"
href="# "

22
client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
View File

@@ -40,20 +40,18 @@ export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
});
};
const statusmenu = (
<Menu
onClick={(e) => {
updateJobStatus(e.key);
}}
>
{bodyshop.md_ro_statuses.statuses.map((item) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
</Menu>
);
const statusmenu = {
onClick: (e) => {
updateJobStatus(e.key);
},
items: bodyshop.md_ro_statuses.statuses.map((item) => ({
key: item,
label: item,
})),
};
return (
<Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
<Dropdown menu={statusmenu} trigger={["click"]} key="changestatus">
<Button shape="round">
<span>{job.status}</span>

41
client/src/components/jobs-change-status/jobs-change-status.component.jsx
View File

@@ -81,29 +81,30 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
}
}, [job, setAvailableStatuses, bodyshop]);
const statusmenu = (
<Menu
onClick={(e) => {
updateJobStatus(e.key);
}}
>
{availableStatuses.map((item) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
{job.converted && (
<>
<Menu.Divider />
{otherStages.map((item, idx) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
</>
)}
</Menu>
);
const statusmenu = {
onClick: (e) => {
updateJobStatus(e.key);
},
items: [
...availableStatuses.map((item) => ({
key: item,
label: item,
})),
...(job.converted && [
{
type: "divider",
},
...otherStages.map((item, idx) => ({
key: item,
label: item,
})),
]),
],
};
return (
<Dropdown
overlay={statusmenu}
menu={statusmenu}
trigger={["click"]}
key="changestatus"
disabled={jobRO || !job.converted}

19
client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
View File

@@ -62,18 +62,17 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
);
};
const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
<Menu onClick={handleMenuClick}>
{bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
<Menu.Item disabled={disabled} key={mapping.name}>
{mapping.name}
</Menu.Item>
))}
</Menu>
);
const overlay = {
onClick: handleMenuClick,
items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
label: mapping.name,
key: mapping.name,
disabled: disabled,
})),
};
return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
<Dropdown overlay={overlay}>
<Dropdown menu={overlay}>
<Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
</Dropdown>
) : (

21
client/src/components/jobs-detail-change-estimator/jobs-detail-change-estimator.component.jsx
View File

@@ -15,20 +15,17 @@ export function JobsDetailChangeEstimator({ disabled, form, bodyshop }) {
form.setFieldsValue(est);
};
const menu = (
<div>
<Menu onClick={handleClick}>
{bodyshop.md_estimators.map((est, idx) => (
<Menu.Item value={est} key={idx}>
{`${est.est_ct_fn} ${est.est_ct_ln}`}
</Menu.Item>
))}
</Menu>
</div>
);
const menu = {
onClick: handleClick,
items: bodyshop.md_estimators.map((est, idx) => ({
value: est,
key: idx,
label: `${est.est_ct_fn || ""} ${est.est_ct_ln || ""}`.trim(),
})),
};
return (
<Dropdown overlay={menu} disabled={disabled}>
<Dropdown menu={menu} disabled={disabled}>
<a
className="ant-dropdown-link"
href=" #"

28
client/src/components/jobs-detail-change-filehandler/jobs-detail-change-filehandler.component.jsx
View File

@@ -15,23 +15,21 @@ export function JobsDetailChangeFilehandler({ disabled, form, bodyshop }) {
form.setFieldsValue(est);
};
const menu = (
<Menu
onClick={handleClick}
style={{
columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
}}
>
{bodyshop.md_filehandlers.map((est, idx) => (
<Menu.Item value={est} key={idx} style={{ breakInside: "avoid" }}>
{`${est.ins_ct_fn} ${est.ins_ct_ln}`}
</Menu.Item>
))}
</Menu>
);
const menu = {
onClick: handleClick,
style: {
columnCount: Math.floor(bodyshop.md_filehandlers.length / 10) + 1,
},
items: bodyshop.md_filehandlers.map((est, idx) => ({
value: est,
key: idx,
style: { breakInside: "avoid" },
label: `${est.ins_ct_fn || ""} ${est.ins_ct_ln || ""}`.trim(),
})),
};
return (
<Dropdown overlay={menu} disabled={disabled}>
<Dropdown menu={menu} disabled={disabled}>
<a
className="ant-dropdown-link"
href=" #"

30
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addevent.jsx
View File

@@ -4,7 +4,6 @@ import {
Card,
Form,
Input,
Menu,
notification,
Popover,
Select,
@@ -13,25 +12,11 @@ import {
import moment from "moment";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(JobsDetailHeaderAddEvent);
export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) {
export default function JobsDetailHeaderAddEvent({ bodyshop, jobid }) {
const { t } = useTranslation();
const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
@@ -153,11 +138,12 @@ export function JobsDetailHeaderAddEvent({ bodyshop, jobid, ...props }) {
setVisibility(true);
};
return (
<Popover content={overlay} visible={visibility}>
<Menu.Item {...props} onClick={handleClick}>
return {
key: "addmanualevent",
label: (
<Popover content={overlay} open={visibility} onClick={handleClick}>
{t("appointments.labels.manualevent")}
</Menu.Item>
</Popover>
);
</Popover>
),
};
}

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

@@ -105,13 +105,14 @@ export function JobsDetailHeaderActions({
});
};
const statusmenu = (
<Menu key="popovermenu">
<Menu.Item
disabled={!jobInPreProduction || !job.converted || jobRO}
onClick={() => {
const statusmenu = {
items: [
{
key: "schedule",
disabled: !jobInPreProduction || !job.converted || jobRO,
label: t("jobs.actions.schedule"),
onClick: () => {
logImEXEvent("job_header_schedule");
setScheduleContext({
actions: { refetch: refetch },
context: {
@@ -120,200 +121,228 @@ export function JobsDetailHeaderActions({
alt_transport: job.alt_transport,
},
});
}}
>
{t("jobs.actions.schedule")}
</Menu.Item>
<Menu.Item
disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
>
<Popconfirm
title={t("general.labels.areyousure")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
onConfirm={async () => {
const jobUpdate = await cancelAllAppointments({
variables: {
jobid: job.id,
job: {
date_scheduled: null,
scheduled_in: null,
scheduled_completion: null,
status: bodyshop.md_ro_statuses.default_imported,
},
},
{
key: "cancelappts",
disabled: job.status !== bodyshop.md_ro_statuses.default_scheduled,
label: (
<Popconfirm
title={t("general.labels.areyousure")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
disabled={job.status !== bodyshop.md_ro_statuses.default_scheduled}
onConfirm={async () => {
const jobUpdate = await cancelAllAppointments({
variables: {
jobid: job.id,
job: {
date_scheduled: null,
scheduled_in: null,
scheduled_completion: null,
status: bodyshop.md_ro_statuses.default_imported,
},
},
},
});
if (!jobUpdate.errors) {
notification["success"]({
message: t("appointments.successes.canceled"),
});
return;
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.cancelallappointments")}
</Popconfirm>
</Menu.Item>
<Menu.Item
disabled={
if (!jobUpdate.errors) {
notification["success"]({
message: t("appointments.successes.canceled"),
});
return;
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.cancelallappointments")}
</Popconfirm>
),
},
{
key: "intake",
disabled:
!!job.intakechecklist ||
!jobInPreProduction ||
!job.converted ||
jobRO
}
>
{!!job.intakechecklist ||
!jobInPreProduction ||
!job.converted ||
jobRO ? (
t("jobs.actions.intake")
) : (
<Link to={`/manage/jobs/${job.id}/intake`}>
{t("jobs.actions.intake")}
</Link>
)}
</Menu.Item>
<Menu.Item disabled={!jobInProduction || jobRO}>
{!jobInProduction ? (
jobRO,
label:
!!job.intakechecklist ||
!jobInPreProduction ||
!job.converted ||
jobRO ? (
t("jobs.actions.intake")
) : (
<Link to={`/manage/jobs/${job.id}/intake`}>
{t("jobs.actions.intake")}
</Link>
),
},
{
disabled: !jobInProduction || jobRO,
key: "deliver",
label: !jobInProduction ? (
t("jobs.actions.deliver")
) : (
<Link to={`/manage/jobs/${job.id}/deliver`}>
{t("jobs.actions.deliver")}
</Link>
)}
</Menu.Item>
<Menu.Item disabled={!job.converted}>
<Link to={`/manage/jobs/${job.id}/checklist`}>
{t("jobs.actions.viewchecklist")}
</Link>
</Menu.Item>
<Menu.Item
key="entertimetickets"
disabled={
),
},
{
key: "viewchecklist",
disabled: !job.converted,
label: (
<Link to={`/manage/jobs/${job.id}/checklist`}>
{t("jobs.actions.viewchecklist")}
</Link>
),
},
{
key: "entertimetickets",
disabled:
!job.converted ||
(!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced)
}
onClick={() => {
(!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced),
onClick: () => {
logImEXEvent("job_header_enter_time_ticekts");
setTimeTicketContext({
actions: {},
context: { jobId: job.id },
});
}}
>
{t("timetickets.actions.enter")}
</Menu.Item>
<Menu.Item
key="enterpayments"
disabled={!job.converted}
onClick={() => {
},
label: t("timetickets.actions.enter"),
},
{
key: "enterpayments",
disabled: !job.converted,
label: t("menus.header.enterpayment"),
onClick: () => {
logImEXEvent("job_header_enter_payment");
setPaymentContext({
actions: {},
context: { jobid: job.id },
});
}}
>
{t("menus.header.enterpayment")}
</Menu.Item>
<Menu.Item key="cccontract" disabled={jobRO || !job.converted}>
<Link
to={{
pathname: "/manage/courtesycars/contracts/new",
state: { jobId: job.id },
}}
>
{t("menus.jobsactions.newcccontract")}
</Link>
</Menu.Item>
{job.inproduction ? (
<Menu.Item
key="addtoproduction"
disabled={!job.converted}
onClick={() => AddToProduction(client, job.id, refetch, true)}
>
{t("jobs.actions.removefromproduction")}
</Menu.Item>
) : (
<Menu.Item
key="addtoproduction"
disabled={!job.converted}
onClick={() => AddToProduction(client, job.id, refetch)}
>
{t("jobs.actions.addtoproduction")}
</Menu.Item>
)}
<Menu.Item key="togglesuspend" onClick={handleSuspend}>
{job.suspended
},
},
{
key: "cccontract",
disabled: jobRO || !job.converted,
label: (
<Link
to={{
pathname: "/manage/courtesycars/contracts/new",
state: { jobId: job.id },
}}
>
{t("menus.jobsactions.newcccontract")}
</Link>
),
},
...(job.inproduction
? [
{
key: "removetoproduction",
disabled: !job.converted,
onClick: () => AddToProduction(client, job.id, refetch, true),
label: t("jobs.actions.removefromproduction"),
},
]
: [
{
key: "addtoproduction",
disabled: !job.converted,
onClick: () => AddToProduction(client, job.id, refetch),
label: t("jobs.actions.addtoproduction"),
},
]),
{
key: "togglesuspend",
onClick: handleSuspend,
label: job.suspended
? t("production.actions.unsuspend")
: t("production.actions.suspend")}
</Menu.Item>
<Menu.Item key="toggleAlert" onClick={handleAlertToggle}>
{job.production_vars && job.production_vars.alert
? t("production.labels.alertoff")
: t("production.labels.alerton")}
</Menu.Item>
<Menu.SubMenu key="dupe" title={t("menus.jobsactions.duplicate")}>
<Menu.Item>
<Popconfirm
title={t("jobs.labels.duplicateconfirm")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={() =>
DuplicateJob(
client,
job.id,
{ defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
(newJobId) => {
history.push(`/manage/jobs/${newJobId}`);
notification["success"]({
message: t("jobs.successes.duplicated"),
});
},
true
)
}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.duplicate")}
</Popconfirm>
</Menu.Item>
<Menu.Item>
<Popconfirm
title={t("jobs.labels.duplicateconfirm")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={() =>
DuplicateJob(
client,
job.id,
{ defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
(newJobId) => {
history.push(`/manage/jobs/${newJobId}`);
notification["success"]({
message: t("jobs.successes.duplicated"),
});
: t("production.actions.suspend"),
},
{
key: "toggleAlert",
onClick: handleAlertToggle,
label:
job.production_vars && job.production_vars.alert
? t("production.labels.alertoff")
: t("production.labels.alerton"),
},
{
key: "dupe",
label: t("menus.jobsactions.duplicate"),
children: [
{
key: "dupewithlines",
label: (
<Popconfirm
title={t("jobs.labels.duplicateconfirm")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={() =>
DuplicateJob(
client,
job.id,
{
defaultOpenStatus:
bodyshop.md_ro_statuses.default_imported,
},
(newJobId) => {
history.push(`/manage/jobs/${newJobId}`);
notification["success"]({
message: t("jobs.successes.duplicated"),
});
},
true
)
}
)
}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.duplicatenolines")}
</Popconfirm>
</Menu.Item>
</Menu.SubMenu>
<Menu.Item
key="postbills"
disabled={!job.converted}
onClick={() => {
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.duplicate")}
</Popconfirm>
),
},
{
key: "dupewithoutlines",
label: (
<Popconfirm
title={t("jobs.labels.duplicateconfirm")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={() =>
DuplicateJob(
client,
job.id,
{
defaultOpenStatus:
bodyshop.md_ro_statuses.default_imported,
},
(newJobId) => {
history.push(`/manage/jobs/${newJobId}`);
notification["success"]({
message: t("jobs.successes.duplicated"),
});
}
)
}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.duplicatenolines")}
</Popconfirm>
),
},
],
},
{
key: "postbills",
disabled: !job.converted,
label: t("jobs.actions.postbills"),
onClick: () => {
logImEXEvent("job_header_enter_bills");
setBillEnterContext({
@@ -322,14 +351,13 @@ export function JobsDetailHeaderActions({
job: job,
},
});
}}
>
{t("jobs.actions.postbills")}
</Menu.Item>
<Menu.Item
key="addtopartsqueue"
disabled={!job.converted || !jobInProduction || jobRO}
onClick={async () => {
},
},
{
key: "addtopartsqueue",
disabled: !job.converted || !jobInProduction || jobRO,
label: t("jobs.actions.addtopartsqueue"),
onClick: async () => {
const result = await updateJob({
variables: {
jobId: job.id,
@@ -348,12 +376,12 @@ export function JobsDetailHeaderActions({
}),
});
}
}}
>
{t("jobs.actions.addtopartsqueue")}
</Menu.Item>
<Menu.Item disabled={!jobInPostProduction} key="closejob">
{!jobInPostProduction ? (
},
},
{
disabled: !jobInPostProduction,
key: "closejob",
label: !jobInPostProduction ? (
t("menus.jobsactions.closejob")
) : (
<Link
@@ -363,23 +391,27 @@ export function JobsDetailHeaderActions({
>
{t("menus.jobsactions.closejob")}
</Link>
)}
</Menu.Item>
<Menu.Item key="admin">
<Link
to={{
pathname: `/manage/jobs/${job.id}/admin`,
}}
>
{t("menus.jobsactions.admin")}
</Link>
</Menu.Item>
<JobsDetailHeaderActionsExportcustdataComponent job={job} />
<JobsDetaiLheaderCsi job={job} />
<Menu.Item
key="jobcosting"
disabled={!job.converted}
onClick={() => {
),
},
{
key: "admin",
label: (
<Link
to={{
pathname: `/manage/jobs/${job.id}/admin`,
}}
>
{t("menus.jobsactions.admin")}
</Link>
),
},
JobsDetailHeaderActionsExportcustdataComponent({ bodyshop, job }),
JobsDetaiLheaderCsi({ job, bodyshop }),
{
key: "jobcosting",
label: t("jobs.labels.jobcosting"),
disabled: !job.converted,
onClick: () => {
logImEXEvent("job_header_job_costing");
setJobCostingContext({
actions: { refetch: refetch },
@@ -387,96 +419,108 @@ export function JobsDetailHeaderActions({
jobId: job.id,
},
});
}}
>
{t("jobs.labels.jobcosting")}
</Menu.Item>
{job && !job.converted && (
<Menu.Item>
<Popconfirm
title={t("jobs.labels.deleteconfirm")}
okText={t("general.labels.yes")}
cancelText={t("general.labels.no")}
onClick={(e) => e.stopPropagation()}
onConfirm={async () => {
//delete the job.
const result = await deleteJob({ variables: { id: job.id } });
},
},
...(job && !job.converted
? [
{
key: "deletejob",
label: (
<Popconfirm
title={t("jobs.labels.deleteconfirm")}
okText={t("general.labels.yes")}
cancelText={t("general.labels.no")}
onClick={(e) => e.stopPropagation()}
onConfirm={async () => {
//delete the job.
const result = await deleteJob({
variables: { id: job.id },
});
if (!!!result.errors) {
notification["success"]({
message: t("jobs.successes.delete"),
});
//go back to jobs list.
history.push(`/manage/`);
} else {
notification["error"]({
message: t("jobs.errors.deleted", {
error: JSON.stringify(result.errors),
}),
});
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.deletejob")}
</Popconfirm>
</Menu.Item>
)}
<JobsDetailHeaderActionsAddevent jobid={job.id} />
{!jobRO && job.converted && (
<Menu.Item>
<Popconfirm
title={t("jobs.labels.voidjob")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={async () => {
//delete the job.
const result = await voidJob({
variables: {
jobId: job.id,
job: {
status: bodyshop.md_ro_statuses.default_void,
voided: true,
scheduled_in: null,
scheduled_completion: null,
inproduction: false,
},
note: [
{
jobid: job.id,
created_by: currentUser.email,
audit: true,
text: t("jobs.labels.voidnote"),
},
],
},
});
if (!!!result.errors) {
notification["success"]({
message: t("jobs.successes.delete"),
});
//go back to jobs list.
history.push(`/manage/`);
} else {
notification["error"]({
message: t("jobs.errors.deleted", {
error: JSON.stringify(result.errors),
}),
});
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.deletejob")}
</Popconfirm>
),
},
]
: []),
///////HEADER ADD EVENT ITEM
JobsDetailHeaderActionsAddevent({ jobid: job.id, bodyshop }),
...(!jobRO && job.converted
? [
{
key: "voidjob",
label: (
<Popconfirm
title={t("jobs.labels.voidjob")}
okText="Yes"
cancelText="No"
onClick={(e) => e.stopPropagation()}
onConfirm={async () => {
//delete the job.
const result = await voidJob({
variables: {
jobId: job.id,
job: {
status: bodyshop.md_ro_statuses.default_void,
voided: true,
scheduled_in: null,
scheduled_completion: null,
inproduction: false,
},
note: [
{
jobid: job.id,
created_by: currentUser.email,
audit: true,
text: t("jobs.labels.voidnote"),
},
],
},
});
if (!!!result.errors) {
notification["success"]({
message: t("jobs.successes.voided"),
});
//go back to jobs list.
history.push(`/manage/`);
} else {
notification["error"]({
message: t("jobs.errors.voiding", {
error: JSON.stringify(result.errors),
}),
});
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.void")}
</Popconfirm>
),
},
]
: []),
],
};
if (!!!result.errors) {
notification["success"]({
message: t("jobs.successes.voided"),
});
//go back to jobs list.
history.push(`/manage/`);
} else {
notification["error"]({
message: t("jobs.errors.voiding", {
error: JSON.stringify(result.errors),
}),
});
}
}}
getPopupContainer={(trigger) => trigger.parentNode}
>
{t("menus.jobsactions.void")}
</Popconfirm>
</Menu.Item>
)}
</Menu>
);
return (
<Dropdown overlay={statusmenu} trigger={["click"]} key="changestatus">
<Dropdown menu={statusmenu} trigger={["click"]} key="changestatus">
<Button>
<span>{t("general.labels.actions")}</span>

215
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.csi.component.jsx
View File

@@ -1,11 +1,8 @@
import { useApolloClient, useMutation } from "@apollo/client";
import { Menu, notification } from "antd";
import { notification } from "antd";
import parsePhoneNumber from "libphonenumber-js";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
import {
GET_CURRENT_QUESTIONSET_ID,
@@ -16,30 +13,14 @@ import {
openChatByPhone,
setMessage,
} from "../../redux/messaging/messaging.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { store } from "../../redux/store";
import i18n from "../../translations/i18n";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { TemplateList } from "../../utils/TemplateConstants";
import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser'
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
setEmailOptions: (e) => dispatch(setEmailOptions(e)),
openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
setMessage: (text) => dispatch(setMessage(text)),
});
export function JobsDetailHeaderCsi({
setEmailOptions,
bodyshop,
job,
openChatByPhone,
setMessage,
...props
}) {
const { t } = useTranslation();
export default function JobsDetailHeaderCsi({ bodyshop, job }) {
const { t } = i18n;
const [insertCsi] = useMutation(INSERT_CSI);
const client = useApolloClient();
@@ -97,29 +78,35 @@ export function JobsDetailHeaderCsi({
return;
}
if (e.key === "email")
setEmailOptions({
jobid: job.id,
messageOptions: {
to: [job.ownr_ea],
replyTo: bodyshop.email,
},
template: {
name: TemplateList("job_special").csi_invitation_action.key,
variables: {
id: result.data.insert_csi.returning[0].id,
store.dispatch(
setEmailOptions({
jobid: job.id,
messageOptions: {
to: [job.ownr_ea],
replyTo: bodyshop.email,
},
},
});
template: {
name: TemplateList("job_special").csi_invitation_action.key,
variables: {
id: result.data.insert_csi.returning[0].id,
},
},
})
);
if (e.key === "text") {
const p = parsePhoneNumber(job.ownr_ph1, "CA");
if (p && p.isValid()) {
openChatByPhone({
phone_num: p.formatInternational(),
jobid: job.id,
});
setMessage(
`${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
store.dispatch(
openChatByPhone({
phone_num: p.formatInternational(),
jobid: job.id,
})
);
store.dispatch(
setMessage(
`${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
)
);
} else {
notification["error"]({
@@ -140,29 +127,35 @@ export function JobsDetailHeaderCsi({
}
} else {
if (e.key === "email")
setEmailOptions({
jobid: job.id,
messageOptions: {
to: [job.ownr_ea],
replyTo: bodyshop.email,
},
template: {
name: TemplateList("job_special").csi_invitation_action.key,
variables: {
id: job.csiinvites[0].id,
store.dispatch(
setEmailOptions({
jobid: job.id,
messageOptions: {
to: [job.ownr_ea],
replyTo: bodyshop.email,
},
},
});
template: {
name: TemplateList("job_special").csi_invitation_action.key,
variables: {
id: job.csiinvites[0].id,
},
},
})
);
if (e.key === "text") {
const p = parsePhoneNumber(job.ownr_ph1, "CA");
if (p && p.isValid()) {
openChatByPhone({
phone_num: p.formatInternational(),
jobid: job.id,
});
setMessage(
`${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`
store.dispatch(
openChatByPhone({
phone_num: p.formatInternational(),
jobid: job.id,
})
);
store.dispatch(
setMessage(
`${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`
)
);
} else {
notification["error"]({
@@ -180,61 +173,51 @@ export function JobsDetailHeaderCsi({
}
};
if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return <></>;
if (!HasFeatureAccess({ featureName: "csi", bodyshop })) return {};
return (
<Menu.SubMenu
key="sendcsi"
title={t("jobs.actions.sendcsi")}
disabled={!job.converted}
{...props}
>
<Menu.Item
onClick={handleCreateCsi}
key="email"
disabled={!!!job.ownr_ea}
>
{t("general.labels.email")}
</Menu.Item>
<Menu.Item
onClick={handleCreateCsi}
key="text"
disabled={!!!job.ownr_ph1}
>
{t("general.labels.text")}
</Menu.Item>
<Menu.Item
onClick={handleCreateCsi}
key="generate"
disabled={job.csiinvites && job.csiinvites.length > 0}
>
{t("jobs.actions.generatecsi")}
</Menu.Item>
<Menu.Divider />
{job.csiinvites.map((item, idx) => {
return item.completedon ? (
<Menu.Item key={idx}>
<Link to={`/manage/shop/csi?responseid=${item.id}`}>
<DateTimeFormatter>{item.completedon}</DateTimeFormatter>
</Link>
</Menu.Item>
) : (
<Menu.Item
key={idx}
onClick={() => {
navigator.clipboard.writeText(
`${window.location.protocol}//${window.location.host}/csi/${item.id}`
);
}}
>
{t("general.actions.copylink")}
</Menu.Item>
);
})}
</Menu.SubMenu>
);
return {
key: "sendcsi",
label: t("jobs.actions.sendcsi"),
children: [
{
key: "email",
onClick: handleCreateCsi,
disabled: !!!job.ownr_ea,
label: t("general.labels.email"),
},
{
onClick: handleCreateCsi,
key: "text",
disabled: !!!job.ownr_ph1,
label: t("general.labels.text"),
},
{
key: "generate",
onClick: handleCreateCsi,
disabled: job.csiinvites && job.csiinvites.length > 0,
label: t("jobs.actions.generatecsi"),
},
{ type: "divider" },
...job.csiinvites.map((item, idx) => {
return item.completedon
? {
key: idx,
label: (
<Link to={`/manage/shop/csi?responseid=${item.id}`}>
<DateTimeFormatter>{item.completedon}</DateTimeFormatter>
</Link>
),
}
: {
key: idx,
onClick: () => {
navigator.clipboard.writeText(
`${window.location.protocol}//${window.location.host}/csi/${item.id}`
);
},
label: t("general.actions.copylink"),
};
}),
],
};
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(JobsDetailHeaderCsi);

48
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.exportcustdata.component.jsx
View File

@@ -1,23 +1,13 @@
import { Menu, notification } from "antd";
import { notification } from "antd";
import axios from "axios";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import i18next from "i18next";
import { auth, logImEXEvent } from "../../firebase/firebase.utils";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({});
export function JobsDetailHeaderActionexportCustomerData({
export default function JobsDetailHeaderActionexportCustomerData({
bodyshop,
job,
...props
}) {
const { t } = useTranslation();
const { t } = i18next;
const handleExportCustData = async (e) => {
logImEXEvent("job_export_cust_data");
@@ -100,18 +90,20 @@ export function JobsDetailHeaderActionexportCustomerData({
}
};
return (
<Menu.Item
{...props}
onClick={handleExportCustData}
key="exportcustdata"
disabled={!job.converted}
>
{t("jobs.actions.exportcustdata")}
</Menu.Item>
);
return {
onClick: handleExportCustData,
key: "exportcustdata",
disabled: !job.converted,
label: t("jobs.actions.exportcustdata"),
};
// (
// <Menu.Item
// {...props}
// onClick={handleExportCustData}
// key="exportcustdata"
// disabled={!job.converted}
// >
// {t("jobs.actions.exportcustdata")}
// </Menu.Item>
// );
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(JobsDetailHeaderActionexportCustomerData);

7
client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx
View File

@@ -1,5 +1,5 @@
import React, { useEffect } from "react";
import Gallery from "react-grid-gallery";
import { Gallery } from "react-grid-gallery";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -38,7 +38,7 @@ function JobDocumentsLocalGalleryExternal({
const { t } = useTranslation();
useEffect(() => {
if ( jobId) {
if (jobId) {
getJobMedia(jobId);
}
}, [jobId, getJobMedia]);
@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
val.type.mime &&
val.type.mime.startsWith("image")
) {
acc.push(val);
acc.push({ ...val, src: val.thumbnail });
}
return acc;
}, [])
@@ -65,7 +65,6 @@ function JobDocumentsLocalGalleryExternal({
<div className="clearfix">
<Gallery
images={galleryImages}
backdropClosesModal={true}
onSelectImage={(index, image) => {
setgalleryImages(
galleryImages.map((g, idx) =>

38
client/yarn.lock
View File

@@ -3412,10 +3412,10 @@ ansi-styles@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
antd@^4.22.3:
version "4.24.7"
resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.7.tgz#ad90cc2d6225fe3e0030aeccdc64de6c26edc3e7"
integrity sha512-Qr3AYkeqpd3i/c6M7pjca7Y6XlaIv/p6gD3aqe7/0o8Ueg50G7Aeh+TOaiUfXLGDhnVoNEdaVdDiv8aIaoWB5A==
antd@4.24.5:
version "4.24.5"
resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.5.tgz#e2489fe7929b53044f239f0893f22baf52e43c48"
integrity sha512-1dgDd6OqVP0OGNenNm6bPppYsCO1wkT4SFLcpS/QiiiVZQoDCErQYvEH0ULmPWAEler1Brzal260wwpm0uPeeg==
dependencies:
"@ant-design/colors" "^6.0.0"
"@ant-design/icons" "^4.7.0"
@@ -3430,10 +3430,10 @@ antd@^4.22.3:
rc-checkbox "~2.3.0"
rc-collapse "~3.4.2"
rc-dialog "~9.0.2"
rc-drawer "~6.1.0"
rc-drawer "~6.0.0"
rc-dropdown "~4.0.0"
rc-field-form "~1.27.0"
rc-image "~5.13.0"
rc-image "~5.12.0"
rc-input "~0.1.4"
rc-input-number "~7.3.9"
rc-mentions "~1.13.1"
@@ -3451,7 +3451,7 @@ antd@^4.22.3:
rc-steps "~5.0.0-alpha.2"
rc-switch "~3.2.0"
rc-table "~7.26.0"
rc-tabs "~12.5.0"
rc-tabs "~12.4.1"
rc-textarea "~0.4.5"
rc-tooltip "~5.2.0"
rc-tree "~5.7.0"
@@ -9819,10 +9819,10 @@ rc-dialog@~9.0.0, rc-dialog@~9.0.2:
rc-motion "^2.3.0"
rc-util "^5.21.0"
rc-drawer@~6.1.0:
version "6.1.2"
resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.2.tgz#032918a21bfa8a7d9e52ada1e7b8ed08c0ae6346"
integrity sha512-mYsTVT8Amy0LRrpVEv7gI1hOjtfMSO/qHAaCDzFx9QBLnms3cAQLJkaxRWM+Eq99oyLhU/JkgoqTg13bc4ogOQ==
rc-drawer@~6.0.0:
version "6.0.3"
resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.0.3.tgz#09993ecdf88ddd569d5a3341d907e3ab258096bb"
integrity sha512-u4RajgrnREKQH/21gB2JHZiA6ZECo0X0BbmDxAJEhKD9jUhlAbqMN5I9VWa4PSzi9ceLHUShqQcPAh2EJswffw==
dependencies:
"@babel/runtime" "^7.10.1"
"@rc-component/portal" "^1.0.0-6"
@@ -9849,10 +9849,10 @@ rc-field-form@~1.27.0:
async-validator "^4.1.0"
rc-util "^5.8.0"
rc-image@~5.13.0:
version "5.13.0"
resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.13.0.tgz#1ed9b852a40b5eff34786ba7d2f0e9d26eeab874"
integrity sha512-iZTOmw5eWo2+gcrJMMcnd7SsxVHl3w5xlyCgsULUdJhJbnuI8i/AL0tVOsE7aLn9VfOh1qgDT3mC2G75/c7mqg==
rc-image@~5.12.0:
version "5.12.2"
resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.12.2.tgz#ccaab23fc0f0eb2351724dc0247503022c1dda90"
integrity sha512-12OCOspbN2AW2L1w+7vnYc+k0RexenqfQZIvq3WyYODp9GnTN4GLV8juekm3Apc/pwdfBSp0The1FZ5KXEozhg==
dependencies:
"@babel/runtime" "^7.11.2"
"@rc-component/portal" "^1.0.2"
@@ -10065,10 +10065,10 @@ rc-table@~7.26.0:
rc-util "^5.22.5"
shallowequal "^1.1.0"
rc-tabs@~12.5.0:
version "12.5.6"
resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.5.6.tgz#611728575d5f3ef010a8e5e75d2c1b67bb71e86a"
integrity sha512-aArXHzxK7YICxe+622CZ8FlO5coMi8P7E6tXpseCPKm1gdTjUt0LrQK1/AxcrRXZXG3K4QqhlKmET0+cX5DQaQ==
rc-tabs@~12.4.1:
version "12.4.2"
resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.4.2.tgz#487a1b3f8d8cf0bfc121224013dab00d4a8e0532"
integrity sha512-FFlGwuTjQUznWzJtyhmHc6KAp5lRQFxKUv9Aj1UtsOYe2e7WGmuzcrd+/LQchuPe0VjhaZPdGkmFGcqGqNO6ow==
dependencies:
"@babel/runtime" "^7.11.2"
classnames "2.x"