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

Lint all the things

Browse Source
This commit is contained in:
Dave
2025-08-19 16:23:29 -04:00
parent f6d6b548be
commit 33fb60ca1a
640 changed files with 2129 additions and 3927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/pages/accounting-payables/accounting-payables.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

2
client/src/pages/accounting-payments/accounting-payments.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

9
client/src/pages/accounting-qbo/accounting-qbo.page.jsx
View File

@@ -1,21 +1,18 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import QboAuthorizeComponent from "../../components/qbo-authorize/qbo-authorize.component";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function AccountingReceivablesContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
export function AccountingReceivablesContainer({ setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
useEffect(() => {

2
client/src/pages/accounting-receivables/accounting-receivables.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

4
client/src/pages/bills/bills.page.component.jsx
View File

@@ -18,11 +18,10 @@ import { alphaSort, dateSort } from "../../utils/sorters";
import useLocalStorage from "../../utils/useLocalStorage";
const mapDispatchToProps = (dispatch) => ({
setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
});
export function BillsListPage({ loading, data, refetch, total, setPartsOrderContext, setBillEnterContext }) {
export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
const search = queryString.parse(useLocation().search);
const [openSearchResults, setOpenSearchResults] = useState([]);
const [searchLoading, setSearchLoading] = useState(false);
@@ -193,7 +192,6 @@ export function BillsListPage({ loading, data, refetch, total, setPartsOrderCont
if (search.search && search.search.trim() !== "") {
searchBills();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
async function searchBills(value) {

2
client/src/pages/bills/bills.page.container.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import queryString from "query-string";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation } from "react-router-dom";

2
client/src/pages/contract-create/contract-create.page.component.jsx
View File

@@ -1,7 +1,5 @@
import { Button, Col, Form, Row, Space, Switch } from "antd";
import { PageHeader } from "@ant-design/pro-layout";
import React from "react";
import { useTranslation } from "react-i18next";
import ContractCarsContainer from "../../components/contract-cars/contract-cars.container";
import ContractFormComponent from "../../components/contract-form/contract-form.component";

2
client/src/pages/contract-create/contract-create.page.container.jsx
View File

@@ -1,6 +1,6 @@
import { useMutation } from "@apollo/client";
import { Card, Form } from "antd";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";

8
client/src/pages/contract-detail/contract-detail.page.component.jsx
View File

@@ -1,7 +1,5 @@
import { Button, Col, Dropdown, Form, Row, Space, Typography } from "antd";
import { PageHeader } from "@ant-design/pro-layout";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import ContractConvertToRo from "../../components/contract-convert-to-ro/contract-convert-to-ro.component";
@@ -37,8 +35,8 @@ export function ContractDetailPage({
</Row>
<PageHeader
title={t("contracts.labels.agreement", {
agreement_num: contract && contract.agreementnumber,
status: t(contract && contract.status)
agreement_num: contract?.agreementnumber,
status: t(contract?.status)
})}
extra={
<Form.Item shouldUpdate>
@@ -78,7 +76,7 @@ export function ContractDetailPage({
{t("general.actions.save")}
</Button>
<Button
disabled={!!!contract || (contract && contract.status !== "contracts.status.out")}
disabled={!contract || (contract && contract.status !== "contracts.status.out")}
onClick={() => {
setCourtesyCarReturnModalContext({
actions: { refetch },

12
client/src/pages/contract-detail/contract-detail.page.container.jsx
View File

@@ -1,7 +1,7 @@
import { useMutation, useQuery } from "@apollo/client";
import { Card, Form } from "antd";
import dayjs from "../../utils/day";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -52,7 +52,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set
rome: t("titles.romeonline")
})
: t("titles.contracts-detail", {
id: (data && data.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || ""
id: (data?.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || ""
});
setBreadcrumbs([
@@ -64,12 +64,12 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set
{
link: "/manage/courtesycars/contracts/new",
label: t("titles.bc.contracts-detail", {
number: (data && data.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || ""
number: (data?.cccontracts_by_pk && data.cccontracts_by_pk.agreementnumber) || ""
})
}
]);
if (data && data.cccontracts_by_pk)
if (data?.cccontracts_by_pk)
addRecentItem(
CreateRecentItem(
contractId,
@@ -85,7 +85,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set
const result = await updateContract({
variables: { cccontract: { ...values }, contractId: contractId }
});
if (!!result.errors) {
if (result.errors) {
notification["error"]({
message: t("contracts.errors.saving", {
message: JSON.stringify(result.errors)
@@ -102,7 +102,7 @@ export function ContractDetailPageContainer({ setBreadcrumbs, addRecentItem, set
};
useEffect(() => {
if (data && data.cccontracts_by_pk) form.resetFields();
if (data?.cccontracts_by_pk) form.resetFields();
}, [data, form]);
if (error) return <AlertComponent message={error.message} type="error" />;

1
client/src/pages/contracts/contracts.page.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import ContractsList from "../../components/contracts-list/contracts-list.component";
export default function ContractsPageComponent({ loading, data, refetch, total }) {

2
client/src/pages/contracts/contracts.page.container.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import queryString from "query-string";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation } from "react-router-dom";

4
client/src/pages/courtesy-car-create/courtesy-car-create.page.container.jsx
View File

@@ -1,6 +1,6 @@
import { useMutation } from "@apollo/client";
import { Card, Form } from "antd";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useNavigate } from "react-router-dom";
@@ -37,7 +37,7 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect
variables: { courtesycar: { ...values, bodyshopid: bodyshop.id } }
});
if (!!result.errors) {
if (result.errors) {
notification["error"]({
message: t("courtesycars.errors.saving", {
message: JSON.stringify(result.errors)

1
client/src/pages/courtesy-car-detail/courtesy-car-detail.page.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import CourtesyCarCreateFormComponent from "../../components/courtesy-car-form/courtesy-car-form.component";
import CourtesyCarContractListComponent from "../../components/courtesy-car-contract-list/courtesy-car-contract-list.component";
import { Col, Divider, Row } from "antd";

16
client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx
View File

@@ -1,7 +1,7 @@
import { useMutation, useQuery } from "@apollo/client";
import { Form } from "antd";
import dayjs from "../../utils/day";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useParams } from "react-router-dom";
@@ -68,19 +68,19 @@ export function CourtesyCarDetailPageContainer({ setBreadcrumbs, addRecentItem,
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)"
}),
id: (data && data.courtesycars_by_pk && data.courtesycars_by_pk.fleet_number) || ""
id: (data?.courtesycars_by_pk && data.courtesycars_by_pk.fleet_number) || ""
});
setBreadcrumbs([
{ link: "/manage/courtesycars", label: t("titles.bc.courtesycars") },
{
link: `/manage/courtesycars/${(data && data.courtesycars_by_pk && data.courtesycars_by_pk.id) || ""}`,
link: `/manage/courtesycars/${(data?.courtesycars_by_pk && data.courtesycars_by_pk.id) || ""}`,
label: t("titles.bc.courtesycars-detail", {
number: (data && data.courtesycars_by_pk && data.courtesycars_by_pk.fleetnumber) || ""
number: (data?.courtesycars_by_pk && data.courtesycars_by_pk.fleetnumber) || ""
})
}
]);
if (data && data.courtesycars_by_pk)
if (data?.courtesycars_by_pk)
addRecentItem(
CreateRecentItem(
ccId,
@@ -103,7 +103,7 @@ export function CourtesyCarDetailPageContainer({ setBreadcrumbs, addRecentItem,
awaitRefetchQueries: true
});
if (!!result.errors) {
if (result.errors) {
notification["error"]({
message: t("courtesycars.errors.saving", { error: error })
});
@@ -117,7 +117,7 @@ export function CourtesyCarDetailPageContainer({ setBreadcrumbs, addRecentItem,
};
useEffect(() => {
if (data && data.courtesycars_by_pk) {
if (data?.courtesycars_by_pk) {
form.resetFields();
form.resetFields();
}
@@ -126,7 +126,7 @@ export function CourtesyCarDetailPageContainer({ setBreadcrumbs, addRecentItem,
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.courtesycars_by_pk) return <NotFound />;
if (!data.courtesycars_by_pk) return <NotFound />;
return (
<RbacWrapper action="courtesycar:detail">

1
client/src/pages/courtesy-cars/courtesy-cars.page.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import CourtesyCarsListComponent from "../../components/courtesy-cars-list/courtesy-cars-list.component";
export default function CourtesyCarsPageComponent({ loading, data, refetch }) {

4
client/src/pages/courtesy-cars/courtesy-cars.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import AlertComponent from "../../components/alert/alert.component";
@@ -45,7 +45,7 @@ export function CourtesyCarsPageContainer({ setBreadcrumbs, setSelectedHeader })
}
>
<RbacWrapper action="courtesycar:list">
<CourtesyCarsPageComponent loading={loading} data={(data && data.courtesycars) || []} refetch={refetch} />
<CourtesyCarsPageComponent loading={loading} data={data?.courtesycars || []} refetch={refetch} />
</RbacWrapper>
</FeatureWrapperComponent>
);

2
client/src/pages/dashboard/dashboard.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import DashboardGridComponent from "../../components/dashboard-grid/dashboard-grid.component";

1
client/src/pages/disclaimer/disclaimer.page.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { Typography } from "antd";
import InstanceRenderMgr from "../../utils/instanceRenderMgr";
import { useTranslation } from "react-i18next";

12
client/src/pages/dms-payables/dms-payables.container.jsx
View File

@@ -1,5 +1,5 @@
import { Button, Card, Col, Row, Select, Space } from "antd";
import React, { useEffect, useRef, useState } from "react";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
@@ -9,13 +9,10 @@ import DmsAllocationsSummaryApComponent from "../../components/dms-allocations-s
import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
import { auth } from "../../firebase/firebase.utils";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -33,7 +30,7 @@ export const socket = SocketIO(import.meta.env.PROD ? import.meta.env.VITE_APP_A
}
});
export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
const [logLevel, setLogLevel] = useState("DEBUG");
const history = useNavigate();
@@ -85,7 +82,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
});
});
socket.on("ap-export-complete", (payload) => {
socket.on("ap-export-complete", () => {
notification.open({
type: "success",
message: t("jobs.labels.dms.apexported")
@@ -97,7 +94,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
socket.removeAllListeners();
socket.disconnect();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
if (!state?.billids) {

3
client/src/pages/dms/dms.container.jsx
View File

@@ -1,7 +1,7 @@
import { useQuery } from "@apollo/client";
import { Button, Card, Col, Result, Row, Select, Space } from "antd";
import queryString from "query-string";
import React, { useEffect, useRef, useState } from "react";
import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -123,7 +123,6 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
socket.removeAllListeners();
socket.disconnect();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
if (loading) return <LoadingSpinner />;

26
client/src/pages/export-logs/export-logs.page.component.jsx
View File

@@ -3,23 +3,19 @@ import { useQuery } from "@apollo/client";
import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
import _ from "lodash";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useLocation, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_EXPORT_LOG_PAGINATED } from "../../graphql/accounting.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { DateTimeFormatter } from "../../utils/DateFormatter";
import { pageLimit } from "../../utils/config";
import { alphaSort, dateSort } from "./../../utils/sorters";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
export function ExportLogsPageComponent({ bodyshop }) {
export function ExportLogsPageComponent() {
const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, search } = searchParams;
const history = useNavigate();
@@ -97,9 +93,7 @@ export function ExportLogsPageComponent({ bodyshop }) {
sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) =>
record.job && (
<Link to={`/manage/jobs/${record.job.id}`}>
{(record.job && record.job.ro_number) || t("general.labels.na")}
</Link>
<Link to={`/manage/jobs/${record.job.id}`}>{record.job?.ro_number || t("general.labels.na")}</Link>
)
},
{
@@ -109,11 +103,7 @@ export function ExportLogsPageComponent({ bodyshop }) {
sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
sortOrder: sortcolumn === "invoice_number" && sortorder,
render: (text, record) =>
record.bill && (
<Link to={"/manage/bills?billid=" + (record.bill && record.bill.id)}>
{record.bill && record.bill.invoice_number}
</Link>
)
record.bill && <Link to={"/manage/bills?billid=" + record.bill?.id}>{record.bill?.invoice_number}</Link>
},
{
title: t("payments.fields.paymentnum"),
@@ -123,9 +113,7 @@ export function ExportLogsPageComponent({ bodyshop }) {
sortOrder: sortcolumn === "paymentnum" && sortorder,
render: (text, record) =>
record.payment && (
<Link to={"/manage/payments?search=" + (record.payment && record.payment.paymentnum)}>
{record.payment && record.payment.paymentnum}
</Link>
<Link to={"/manage/payments?search=" + record.payment?.paymentnum}>{record.payment?.paymentnum}</Link>
)
},
{
@@ -197,12 +185,12 @@ export function ExportLogsPageComponent({ bodyshop }) {
pagination={{
position: "top",
pageSize: pageLimit,
current: parseInt(page || 1),
current: parseInt(page || 1, 10),
total: data && data.search_exportlog_aggregate.aggregate.count
}}
columns={columns}
rowKey="id"
dataSource={data && data.search_exportlog}
dataSource={data?.search_exportlog}
style={{ height: "100%" }}
scroll={{ x: true }}
onChange={handleTableChange}

2
client/src/pages/export-logs/export-logs.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

3
client/src/pages/feature-request/feature-request.page.jsx
View File

@@ -1,5 +1,5 @@
import axios from "axios";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
@@ -33,6 +33,7 @@ export function FeedbackPage({ setBreadcrumbs, setSelectedHeader }) {
theme: "light" // options: light [default], dark, auto
});
}
RenderCanny();
}, []);

1
client/src/pages/help/help.page.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import HelpRescue from "../../components/help-rescue/help-rescue.component";
export default function HelpPage() {

2
client/src/pages/inventory/inventory.page.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

4
client/src/pages/jobs-admin/jobs-admin.page.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import { Card, Col, Result, Row, Space, Typography } from "antd";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -77,7 +77,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.jobs_by_pk) return <NotFound />;
if (!data.jobs_by_pk) return <NotFound />;
if (!data.jobs_by_pk.job_totals)
return <Result title={t("jobs.errors.nofinancial")} extra={<JobCalculateTotals job={data.jobs_by_pk} />} />;

2
client/src/pages/jobs-all/jobs-all.container.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import queryString from "query-string";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation } from "react-router-dom";

4
client/src/pages/jobs-available/jobs-available.page.container.jsx
View File

@@ -1,7 +1,7 @@
import { Button } from "antd";
import { PageHeader } from "@ant-design/pro-layout";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
@@ -63,7 +63,7 @@ export function JobsAvailablePageContainer({ partnerVersion, setBreadcrumbs, set
message={t("general.messages.partnernotrunning", {
app: InstanceRenderManager({
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
rome: "$t(titles.romeonline)"
})
})}
/>

20
client/src/pages/jobs-checklist-view/jobs-checklist-view.page.jsx
View File

@@ -1,7 +1,7 @@
import { useQuery } from "@apollo/client";
import { Card, Col, Row, Typography } from "antd";
import dayjs from "../../utils/day";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -12,21 +12,17 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { QUERY_JOB_CHECKLISTS } from "../../graphql/jobs.queries";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function JobsChecklistViewContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
export function JobsChecklistViewContainer({ setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
const { jobId } = useParams();
const { loading, error, data } = useQuery(QUERY_JOB_CHECKLISTS, {
@@ -48,7 +44,7 @@ export function JobsChecklistViewContainer({ bodyshop, setBreadcrumbs, setSelect
{
link: `/manage/jobs/${jobId}`,
label: t("titles.bc.jobs-detail", {
number: (data && data.jobs_by_pk && data.jobs_by_pk.ro_number) || ""
number: (data?.jobs_by_pk && data.jobs_by_pk.ro_number) || ""
})
},
{
@@ -87,10 +83,10 @@ export function JobsChecklistViewContainer({ bodyshop, setBreadcrumbs, setSelect
<Row gutter={[16, 16]}>
<Col span={12}>
<Typography.Title level={4}>{t("jobs.labels.intakechecklist")}</Typography.Title>
{data.jobs_by_pk.intakechecklist && data.jobs_by_pk.intakechecklist.form && (
{data.jobs_by_pk.intakechecklist?.form && (
<>
<JobChecklistForm
formItems={data.jobs_by_pk.intakechecklist && data.jobs_by_pk.intakechecklist.form}
formItems={data.jobs_by_pk.intakechecklist?.form}
type="intake"
job={data.jobs_by_pk}
readOnly
@@ -101,10 +97,10 @@ export function JobsChecklistViewContainer({ bodyshop, setBreadcrumbs, setSelect
</Col>
<Col span={12}>
<Typography.Title level={4}>{t("jobs.labels.deliverchecklist")}</Typography.Title>
{data.jobs_by_pk.deliverchecklist && data.jobs_by_pk.deliverchecklist.form && (
{data.jobs_by_pk.deliverchecklist?.form && (
<>
<JobChecklistForm
formItems={data.jobs_by_pk.deliverchecklist && data.jobs_by_pk.deliverchecklist.form}
formItems={data.jobs_by_pk.deliverchecklist?.form}
type="deliver"
job={data.jobs_by_pk}
readOnly

10
client/src/pages/jobs-close/jobs-close.container.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import { Result } from "antd";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -30,7 +30,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, setJobRe
});
const { t } = useTranslation();
useEffect(() => {
if (data && data.jobs_by_pk) {
if (data?.jobs_by_pk) {
setJobReadOnly(IsJobReadOnly(data.jobs_by_pk));
}
}, [data, setJobReadOnly]);
@@ -41,7 +41,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, setJobRe
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)"
}),
number: data ? data.jobs_by_pk && data.jobs_by_pk.ro_number : null
number: data ? data.jobs_by_pk?.ro_number : null
});
setBreadcrumbs([
@@ -52,7 +52,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, setJobRe
{
link: `/manage/jobs/${jobId}/`,
label: t("titles.bc.jobs-detail", {
number: data ? data.jobs_by_pk && data.jobs_by_pk.ro_number : null
number: data ? data.jobs_by_pk?.ro_number : null
})
},
{
@@ -64,7 +64,7 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, setJobRe
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.jobs_by_pk) return <NotFound />;
if (!data.jobs_by_pk) return <NotFound />;
if (!data.jobs_by_pk.job_totals)
return <Result title={t("jobs.errors.nofinancial")} extra={<JobCalculateTotals job={data.jobs_by_pk} />} />;

10
client/src/pages/jobs-create/jobs-create.component.jsx
View File

@@ -1,7 +1,7 @@
import { PageHeader } from "@ant-design/pro-layout";
import { Button, Result, Space, Steps } from "antd";
import React, { useContext, useState } from "react";
import { useContext, useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import AlertComponent from "../../components/alert/alert.component";
@@ -63,7 +63,7 @@ export default function JobsCreateComponent({ form }) {
next();
form
.validateFields()
.then((r) => {
.then(() => {
if (steps[pageIndex].validation) {
setErrorMessage(null);
next();
@@ -83,7 +83,9 @@ export default function JobsCreateComponent({ form }) {
onClick={() => {
form
.validateFields()
.then((r) => {})
.then(() => {
// NO OP
})
.catch((error) => console.log("error", error));
form.submit();
}}
@@ -108,7 +110,7 @@ export default function JobsCreateComponent({ form }) {
setPageIndex(idx);
form
.validateFields()
.then((r) => {
.then(() => {
if (steps[pageIndex].validation) {
setErrorMessage(null);
setPageIndex(idx);

8
client/src/pages/jobs-create/jobs-create.container.jsx
View File

@@ -1,7 +1,7 @@
import { useLazyQuery, useMutation } from "@apollo/client";
import { Form } from "antd";
import _ from "lodash";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -48,7 +48,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
const [loadOwner, RemoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
useEffect(() => {
if (!!state.owner.selectedid) {
if (state.owner.selectedid) {
loadOwner({
variables: { id: state.owner.selectedid }
});
@@ -111,7 +111,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
);
let ownerData;
if (!!!job.ownerid) {
if (!job.ownerid) {
ownerData = job.owner.data;
ownerData.shopid = bodyshop.id;
delete ownerData.preferred_contact;
@@ -122,7 +122,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
delete ownerData.__typename;
}
if (!state.vehicle.none) {
if (!!!job.vehicleid) {
if (!job.vehicleid) {
delete job.vehicleid;
job.vehicle.data.shopid = bodyshop.id;
job.plate_no = job.vehicle.data.plate_no;

4
client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -59,7 +59,7 @@ export function JobsDeliverContainer({ bodyshop, setBreadcrumbs, setSelectedHead
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (data && !!!data.bodyshops_by_pk.deliverchecklist)
if (data && !data.bodyshops_by_pk.deliverchecklist)
return <AlertComponent message={t("deliver.errors.nochecklist")} type="error" />;
return (
<FeatureWrapperComponent

2
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -260,7 +260,7 @@ export function JobsDetailPage({
form.setFieldsValue(transformJobToForm(job));
form.resetFields();
}
} catch (error) {
} catch {
notification["error"]({
message: t("jobs.errors.totalscalc")
});

10
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useMutation, useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -61,19 +61,19 @@ function JobsDetailPageContainer({ setBreadcrumbs, addRecentItem, setSelectedHea
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)"
}),
ro_number: (data.jobs_by_pk && data.jobs_by_pk.ro_number) || t("general.labels.na")
ro_number: data.jobs_by_pk?.ro_number || t("general.labels.na")
});
setBreadcrumbs([
{ link: "/manage/jobs", label: t("titles.bc.jobs") },
{
link: `/manage/jobs/${jobId}`,
label: t("titles.bc.jobs-detail", {
number: (data && data.jobs_by_pk && data.jobs_by_pk.ro_number) || t("general.labels.na")
number: (data?.jobs_by_pk && data.jobs_by_pk.ro_number) || t("general.labels.na")
})
}
]);
if (data && data.jobs_by_pk) {
if (data?.jobs_by_pk) {
setJobReadOnly(IsJobReadOnly(data.jobs_by_pk));
addRecentItem(
@@ -90,7 +90,7 @@ function JobsDetailPageContainer({ setBreadcrumbs, addRecentItem, setSelectedHea
if (loading) return <SpinComponent />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.jobs_by_pk) return <NotFound />;
if (!data.jobs_by_pk) return <NotFound />;
return data.jobs_by_pk ? (
<RbacWrapper action="jobs:detail">

8
client/src/pages/jobs-intake/jobs-intake.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -48,7 +48,7 @@ export function JobsIntakeContainer({ bodyshop, setBreadcrumbs, setSelectedHeade
{
link: `/manage/jobs/${jobId}`,
label: t("titles.bc.jobs-detail", {
number: data && ((data.jobs_by_pk && data.jobs_by_pk.ro_number) || t("general.labels.na"))
number: data && (data.jobs_by_pk?.ro_number || t("general.labels.na"))
})
},
{
@@ -61,7 +61,7 @@ export function JobsIntakeContainer({ bodyshop, setBreadcrumbs, setSelectedHeade
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (data && !!!data.bodyshops_by_pk.intakechecklist)
if (data && !data.bodyshops_by_pk.intakechecklist)
return <AlertComponent message={t("intake.errors.nochecklist")} type="error" />;
return (
@@ -82,7 +82,7 @@ export function JobsIntakeContainer({ bodyshop, setBreadcrumbs, setSelectedHeade
<JobChecklist
type="intake"
checklistConfig={(data && data.bodyshops_by_pk.intakechecklist) || {}}
job={data && data.jobs_by_pk}
job={data?.jobs_by_pk}
/>
)}
</div>

2
client/src/pages/jobs-ready/jobs-ready.page.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import JobDetailCards from "../../components/job-detail-cards/job-detail-cards.component";

2
client/src/pages/jobs/jobs.page.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import JobDetailCards from "../../components/job-detail-cards/job-detail-cards.component";

2
client/src/pages/landing/landing.page.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { connect } from "react-redux";
import { useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";

2
client/src/pages/manage-root/manage-root.page.component.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
//import DashboardGridComponent from "../../components/dashboard-grid/dashboard-grid.component";
import { useNavigate } from "react-router-dom";

9
client/src/pages/manage-root/manage-root.page.container.jsx
View File

@@ -1,21 +1,18 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { setBreadcrumbs } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import ManageRootPageComponent from "./manage-root.page.component";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs))
});
export function ManageRootPageContainer({ setBreadcrumbs, bodyshop }) {
export function ManageRootPageContainer({ setBreadcrumbs }) {
const { t } = useTranslation();
useEffect(() => {
document.title = t("titles.manageroot", {

3
client/src/pages/manage/manage.page.component.jsx
View File

@@ -1,5 +1,5 @@
import { FloatButton, Layout, Spin } from "antd";
import { Route, Routes, useNavigate } from "react-router-dom";
import { Route, Routes } from "react-router-dom";
// import preval from "preval.macro";
import { lazy, Suspense, useEffect, useState } from "react";
@@ -113,7 +113,6 @@ const mapStateToProps = createStructuredSelector({
export function Manage({ conflict, bodyshop, partsManagementOnly }) {
const { t } = useTranslation();
const [chatVisible] = useState(false);
const navigate = useNavigate();
// Centralized alerts handling (fetch + dedupe + notifications)
useAlertsNotifications();

2
client/src/pages/manage/manage.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import AlertComponent from "../../components/alert/alert.component";

1
client/src/pages/owners-detail/owners-detail.page.component.jsx
View File

@@ -1,5 +1,4 @@
import { Col, Divider, Row } from "antd";
import React from "react";
import OwnerDetailForm from "../../components/owner-detail-form/owner-detail-form.container";
import OwnerDetailJobsComponent from "../../components/owner-detail-jobs/owner-detail-jobs.component";

4
client/src/pages/owners-detail/owners-detail.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useParams } from "react-router-dom";
@@ -57,7 +57,7 @@ export function OwnersDetailContainer({ setBreadcrumbs, addRecentItem, setSelect
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
if (!!!data.owners_by_pk) return <NotFound />;
if (!data.owners_by_pk) return <NotFound />;
return (
<RbacWrapper action="owners:detail">

1
client/src/pages/owners/owners.page.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import OwnersListContainer from "../../components/owners-list/owners-list.container";
export default function OwnersPageComponent() {

2
client/src/pages/owners/owners.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import OwnersPageComponent from "./owners.page.component";
import { useTranslation } from "react-i18next";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";

2
client/src/pages/parts-queue/parts-queue.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import PartsQueueDetailCard from "../../components/parts-queue-card/parts-queue-card.component";

13
client/src/pages/phonebook/phonebook.page.component.jsx
View File

@@ -3,7 +3,6 @@ import { useQuery } from "@apollo/client";
import { Button, Card, Input, Space, Table, Typography } from "antd";
import _ from "lodash";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
@@ -95,13 +94,13 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
title: t("phonebook.fields.phone1"),
dataIndex: "phone1",
key: "phone1",
render: (text, record) => <ChatOpenButton phone={text} />
render: (text) => <ChatOpenButton phone={text} />
},
{
title: t("phonebook.fields.phone2"),
dataIndex: "phone2",
key: "phone2",
render: (text, record) => <ChatOpenButton phone={text} />
render: (text) => <ChatOpenButton phone={text} />
},
{
title: t("phonebook.fields.address1"),
@@ -179,12 +178,12 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
pagination={{
position: "top",
pageSize: pageLimit,
current: parseInt(page || 1),
current: parseInt(page || 1, 10),
total: data && data.search_phonebook_aggregate.aggregate.count
}}
columns={columns}
rowKey="id"
dataSource={data && data.search_phonebook}
dataSource={data?.search_phonebook}
//scroll={{ x: true }}
onChange={handleTableChange}
rowSelection={{
@@ -192,9 +191,9 @@ export function PhonebookPageComponent({ bodyshop, authLevel }) {
type: "radio",
selectedRowKeys: [phonebookentry]
}}
onRow={(record, rowIndex) => {
onRow={(record) => {
return {
onClick: (event) => {
onClick: () => {
handleOnRowClick(record);
}
};

2
client/src/pages/phonebook/phonebook.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

6
client/src/pages/production-board/production-board.component.jsx
View File

@@ -1,14 +1,14 @@
import React from "react";
import ProductionBoardKanbanContainer from "../../components/production-board-kanban/production-board-kanban.container";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { useSplitTreatments } from "@splitsoftware/splitio-react";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardComponent);
@@ -19,7 +19,7 @@ export function ProductionBoardComponent({ bodyshop }) {
} = useSplitTreatments({
attributes: {},
names: ["Production_Use_View"],
splitKey: bodyshop && bodyshop.imexshopid
splitKey: bodyshop?.imexshopid
});
return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;

9
client/src/pages/production-board/production-board.container.jsx
View File

@@ -1,5 +1,5 @@
import { Card } from "antd";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -7,20 +7,17 @@ import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.com
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import ProductionBoardComponent from "./production-board.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapStateToProps = createStructuredSelector({});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function ProductionBoardContainer({ setBreadcrumbs, bodyshop, setSelectedHeader }) {
export function ProductionBoardContainer({ setBreadcrumbs, setSelectedHeader }) {
const { t } = useTranslation();
useEffect(() => {

6
client/src/pages/production-list/production-list.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
import ProductionListTable from "../../components/production-list-table/production-list-table.container";
@@ -6,10 +5,11 @@ import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { useSplitTreatments } from "@splitsoftware/splitio-react";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(ProductionListComponent);
@@ -20,7 +20,7 @@ export function ProductionListComponent({ bodyshop }) {
} = useSplitTreatments({
attributes: {},
names: ["Production_Use_View"],
splitKey: bodyshop && bodyshop.imexshopid
splitKey: bodyshop?.imexshopid
});
return (

2
client/src/pages/production-list/production-list.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

5
client/src/pages/profile/profile.container.page.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
@@ -18,8 +18,7 @@ export function ProfileContainerPage({ setBreadcrumbs, setSelectedHeader }) {
document.title = t("titles.profile", {
app: InstanceRenderManager({
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
rome: "$t(titles.romeonline)"
})
});
}, [t, setBreadcrumbs, setSelectedHeader]);

1
client/src/pages/profile/profile.page.jsx
View File

@@ -1,5 +1,4 @@
import { Row } from "antd";
import React from "react";
import ProfileMyComponent from "../../components/profile-my/profile-my.component";
import ProfileShopsContainer from "../../components/profile-shops/profile-shops.container";

1
client/src/pages/reset-password/reset-password.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import { useLocation } from "react-router-dom";
import UserRequestResetPw from "../../components/user-request-pw-reset/user-request-reset-pw.component";
import UserValidatePwReset from "../../components/user-validate-pw-reset/user-validate-pw-reset.component";

1
client/src/pages/shift-clock/shift-clock.page.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import TimeTicketShift from "../../components/time-ticket-shift/time-ticket-shift.container";
import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";

2
client/src/pages/shop-csi/shop-csi.container.page.jsx
View File

@@ -1,6 +1,6 @@
import { useQuery } from "@apollo/client";
import { Card, Col, Row } from "antd";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

1
client/src/pages/shop-vendor/shop-vendor.page.component.jsx generated
View File

@@ -1,5 +1,4 @@
import { Drawer, Grid } from "antd";
import React from "react";
import { useNavigate, useSearchParams } from "react-router-dom";
import VendorsFormContainer from "../../components/vendors-form/vendors-form.container";
import VendorsListContainer from "../../components/vendors-list/vendors-list.container";

2
client/src/pages/shop-vendor/shop-vendor.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import ShopVendorPageComponent from "./shop-vendor.page.component";

4
client/src/pages/shop/shop.page.component.jsx
View File

@@ -1,6 +1,6 @@
import { Tabs } from "antd";
import queryString from "query-string";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
@@ -100,7 +100,7 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
children: <ShopInfoConsentComponent bodyshop={bodyshop} />
});
}
return (
<RbacWrapper action="shop:config">
<Tabs activeKey={search.tab} onChange={(key) => history({ search: `?tab=${key}` })} items={items} />

1
client/src/pages/sign-in/sign-in.page.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import SignIn from "../../components/sign-in-form/sign-in-form.component";
export default function SignInPage() {

22
client/src/pages/simplified-parts-jobs-detail/simplified-parts-jobs-detail.component.jsx
View File

@@ -17,13 +17,10 @@ import JobsDetailHeaderActions from "../../components/jobs-detail-header-actions
import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component.jsx";
import JobsDetailPliContainer from "../../components/jobs-detail-pli/jobs-detail-pli.container.jsx";
import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries.js";
import { insertAuditTrail } from "../../redux/application/application.actions.js";
import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors.js";
import { setModalContext } from "../../redux/modals/modals.actions.js";
import { selectBodyshop } from "../../redux/user/user.selectors.js";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
jobRO: selectJobReadOnly,
isPartsEntry: selectIsPartsEntry
});
@@ -34,27 +31,10 @@ const mapDispatchToProps = (dispatch) => ({
context: context,
modal: "printCenter"
})
),
insertAuditTrail: ({ jobid, operation, type }) =>
dispatch(
insertAuditTrail({
jobid,
operation,
type
})
)
});
export function SimplifiedPartsJobDetailComponent({
bodyshop,
setPrintCenterContext,
jobRO,
job,
mutationUpdateJob,
insertAuditTrail,
refetch,
isPartsEntry
}) {
export function SimplifiedPartsJobDetailComponent({ setPrintCenterContext, jobRO, job, refetch, isPartsEntry }) {
const { t } = useTranslation();
const [form] = Form.useForm();
const history = useNavigate();

2
client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useState } from "react";
import { useState } from "react";
import { Button, Card, Input, Space, Table } from "antd";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

19
client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
View File

@@ -2,7 +2,6 @@ import { MinusCircleTwoTone, PlusCircleTwoTone, SyncOutlined } from "@ant-design
import { useQuery } from "@apollo/client";
import { Button, Card, Space, Table } from "antd";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
@@ -20,7 +19,7 @@ const mapStateToProps = createStructuredSelector({
technician: selectTechnician,
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({});
const mapDispatchToProps = () => ({});
export function TechDispatchedParts({ technician, bodyshop }) {
const searchParams = queryString.parse(useLocation().search);
@@ -83,12 +82,20 @@ export function TechDispatchedParts({ technician, bodyshop }) {
title: t("general.labels.actions"),
dataIndex: "actions",
key: "actions",
render: (text, record) => <Button onClick={() => {}}>{t("timetickets.actions.claimtasks")}</Button>
render: () => (
<Button
onClick={() => {
// NO OP
}}
>
{t("timetickets.actions.claimtasks")}
</Button>
)
}
]
: [])
];
const handleTableChange = (pagination, filters, sorter) => {
const handleTableChange = (pagination) => {
searchParams.page = pagination.current;
history({ search: queryString.stringify(searchParams) });
};
@@ -107,7 +114,7 @@ export function TechDispatchedParts({ technician, bodyshop }) {
loading={loading}
pagination={{
pageSize: 25,
current: parseInt(page || 1),
current: parseInt(page || 1, 10),
total: data ? data.parts_dispatch_aggregate.aggregate.count : 0,
showSizeChanger: false
}}
@@ -118,7 +125,7 @@ export function TechDispatchedParts({ technician, bodyshop }) {
onChange={handleTableChange}
expandable={{
expandedRowRender: (record) => <PartsDispatchExpander dispatch={record} />,
rowExpandable: (record) => true,
rowExpandable: () => true,
//expandRowByClick: true,
expandIcon: ({ expanded, onExpand, record }) =>
expanded ? (

2
client/src/pages/tech-job-clock/tech-job-clock.component.jsx
View File

@@ -1,5 +1,5 @@
import { Divider } from "antd";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import TechClockInFormContainer from "../../components/tech-job-clock-in-form/tech-job-clock-in-form.container";
import TechClockedInList from "../../components/tech-job-clocked-in-list/tech-job-clocked-in-list.component";

2
client/src/pages/tech-lookup/tech-lookup.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import RbacWrapperComponent from "../../components/rbac-wrapper/rbac-wrapper.component";
import TechLookupJobsList from "../../components/tech-lookup-jobs-list/tech-lookup-jobs-list.component";

2
client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import TimeTicketShift from "../../components/time-ticket-shift/time-ticket-shift.container";
import InstanceRenderManager from "../../utils/instanceRenderMgr";

2
client/src/pages/tech/tech.page.container.jsx
View File

@@ -1,5 +1,5 @@
import { useQuery } from "@apollo/client";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { connect } from "react-redux";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries";

21
client/src/pages/temporary-docs/temporary-docs.component.jsx
View File

@@ -1,5 +1,4 @@
import { useQuery } from "@apollo/client";
import React from "react";
import AlertComponent from "../../components/alert/alert.component";
import JobsDocumentsContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
@@ -14,7 +13,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
const mapDispatchToProps = () => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(TemporaryDocsComponent);
@@ -25,7 +24,7 @@ export function TemporaryDocsComponent({ bodyshop }) {
} = useSplitTreatments({
attributes: {},
names: ["Imgproxy"],
splitKey: bodyshop && bodyshop.imexshopid
splitKey: bodyshop?.imexshopid
});
const { loading, error, data, refetch } = useQuery(QUERY_TEMPORARY_DOCS, {
@@ -41,14 +40,12 @@ export function TemporaryDocsComponent({ bodyshop }) {
return <JobsDocumentsLocalGallery job={{ id: "temporary" }} />;
}
return (
<>
<JobsDocumentsContainer
documentsList={data ? data.documents : []}
jobId={null}
billId={null}
refetchOverride={refetch}
ignoreSizeLimit
/>
</>
<JobsDocumentsContainer
documentsList={data ? data.documents : []}
jobId={null}
billId={null}
refetchOverride={refetch}
ignoreSizeLimit
/>
);
}

2
client/src/pages/temporary-docs/temporary-docs.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

2
client/src/pages/time-tickets/time-tickets.container.jsx
View File

@@ -1,7 +1,7 @@
import { useQuery } from "@apollo/client";
import { Card, Col, Row, Space } from "antd";
import dayjs from "../../utils/day";
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { useSearchParams } from "react-router-dom";

2
client/src/pages/tt-approvals/tt-approvals.page.container.jsx
View File

@@ -1,4 +1,4 @@
import React, { useEffect } from "react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";

1
client/src/pages/vehicles-detail/vehicles-detail.page.component.jsx
View File

@@ -1,5 +1,4 @@
import { Col, Divider, Row } from "antd";
import React from "react";
import VehicleDetailFormContainer from "../../components/vehicle-detail-form/vehicle-detail-form.container";
import VehicleDetailJobsComponent from "../../components/vehicle-detail-jobs/vehicle-detail-jobs.component";

1
client/src/pages/vehicles/vehicles.page.component.jsx
View File

@@ -1,4 +1,3 @@
import React from "react";
import VehiclesListContainer from "../../components/vehicles-list/vehicles-list.container";
export default function VehiclesPageComponent() {