Fix found bugs during demo

client/src/App/App.jsx

@@ -30,9 +30,6 @@ const CsiPage = lazy(() => import("../pages/csi/csi.container.page"));
 const MobilePaymentContainer = lazy(() =>
     import("../pages/mobile-payment/mobile-payment.container")
 );
-const ManageRootPage = lazy(() =>
-    import("../pages/manage-root/manage-root.page.container")
-);
 const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
     online: selectOnline,
@@ -117,15 +114,14 @@ export function App({
                 <Route path="/csi/:surveyId" element={<ErrorBoundary><CsiPage/></ErrorBoundary>}/>
                 <Route path="/disclaimer" element={<ErrorBoundary><DisclaimerPage/></ErrorBoundary>}/>
                 <Route path="/mp/:paymentIs" element={<ErrorBoundary><MobilePaymentContainer/></ErrorBoundary>}/>
-                <Route path="/manage" element={<ErrorBoundary><PrivateRoute isAuthorized={currentUser.authorized}/></ErrorBoundary>}>
-                    <Route path='/manage/' element={<ManageRootPage/>}/>
-                    <Route path="/manage/*" element={<ManagePage/>}/>
+                <Route path="/manage/*" element={<ErrorBoundary><PrivateRoute isAuthorized={currentUser.authorized}/></ErrorBoundary>}>
+                    <Route path="*" element={<ManagePage/>}/>
                 </Route>
-                <Route path="/tech" element={<ErrorBoundary><PrivateRoute isAuthorized={currentUser.authorized}/></ErrorBoundary>}>
-                    <Route path="/tech/*" element={<TechPageContainer/>}/>
+                <Route path="/tech/*" element={<ErrorBoundary><PrivateRoute isAuthorized={currentUser.authorized}/></ErrorBoundary>}>
+                    <Route path="*" element={<TechPageContainer/>}/>
                 </Route>
-                <Route path="/edit" element={<PrivateRoute isAuthorized={currentUser.authorized}/>}>
-                    <Route path="/edit/*" element={<DocumentEditorContainer/>}/>
+                <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized}/>}>
+                    <Route path="*" element={<DocumentEditorContainer/>}/>
                 </Route>
             </Routes>
         </Suspense>

client/src/pages/landing/landing.page.jsx

@@ -15,8 +15,8 @@ export function LandingPage({ currentUser }) {
   const navigate = useNavigate();
 
   useEffect(() => {
-    if (!currentUser.authorized) {
-      navigate('/manage/');
+    if (currentUser.authorized) {
+      navigate('/manage/jobs');
     }
   }, [currentUser, navigate]);
 

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

@@ -164,6 +164,9 @@ const Dms = lazy(() => import("../dms/dms.container"));
 const DmsPayables = lazy(() =>
     import("../dms-payables/dms-payables.container")
 );
+const ManageRootPage = lazy(() =>
+    import("../manage-root/manage-root.page.container")
+);
 
 const {Content, Footer} = Layout;
 
@@ -203,6 +206,7 @@ export function Manage({conflict, bodyshop}) {
             <PrintCenterModalContainer/>
             <Routes>
                 <Route path='/_test' element={<TestComponent/>}/>
+                <Route path='/' element={<ManageRootPage/>}/>
                 <Route path='/jobs' element={<JobsPage/>}/>
                 <Route
                     path='/jobs/:jobId/intake'

client/src/pages/scoreboard/scoreboard.page.container.jsx

@@ -1,9 +1,12 @@
 import Icon, { FieldTimeOutlined } from "@ant-design/icons";
 import { Tabs } from "antd";
+import queryString from "query-string";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
+import { useNavigate, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import FeatureWrapper from "../../components/feature-wrapper/feature-wrapper.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import ScoreboardDisplay from "../../components/scoreboard-display/scoreboard-display.component";
@@ -14,9 +17,6 @@ import {
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useNavigate, useLocation } from "react-router-dom";
-import {createStructuredSelector} from "reselect";
-import queryString from "query-string";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -29,9 +29,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
-    const searchParams = queryString.parse(useLocation().search);
-    const { tab } = searchParams;
-  const navigate = useNavigate();
+  const searchParams = queryString.parse(useLocation().search);
+  const { tab } = searchParams;
+  const history = useNavigate();
   useEffect(() => {
     document.title = t("titles.scoreboard");
     setSelectedHeader("scoreboard");
@@ -44,58 +44,60 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
   return (
-      <FeatureWrapper featureName="scoreboard">
-        <RbacWrapper action="scoreboard:view">
-          <Tabs
-              activeKey={tab || "sb"}
-              destroyInactiveTabPane
-              onChange={(key) => {
-                searchParams.set("tab", key);
-                navigate({ search: searchParams.toString() });
-              }}
-          >
-            <Tabs.TabPane
-                tab={
-                  <span>
+    <FeatureWrapper featureName="scoreboard">
+      <RbacWrapper action="scoreboard:view">
+        <Tabs
+          activeKey={tab || "sb"}
+          destroyInactiveTabPane
+          onChange={(key) => {
+            searchParams.tab = key;
+            history({
+              search: queryString.stringify(searchParams),
+            });
+          }}
+        >
+          <Tabs.TabPane
+            tab={
+              <span>
                 <Icon component={FaShieldAlt} />
-                    {t("scoreboard.labels.jobs")}
+                {t("scoreboard.labels.jobs")}
               </span>
-                }
-                destroyInactiveTabPane
-                key="sb"
-            >
-              <ScoreboardDisplay />
-            </Tabs.TabPane>
-            <Tabs.TabPane
-                tab={
-                  <span>
+            }
+            destroyInactiveTabPane
+            key="sb"
+          >
+            <ScoreboardDisplay />
+          </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
                 <FieldTimeOutlined />
-                    {t("scoreboard.labels.timeticketsemployee")}
+                {t("scoreboard.labels.timeticketsemployee")}
               </span>
-                }
-                destroyInactiveTabPane
-                key="tickets"
-            >
-              <ScoreboardTimeTickets />
-            </Tabs.TabPane>
-            <Tabs.TabPane
-                tab={
-                  <span>
+            }
+            destroyInactiveTabPane
+            key="tickets"
+          >
+            <ScoreboardTimeTickets />
+          </Tabs.TabPane>
+          <Tabs.TabPane
+            tab={
+              <span>
                 <FieldTimeOutlined />
-                    {t("scoreboard.labels.allemployeetimetickets")}
+                {t("scoreboard.labels.allemployeetimetickets")}
               </span>
-                }
-                destroyInactiveTabPane
-                key="ticketsstats"
-            >
-              <ScoreboardTimeTicketsStats />
-            </Tabs.TabPane>
-          </Tabs>
-        </RbacWrapper>
-      </FeatureWrapper>
+            }
+            destroyInactiveTabPane
+            key="ticketsstats"
+          >
+            <ScoreboardTimeTicketsStats />
+          </Tabs.TabPane>
+        </Tabs>
+      </RbacWrapper>
+    </FeatureWrapper>
   );
 }
 export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(ScoreboardContainer);
+  mapStateToProps,
+  mapDispatchToProps
+)(ScoreboardContainer);

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

@@ -1,6 +1,7 @@
 import { Tabs } from "antd";
 import React, { useEffect } from "react";
 import { useNavigate, useLocation } from "react-router-dom";
+import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
@@ -15,7 +16,6 @@ import {
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
-import queryString from "query-string";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -26,9 +26,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   const { t } = useTranslation();
-  const navigate = useNavigate();
-  const searchParams = queryString.parse(useLocation().search);
-  const { tab } = searchParams;
+  const history = useNavigate();
+  const search = queryString.parse(useLocation().search);
+
   useEffect(() => {
     document.title = t("titles.shop");
     setSelectedHeader("shop");
@@ -41,32 +41,29 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);
 
   useEffect(() => {
-    if (!tab) navigate({ search: "?tab=info" });
-  }, [navigate, tab]);
+    if (!search.tab) history({ search: "?tab=info" });
+  }, [history, search]);
 
   return (
-      <RbacWrapper action="shop:config">
-        <Tabs
-            defaultActiveKey={tab}
-            onChange={(key) => {
-              searchParams.set("tab", key);
-              navigate({ search: searchParams.toString() });
-            }}
-        >
-          <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
-            <ShopInfoContainer />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
-            <ShopEmployeesContainer />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
-            <ShopInfoUsersComponent />
-          </Tabs.TabPane>
-          <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
-            <ShopCsiConfig />
-          </Tabs.TabPane>
-        </Tabs>
-      </RbacWrapper>
+    <RbacWrapper action="shop:config">
+      <Tabs
+        defaultActiveKey={search.tab}
+        onChange={(key) => history({ search: `?tab=${key}` })}
+      >
+        <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
+          <ShopInfoContainer />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
+          <ShopEmployeesContainer />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
+          <ShopInfoUsersComponent />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
+          <ShopCsiConfig />
+        </Tabs.TabPane>
+      </Tabs>
+    </RbacWrapper>
   );
 }
-export default connect(mapStateToProps, mapDispatchToProps)(ShopPage);
+export default connect(mapStateToProps, mapDispatchToProps)(ShopPage);

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

@@ -68,7 +68,6 @@ export function TechPage({ technician }) {
         <Layout>
           <UpdateAlert />
           <TechHeader />
-
           <Content className="tech-content-container">
             <ErrorBoundary>
               <Suspense
@@ -82,7 +81,7 @@ export function TechPage({ technician }) {
                   <PrintCenterModalContainer />
                   <Routes>
                     <Route path='/login' element={<TechLogin />} />
-                    <Route path='/joblokup' element={<TechLookup />} />
+                    <Route path='/joblookup' element={<TechLookup />} />
                     <Route path='/list' element={<ProductionListPage />} />
                     <Route path='/jobclock' element={<TechJobClock />} />
                     <Route path='/shiftclock' element={<TechShiftClock />} />
@@ -91,7 +90,6 @@ export function TechPage({ technician }) {
                 </FeatureWrapper>
               </Suspense>
             </ErrorBoundary>
-
             <BackTop />
           </Content>
         </Layout>

client/src/pages/tech/tech.page.container.jsx

@@ -25,10 +25,12 @@ export function TechPageContainer({ bodyshop, setBodyshop }) {
     nextFetchPolicy: "network-only",
   });
   const { t } = useTranslation();
+
   useEffect(() => {
     if (data) setBodyshop(data.bodyshops[0]);
   }, [data, setBodyshop]);
 
+
   if (loading || !bodyshop)
     return <LoadingSpinner message={t("general.labels.loadingshop")} />;
   if (error) return <AlertComponent message={error.message} type="error" />;

client/src/utils/prompt.js

@@ -15,7 +15,7 @@ function Prompt(props) {
     )
 }
 
-export default Prompt
+export default Prompt;
 
 
 // Potential new solution: