diff --git a/client/src/components/production-list-columns/production-list-columns.status.component.jsx b/client/src/components/production-list-columns/production-list-columns.status.component.jsx
index e29ffdbeb..18e4c8c9c 100644
--- a/client/src/components/production-list-columns/production-list-columns.status.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.status.component.jsx
@@ -1,12 +1,12 @@
import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, Spin } from "antd";
+import { Dropdown, Spin } from "antd";
import React, { useState } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
const mapStateToProps = createStructuredSelector({
@@ -47,16 +47,14 @@ export function ProductionListColumnStatus({
return (
- {bodyshop.md_ro_statuses.production_statuses.map((item) => (
- {item}
- ))}
-
- }
+ menu={{
+ style: { maxHeight: "200px", overflowY: "auto" },
+ onClick: handleSetStatus,
+ items: bodyshop.md_ro_statuses.production_statuses.map((item) => ({
+ key: item,
+ label: item,
+ })),
+ }}
trigger={["click"]}
>
diff --git a/client/src/components/production-list-table/production-list-print.component.jsx b/client/src/components/production-list-table/production-list-print.component.jsx
index 4e31b33d0..355541cfc 100644
--- a/client/src/components/production-list-table/production-list-print.component.jsx
+++ b/client/src/components/production-list-table/production-list-print.component.jsx
@@ -1,8 +1,8 @@
-import { Button, Dropdown, Menu } from "antd";
+import { Button, Dropdown } from "antd";
import React, { useState } from "react";
-import { TemplateList } from "../../utils/TemplateConstants";
import { useTranslation } from "react-i18next";
import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -31,98 +31,86 @@ export function ProductionListPrint({ bodyshop }) {
return (
- {Object.keys(ProdTemplates).map((key) => (
- {
+ menu={{
+ items: [
+ ...Object.keys(ProdTemplates).map((key) => ({
+ key: key,
+ onClick: async () => {
+ setLoading(true);
+ await GenerateDocument(
+ {
+ name: ProdTemplates[key].key,
+ // variables: { id: contract.id },
+ },
+ {},
+ "p"
+ );
+ setLoading(false);
+ },
+ label: ProdTemplates[key].title,
+ })),
+ {
+ key: "prodbyonetech",
+ label: t("reportcenter.templates.production_by_technician_one"),
+ children: bodyshop.employees.map((e) => ({
+ key: e.id,
+ onClick: async () => {
setLoading(true);
await GenerateDocument(
{
- name: ProdTemplates[key].key,
- // variables: { id: contract.id },
+ name: production_by_technician_one.key,
+ variables: { id: e.id },
},
{},
"p"
);
setLoading(false);
- }}
- >
- {ProdTemplates[key].title}
-
- ))}
-
- {bodyshop.employees.map((e) => (
- {
- setLoading(true);
- await GenerateDocument(
- {
- name: production_by_technician_one.key,
- variables: { id: e.id },
- },
- {},
- "p"
- );
- setLoading(false);
- }}
- >
- {e.first_name} {e.last_name}
-
- ))}
-
-
- {bodyshop.md_categories.map((e) => (
- {
- setLoading(true);
- await GenerateDocument(
- {
- name: production_by_category_one.key,
- variables: { category: e },
- },
- {},
- "p"
- );
- setLoading(false);
- }}
- >
- {e}
-
- ))}
-
-
- {bodyshop.md_ro_statuses.production_statuses.map((e) => (
- {
- setLoading(true);
- await GenerateDocument(
- {
- name: production_by_repair_status_one.key,
- variables: { status: e },
- },
- {},
- "p"
- );
- setLoading(false);
- }}
- >
- {e}
-
- ))}
-
-
- }
+ },
+ label: `${e.first_name || ""} ${e.last_name || ""}`.trim(),
+ })),
+ },
+ {
+ key: "prodbycategory",
+ label: t("reportcenter.templates.production_by_category_one"),
+ children: bodyshop.md_categories.map((e) => ({
+ key: e,
+ onClick: async () => {
+ setLoading(true);
+ await GenerateDocument(
+ {
+ name: production_by_category_one.key,
+ variables: { category: e },
+ },
+ {},
+ "p"
+ );
+ setLoading(false);
+ },
+ label: e,
+ })),
+ },
+ {
+ key: "prodbyrepairstatus",
+ label: t("reportcenter.templates.production_by_repair_status_one"),
+ children: bodyshop.md_ro_statuses.production_statuses.map((e) => ({
+ key: e,
+ onClick: async () => {
+ setLoading(true);
+ await GenerateDocument(
+ {
+ name: production_by_repair_status_one.key,
+ variables: { status: e },
+ },
+ {},
+ "p"
+ );
+ setLoading(false);
+ },
+ label: e,
+ })),
+ },
+ ],
+ }}
>
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index 6595476d5..97230eb83 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -4,7 +4,6 @@ import {
Button,
Dropdown,
Input,
- Menu,
PageHeader,
Space,
Statistic,
@@ -121,13 +120,10 @@ export function ProductionListTable({
const headerItem = (col) => (
-
- {t("production.actions.removecolumn")}
-
-
- }
+ menu={{
+ onClick: removeColumn,
+ items: [{ key: col.key, label: t("production.actions.removecolumn") }],
+ }}
trigger={["contextMenu"]}
>
{col.title}
diff --git a/client/src/components/schedule-block-day/schedule-block-day.component.jsx b/client/src/components/schedule-block-day/schedule-block-day.component.jsx
index 548da1f9f..5c58eb3c7 100644
--- a/client/src/components/schedule-block-day/schedule-block-day.component.jsx
+++ b/client/src/components/schedule-block-day/schedule-block-day.component.jsx
@@ -1,13 +1,13 @@
import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, notification } from "antd";
+import { Dropdown, notification } from "antd";
import moment from "moment";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_APPOINTMENT_BLOCK } from "../../graphql/appointments.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import { logImEXEvent } from "../../firebase/firebase.utils";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -55,15 +55,12 @@ export function ScheduleBlockDay({
}
};
- const menu = (
-
- );
-
return (
diff --git a/client/src/components/tech-sider/tech-sider.component.jsx b/client/src/components/tech-sider/tech-sider.component.jsx
index 1bd3bcdf8..e91dd8dd8 100644
--- a/client/src/components/tech-sider/tech-sider.component.jsx
+++ b/client/src/components/tech-sider/tech-sider.component.jsx
@@ -30,50 +30,68 @@ export function TechSider({ technician, techLogout }) {
return (
-
+ ,
+ label: {t("menus.tech.login")},
+ },
+ {
+ key: "joblookup",
+ disabled: !!!technician,
+ icon: ,
+ label: (
+ {t("menus.tech.joblookup")}
+ ),
+ },
+ {
+ key: "jobclockin",
+ disabled: !!!technician,
+ icon: ,
+ label: (
+ {t("menus.tech.jobclockin")}
+ ),
+ },
+ {
+ key: "shiftclock",
+ disabled: !!!technician,
+ icon: ,
+ label: (
+
+ {t("menus.tech.shiftclockin")}
+
+ ),
+ },
+ {
+ key: "prodlist",
+ disabled: !!!technician,
+ icon: ,
+ label: (
+ {t("menus.tech.productionlist")}
+ ),
+ },
+ {
+ key: "prodboard",
+ disabled: !!!technician,
+ icon: ,
+ label: (
+ {t("menus.tech.productionboard")}
+ ),
+ },
+ {
+ key: "logout",
+ disabled: !!!technician,
+ onClick: () => techLogout(),
+ icon: ,
+ label: t("menus.tech.logout"),
+ },
+ ]}
+ >
);
}
diff --git a/client/src/pages/contract-detail/contract-detail.page.component.jsx b/client/src/pages/contract-detail/contract-detail.page.component.jsx
index 3cf317236..a81b20d50 100644
--- a/client/src/pages/contract-detail/contract-detail.page.component.jsx
+++ b/client/src/pages/contract-detail/contract-detail.page.component.jsx
@@ -3,11 +3,10 @@ import {
Col,
Dropdown,
Form,
- Menu,
PageHeader,
Row,
Space,
- Typography,
+ Typography
} from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -76,10 +75,11 @@ export function ContractDetailPage({
-
+ menu={{
+ items: [
+ {
+ key: "contract",
+ onClick: () =>
GenerateDocument(
{
name: TemplateList("courtesycarcontract")
@@ -88,13 +88,15 @@ export function ContractDetailPage({
},
{},
"p"
- )
- }
- >
- {t("contracts.actions.printcontract")}
-
-
+ ),
+ label: t("contracts.actions.printcontract"),
+ },
+ {
+ key: "terms",
+ label: t(
+ "printcenter.courtesycarcontract.courtesy_car_terms"
+ ),
+ onClick: () =>
GenerateDocument(
{
name: TemplateList("courtesycarcontract")
@@ -103,15 +105,14 @@ export function ContractDetailPage({
},
{},
"p"
- )
- }
- >
- {t(
- "printcenter.courtesycarcontract.courtesy_car_terms"
- )}
-
-
+ ),
+ },
+ {
+ key: "impound",
+ label: t(
+ "printcenter.courtesycarcontract.courtesy_car_impound"
+ ),
+ onClick: () =>
GenerateDocument(
{
name: TemplateList("courtesycarcontract")
@@ -120,15 +121,10 @@ export function ContractDetailPage({
},
{},
"p"
- )
- }
- >
- {t(
- "printcenter.courtesycarcontract.courtesy_car_impound"
- )}
-
-
- }
+ ),
+ },
+ ],
+ }}
>
diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js
index eb631aff8..f997f66a1 100644
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -142,7 +142,7 @@ middlewares.push(
const cache = new InMemoryCache({});
-export default new ApolloClient({
+const c = new ApolloClient({
link: ApolloLink.from(middlewares),
cache,
connectToDevTools: process.env.NODE_ENV !== "production",
@@ -161,3 +161,5 @@ export default new ApolloClient({
},
},
});
+
+export default c;