- reapply proper prettier formatting.

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-03 14:09:09 -04:00
parent e51f72ff98
commit ab031c01de
26 changed files with 10734 additions and 10641 deletions

View File

@@ -91,7 +91,7 @@ export function JobsDetailPage({
job,
mutationUpdateJob,
handleSubmit,
currentUser,
currentUser,
insertAuditTrail,
refetch
}) {
@@ -120,7 +120,7 @@ export function JobsDetailPage({
window.removeEventListener('taskUpdated', handleTaskUpdated);
};
}, [refetch]);
//useKeyboardSaveShortcut(form.submit);
const handleFinish = async (values) => {
@@ -406,15 +406,19 @@ export function JobsDetailPage({
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} />}
{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'/>
children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop}
relationshipType={'jobid'} relationshipId={job.id}
query={QUERY_JOB_TASKS_PAGINATED}
titleTranslation='tasks.titles.job_tasks'/>
},
]}
/>
</Form>
</div>
);
/>
</Form>
</div>
);
}
export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailPage);

View File

@@ -1,4 +1,4 @@
import { FloatButton, Layout, Spin, Collapse, Button, Space, Tag } from "antd";
import {Button, Collapse, FloatButton, Layout, Space, Spin, Tag} from "antd";
// import preval from "preval.macro";
import React, {lazy, Suspense, useEffect, useState} from "react";
import {useTranslation} from "react-i18next";
@@ -20,8 +20,8 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
import PrintCenterModalContainer
from "../../components/print-center-modal/print-center-modal.container";
import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
import { requestForToken } from "../../firebase/firebase.utils";
import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
import {requestForToken} from "../../firebase/firebase.utils";
import {selectBodyshop, selectInstanceConflict} from "../../redux/user/user.selectors";
import UpdateAlert from "../../components/update-alert/update-alert.component";
import {setJoyRideFinished} from "../../redux/application/application.actions.js";
@@ -106,7 +106,7 @@ const MyTasksPage = lazy(() => import("../tasks/myTasksPageContainer.jsx"));
const AllTasksPage = lazy(() => import("../tasks/allTasksPageContainer.jsx"));
const TaskUpsertModalContainer = lazy(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
const { Content, Footer } = Layout;
const {Content, Footer} = Layout;
const mapStateToProps = createStructuredSelector({
conflict: selectInstanceConflict,
@@ -119,8 +119,8 @@ const mapDispatchToProps = (dispatch) => ({
setJoyRideFinished: (steps) => dispatch(setJoyRideFinished(steps))
});
export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished }) {
const { t } = useTranslation();
export function Manage({conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished}) {
const {t} = useTranslation();
const [chatVisible] = useState(false);
const [tours, setTours] = useState([]);
@@ -156,115 +156,115 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
/>
}
>
<PaymentModalContainer />
<PaymentModalContainer/>
<CardPaymentModalContainer />
<CardPaymentModalContainer/>
<TaskUpsertModalContainer/>
<BreadCrumbs />
<BillEnterModalContainer />
<JobCostingModal />
<ReportCenterModal />
<EmailOverlayContainer />
<TimeTicketModalContainer />
<TimeTicketModalTask />
<PrintCenterModalContainer />
<BreadCrumbs/>
<BillEnterModalContainer/>
<JobCostingModal/>
<ReportCenterModal/>
<EmailOverlayContainer/>
<TimeTicketModalContainer/>
<TimeTicketModalTask/>
<PrintCenterModalContainer/>
<Routes>
<Route path="/_test" element={<TestComponent />} />
<Route path="/" element={<ManageRootPage />} />
<Route path="/_test" element={<TestComponent/>}/>
<Route path="/" element={<ManageRootPage/>}/>
<Route
path="/jobs"
element={
<Suspense fallback={<Spin />}>
<JobsPage />
<Suspense fallback={<Spin/>}>
<JobsPage/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId/intake"
element={
<Suspense fallback={<Spin />}>
<JobIntake />
<Suspense fallback={<Spin/>}>
<JobIntake/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId/deliver"
element={
<Suspense fallback={<Spin />}>
<JobDeliver />
<Suspense fallback={<Spin/>}>
<JobDeliver/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId/checklist"
element={
<Suspense fallback={<Spin />}>
<JobChecklistView />
<Suspense fallback={<Spin/>}>
<JobChecklistView/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId/close"
element={
<Suspense fallback={<Spin />}>
<JobsClose />
<Suspense fallback={<Spin/>}>
<JobsClose/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId/admin"
element={
<Suspense fallback={<Spin />}>
<JobsAdmin />
<Suspense fallback={<Spin/>}>
<JobsAdmin/>
</Suspense>
}
/>
<Route
path="/jobs/all"
element={
<Suspense fallback={<Spin />}>
<AllJobs />
<Suspense fallback={<Spin/>}>
<AllJobs/>
</Suspense>
}
/>
<Route
path="/jobs/ready"
element={
<Suspense fallback={<Spin />}>
<ReadyJobs />
<Suspense fallback={<Spin/>}>
<ReadyJobs/>
</Suspense>
}
/>
<Route
path="/jobs/new"
element={
<Suspense fallback={<Spin />}>
<JobsCreateContainerPage />
<Suspense fallback={<Spin/>}>
<JobsCreateContainerPage/>
</Suspense>
}
/>
<Route
path="/jobs/:jobId"
element={
<Suspense fallback={<Spin />}>
<JobsDetailPage />
<Suspense fallback={<Spin/>}>
<JobsDetailPage/>
</Suspense>
}
/>
<Route
path="/temporarydocs/"
element={
<Suspense fallback={<Spin />}>
<TempDocs />
<Suspense fallback={<Spin/>}>
<TempDocs/>
</Suspense>
}
/>
<Route
path='/tasks/mytasks'
element={
<Suspense fallback={<Spin/>}>
<MyTasksPage/>
</Suspense>}
element={
<Suspense fallback={<Spin/>}>
<MyTasksPage/>
</Suspense>}
/>
<Route
path='/tasks/alltasks'
@@ -276,144 +276,144 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
<Route
path="/inventory/"
element={
<Suspense fallback={<Spin />}>
<InventoryListPage />
<Suspense fallback={<Spin/>}>
<InventoryListPage/>
</Suspense>
}
/>
<Route
path="/courtesycars/"
element={
<Suspense fallback={<Spin />}>
<CourtesyCarsPage />
<Suspense fallback={<Spin/>}>
<CourtesyCarsPage/>
</Suspense>
}
/>
<Route
path="/courtesycars/new"
element={
<Suspense fallback={<Spin />}>
<CourtesyCarCreateContainer />
<Suspense fallback={<Spin/>}>
<CourtesyCarCreateContainer/>
</Suspense>
}
/>
<Route
path="/courtesycars/contracts"
element={
<Suspense fallback={<Spin />}>
<ContractsList />
<Suspense fallback={<Spin/>}>
<ContractsList/>
</Suspense>
}
/>
<Route
path="/courtesycars/contracts/new"
element={
<Suspense fallback={<Spin />}>
<ContractCreatePage />
<Suspense fallback={<Spin/>}>
<ContractCreatePage/>
</Suspense>
}
/>
<Route
path="/courtesycars/contracts/:contractId"
element={
<Suspense fallback={<Spin />}>
<ContractDetailPage />
<Suspense fallback={<Spin/>}>
<ContractDetailPage/>
</Suspense>
}
/>
<Route
path="/courtesycars/:ccId"
element={
<Suspense fallback={<Spin />}>
<CourtesyCarDetailContainer />
<Suspense fallback={<Spin/>}>
<CourtesyCarDetailContainer/>
</Suspense>
}
/>
<Route
path="/profile"
element={
<Suspense fallback={<Spin />}>
<ProfilePage />
<Suspense fallback={<Spin/>}>
<ProfilePage/>
</Suspense>
}
/>
<Route
path="/vehicles"
element={
<Suspense fallback={<Spin />}>
<VehiclesContainer />
<Suspense fallback={<Spin/>}>
<VehiclesContainer/>
</Suspense>
}
/>
<Route
path="/production/list"
element={
<Suspense fallback={<Spin />}>
<ProductionListPage />
<Suspense fallback={<Spin/>}>
<ProductionListPage/>
</Suspense>
}
/>
<Route
path="/production/board"
element={
<Suspense fallback={<Spin />}>
<ProductionBoardPage />
<Suspense fallback={<Spin/>}>
<ProductionBoardPage/>
</Suspense>
}
/>
<Route
path="/vehicles/:vehId"
element={
<Suspense fallback={<Spin />}>
<VehiclesDetailContainer />
<Suspense fallback={<Spin/>}>
<VehiclesDetailContainer/>
</Suspense>
}
/>
<Route
path="/bills"
element={
<Suspense fallback={<Spin />}>
<BillsListPage />
<Suspense fallback={<Spin/>}>
<BillsListPage/>
</Suspense>
}
/>
<Route
path="/owners"
element={
<Suspense fallback={<Spin />}>
<OwnersContainer />
<Suspense fallback={<Spin/>}>
<OwnersContainer/>
</Suspense>
}
/>
<Route
path="/owners/:ownerId"
element={
<Suspense fallback={<Spin />}>
<OwnersDetailContainer />
<Suspense fallback={<Spin/>}>
<OwnersDetailContainer/>
</Suspense>
}
/>
<Route
path="/schedule"
element={
<Suspense fallback={<Spin />}>
<ScheduleContainer />
<Suspense fallback={<Spin/>}>
<ScheduleContainer/>
</Suspense>
}
/>
<Route
path="/available"
element={
<Suspense fallback={<Spin />}>
<JobsAvailablePage />
<Suspense fallback={<Spin/>}>
<JobsAvailablePage/>
</Suspense>
}
/>
<Route
path="/shop"
element={
<Suspense fallback={<Spin />}>
<ShopPage />
<Suspense fallback={<Spin/>}>
<ShopPage/>
</Suspense>
}
/>
@@ -426,16 +426,16 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
<Route
path="/shop/vendors"
element={
<Suspense fallback={<Spin />}>
<ShopVendorPageContainer />
<Suspense fallback={<Spin/>}>
<ShopVendorPageContainer/>
</Suspense>
}
/>
<Route
path="/shop/csi"
element={
<Suspense fallback={<Spin />}>
<ShopCsiPageContainer />
<Suspense fallback={<Spin/>}>
<ShopCsiPageContainer/>
</Suspense>
}
/>
@@ -443,8 +443,8 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
<Route
path="/accounting/qbo"
element={
<Suspense fallback={<Spin />}>
<AccountingQboCallback />
<Suspense fallback={<Spin/>}>
<AccountingQboCallback/>
</Suspense>
}
/>
@@ -452,56 +452,56 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
<Route
path="/accounting/receivables"
element={
<Suspense fallback={<Spin />}>
<AccountingReceivables />
<Suspense fallback={<Spin/>}>
<AccountingReceivables/>
</Suspense>
}
/>
<Route
path="/accounting/payables"
element={
<Suspense fallback={<Spin />}>
<AccountingPayables />
<Suspense fallback={<Spin/>}>
<AccountingPayables/>
</Suspense>
}
/>
<Route
path="/accounting/payments"
element={
<Suspense fallback={<Spin />}>
<AccountingPayments />
<Suspense fallback={<Spin/>}>
<AccountingPayments/>
</Suspense>
}
/>
<Route
path="/accounting/exportlogs"
element={
<Suspense fallback={<Spin />}>
<ExportLogs />
<Suspense fallback={<Spin/>}>
<ExportLogs/>
</Suspense>
}
/>
<Route
path="/ttapprovals"
element={
<Suspense fallback={<Spin />}>
<TtApprovals />
<Suspense fallback={<Spin/>}>
<TtApprovals/>
</Suspense>
}
/>
<Route
path="/partsqueue"
element={
<Suspense fallback={<Spin />}>
<PartsQueue />
<Suspense fallback={<Spin/>}>
<PartsQueue/>
</Suspense>
}
/>
<Route
path="/phonebook"
element={
<Suspense fallback={<Spin />}>
<Phonebook />
<Suspense fallback={<Spin/>}>
<Phonebook/>
</Suspense>
}
/>
@@ -509,65 +509,65 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
<Route
path="/payments"
element={
<Suspense fallback={<Spin />}>
<PaymentsAll />
<Suspense fallback={<Spin/>}>
<PaymentsAll/>
</Suspense>
}
/>
<Route
path="/shiftclock"
element={
<Suspense fallback={<Spin />}>
<ShiftClock />
<Suspense fallback={<Spin/>}>
<ShiftClock/>
</Suspense>
}
/>
<Route
path="/scoreboard"
element={
<Suspense fallback={<Spin />}>
<Scoreboard />
<Suspense fallback={<Spin/>}>
<Scoreboard/>
</Suspense>
}
/>
<Route
path="/timetickets"
element={
<Suspense fallback={<Spin />}>
<TimeTicketsAll />
<Suspense fallback={<Spin/>}>
<TimeTicketsAll/>
</Suspense>
}
/>
<Route
path="/help"
element={
<Suspense fallback={<Spin />}>
<Help />
<Suspense fallback={<Spin/>}>
<Help/>
</Suspense>
}
/>
<Route path="/emailtest" element={<EmailTest />} />
<Route path="/emailtest" element={<EmailTest/>}/>
<Route
path="/dashboard"
element={
<Suspense fallback={<Spin />}>
<Dashboard />
<Suspense fallback={<Spin/>}>
<Dashboard/>
</Suspense>
}
/>
<Route
path="/dms"
element={
<Suspense fallback={<Spin />}>
<Dms />
<Suspense fallback={<Spin/>}>
<Dms/>
</Suspense>
}
/>
<Route
path="/dmsap"
element={
<Suspense fallback={<Spin />}>
<DmsPayables />
<Suspense fallback={<Spin/>}>
<DmsPayables/>
</Suspense>
}
/>
@@ -577,16 +577,16 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
let PageContent;
if (conflict) PageContent = <ConflictComponent />;
else if (bodyshop && bodyshop.sub_status !== "active") PageContent = <ShopSubStatusComponent />;
if (conflict) PageContent = <ConflictComponent/>;
else if (bodyshop && bodyshop.sub_status !== "active") PageContent = <ShopSubStatusComponent/>;
else PageContent = AppRouteTable;
return (
<>
<ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
<Layout style={{ minHeight: "100vh" }} className="layout-container">
<UpdateAlert />
<HeaderContainer />
<ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible}/>
<Layout style={{minHeight: "100vh"}} className="layout-container">
<UpdateAlert/>
<HeaderContainer/>
<Content className="content-container">
<Joyride
debug
@@ -603,12 +603,12 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
}
}}
/>
<PartnerPingComponent />
<Sentry.ErrorBoundary fallback={<ErrorBoundary />} showDialog>
<PartnerPingComponent/>
<Sentry.ErrorBoundary fallback={<ErrorBoundary/>} showDialog>
{PageContent}
</Sentry.ErrorBoundary>
<FloatButton.BackTop style={{ right: 100, bottom: 25 }} />
<FloatButton.BackTop style={{right: 100, bottom: 25}}/>
</Content>
<Footer>
<div
@@ -620,7 +620,7 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
margin: "1rem 0rem"
}}
>
<div style={{ display: "flex" }}>
<div style={{display: "flex"}}>
<div>
{`${InstanceRenderManager({
imex: t("titles.imexonline"),
@@ -628,9 +628,9 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
promanager: t("titles.promanager")
})} - ${import.meta.env.VITE_APP_GIT_SHA_DATE}`}
</div>
<div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
<div id="noticeable-widget" style={{marginLeft: "1rem"}}/>
</div>
<Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
<Link to="/disclaimer" target="_blank" style={{color: "#ccc"}}>
Disclaimer & Notices
</Link>
</div>
@@ -647,7 +647,8 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
Get Tours
</Button>
{tours.map((tour) => (
<Tag key={tour.id} onClick={() => window.productFruits.api.tours.tryStartTour(tour.id)}>
<Tag key={tour.id}
onClick={() => window.productFruits.api.tours.tryStartTour(tour.id)}>
{tour.name}
</Tag>
))}

View File

@@ -64,7 +64,8 @@ export function MyTasksPageContainer({
}, [setTaskUpsertContext]);
return (
<TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser} bodyshop={bodyshop}/>
<TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
}

View File

@@ -38,7 +38,8 @@ export function MyTasksPageContainer({bodyshop, currentUser, setBreadcrumbs, set
}, [t, setBreadcrumbs, setSelectedHeader]);
return (
<TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser} bodyshop={bodyshop}/>
<TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
}

View File

@@ -1,6 +1,6 @@
export const TaskPageTypes = {
MY_TASKS: 'myTasks',
ALL_TASKS: 'allTasks',
MY_TASKS: 'myTasks',
ALL_TASKS: 'allTasks',
};
export default TaskPageTypes;