@truedat/dq 4.43.6 → 4.44.2

package/src/components/RuleRoutes.js

@@ -1,30 +1,16 @@
 import _ from "lodash/fp";
 import React from "react";
-import { useParams } from "react-router-dom";
 import PropTypes from "prop-types";
 import { Route, useRouteMatch } from "react-router-dom";
 import { connect } from "react-redux";
 import { Segment } from "semantic-ui-react";
-import { Unauthorized } from "@truedat/core/components";
-import { useAuthorized } from "@truedat/core/hooks";
 import {
   RULE,
   RULE_EDIT,
   RULE_EVENTS,
-  RULE_IMPLEMENTATION_CLONE,
-  RULE_IMPLEMENTATION_EDIT,
-  RULE_IMPLEMENTATION_EVENTS,
-  IMPLEMENTATION_CONCEPT_LINKS,
-  IMPLEMENTATION_CONCEPT_LINKS_NEW,
-  IMPLEMENTATION_STRUCTURES,
-  IMPLEMENTATION_STRUCTURES_NEW,
-  RULE_IMPLEMENTATION_MOVE,
   RULE_IMPLEMENTATION_NEW,
-  RULE_IMPLEMENTATION_RESULT_DETAILS,
-  RULE_IMPLEMENTATION_RESULTS_DETAILS,
-  RULE_IMPLEMENTATION,
+  RULE_IMPLEMENTATION_NEW_RAW,
   RULE_NEW,
-  RULE_IMPLEMENTATION_RESULTS,
   RULE_IMPLEMENTATIONS,
 } from "@truedat/core/routes";
 import {
@@ -32,27 +18,16 @@ import {
   getImplementationStructuresLoaded,
 } from "../selectors";
 import EditRule from "./EditRule";
-import RuleResultDetails from "./RuleResultDetails";
-import RuleResultsRoutes from "./RuleResultsRoutes";
-import ImplementationStructures from "./ImplementationStructures";
-import ImplementationStructuresNew from "./ImplementationStructuresNew";
-import MoveImplementation from "./MoveImplementation";
 import NewRule from "./NewRule";
 import NewRuleImplementation from "./NewRuleImplementation";
 import Rule from "./Rule";
 import RuleCrumbs from "./RuleCrumbs";
 import RuleEvents from "./RuleEvents";
 import RuleFormImplementations from "./RuleFormImplementations";
-import RuleImplementation from "./RuleImplementation";
-import RuleImplementationEvents from "./RuleImplementationEvents";
-import RuleImplementationLoader from "./RuleImplementationLoader";
-import RuleImplementationProperties from "./RuleImplementationProperties";
-import RuleImplementationResults from "./RuleImplementationResults";
 import RuleImplementationsFromRuleLoader from "./RuleImplementationsFromRuleLoader";
 import RuleLoader from "./RuleLoader";
 import RuleProperties from "./RuleProperties";
 import RuleSubscriptionLoader from "./RuleSubscriptionLoader";
-import RuleResultRemediationLoader from "./RuleResultRemediationLoader";
 
 const DomainsLoader = React.lazy(() =>
   import("@truedat/bg/taxonomy/components/DomainsLoader")
@@ -66,15 +41,6 @@ const EventsLoader = React.lazy(() =>
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
-const ImplementationStructuresLoader = React.lazy(() =>
-  import("@truedat/dd/components/ImplementationStructuresLoader")
-);
-const ImplementationLinks = React.lazy(() =>
-  import("@truedat/lm/components/ImplementationLinks")
-);
-const ImplementationRelationForm = React.lazy(() =>
-  import("@truedat/lm/components/ImplementationRelationForm")
-);
 
 const QualityTemplatesLoader = () => <TemplatesLoader scope="dq" />;
 const ImplementationTemplatesLoader = () => <TemplatesLoader scope="ri" />;
@@ -85,23 +51,13 @@ const RuleEventsLoader = () => {
   return <EventsLoader resource_id={id} resource_type="rule" />;
 };
 
-const ImplementationEventsLoader = () => {
-  const match = useRouteMatch();
-  const id = _.path("params.implementation_id")(match);
-  return <EventsLoader resource_id={id} resource_type="implementation" />;
-};
-
 export const RuleRoutes = ({
   ruleLoaded,
-  ruleImplementationLoaded,
-  implementationStructures,
   rule,
-  implementationStructuresLoaded,
   systemsLoading,
   templatesLoaded,
   template,
   structuresAliasesLoading,
-  ruleImplementation,
 }) => {
   return (
     <>
@@ -201,241 +157,18 @@ export const RuleRoutes = ({
                 </>
               )}
             />
-
-            <ImplementationRoutes
-              {...{
-                ruleLoaded,
-                ruleImplementationLoaded,
-                implementationStructures,
-                implementationStructuresLoaded,
-                structuresAliasesLoading,
-                ruleImplementation,
-              }}
-            />
-          </>
-        )}
-      />
-    </>
-  );
-};
-
-const ImplementationRoutes = ({
-  ruleLoaded,
-  ruleImplementationLoaded,
-  implementationStructures,
-  implementationStructuresLoaded,
-  structuresAliasesLoading,
-  ruleImplementation,
-}) => {
-  const latest = _.head(ruleImplementation.results);
-  const authorized = useAuthorized();
-  const { rule_result_id: ruleResultId } = useParams();
-
-  return (
-    <>
-      <Route
-        path={RULE_IMPLEMENTATION}
-        render={() => (
-          <>
-            <RuleImplementationLoader />
-
             <Route
               exact
-              path={RULE_IMPLEMENTATION}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    <ImplementationTemplatesLoader />
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <RuleImplementationProperties />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_EVENTS}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    <ImplementationEventsLoader />
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <RuleImplementationEvents />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_CLONE}
-              render={() => (
-                <>
-                  <ImplementationTemplatesLoader />
-                  {ruleImplementationLoaded && (
-                    <ImplementationStructuresLoader
-                      structureIds={implementationStructures}
-                    />
-                  )}
-                  {!structuresAliasesLoading &&
-                    ruleImplementationLoaded &&
-                    implementationStructuresLoaded && (
-                      <NewRuleImplementation edition={true} clone={true} />
-                    )}
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_EDIT}
+              path={RULE_IMPLEMENTATION_NEW_RAW}
               render={() => (
                 <>
                   <ImplementationTemplatesLoader />
-                  {ruleImplementationLoaded && (
-                    <ImplementationStructuresLoader
-                      structureIds={implementationStructures}
+                  {!structuresAliasesLoading && !systemsLoading && (
+                    <NewRuleImplementation
+                      edition={false}
+                      implementationType="raw"
                     />
                   )}
-                  {!structuresAliasesLoading &&
-                    ruleImplementationLoaded &&
-                    implementationStructuresLoaded && (
-                      <NewRuleImplementation edition />
-                    )}
-                </>
-              )}
-            />
-
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_MOVE}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded ? (
-                      <RuleImplementation>
-                        {authorized ? <MoveImplementation /> : <Unauthorized />}
-                      </RuleImplementation>
-                    ) : null}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_CONCEPT_LINKS}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <ImplementationLinks />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_CONCEPT_LINKS_NEW}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <ImplementationRelationForm />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_STRUCTURES}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <ImplementationStructures />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={IMPLEMENTATION_STRUCTURES_NEW}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <ImplementationStructuresNew />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_RESULTS}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <RuleImplementationResults ruleResult={latest} />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-
-            <Route
-              exact
-              path={RULE_IMPLEMENTATION_RESULTS_DETAILS}
-              render={() => (
-                <>
-                  <RuleCrumbs />
-                  <Segment>
-                    {ruleLoaded && ruleImplementationLoaded && (
-                      <RuleImplementation>
-                        <RuleResultDetails ruleResultId={latest.id} />
-                      </RuleImplementation>
-                    )}
-                  </Segment>
-                </>
-              )}
-            />
-            <Route
-              path={RULE_IMPLEMENTATION_RESULT_DETAILS}
-              render={() => (
-                <>
-                  <RuleResultRemediationLoader
-                    propRuleResultId={ruleResultId}
-                  />
-                  <TemplatesLoader scope="remediation" />
-                  <RuleResultsRoutes />
                 </>
               )}
             />
@@ -446,23 +179,13 @@ const ImplementationRoutes = ({
   );
 };
 
-const implementationPropTypes = {
-  ruleLoaded: PropTypes.bool,
-  ruleImplementationLoaded: PropTypes.bool,
-  implementationStructures: PropTypes.array,
-  implementationStructuresLoaded: PropTypes.bool,
-  structuresAliasesLoading: PropTypes.bool,
-  ruleImplementation: PropTypes.object,
-};
-
-ImplementationRoutes.propTypes = implementationPropTypes;
-
 RuleRoutes.propTypes = {
   rule: PropTypes.object,
   template: PropTypes.object,
   systemsLoading: PropTypes.bool,
   templatesLoaded: PropTypes.bool,
-  ...implementationPropTypes,
+  ruleLoaded: PropTypes.bool,
+  structuresAliasesLoading: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => {

package/src/components/__tests__/__snapshots__/ImplementationResultBar.spec.js.snap

@@ -8,7 +8,7 @@ exports[`<ImplementationResultBar /> render failed implementation 1`] = `
     <a
       as="div"
       class="rule-summary pointer"
-      href="/rules/8/implementations/1/results"
+      href="/implementations/1/results"
     >
       <span
         class="failed-color"
@@ -33,7 +33,7 @@ exports[`<ImplementationResultBar /> render not executed implementation 1`] = `
     <a
       as="div"
       class="rule-summary pointer"
-      href="/rules/8/implementations/1/results"
+      href="/implementations/1/results"
     >
       <span
         class="not-executed-color"
@@ -58,7 +58,7 @@ exports[`<ImplementationResultBar /> render overGoal implementation 1`] = `
     <a
       as="div"
       class="rule-summary pointer"
-      href="/rules/8/implementations/1/results"
+      href="/implementations/1/results"
     >
       <span
         class="over-goal-color"
@@ -88,7 +88,7 @@ exports[`<ImplementationResultBar /> render underGoal implementation 1`] = `
     <a
       as="div"
       class="rule-summary pointer"
-      href="/rules/8/implementations/1/results"
+      href="/implementations/1/results"
     >
       <span
         class="under-goal-color"
@@ -118,7 +118,7 @@ exports[`<ImplementationResultBar /> render underMinimum implementation 1`] = `
     <a
       as="div"
       class="rule-summary pointer"
-      href="/rules/8/implementations/1/results"
+      href="/implementations/1/results"
     >
       <span
         class="under-minimum-color"

package/src/components/__tests__/__snapshots__/NewRuleImplementation.spec.js.snap

@@ -926,6 +926,9 @@ exports[`<NewRuleImplementation /> matches the latest snapshot 1`] = `
                   </div>
                 </div>
               </div>
+              <div
+                class="field"
+              />
               <div
                 class="ui segment"
               >

package/src/components/__tests__/__snapshots__/RuleCrumbs.spec.js.snap

@@ -27,58 +27,10 @@ exports[`<RuleCrumbs /> matches a snapshot with resultId 1`] = `
   <BreadcrumbDivider
     icon="right angle"
   />
-  <BreadcrumbSection
-    active={false}
-    as={
-      Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "displayName": "Link",
-        "propTypes": Object {
-          "innerRef": [Function],
-          "onClick": [Function],
-          "replace": [Function],
-          "target": [Function],
-          "to": [Function],
-        },
-        "render": [Function],
-      }
-    }
-    to="/rules/1"
-  >
-    foo
-  </BreadcrumbSection>
-  <BreadcrumbDivider
-    icon="right angle"
-  />
-  <BreadcrumbSection
-    active={false}
-    as={
-      Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "displayName": "Link",
-        "propTypes": Object {
-          "innerRef": [Function],
-          "onClick": [Function],
-          "replace": [Function],
-          "target": [Function],
-          "to": [Function],
-        },
-        "render": [Function],
-      }
-    }
-    to="/rules/1/implementations/2"
-  >
-    ri
-  </BreadcrumbSection>
-  <BreadcrumbDivider
-    icon="right angle"
-  />
   <BreadcrumbSection
     active={true}
   >
-    <DateTime
-      value="2021-10-14 11:57"
-    />
+    foo
   </BreadcrumbSection>
 </Breadcrumb>
 `;
@@ -110,33 +62,10 @@ exports[`<RuleCrumbs /> matches the latest snapshot 1`] = `
   <BreadcrumbDivider
     icon="right angle"
   />
-  <BreadcrumbSection
-    active={false}
-    as={
-      Object {
-        "$$typeof": Symbol(react.forward_ref),
-        "displayName": "Link",
-        "propTypes": Object {
-          "innerRef": [Function],
-          "onClick": [Function],
-          "replace": [Function],
-          "target": [Function],
-          "to": [Function],
-        },
-        "render": [Function],
-      }
-    }
-    to="/rules/1"
-  >
-    foo
-  </BreadcrumbSection>
-  <BreadcrumbDivider
-    icon="right angle"
-  />
   <BreadcrumbSection
     active={true}
   >
-    ri
+    foo
   </BreadcrumbSection>
 </Breadcrumb>
 `;

package/src/components/__tests__/__snapshots__/RuleImplementation.spec.js.snap

@@ -25,7 +25,7 @@ exports[`<RuleImplementation /> matches the latest snapshot 1`] = `
             <a
               as="div"
               class="rule-summary pointer"
-              href="/rules/1/implementations/1/results"
+              href="/implementations/1/results"
             >
               <span
                 class="not-executed-color"
@@ -44,117 +44,38 @@ exports[`<RuleImplementation /> matches the latest snapshot 1`] = `
     </div>
     <div
       class="right aligned eight wide column"
-    >
-      <div
-        aria-expanded="false"
-        class="ui floating dropdown button icon group-actions"
-        role="listbox"
-        tabindex="0"
-      >
-        <i
-          aria-hidden="true"
-          class="ellipsis vertical icon"
-        />
-        <div
-          class="left menu transition"
-        >
-          <a
-            class="item"
-          >
-            <i
-              aria-hidden="true"
-              class="black folder open outline icon"
-            />
-            archive
-          </a>
-          <a
-            aria-checked="false"
-            aria-selected="false"
-            class="item"
-            href="/rules/1/implementations/1/edit"
-            role="option"
-            style="pointer-events: all;"
-          >
-            <i
-              aria-hidden="true"
-              class="edit outline icon"
-            />
-            <span
-              class="text"
-            >
-              edit
-            </span>
-          </a>
-          <a
-            aria-checked="false"
-            aria-selected="false"
-            class="item"
-            href="/rules/1/implementations/1/move"
-            role="option"
-            style="pointer-events: all;"
-          >
-            <i
-              aria-hidden="true"
-              class="share square icon"
-            />
-            <span
-              class="text"
-            >
-              move
-            </span>
-          </a>
-          <a
-            aria-checked="false"
-            aria-selected="false"
-            class="item"
-            href="/rules/1/implementations/1/clone"
-            role="option"
-            style="pointer-events: all;"
-          >
-            <i
-              aria-hidden="true"
-              class="copy outline icon"
-            />
-            <span
-              class="text"
-            >
-              clone
-            </span>
-          </a>
-        </div>
-      </div>
-    </div>
+    />
   </div>
   <div
     class="ui pointing secondary top attached tabular menu"
   >
     <a
       class="item"
-      href="/rules/1/implementations/1"
+      href="/implementations/1"
     >
       implementation
     </a>
     <a
       class="item"
-      href="/rules/1/implementations/1/links/concepts"
+      href="/implementations/1/links/concepts"
     >
       Related concepts
     </a>
     <a
       class="item"
-      href="/rules/1/implementations/1/structures"
+      href="/implementations/1/structures"
     >
       Structures
     </a>
     <a
       class="item"
-      href="/rules/1/implementations/1/results"
+      href="/implementations/1/results"
     >
       results
     </a>
     <a
       class="item"
-      href="/rules/1/implementations/1/events"
+      href="/implementations/1/events"
     >
       events
     </a>

package/src/components/__tests__/__snapshots__/RuleImplementationResultTabs.spec.js.snap

@@ -7,7 +7,7 @@ exports[`<RuleImplementationResultTabs /> matches the latest snapshot 1`] = `
   >
     <a
       class="item"
-      href="/rules/8/implementations/1/results/2"
+      href="/implementations/1/results/2"
     >
       Information
     </a>

package/src/components/__tests__/__snapshots__/RuleImplementationResults.spec.js.snap

@@ -45,13 +45,6 @@ exports[`<RuleImplementationResults /> matches the latest snapshot 1`] = `
         }
         key="0"
         optionalColumns={Array []}
-        rule={
-          Object {
-            "goal": 100,
-            "minimum": 50,
-            "result_type": "percentage",
-          }
-        }
         ruleImplementation={
           Object {
             "results": Array [

package/src/components/__tests__/__snapshots__/RuleImplementationResultsLink.spec.js.snap

@@ -2,7 +2,7 @@
 
 exports[`<RuleImplementationResultsLink /> matches the latest snapshot 1`] = `
 <Link
-  to="/rules/4/implementations/123/results"
+  to="/implementations/123/results"
 >
   foo
 </Link>