@truedat/dq 7.5.7 → 7.5.10

package/src/components/ImplementationsRoutes.js

@@ -1,11 +1,10 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { Route, Switch, useRouteMatch, useParams } from "react-router-dom";
+import { Route, useParams, Routes } from "react-router";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
-import { Unauthorized } from "@truedat/core/components";
-import { useAuthorized } from "@truedat/core/hooks";
+import { ProtectedRoute, Loader } from "@truedat/core/router";
 import {
   IMPLEMENTATION_CLONE,
   IMPLEMENTATION_CONCEPT_LINKS_NEW,
@@ -53,25 +52,24 @@ import RuleResultRemediationLoader from "./RuleResultRemediationLoader";
 import RuleResultsRoutes from "./RuleResultsRoutes";
 import RuleSubscriptionLoader from "./RuleSubscriptionLoader";
 
-const TemplatesLoader = React.lazy(() =>
-  import("@truedat/df/templates/components/TemplatesLoader")
+const TemplatesLoader = React.lazy(
+  () => import("@truedat/core/components/TemplatesLoader")
 );
-const EventsLoader = React.lazy(() =>
-  import("@truedat/audit/components/EventsLoader")
+const EventsLoader = React.lazy(
+  () => import("@truedat/audit/components/EventsLoader")
 );
-const ImplementationStructuresLoader = React.lazy(() =>
-  import("@truedat/dd/components/ImplementationStructuresLoader")
+const ImplementationStructuresLoader = React.lazy(
+  () => import("@truedat/dd/components/ImplementationStructuresLoader")
 );
-const ImplementationLinks = React.lazy(() =>
-  import("@truedat/lm/components/ImplementationLinks")
+const ImplementationLinks = React.lazy(
+  () => import("@truedat/lm/components/ImplementationLinks")
 );
-const ImplementationRelationForm = React.lazy(() =>
-  import("@truedat/lm/components/ImplementationRelationForm")
+const ImplementationRelationForm = React.lazy(
+  () => import("@truedat/lm/components/ImplementationRelationForm")
 );
 
 const ImplementationEventsLoader = () => {
-  const match = useRouteMatch();
-  const id = _.path("params.implementation_id")(match);
+  const { implementation_id: id } = useParams();
   return <EventsLoader resource_id={id} resource_type="implementation" />;
 };
 
@@ -83,355 +81,414 @@ export const ImplementationsRoutes = ({
   systemsLoading,
   isRuleImplemenationBasic,
 }) => {
-  const authorized = useAuthorized();
   const { rule_result_id: ruleResultId } = useParams();
   return (
-    <Switch>
+    <Routes>
       <Route
-        exact
-        path={IMPLEMENTATION_NEW}
-        render={() => (
+        element={
+          <>
+            <ImplementationCrumbs />
+            <Segment>
+              {ruleImplementationLoaded ? (
+                <RuleImplementation>
+                  <RuleImplementationProperties />
+                </RuleImplementation>
+              ) : null}
+            </Segment>
+          </>
+        }
+      />
+
+      <Route
+        // IMPLEMENTATIONS = "/implementations";
+        index
+        element={<Implementations defaultFilters={{ status: ["published"] }} />}
+      />
+
+      <Route
+        // IMPLEMENTATIONS_PENDING = "/implementations/pending";
+        path="/pending"
+        element={
+          <Implementations
+            defaultFilters={{
+              status: ["draft", "pending_approval", "rejected"],
+            }}
+          />
+        }
+      />
+      <Route
+        // IMPLEMENTATIONS_DEPRECATED = "/implementations/deprecated";
+        path="deprecated"
+        element={
+          <Implementations
+            defaultFilters={{
+              status: ["deprecated"],
+            }}
+          />
+        }
+      />
+      <Route
+        // IMPLEMENTATION_NEW = "/implementations/new";
+        path="new"
+        element={
           <>
             {!structuresAliasesLoading && !systemsLoading ? (
               <NewRuleImplementation />
             ) : null}
           </>
-        )}
+        }
       />
       <Route
-        exact
-        path={IMPLEMENTATION_NEW_BASIC}
-        render={() => (
+        // IMPLEMENTATION_NEW_BASIC = "/implementations/basic";
+        path="basic"
+        element={
           <>
-            <TemplatesLoader scope="ri" />
+            <Loader loaders={<TemplatesLoader scope="ri" />} />
             <NewBasicRuleImplementation />
           </>
-        )}
+        }
       />
       <Route
-        exact
-        path={IMPLEMENTATION_NEW_RAW}
-        render={() => (
+        // IMPLEMENTATION_NEW_RAW = "/implementations/new_raw";
+        path="new_raw"
+        element={
           <>
-            <TemplatesLoader scope="ri" />
+            <Loader loaders={<TemplatesLoader scope="ri" />} />
             {!structuresAliasesLoading && !systemsLoading ? (
               <NewRuleImplementation implementationType="raw" />
             ) : null}
           </>
-        )}
+        }
       />
       <Route
-        path={IMPLEMENTATION}
-        render={() => (
+        // IMPLEMENTATION = "/implementations/:implementation_id(\\d+)";
+        path=":implementation_id"
+        element={
           <>
-            <RuleImplementationLoader />
-            <RuleSubscriptionLoader />
-            <TemplatesLoader scope="ri" />
-            <Route
-              exact
-              path={IMPLEMENTATION}
-              render={() => (
+            <Loader
+              loaders={
                 <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <RuleImplementationProperties />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
+                  <RuleImplementationLoader />
+                  <RuleSubscriptionLoader />
+                  <TemplatesLoader scope="ri" />
                 </>
-              )}
+              }
             />
-            <Route
-              exact
-              path={IMPLEMENTATION_EVENTS}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    <ImplementationEventsLoader />
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <RuleImplementationEvents />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_EXECUTIONS}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <ImplementationExecutions />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_CLONE}
-              render={() => (
-                <>
-                  {ruleImplementationLoaded ? (
+          </>
+        }
+      >
+        <Route
+          index
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <RuleImplementationProperties />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+        <Route
+          // IMPLEMENTATION_EVENTS = "/implementations/:implementation_id/events";
+          path="events"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                <ImplementationEventsLoader />
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <RuleImplementationEvents />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+        <Route
+          // IMPLEMENTATION_EXECUTIONS = "/implementations/:implementation_id/executions";
+          path="executions"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <ImplementationExecutions />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+        <Route
+          // IMPLEMENTATION_RESULTS = "/implementations/:implementation_id/results";
+          path="results"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <RuleImplementationResults />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+
+        <Route
+          // IMPLEMENTATION_HISTORY ="/implementations/:implementation_id/history";
+          path="history"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <RuleImplementationHistory />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+        <Route
+          // IMPLEMENTATION_CLONE = "/implementations/:implementation_id/clone";
+          path="clone"
+          element={
+            <>
+              {ruleImplementationLoaded ? (
+                <Loader
+                  loaders={
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
-                  ) : null}
-                  {!structuresAliasesLoading &&
-                  ruleImplementationLoaded &&
-                  implementationStructuresLoaded ? (
-                    isRuleImplemenationBasic ? (
-                      <NewBasicRuleImplementation edition clone />
-                    ) : (
-                      <NewRuleImplementation edition clone />
-                    )
-                  ) : null}
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_EDIT}
-              render={() => (
-                <>
-                  {ruleImplementationLoaded ? (
+                  }
+                />
+              ) : null}
+              {!structuresAliasesLoading &&
+              ruleImplementationLoaded &&
+              implementationStructuresLoaded ? (
+                isRuleImplemenationBasic ? (
+                  <NewBasicRuleImplementation edition clone />
+                ) : (
+                  <NewRuleImplementation edition clone />
+                )
+              ) : null}
+            </>
+          }
+        />
+
+        <Route
+          // IMPLEMENTATION_EDIT = "/implementations/:implementation_id/edit";
+          path="edit"
+          element={
+            <>
+              {ruleImplementationLoaded ? (
+                <Loader
+                  loaders={
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
-                  ) : null}
-                  {!structuresAliasesLoading &&
-                  ruleImplementationLoaded &&
-                  implementationStructuresLoaded ? (
-                    isRuleImplemenationBasic ? (
-                      <NewBasicRuleImplementation edition />
-                    ) : (
-                      <NewRuleImplementation edition />
-                    )
-                  ) : null}
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_EDIT_AS_DEFAULT}
-              render={() => (
-                <>
-                  {ruleImplementationLoaded ? (
+                  }
+                />
+              ) : null}
+              {!structuresAliasesLoading &&
+              ruleImplementationLoaded &&
+              implementationStructuresLoaded ? (
+                isRuleImplemenationBasic ? (
+                  <NewBasicRuleImplementation edition />
+                ) : (
+                  <NewRuleImplementation edition />
+                )
+              ) : null}
+            </>
+          }
+        />
+
+        <Route
+          // IMPLEMENTATION_EDIT_AS_DEFAULT = "/implementations/:implementation_id/edit_as_default";
+          path="edit_as_default"
+          element={
+            <>
+              {ruleImplementationLoaded ? (
+                <Loader
+                  loaders={
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
-                  ) : null}
-                  {!structuresAliasesLoading &&
-                  ruleImplementationLoaded &&
-                  implementationStructuresLoaded ? (
-                    <NewRuleImplementation
-                      edition
-                      implementationType="default"
-                    />
-                  ) : null}
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_EDIT_AS_RAW}
-              render={() => (
-                <>
-                  {ruleImplementationLoaded ? (
+                  }
+                />
+              ) : null}
+              {!structuresAliasesLoading &&
+              ruleImplementationLoaded &&
+              implementationStructuresLoaded ? (
+                <NewRuleImplementation edition implementationType="default" />
+              ) : null}
+            </>
+          }
+        />
+
+        <Route
+          // IMPLEMENTATION_EDIT_AS_RAW = "/implementations/:implementation_id/edit_as_raw";
+          path="edit_as_raw"
+          element={
+            <>
+              {ruleImplementationLoaded ? (
+                <Loader
+                  loaders={
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
+                  }
+                />
+              ) : null}
+              {!structuresAliasesLoading &&
+              ruleImplementationLoaded &&
+              implementationStructuresLoaded ? (
+                <NewRuleImplementation edition implementationType="raw" />
+              ) : null}
+            </>
+          }
+        />
+
+        <Route
+          // IMPLEMENTATION_MOVE = "/implementations/:implementation_id/move";
+          path="move"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <ProtectedRoute>
+                      <MoveImplementation />
+                    </ProtectedRoute>
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />
+
+        {/* 
+        
+        // Este no tiene sentido, ya que no se envia un resultado y esta  ya puesto en el 
+        / Rule resultsRoutes
+        <Route
+          // IMPLEMENTATION_RESULTS_DETAILS = "/implementations/:implementation_id/detail";
+          path="detail"
+          element={
+            <>
+              <ImplementationCrumbs />
+              <Segment>
+                {ruleImplementationLoaded ? (
+                  <RuleImplementation>
+                    <RuleResultDetails />
+                  </RuleImplementation>
+                ) : null}
+              </Segment>
+            </>
+          }
+        />  */}
+
+        <Route
+          //  IMPLEMENTATION_RESULT_DETAILS = "/implementations/:implementation_id/results/:rule_result_id";
+          path="results/:rule_result_id/*"
+          element={
+            <>
+              <RuleResultRemediationLoader propRuleResultId={ruleResultId} />
+              <TemplatesLoader scope="remediation" />
+              <RuleResultsRoutes />
+            </>
+          }
+        />
+        <Route
+          // IMPLEMENTATION_CONCEPT_LINKS_NEW = "/implementations/:implementation_id/links/concepts";
+          path="links/concepts"
+        >
+          <Route
+            // IMPLEMENTATION_CONCEPT_LINKS_NEW = "/implementations/:implementation_id/links/concepts/";
+            index
+            element={
+              <>
+                <ImplementationCrumbs />
+                <Segment>
+                  {ruleImplementationLoaded ? (
+                    <RuleImplementation>
+                      <ImplementationLinks />
+                    </RuleImplementation>
                   ) : null}
-                  {!structuresAliasesLoading &&
-                  ruleImplementationLoaded &&
-                  implementationStructuresLoaded ? (
-                    <NewRuleImplementation edition implementationType="raw" />
+                </Segment>
+              </>
+            }
+          />
+          <Route
+            // IMPLEMENTATION_CONCEPT_LINKS_NEW = "/implementations/:implementation_id/links/concepts/new";
+            path="new"
+            element={
+              <>
+                <ImplementationCrumbs />
+                <Segment>
+                  {ruleImplementationLoaded ? (
+                    <RuleImplementation>
+                      <ImplementationRelationForm />
+                    </RuleImplementation>
                   ) : null}
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_MOVE}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        {authorized ? <MoveImplementation /> : <Unauthorized />}
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_CONCEPT_LINKS}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <ImplementationLinks />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_CONCEPT_LINKS_NEW}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <ImplementationRelationForm />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_STRUCTURES}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <ImplementationStructures />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_STRUCTURES_NEW}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <ImplementationStructuresNew />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_RESULTS}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <RuleImplementationResults />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_HISTORY}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <RuleImplementationHistory />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_RESULTS_DETAILS}
-              render={() => (
-                <>
-                  <ImplementationCrumbs />
-                  <Segment>
-                    {ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        <RuleResultDetails />
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              path={IMPLEMENTATION_RESULT_DETAILS}
-              render={() => (
-                <>
-                  <RuleResultRemediationLoader
-                    propRuleResultId={ruleResultId}
-                  />
-                  <TemplatesLoader scope="remediation" />
-                  <RuleResultsRoutes />
-                </>
-              )}
-            />
-          </>
-        )}
-      />
-      <Route
-        exact
-        path={IMPLEMENTATIONS}
-        render={() => (
-          <Implementations defaultFilters={{ status: ["published"] }} />
-        )}
-      />
-      <Route
-        exact
-        path={IMPLEMENTATIONS_PENDING}
-        render={() => (
-          <Implementations
-            defaultFilters={{
-              status: ["draft", "pending_approval", "rejected"],
-            }}
+                </Segment>
+              </>
+            }
           />
-        )}
-      />
-      <Route
-        exact
-        path={IMPLEMENTATIONS_DEPRECATED}
-        render={() => (
-          <Implementations
-            defaultFilters={{
-              status: ["deprecated"],
-            }}
+        </Route>
+
+        <Route
+          // IMPLEMENTATION_STRUCTURES ="/implementations/:implementation_id/structures";
+          path="structures"
+        >
+          <Route
+            // IMPLEMENTATION_STRUCTURES ="/implementations/:implementation_id/structures";
+            index
+            element={
+              <>
+                <ImplementationCrumbs />
+                <Segment>
+                  {ruleImplementationLoaded ? (
+                    <RuleImplementation>
+                      <ImplementationStructures />
+                    </RuleImplementation>
+                  ) : null}
+                </Segment>
+              </>
+            }
           />
-        )}
-      />
-    </Switch>
+
+          <Route
+            // IMPLEMENTATION_STRUCTURES_NEW = "/implementations/:implementation_id/structures/new";
+            path="new"
+            element={
+              <>
+                <ImplementationCrumbs />
+                <Segment>
+                  {ruleImplementationLoaded ? (
+                    <RuleImplementation>
+                      <ImplementationStructuresNew />
+                    </RuleImplementation>
+                  ) : null}
+                </Segment>
+              </>
+            }
+          />
+        </Route>
+      </Route>
+
+      <Route path="*" element={null} />
+    </Routes>
   );
 };