Progress

client/src/pages/manage/manage.page.component.jsx

@@ -179,7 +179,13 @@ const mapStateToProps = createStructuredSelector({
 });
 
 export function Manage({ match, conflict, bodyshop }) {
+
+  // TODO: Remove after client upgrade
+  console.log('Manage Page :');
+  console.dir({ match, conflict, bodyshop });
+
   const { t } = useTranslation();
+
   useEffect(() => {
     const widgetId = "IABVNO4scRKY11XBQkNr";
     window.noticeable.render("widget", widgetId);
@@ -209,184 +215,152 @@ export function Manage({ match, conflict, bodyshop }) {
       <EmailOverlayContainer />
       <TimeTicketModalContainer />
       <PrintCenterModalContainer />
-      <Route exact path={`${match.path}/_test`} component={TestComponent} />
-      <Route exact path={`${match.path}`} component={ManageRootPage} />
-      <Route exact path={`${match.path}/jobs`} component={JobsPage} />
+      <Route path={`${match.path}/_test`} element={<TestComponent />} />
+      <Route path={`${match.path}`} element={<ManageRootPage />} />
+      <Route path={`${match.path}/jobs`} element={<JobsPage />} />
       <Routes>
         <Route
-          exact
           path={`${match.path}/jobs/:jobId/intake`}
-          component={JobIntake}
+          element={<JobIntake />}
         />
         <Route
-          exact
           path={`${match.path}/jobs/:jobId/deliver`}
-          component={JobDeliver}
+          element={<JobDeliver />}
         />
         <Route
-          exact
           path={`${match.path}/jobs/:jobId/checklist`}
-          component={JobChecklistView}
+          element={<JobChecklistView />}
         />
         <Route
-          exact
           path={`${match.path}/jobs/:jobId/close`}
-          component={JobsClose}
+          element={<JobsClose />}
         />
         <Route
-          exact
           path={`${match.path}/jobs/:jobId/admin`}
-          component={JobsAdmin}
+          element={<JobsAdmin />}
         />
-        <Route exact path={`${match.path}/jobs/all`} component={AllJobs} />
-        <Route exact path={`${match.path}/jobs/ready`} component={ReadyJobs} />
+        <Route path={`${match.path}/jobs/all`} element={<AllJobs />} />
+        <Route path={`${match.path}/jobs/ready`} element={<ReadyJobs />} />
         <Route
-          exact
           path={`${match.path}/jobs/new`}
-          component={JobsCreateContainerPage}
+          element={<JobsCreateContainerPage />}
         />
-        <Route path={`${match.path}/jobs/:jobId`} component={JobsDetailPage} />
+        <Route path={`${match.path}/jobs/:jobId`} element={<JobsDetailPage />} />
       </Routes>
-      <Route exact path={`${match.path}/temporarydocs/`} component={TempDocs} />
+      <Route path={`${match.path}/temporarydocs/`} element={<TempDocs />} />
       <Route
-        exact
         path={`${match.path}/inventory/`}
-        component={InventoryListPage}
+        element={<InventoryListPage />}
       />
       <Route
-        exact
         path={`${match.path}/courtesycars/`}
-        component={CourtesyCarsPage}
+        element={<CourtesyCarsPage />}
       />
       <Routes>
         <Route
-          exact
           path={`${match.path}/courtesycars/new`}
-          component={CourtesyCarCreateContainer}
+          element={<CourtesyCarCreateContainer />}
         />
-
         <Route
-          exact
           path={`${match.path}/courtesycars/contracts`}
-          component={ContractsList}
+          element={<ContractsList />}
         />
-
         <Route
-          exact
           path={`${match.path}/courtesycars/contracts/new`}
-          component={ContractCreatePage}
+          element={<ContractCreatePage />}
         />
         <Route
-          exact
           path={`${match.path}/courtesycars/contracts/:contractId`}
-          component={ContractDetailPage}
+          element={<ContractDetailPage />}
         />
-
         <Route
-          exact
           path={`${match.path}/courtesycars/:ccId`}
-          component={CourtesyCarDetailContainer}
+          element={<CourtesyCarDetailContainer />}
         />
       </Routes>
-      <Route exact path={`${match.path}/profile`} component={ProfilePage} />
+      <Route path={`${match.path}/profile`} element={<ProfilePage />} />
       <Route
-        exact
         path={`${match.path}/vehicles`}
-        component={VehiclesContainer}
+        element={<VehiclesContainer />}
       />
       <Route
-        exact
         path={`${match.path}/production/list`}
-        component={ProductionListPage}
+        element={<ProductionListPage />}
       />
       <Route
-        exact
         path={`${match.path}/production/board`}
-        component={ProductionBoardPage}
+        element={<ProductionBoardPage />}
       />
       <Route
-        exact
         path={`${match.path}/vehicles/:vehId`}
-        component={VehiclesDetailContainer}
+        element={<VehiclesDetailContainer />}
       />
-      <Route exact path={`${match.path}/bills`} component={BillsListPage} />
-      <Route exact path={`${match.path}/owners`} component={OwnersContainer} />
+      <Route path={`${match.path}/bills`} element={<BillsListPage />} />
+      <Route path={`${match.path}/owners`} element={<OwnersContainer />} />
       <Route
-        exact
         path={`${match.path}/owners/:ownerId`}
-        component={OwnersDetailContainer}
+        element={<OwnersDetailContainer />}
       />
       <Route
-        exact
         path={`${match.path}/schedule`}
-        component={ScheduleContainer}
+        element={<ScheduleContainer />}
       />
       <Route
-        exact
         path={`${match.path}/available`}
-        component={JobsAvailablePage}
+        element={<JobsAvailablePage />}
       />
-      <Route exact path={`${match.path}/shop/`} component={ShopPage} />
+      <Route path={`${match.path}/shop/`} element={<ShopPage />} />
       {
         //   <Route
-        // exact
         // path={`${match.path}/shop/templates`}
-        // component={ShopTemplates}
+        // element={<ShopTemplates />}
         //   />
       }
       <Route
-        exact
         path={`${match.path}/shop/vendors`}
-        component={ShopVendorPageContainer}
+        element={<ShopVendorPageContainer />}
       />
       <Route
-        exact
         path={`${match.path}/shop/csi`}
-        component={ShopCsiPageContainer}
+        element={<ShopCsiPageContainer />}
       />
 
       <Route
-        exact
         path={`${match.path}/accounting/qbo`}
-        component={AccountingQboCallback}
+        element={<AccountingQboCallback />}
       />
 
       <Route
-        exact
         path={`${match.path}/accounting/receivables`}
-        component={AccountingReceivables}
+        element={<AccountingReceivables />}
       />
       <Route
-        exact
         path={`${match.path}/accounting/payables`}
-        component={AccountingPayables}
+        element={<AccountingPayables />}
       />
       <Route
-        exact
         path={`${match.path}/accounting/payments`}
-        component={AccountingPayments}
+        element={<AccountingPayments />}
       />
       <Route
-        exact
         path={`${match.path}/accounting/exportlogs`}
-        component={ExportLogs}
+        element={<ExportLogs />}
       />
-      <Route exact path={`${match.path}/partsqueue`} component={PartsQueue} />
-      <Route exact path={`${match.path}/phonebook`} component={Phonebook} />
+      <Route path={`${match.path}/partsqueue`} element={<PartsQueue />} />
+      <Route path={`${match.path}/phonebook`} element={<Phonebook />} />
 
-      <Route exact path={`${match.path}/payments`} component={PaymentsAll} />
-      <Route exact path={`${match.path}/shiftclock`} component={ShiftClock} />
-      <Route exact path={`${match.path}/scoreboard`} component={Scoreboard} />
+      <Route path={`${match.path}/payments`} element={<PaymentsAll />} />
+      <Route path={`${match.path}/shiftclock`} element={<ShiftClock />} />
+      <Route path={`${match.path}/scoreboard`} element={<Scoreboard />} />
       <Route
-        exact
         path={`${match.path}/timetickets`}
-        component={TimeTicketsAll}
+        element={<TimeTicketsAll />}
       />
-      <Route exact path={`${match.path}/help`} component={Help} />
-      <Route exact path={`${match.path}/emailtest`} component={EmailTest} />
-      <Route exact path={`${match.path}/dashboard`} component={Dashboard} />
-      <Route exact path={`${match.path}/dms`} component={Dms} />
-      <Route exact path={`${match.path}/dmsap`} component={DmsPayables} />
+      <Route path={`${match.path}/help`} element={<Help />} />
+      <Route path={`${match.path}/emailtest`} element={<EmailTest />} />
+      <Route path={`${match.path}/dashboard`} element={<Dashboard />} />
+      <Route path={`${match.path}/dms`} element={<Dms />} />
+      <Route path={`${match.path}/dmsap`} element={<DmsPayables />} />
     </Suspense>
   );