@truedat/dq 4.43.5 → 4.44.1

package/src/components/RuleImplementationsActions.js

@@ -2,7 +2,13 @@ import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Checkbox } from "semantic-ui-react";
+import { Button, Checkbox } from "semantic-ui-react";
+import { Link } from "react-router-dom";
+import { useIntl } from "react-intl";
+import {
+  IMPLEMENTATION_NEW,
+  IMPLEMENTATION_NEW_RAW,
+} from "@truedat/core/routes";
 import { getImplementationsExecution } from "../selectors";
 import {
   addImplementationFilter,
@@ -17,6 +23,8 @@ export const RuleImplementationsActions = ({
   actions,
   addImplementationFilter,
   canExecute,
+  canCreate,
+  canCreateRaw,
   createExecutionGroup,
   executeImplementationsOn,
   implementationQuery,
@@ -28,6 +36,7 @@ export const RuleImplementationsActions = ({
   setMode,
   toggleImplementationFilterValue,
 }) => {
+  const { formatMessage } = useIntl();
   const showExecutableInfo = () => {
     addImplementationFilter({ filter: "executable" });
     toggleImplementationFilterValue({
@@ -76,6 +85,23 @@ export const RuleImplementationsActions = ({
           />
         </>
       )}
+      {canCreateRaw && (
+        <Button
+          as={Link}
+          to={IMPLEMENTATION_NEW_RAW}
+          content={formatMessage({
+            id: "implementations.actions.create_raw",
+          })}
+        />
+      )}
+      {canCreate && (
+        <Button
+          primary
+          as={Link}
+          to={IMPLEMENTATION_NEW}
+          content={formatMessage({ id: "implementations.actions.create" })}
+        />
+      )}
       <RuleImplementationsOptions
         loading={ruleImplementationsLoading}
         canUploadResults={canUploadResults}
@@ -88,6 +114,8 @@ RuleImplementationsActions.propTypes = {
   actions: PropTypes.object,
   addImplementationFilter: PropTypes.func,
   canExecute: PropTypes.bool,
+  canCreate: PropTypes.bool,
+  canCreateRaw: PropTypes.bool,
   createExecutionGroup: PropTypes.func,
   executeImplementationsOn: PropTypes.bool,
   implementationQuery: PropTypes.object,
@@ -102,6 +130,24 @@ RuleImplementationsActions.propTypes = {
 
 const mapStateToProps = (state) => ({
   canExecute: _.propOr(false, "userImplementationsPermissions.execute")(state),
+  canCreate:
+    _.propOr(
+      false,
+      "userImplementationsPermissions.manage_ruleless_implementations"
+    )(state) &&
+    _.propOr(
+      false,
+      "userImplementationsPermissions.manage_implementations"
+    )(state),
+  canCreateRaw:
+    _.propOr(
+      false,
+      "userImplementationsPermissions.manage_ruleless_implementations"
+    )(state) &&
+    _.propOr(
+      false,
+      "userImplementationsPermissions.manage_raw_implementations"
+    )(state),
   ruleImplementationCount: state.ruleImplementationCount,
   implementationsExecution: getImplementationsExecution(state),
   ruleImplementationsLoading: state.ruleImplementationsLoading,

package/src/components/RuleLink.js

@@ -3,13 +3,12 @@ import PropTypes from "prop-types";
 import { Link } from "react-router-dom";
 import { linkTo } from "@truedat/core/routes";
 
-export const RuleLink = ({ id, name }) => (
-  <Link to={linkTo.RULE({ id })}>{name}</Link>
-);
+export const RuleLink = ({ id, name }) =>
+  id ? <Link to={linkTo.RULE({ id })}>{name}</Link> : null;
 
 RuleLink.propTypes = {
   id: PropTypes.number,
-  name: PropTypes.string
+  name: PropTypes.string,
 };
 
 export default RuleLink;

package/src/components/RuleResultRow.js

@@ -19,7 +19,6 @@ export const RuleResultRow = ({
   customColumns,
   isAdmin,
   ruleImplementation,
-  rule,
 }) => {
   const { formatMessage, formatNumber: _formatNumber } = useIntl();
   const formatNumber = (num) => (_.isNil(num) ? num : _formatNumber(num));
@@ -28,10 +27,8 @@ export const RuleResultRow = ({
     <Table.Row>
       <Table.Cell>
         <Link
-          to={linkTo.RULE_IMPLEMENTATION_RESULT_DETAILS({
-            id: rule.id,
+          to={linkTo.IMPLEMENTATION_RESULT_DETAILS({
             implementation_id: ruleImplementation.id,
-            rule,
             ruleImplementation,
             rule_result_id: ruleResult.id,
           })}
@@ -84,7 +81,6 @@ export const RuleResultRow = ({
             onConfirm={() =>
               deleteRuleResult({
                 id: ruleResult.id,
-                rule_id: rule.id,
                 rule_implementation_id: ruleImplementation.id,
               })
             }
@@ -100,7 +96,6 @@ RuleResultRow.propTypes = {
   deleteRuleResult: PropTypes.func,
   isAdmin: PropTypes.bool,
   optionalColumns: PropTypes.array,
-  rule: PropTypes.object,
   ruleImplementation: PropTypes.object,
   ruleResult: PropTypes.object,
 };

package/src/components/RuleResultsRoutes.js

@@ -2,16 +2,16 @@ import React from "react";
 import { Route } from "react-router-dom";
 import { Segment } from "semantic-ui-react";
 import {
-  RULE_IMPLEMENTATION_RESULT_DETAILS,
-  RULE_IMPLEMENTATION_RESULT_SEGMENTS_RESULTS,
-  RULE_IMPLEMENTATION_RESULT_REMEDIATION_PLAN,
+  IMPLEMENTATION_RESULT_DETAILS,
+  IMPLEMENTATION_RESULT_SEGMENTS_RESULTS,
+  IMPLEMENTATION_RESULT_REMEDIATION_PLAN,
 } from "@truedat/core/routes";
 
 import RuleResult from "./RuleResult";
 import RuleResultDetails from "./RuleResultDetails";
 import RuleResultSegments from "./RuleResultSegments";
 import RuleResultRemediations from "./RuleResultRemediations";
-import RuleCrumbs from "./RuleCrumbs";
+import ImplementationCrumbs from "./ImplementationCrumbs";
 import RuleResultSegmentsLoader from "./RuleResultSegmentsLoader";
 
 export const RuleResultsRoutes = ({}) => {
@@ -19,12 +19,12 @@ export const RuleResultsRoutes = ({}) => {
     <>
       <Route
         exact
-        path={RULE_IMPLEMENTATION_RESULT_DETAILS}
+        path={IMPLEMENTATION_RESULT_DETAILS}
         render={() => (
           <>
             <Segment>
               <>
-                <RuleCrumbs />
+                <ImplementationCrumbs />
                 <RuleResult>
                   <RuleResultDetails />
                 </RuleResult>
@@ -35,12 +35,12 @@ export const RuleResultsRoutes = ({}) => {
       />
       <Route
         exact
-        path={RULE_IMPLEMENTATION_RESULT_SEGMENTS_RESULTS}
+        path={IMPLEMENTATION_RESULT_SEGMENTS_RESULTS}
         render={() => (
           <>
             <Segment>
               <>
-                <RuleCrumbs />
+                <ImplementationCrumbs />
                 <RuleResult>
                   <RuleResultSegmentsLoader />
                   <RuleResultSegments />
@@ -52,12 +52,12 @@ export const RuleResultsRoutes = ({}) => {
       />
       <Route
         exact
-        path={RULE_IMPLEMENTATION_RESULT_REMEDIATION_PLAN}
+        path={IMPLEMENTATION_RESULT_REMEDIATION_PLAN}
         render={() => (
           <>
             <Segment>
               <>
-                <RuleCrumbs />
+                <ImplementationCrumbs />
                 <RuleResult>
                   <RuleResultRemediations />
                 </RuleResult>

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"
               >