@truedat/dq 4.45.4 → 4.45.7

package/src/components/ImplementationsRoutes.js

@@ -22,18 +22,16 @@ import {
   IMPLEMENTATION_STRUCTURES,
   IMPLEMENTATION,
   IMPLEMENTATIONS,
+  IMPLEMENTATIONS_PENDING,
 } from "@truedat/core/routes";
 import {
   getImplementationStructures,
   getImplementationStructuresLoaded,
 } from "../selectors";
 import ImplementationCrumbs from "./ImplementationCrumbs";
-import ImplementationFiltersLoader from "./ImplementationFiltersLoader";
-import RuleImplementations from "./RuleImplementations";
-import RuleImplementationsLoader from "./RuleImplementationsLoader";
-
 import ImplementationStructures from "./ImplementationStructures";
 import ImplementationStructuresNew from "./ImplementationStructuresNew";
+import Implementations from "./Implementations";
 import MoveImplementation from "./MoveImplementation";
 import NewRuleImplementation from "./NewRuleImplementation";
 import RuleImplementation from "./RuleImplementation";
@@ -42,16 +40,13 @@ import RuleImplementationLoader from "./RuleImplementationLoader";
 import RuleImplementationProperties from "./RuleImplementationProperties";
 import RuleImplementationResults from "./RuleImplementationResults";
 import RuleResultDetails from "./RuleResultDetails";
-import RuleResultsRoutes from "./RuleResultsRoutes";
 import RuleResultRemediationLoader from "./RuleResultRemediationLoader";
+import RuleResultsRoutes from "./RuleResultsRoutes";
 import RuleSubscriptionLoader from "./RuleSubscriptionLoader";
 
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
-const UserSearchFiltersLoader = React.lazy(() =>
-  import("@truedat/dd/components/UserSearchFiltersLoader")
-);
 const DomainsLoader = React.lazy(() =>
   import("@truedat/bg/taxonomy/components/DomainsLoader")
 );
@@ -74,9 +69,7 @@ const ImplementationEventsLoader = () => {
   return <EventsLoader resource_id={id} resource_type="implementation" />;
 };
 
-const ImplementationTemplatesLoader = () => <TemplatesLoader scope="ri" />;
-
-const ImplementationsRoutes = ({
+export const ImplementationsRoutes = ({
   structuresAliasesLoading,
   systemsLoading,
   ruleImplementationLoaded,
@@ -101,7 +94,6 @@ const ImplementationsRoutes = ({
               ]}
               filter="all"
             />
-            <TemplatesLoader scope="ri" />
             {!structuresAliasesLoading && !systemsLoading && (
               <NewRuleImplementation edition={false} />
             )}
@@ -133,7 +125,6 @@ const ImplementationsRoutes = ({
           <>
             <RuleImplementationLoader />
             <RuleSubscriptionLoader />
-
             <Route
               exact
               path={IMPLEMENTATION}
@@ -141,17 +132,15 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    <ImplementationTemplatesLoader />
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <RuleImplementationProperties />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
             />
-
             <Route
               exact
               path={IMPLEMENTATION_EVENTS}
@@ -160,16 +149,15 @@ const ImplementationsRoutes = ({
                   <ImplementationCrumbs />
                   <Segment>
                     <ImplementationEventsLoader />
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <RuleImplementationEvents />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
             />
-
             <Route
               exact
               path={IMPLEMENTATION_CLONE}
@@ -186,18 +174,16 @@ const ImplementationsRoutes = ({
                       filter="all"
                     />
                   ) : null}
-
-                  <ImplementationTemplatesLoader />
-                  {ruleImplementationLoaded && (
+                  {ruleImplementationLoaded ? (
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
-                  )}
+                  ) : null}
                   {!structuresAliasesLoading &&
-                    ruleImplementationLoaded &&
-                    implementationStructuresLoaded && (
-                      <NewRuleImplementation edition={true} clone={true} />
-                    )}
+                  ruleImplementationLoaded &&
+                  implementationStructuresLoaded ? (
+                    <NewRuleImplementation edition clone />
+                  ) : null}
                 </>
               )}
             />
@@ -217,22 +203,19 @@ const ImplementationsRoutes = ({
                       filter="all"
                     />
                   ) : null}
-
-                  <ImplementationTemplatesLoader />
-                  {ruleImplementationLoaded && (
+                  {ruleImplementationLoaded ? (
                     <ImplementationStructuresLoader
                       structureIds={implementationStructures}
                     />
-                  )}
+                  ) : null}
                   {!structuresAliasesLoading &&
-                    ruleImplementationLoaded &&
-                    implementationStructuresLoaded && (
-                      <NewRuleImplementation edition />
-                    )}
+                  ruleImplementationLoaded &&
+                  implementationStructuresLoaded ? (
+                    <NewRuleImplementation edition />
+                  ) : null}
                 </>
               )}
             />
-
             <Route
               exact
               path={IMPLEMENTATION_MOVE}
@@ -256,11 +239,11 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <ImplementationLinks />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
@@ -272,11 +255,11 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <ImplementationRelationForm />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
@@ -288,11 +271,11 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <ImplementationStructures />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
@@ -304,11 +287,11 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <ImplementationStructuresNew />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
@@ -320,16 +303,15 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <RuleImplementationResults ruleResult={latest} />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
             />
-
             <Route
               exact
               path={IMPLEMENTATION_RESULTS_DETAILS}
@@ -337,11 +319,11 @@ const ImplementationsRoutes = ({
                 <>
                   <ImplementationCrumbs />
                   <Segment>
-                    {ruleImplementationLoaded && (
+                    {ruleImplementationLoaded ? (
                       <RuleImplementation>
                         <RuleResultDetails ruleResultId={latest.id} />
                       </RuleImplementation>
-                    )}
+                    ) : null}
                   </Segment>
                 </>
               )}
@@ -362,15 +344,21 @@ const ImplementationsRoutes = ({
         )}
       />
       <Route
+        exact
         path={IMPLEMENTATIONS}
         render={() => (
-          <>
-            <RuleImplementationsLoader />
-            <ImplementationFiltersLoader />
-            <TemplatesLoader scope="qe" />
-            <UserSearchFiltersLoader scope="rule_implementation" />
-            <RuleImplementations exact />
-          </>
+          <Implementations defaultFilters={{ status: ["published"] }} />
+        )}
+      />
+      <Route
+        exact
+        path={IMPLEMENTATIONS_PENDING}
+        render={() => (
+          <Implementations
+            defaultFilters={{
+              status: ["draft", "pending_approval", "rejected"],
+            }}
+          />
         )}
       />
     </Switch>

package/src/components/NewRuleImplementation.js

@@ -307,6 +307,7 @@ export const NewRuleImplementation = ({
           goal: ruleImplementationProps.goal,
           rule_id: ruleImplementationProps.rule_id,
           domain_id: ruleImplementationProps.domain_id,
+          status: ruleImplementationProps.status,
         }
       : {
           executable: true,
@@ -450,7 +451,7 @@ export const NewRuleImplementation = ({
   const setImplementationRawContent = (rawContent) =>
     setRuleImplementation({ ...ruleImplementation, rawContent });
 
-  const doSubmit = () => {
+  const doSubmit = (props = {}) => {
     const populations = _.reject(_.isEmpty)(ruleImplementation.populations);
     const validations = _.reject(_.isEmpty)(ruleImplementation.validations);
     const segments = _.reject(_.isEmpty)(ruleImplementation.segments);
@@ -473,6 +474,7 @@ export const NewRuleImplementation = ({
             minimum: ruleImplementation.minimum,
             goal: ruleImplementation.goal,
             domain_id: ruleImplementation.domain_id,
+            status: props?.status,
           }
         : {
             executable: ruleImplementation.executable,
@@ -489,6 +491,7 @@ export const NewRuleImplementation = ({
             minimum: ruleImplementation.minimum,
             goal: ruleImplementation.goal,
             domain_id: ruleImplementation.domain_id,
+            status: props?.status,
           };
 
     clone || !edition

package/src/components/QualityRoutes.js

@@ -2,7 +2,12 @@ import React from "react";
 import { Route } from "react-router-dom";
 import { Unauthorized } from "@truedat/core/components";
 import { useAuthorized } from "@truedat/core/hooks";
-import { EXECUTION_GROUP, IMPLEMENTATIONS, RULES } from "@truedat/core/routes";
+import {
+  EXECUTION_GROUP,
+  IMPLEMENTATIONS,
+  IMPLEMENTATIONS_PENDING,
+  RULES,
+} from "@truedat/core/routes";
 import ExecutionGroup from "./ExecutionGroup";
 import ExecutionGroupLoader from "./ExecutionGroupLoader";
 import ImplementationsRoutes from "./ImplementationsRoutes";
@@ -36,6 +41,12 @@ const QualityRoutes = () => {
           authorized ? <ImplementationsRoutes /> : <Unauthorized />
         }
       />
+      <Route
+        path={IMPLEMENTATIONS_PENDING}
+        render={() =>
+          authorized ? <ImplementationsRoutes /> : <Unauthorized />
+        }
+      />
     </>
   );
 };

package/src/components/RuleFormImplementations.js

@@ -1,82 +1,27 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import React from "react";
 import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
 import { connect } from "react-redux";
-import { Button, Container, Icon, Popup, Label } from "semantic-ui-react";
-import { updateDeletionQuery } from "../routines";
-import Implementations from "./Implementations";
+import { Container } from "semantic-ui-react";
+import RuleImplementationsTable from "./RuleImplementationsTable";
 import RuleImplementationActions from "./RuleImplementationActions";
 
-export const RuleFormImplementations = ({ updateDeletionQuery, rule }) => {
-  const { formatMessage } = useIntl();
-  const [deletedRender, setMode] = useState(false);
-  if (_.isEmpty(rule)) return null;
-  return (
+export const RuleFormImplementations = ({ rule }) =>
+  _.isEmpty(rule) ? null : (
     <Container fluid>
       <div className="inline">
-        {deletedRender && (
-          <Label basic className="alert left">
-            <Icon name={"warning circle"} color={"red"} />
-            {formatMessage({ id: "rule.implementations.deprecated" })}
-          </Label>
-        )}
         <div className="implementation-actions">
-          <Button.Group>
-            <Button
-              active={!deletedRender}
-              icon
-              data-tooltip={formatMessage({
-                id: "ruleImplementations.actions.active.tooltip",
-              })}
-              onClick={() => {
-                setMode(false);
-                updateDeletionQuery({
-                  id: rule?.id,
-                  deleted: false,
-                });
-              }}
-            >
-              <Icon name="list ul" />
-            </Button>
-            <Popup
-              content={formatMessage({
-                id: "ruleImplementations.actions.popup.deprecated",
-              })}
-              trigger={
-                <Button
-                  active={deletedRender}
-                  icon
-                  onClick={() => {
-                    setMode(true);
-                    updateDeletionQuery({
-                      id: rule?.id,
-                      deleted: true,
-                    });
-                  }}
-                >
-                  <Icon name="folder open outline" />
-                </Button>
-              }
-            />
-          </Button.Group>
           <RuleImplementationActions />
         </div>
       </div>
-      <Implementations rule={rule} deletedRender={deletedRender} />
+      <RuleImplementationsTable withoutColumns={["rule", "business_concept"]} />
     </Container>
   );
-};
 
-const mapStateToProps = ({ rule }) => ({
-  rule,
-});
+const mapStateToProps = ({ rule }) => ({ rule });
 
 RuleFormImplementations.propTypes = {
-  updateDeletionQuery: PropTypes.func,
   rule: PropTypes.object,
 };
 
-export default connect(mapStateToProps, { updateDeletionQuery })(
-  RuleFormImplementations
-);
+export default connect(mapStateToProps)(RuleFormImplementations);

package/src/components/RuleImplementation.js

@@ -1,190 +1,17 @@
 import _ from "lodash/fp";
 import React from "react";
-import { Link } from "react-router-dom";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
-import { Header, Label, Menu, Grid, Icon } from "semantic-ui-react";
-import { ConfirmModal, GroupActions } from "@truedat/core/components";
-import { useAuthorized } from "@truedat/core/hooks";
-import { linkTo } from "@truedat/core/routes";
-import { createExecutionGroup, setRuleImplementationStatus } from "../routines";
-import RuleImplementationTabs from "./RuleImplementationTabs";
+import { Header, Label, Grid, Icon } from "semantic-ui-react";
+import ImplementationActions from "./ImplementationActions";
 import ImplementationResultBar from "./ImplementationResultBar";
-import ExecutionPopup from "./ExecutionPopup";
+import RuleImplementationTabs from "./RuleImplementationTabs";
 import Subscription from "./Subscription";
 
-const getAvailableActions = (props, formatMessage) => {
-  const contentActions = _.isEmpty(props?.ruleImplementation)
-    ? []
-    : [
-        {
-          key: "delete",
-          value: "delete",
-          as: OptionModal,
-          headerMessage:
-            "ruleImplementation.actions.delete.confirmation.header",
-          contentMessage:
-            "ruleImplementation.actions.delete.confirmation.content",
-          iconName: "trash alternate outline",
-          iconColor: "red",
-          option: "ruleImplementation.actions.delete",
-          selected: false,
-          active: false,
-          filter: !_.prop("activeMode")(props),
-          ...props,
-        },
-        {
-          key: "softDelete",
-          value: "softDelete",
-          as: OptionModal,
-          headerMessage:
-            "ruleImplementation.actions.delete.confirmation.header",
-          contentMessage:
-            "ruleImplementation.actions.delete.confirmation.content",
-          iconName: "folder open outline",
-          iconColor: "black",
-          option: "ruleImplementation.actions.deprecate",
-          selected: false,
-          active: false,
-          filter: _.prop("activeMode")(props),
-          ...props,
-        },
-        {
-          key: "restore",
-          iconName: "undo",
-          option: "ruleImplementation.actions.restore",
-          value: "restore",
-          as: OptionModal,
-          headerMessage:
-            "ruleImplementation.actions.restore.confirmation.header",
-          contentMessage:
-            "ruleImplementation.actions.restore.confirmation.content",
-          selected: false,
-          active: false,
-          filter: !_.prop("activeMode")(props),
-          restore: true,
-          ...props,
-        },
-        {
-          key: "edit",
-          icon: "edit outline",
-          text: formatMessage({ id: "ruleImplementation.actions.edit" }),
-          value: "edit",
-          as: Link,
-          to: linkTo.IMPLEMENTATION_EDIT({
-            implementation_id: _.path("ruleImplementation.id")(props),
-          }),
-          filter: props.canEdit,
-          selected: false,
-          active: false,
-        },
-        {
-          key: "move",
-          icon: "share square",
-          text: formatMessage({ id: "ruleImplementation.actions.move" }),
-          value: "move",
-          as: Link,
-          to: linkTo.IMPLEMENTATION_MOVE({
-            implementation_id: _.path("ruleImplementation.id")(props),
-          }),
-          filter: props?.authorized,
-          selected: false,
-          active: false,
-        },
-        {
-          key: "clone",
-          icon: "copy outline",
-          text: formatMessage({ id: "ruleImplementation.actions.clone" }),
-          value: "clone",
-          as: Link,
-          to: linkTo.IMPLEMENTATION_CLONE({
-            implementation_id: _.path("ruleImplementation.id")(props),
-          }),
-          filter: true,
-          selected: false,
-          active: false,
-        },
-      ];
-
-  return _.flow(_.filter("filter"), _.map(_.omit(["filter"])))(contentActions);
-};
-
-const OptionModal = ({
-  activeMode,
-  contentMessage,
-  headerMessage,
-  iconColor,
-  iconName,
-  option,
-  restore,
-  ruleImplementation,
-  setRuleImplementationStatus,
-}) => {
-  const { formatMessage } = useIntl();
-  const payload = restore ? { restore } : { softDelete: activeMode };
-  return (
-    <ConfirmModal
-      trigger={
-        <Menu.Item
-          icon={{ name: iconName, color: iconColor }}
-          content={formatMessage({ id: option })}
-        />
-      }
-      header={formatMessage({ id: headerMessage })}
-      content={formatMessage({ id: contentMessage })}
-      onConfirm={() =>
-        setRuleImplementationStatus({
-          id: ruleImplementation.id,
-          ...payload,
-        })
-      }
-      onOpen={(e) => e.stopPropagation()}
-      onClose={(e) => e.stopPropagation()}
-    />
-  );
-};
-
-OptionModal.propTypes = {
-  activeMode: PropTypes.bool,
-  contentMessage: PropTypes.string,
-  headerMessage: PropTypes.string,
-  iconColor: PropTypes.string,
-  iconName: PropTypes.string,
-  option: PropTypes.string,
-  restore: PropTypes.bool,
-  ruleImplementation: PropTypes.object,
-  setRuleImplementationStatus: PropTypes.func,
-};
-
-export const RuleImplementation = ({
-  children,
-  createExecutionGroup,
-  canExecute,
-  setRuleImplementationStatus,
-  ruleImplementation,
-  canEdit,
-  canManage,
-}) => {
-  const authorized = useAuthorized();
+export const RuleImplementation = ({ children, ruleImplementation }) => {
   const { formatMessage } = useIntl();
   const deletedAt = _.prop("deleted_at")(ruleImplementation);
-  const activeMode = _.isNil(deletedAt);
-  const availableActions = getAvailableActions(
-    {
-      activeMode,
-      authorized,
-      ruleImplementation,
-      setRuleImplementationStatus,
-      canEdit,
-    },
-    formatMessage
-  );
-
-  const handleSubmit = (df_content) => {
-    const query = { filters: { id: [ruleImplementation?.id] } };
-    createExecutionGroup({ ...query, df_content });
-  };
 
   return (
     <>
@@ -200,14 +27,7 @@ export const RuleImplementation = ({
         </Grid.Column>
         <Grid.Column width={8} textAlign="right">
           <>
-            {canExecute && ruleImplementation.executable ? (
-              <ExecutionPopup onSubmit={handleSubmit} count={1} />
-            ) : null}
-            <Subscription
-              resource={ruleImplementation}
-              resourceType="implementation"
-            />
-            {deletedAt && (
+            {deletedAt ? (
               <Label
                 className="alert warning"
                 content={formatMessage({
@@ -215,10 +35,13 @@ export const RuleImplementation = ({
                 })}
                 icon={{ name: "warning circle", color: "red" }}
               />
+            ) : (
+              <Subscription
+                resource={ruleImplementation}
+                resourceType="implementation"
+              />
             )}
-            {canManage && !_.isEmpty(availableActions) && (
-              <GroupActions availableActions={availableActions} />
-            )}
+            <ImplementationActions />
           </>
         </Grid.Column>
       </Grid>
@@ -229,24 +52,10 @@ export const RuleImplementation = ({
 };
 
 RuleImplementation.propTypes = {
-  createExecutionGroup: PropTypes.func,
-  canExecute: PropTypes.bool,
-  ruleImplementation: PropTypes.object.isRequired,
-  setRuleImplementationStatus: PropTypes.func,
   ruleImplementation: PropTypes.object,
-  canEdit: PropTypes.bool,
-  canManage: PropTypes.bool,
   children: PropTypes.node,
 };
 
-const mapStateToProps = ({ ruleImplementation, implementationActions }) => ({
-  ruleImplementation,
-  canExecute: !!implementationActions?.execute,
-  canEdit: !!implementationActions?.edit,
-  canManage: !!implementationActions?.manage,
-});
+const mapStateToProps = ({ ruleImplementation }) => ({ ruleImplementation });
 
-export default connect(mapStateToProps, {
-  createExecutionGroup,
-  setRuleImplementationStatus,
-})(RuleImplementation);
+export default connect(mapStateToProps)(RuleImplementation);