Merge CEC-394 Car update log (#82)

src/components/Routes/SiteRoutes.jsx

@@ -6,20 +6,19 @@ import { MessageBar } from "../MessageBar";
 import { useUserContext } from "../Contexts/UserContext";
 import { Roles } from "../../utils/roles";
 
-const SSOForm = React.lazy(() => import("../SSOForm"));
-const Home = React.lazy(() => import("../Home"));
-const VehicleAddForm = React.lazy(() => import("../Cars/Add"));
-const PageNotFound = React.lazy(() => import("../404"));
-const CarUpdatesDeploy = React.lazy(() => import("../CarUpdates/Deploy"));
-const CarUpdatesStatus = React.lazy(() => import("../CarUpdates/Status"));
-const CarUpdates = React.lazy(() => import("../Cars/Status"));
-const SendCommandBulk = React.lazy(() => import("../Cars/SendCommandBulk"));
-const Datascope = React.lazy(() => import("../Datascope/Home"));
 const BatteryDatascope = React.lazy(() => import("../Datascope/Battery"));
+const CarsList = React.lazy(() => import("../Cars/List"));
+const CarStatus = React.lazy(() => import("../Cars/Status"));
+const CarUpdateStatus = React.lazy(() => import("../Cars/UpdateStatus"));
+const Datascope = React.lazy(() => import("../Datascope/Home"));
+const Home = React.lazy(() => import("../Home"));
 const Manifests = React.lazy(() => import("../Manifest/List"));
 const ManifestDeploy = React.lazy(() => import("../Manifest/Deploy"));
 const ManifestStatus = React.lazy(() => import("../Manifest/Status"));
 const ManifestCreate = React.lazy(() => import("../Manifest/Create"));
+const PageNotFound = React.lazy(() => import("../404"));
+const SSOForm = React.lazy(() => import("../SSOForm"));
+const VehicleAddForm = React.lazy(() => import("../Cars/Add"));
 
 const SiteRoutes = () => {
   const { token, groups } = useUserContext();
@@ -34,52 +33,6 @@ const SiteRoutes = () => {
           type={TYPES.GUEST}
           token={token}
         />
-        <AuthRoute
-          path="/home"
-          render={() => <Home />}
-          type={TYPES.PROTECTED}
-          token={token}
-        />
-        <AuthRoute
-          path="/carupdate-deploy/:packageid"
-          render={() => <CarUpdatesDeploy />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/carupdate-status/:packageid"
-          render={() => <CarUpdatesStatus />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.READ, Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicles"
-          render={() => <SendCommandBulk />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicle-add"
-          render={() => <VehicleAddForm />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.CREATE]}
-        />
-        <AuthRoute
-          path="/vehicle-status/:vin"
-          render={() => <CarUpdates />}
-          type={TYPES.PROTECTED}
-          token={token}
-          groups={groups}
-          roles={[Roles.READ, Roles.CREATE]}
-        />
         <AuthRoute
           path="/datascope/battery"
           render={() => <BatteryDatascope />}
@@ -96,6 +49,12 @@ const SiteRoutes = () => {
           groups={groups}
           roles={[Roles.READ, Roles.CREATE]}
         />
+        <AuthRoute
+          path="/home"
+          render={() => <Home />}
+          type={TYPES.PROTECTED}
+          token={token}
+        />
         <AuthRoute
           path="/packages"
           render={() => <Manifests />}
@@ -104,6 +63,14 @@ const SiteRoutes = () => {
           groups={groups}
           roles={[Roles.READ, Roles.CREATE]}
         />
+        <AuthRoute
+          path="/package-create"
+          render={() => <ManifestCreate />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.CREATE]}
+        />
         <AuthRoute
           path="/package-deploy/:manifest_id"
           render={() => <ManifestDeploy />}
@@ -121,13 +88,37 @@ const SiteRoutes = () => {
           roles={[Roles.READ, Roles.CREATE]}
         />
         <AuthRoute
-          path="/package-create"
-          render={() => <ManifestCreate />}
+          path="/vehicles"
+          render={() => <CarsList />}
           type={TYPES.PROTECTED}
           token={token}
           groups={groups}
           roles={[Roles.CREATE]}
         />
+        <AuthRoute
+          path="/vehicle-add"
+          render={() => <VehicleAddForm />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.CREATE]}
+        />
+        <AuthRoute
+          path="/vehicle-status/:vin/:carupdateid"
+          render={() => <CarUpdateStatus />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.READ, Roles.CREATE]}
+        />
+        <AuthRoute
+          path="/vehicle-status/:vin"
+          render={() => <CarStatus />}
+          type={TYPES.PROTECTED}
+          token={token}
+          groups={groups}
+          roles={[Roles.READ, Roles.CREATE]}
+        />
         <PageNotFound />
       </Switch>
     </Suspense>