Fix Formatting issues

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-08 22:25:07 -04:00
parent df0f8ef9dc
commit 33c282051b
34 changed files with 1805 additions and 1820 deletions

View File

@@ -8,64 +8,53 @@ import Icon, {
SyncOutlined,
ToolFilled
} from "@ant-design/icons";
import {Badge, Button, Divider, Form, notification, Space, Tabs} from "antd";
import {PageHeader} from "@ant-design/pro-layout";
import { Badge, Button, Divider, Form, notification, Space, Tabs } from "antd";
import { PageHeader } from "@ant-design/pro-layout";
import Axios from "axios";
import dayjs from "../../utils/day";
import queryString from "query-string";
import React, {useEffect, useState} from "react";
import {useTranslation} from "react-i18next";
import {FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks} from "react-icons/fa";
import {connect} from "react-redux";
import {useLocation, useNavigate} from "react-router-dom";
import {createStructuredSelector} from "reselect";
import FormFieldsChanged
from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
import JobLineUpsertModalContainer
from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
import JobReconciliationModal
from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
import JobsChangeStatus from "../../components/jobs-change-status/jobs-change-status.component";
import JobsConvertButton from "../../components/jobs-convert-button/jobs-convert-button.component";
import JobsDetailDatesComponent
from "../../components/jobs-detail-dates/jobs-detail-dates.component";
import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
import JobsDetailGeneral from "../../components/jobs-detail-general/jobs-detail-general.component";
import JobsDetailHeaderActions
from "../../components/jobs-detail-header-actions/jobs-detail-header-actions.component";
import JobsDetailHeaderActions from "../../components/jobs-detail-header-actions/jobs-detail-header-actions.component";
import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
import JobsDetailLaborContainer
from "../../components/jobs-detail-labor/jobs-detail-labor.container";
import JobsDetailLaborContainer from "../../components/jobs-detail-labor/jobs-detail-labor.container";
import JobsDetailPliContainer from "../../components/jobs-detail-pli/jobs-detail-pli.container";
import JobsDetailRates from "../../components/jobs-detail-rates/jobs-detail-rates.component";
import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-totals.component";
import JobsDocumentsGalleryContainer
from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import JobsDocumentsLocalGallery
from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
import NoteUpsertModalComponent
from "../../components/note-upsert-modal/note-upsert-modal.container";
import ScheduleJobModalContainer
from "../../components/schedule-job-modal/schedule-job-modal.container";
import {insertAuditTrail} from "../../redux/application/application.actions";
import {selectJobReadOnly} from "../../redux/application/application.selectors";
import {setModalContext} from "../../redux/modals/modals.actions";
import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors";
import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions";
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import UndefinedToNull from "../../utils/undefinedtonull";
import _ from "lodash";
import JobProfileDataWarning
from "../../components/job-profile-data-warning/job-profile-data-warning.component";
import {DateTimeFormat} from "../../utils/DateFormatter";
import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
import { DateTimeFormat } from "../../utils/DateFormatter";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import {HasFeatureAccess} from "../../components/feature-wrapper/feature-wrapper.component";
import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
import TaskListContainer from "../../components/task-list/task-list.container.jsx";
import {QUERY_JOB_TASKS_PAGINATED} from "../../graphql/tasks.queries.js";
import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -73,29 +62,35 @@ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setPrintCenterContext: (context) => dispatch(setModalContext({
context: context,
modal: "printCenter"
})),
insertAuditTrail: ({jobid, operation, type}) => dispatch(insertAuditTrail({
jobid,
operation,
type
}))
setPrintCenterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "printCenter"
})
),
insertAuditTrail: ({ jobid, operation, type }) =>
dispatch(
insertAuditTrail({
jobid,
operation,
type
})
)
});
export function JobsDetailPage({
bodyshop,
setPrintCenterContext,
jobRO,
job,
mutationUpdateJob,
handleSubmit,
currentUser,
insertAuditTrail,
refetch
}) {
const {t} = useTranslation();
bodyshop,
setPrintCenterContext,
jobRO,
job,
mutationUpdateJob,
handleSubmit,
currentUser,
insertAuditTrail,
refetch
}) {
const { t } = useTranslation();
const [form] = Form.useForm();
const history = useNavigate();
const [loading, setLoading] = useState(false);
@@ -111,13 +106,13 @@ export function JobsDetailPage({
useEffect(() => {
const handleTaskUpdated = async (event) => {
await refetch().catch(e => `Something went wrong fetching tasks: ${e.message || ''}`);
await refetch().catch((e) => `Something went wrong fetching tasks: ${e.message || ""}`);
};
window.addEventListener('taskUpdated', handleTaskUpdated);
window.addEventListener("taskUpdated", handleTaskUpdated);
// Clean up the event listener when the component is unmounted.
return () => {
window.removeEventListener('taskUpdated', handleTaskUpdated);
window.removeEventListener("taskUpdated", handleTaskUpdated);
};
}, [refetch]);
@@ -156,7 +151,7 @@ export function JobsDetailPage({
};
return acc;
}, {}),
cieca_pfo: {...job.cieca_pfo, ...values.cieca_pfo}
cieca_pfo: { ...job.cieca_pfo, ...values.cieca_pfo }
}
}
});
@@ -251,15 +246,15 @@ export function JobsDetailPage({
}}
key="refresh"
>
<SyncOutlined/>
<SyncOutlined />
{t("general.labels.refresh")}
</Button>
<JobsChangeStatus job={job}/>
<JobSyncButton job={job}/>
<JobsChangeStatus job={job} />
<JobSyncButton job={job} />
<Button
onClick={() => {
setPrintCenterContext({
actions: {refetch: refetch},
actions: { refetch: refetch },
context: {
id: job.id,
job: job,
@@ -269,12 +264,11 @@ export function JobsDetailPage({
}}
key="printing"
>
<PrinterFilled/>
<PrinterFilled />
{t("jobs.actions.printCenter")}
</Button>
<JobsConvertButton job={job} refetch={refetch}
parentFormIsFieldsTouched={form.isFieldsTouched}/>
<JobsDetailHeaderActions key="actions" job={job} refetch={refetch}/>
<JobsConvertButton job={job} refetch={refetch} parentFormIsFieldsTouched={form.isFieldsTouched} />
<JobsDetailHeaderActions key="actions" job={job} refetch={refetch} />
<Button type="primary" loading={loading} disabled={jobRO} onClick={() => form.submit()}>
{t("general.actions.save")}
</Button>
@@ -283,10 +277,10 @@ export function JobsDetailPage({
return (
<div>
<ScheduleJobModalContainer/>
<JobReconciliationModal/>
<JobLineUpsertModalContainer/>
<NoteUpsertModalComponent/>
<ScheduleJobModalContainer />
<JobReconciliationModal />
<JobLineUpsertModalContainer />
<NoteUpsertModalComponent />
<Form
form={form}
name="JobDetailForm"
@@ -300,120 +294,128 @@ export function JobsDetailPage({
title={job.ro_number || t("general.labels.na")}
extra={menuExtra}
/>
<JobsDetailHeader job={job}/>
<Divider type="horizontal"/>
<JobProfileDataWarning job={job}/>
<FormFieldsChanged form={form}/>
<JobsDetailHeader job={job} />
<Divider type="horizontal" />
<JobProfileDataWarning job={job} />
<FormFieldsChanged form={form} />
<Tabs
defaultActiveKey={search.tab}
onChange={(key) => history({search: `?tab=${key}`})}
tabBarStyle={{fontWeight: "bold", borderBottom: "10px"}}
onChange={(key) => history({ search: `?tab=${key}` })}
tabBarStyle={{ fontWeight: "bold", borderBottom: "10px" }}
items={[
{
key: "general",
icon: <Icon component={FaShieldAlt}/>,
icon: <Icon component={FaShieldAlt} />,
label: t("menus.jobsdetail.general"),
forceRender: true,
children: <JobsDetailGeneral job={job} form={form}/>
children: <JobsDetailGeneral job={job} form={form} />
},
{
key: "repairdata",
icon: <BarsOutlined/>,
icon: <BarsOutlined />,
label: t("menus.jobsdetail.repairdata"),
forceRender: true,
children: <JobsLinesContainer job={job} joblines={job.joblines} refetch={refetch}
form={form}/>
children: <JobsLinesContainer job={job} joblines={job.joblines} refetch={refetch} form={form} />
},
{
key: "rates",
icon: <DollarCircleOutlined/>,
icon: <DollarCircleOutlined />,
label: t("menus.jobsdetail.rates"),
forceRender: true,
children: <JobsDetailRates job={job} form={form}/>
children: <JobsDetailRates job={job} form={form} />
},
{
key: "totals",
icon: <DollarCircleOutlined/>,
icon: <DollarCircleOutlined />,
label: t("menus.jobsdetail.totals"),
children: <JobsDetailTotals job={job} refetch={refetch}/>
children: <JobsDetailTotals job={job} refetch={refetch} />
},
{
key: "partssublet",
icon: <ToolFilled/>,
label: HasFeatureAccess({featureName: "bills", bodyshop})
icon: <ToolFilled />,
label: HasFeatureAccess({ featureName: "bills", bodyshop })
? t("menus.jobsdetail.partssublet")
: t("menus.jobsdetail.parts"),
children: <JobsDetailPliContainer job={job}/>
children: <JobsDetailPliContainer job={job} />
},
...(InstanceRenderManager({
imex: true,
rome: true,
promanager: HasFeatureAccess({featureName: "timetickets", bodyshop})
promanager: HasFeatureAccess({ featureName: "timetickets", bodyshop })
})
? [
{
key: "labor",
icon: <Icon component={FaHardHat}/>,
label: t("menus.jobsdetail.labor"),
children: <JobsDetailLaborContainer job={job} jobId={job.id}/>
}
]
{
key: "labor",
icon: <Icon component={FaHardHat} />,
label: t("menus.jobsdetail.labor"),
children: <JobsDetailLaborContainer job={job} jobId={job.id} />
}
]
: []),
{
key: "lifecycle",
icon: <BarsOutlined/>,
icon: <BarsOutlined />,
label: t("menus.jobsdetail.lifecycle"),
children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses}/>
children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />
},
{
key: "dates",
icon: <CalendarFilled/>,
icon: <CalendarFilled />,
label: t("menus.jobsdetail.dates"),
forceRender: true,
children: <JobsDetailDatesComponent job={job}/>
children: <JobsDetailDatesComponent job={job} />
},
...(InstanceRenderManager({
imex: true,
rome: true,
promanager: HasFeatureAccess({featureName: "media", bodyshop})
promanager: HasFeatureAccess({ featureName: "media", bodyshop })
})
? [
{
key: "documents",
icon: <FileImageFilled/>,
label: t("jobs.labels.documents"),
children: bodyshop.uselocalmediaserver ? (
<JobsDocumentsLocalGallery job={job}/>
) : (
<JobsDocumentsGalleryContainer jobId={job.id}/>
)
}
]
{
key: "documents",
icon: <FileImageFilled />,
label: t("jobs.labels.documents"),
children: bodyshop.uselocalmediaserver ? (
<JobsDocumentsLocalGallery job={job} />
) : (
<JobsDocumentsGalleryContainer jobId={job.id} />
)
}
]
: []),
{
key: "notes",
icon: <Icon component={FaRegStickyNote}/>,
icon: <Icon component={FaRegStickyNote} />,
label: t("jobs.labels.notes"),
children: <JobNotesContainer jobId={job.id}/>
children: <JobNotesContainer jobId={job.id} />
},
{
key: "audit",
icon: <HistoryOutlined/>,
icon: <HistoryOutlined />,
label: t("jobs.labels.audit"),
children: <JobAuditTrail jobId={job.id}/>
children: <JobAuditTrail jobId={job.id} />
},
{
key: 'tasks',
icon: <FaTasks/>,
label: <Space direction='horizontal'>
{t("jobs.labels.tasks")}{job.tasks_aggregate.aggregate.count > 0 &&
<Badge count={job.tasks_aggregate.aggregate.count}/>}
</Space>,
children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop}
relationshipType={'jobid'} relationshipId={job.id}
query={QUERY_JOB_TASKS_PAGINATED}
titleTranslation='tasks.titles.job_tasks' showRo={false}/>
},
key: "tasks",
icon: <FaTasks />,
label: (
<Space direction="horizontal">
{t("jobs.labels.tasks")}
{job.tasks_aggregate.aggregate.count > 0 && <Badge count={job.tasks_aggregate.aggregate.count} />}
</Space>
),
children: (
<TaskListContainer
currentUser={currentUser}
bodyshop={bodyshop}
relationshipType={"jobid"}
relationshipId={job.id}
query={QUERY_JOB_TASKS_PAGINATED}
titleTranslation="tasks.titles.job_tasks"
showRo={false}
/>
)
}
]}
/>
</Form>
@@ -424,7 +426,7 @@ export function JobsDetailPage({
export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailPage);
const transformJobToForm = (job) => {
const transformedJob = {...job};
const transformedJob = { ...job };
transformedJob.parts_tax_rates = Object.keys(transformedJob.parts_tax_rates).reduce((acc, parttype) => {
acc[parttype] = Object.keys(transformedJob.parts_tax_rates[parttype]).reduce((innerAcc, key) => {