@truedat/dq 7.5.10 → 7.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dq",
-  "version": "7.5.10",
+  "version": "7.5.11",
   "description": "Truedat Web Data Quality Module",
   "sideEffects": false,
   "module": "src/index.js",
@@ -53,7 +53,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.5.10",
+    "@truedat/test": "7.5.11",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -88,5 +88,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "8a8c49e9d5d6bb4e5f2b503b063bfd6dd20a503d"
+  "gitHead": "cbb92d5206752fe2add4195432b0401da17a0f23"
 }

package/src/components/ImplementationActions.js

@@ -1,6 +1,6 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import { Link } from "react-router";
+import { Link, useNavigate } from "react-router";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
@@ -19,7 +19,7 @@ import ExecutionPopup from "./ExecutionPopup";
 export const implementationActions = ({
   actions,
   id,
-  deleteImplementation,
+  onConfirmDelete,
   formatMessage,
 }) =>
   _.filter(({ key }) => _.flow(Object.keys, _.includes(key))(actions))([
@@ -64,8 +64,7 @@ export const implementationActions = ({
       iconName: "trash alternate outline",
       iconColor: "red",
       option: "ruleImplementation.actions.delete",
-      onConfirm: () =>
-        deleteImplementation({ id, redirectUrl: IMPLEMENTATIONS }),
+      onConfirm: () => onConfirmDelete({ id }),
     },
   ]);
 
@@ -79,8 +78,15 @@ export const ImplementationActions = ({
   ruleImplementation,
   submitImplementation,
 }) => {
+  const navigate = useNavigate();
   const { formatMessage } = useIntl();
   const id = ruleImplementation?.id;
+
+  const onConfirmDelete = async (id) => {
+    await deleteImplementation(id);
+    navigate(IMPLEMENTATIONS);
+  };
+
   const handleExecute = (df_content) => {
     const query = { filters: { id: [ruleImplementation?.id] } };
     createExecutionGroup({ ...query, df_content });
@@ -88,7 +94,7 @@ export const ImplementationActions = ({
   const secondaryActions = implementationActions({
     actions,
     id,
-    deleteImplementation,
+    onConfirmDelete,
     formatMessage,
   });
   return (

package/src/components/RuleActions.js

@@ -1,14 +1,14 @@
 import _ from "lodash/fp";
-import { Link } from "react-router";
+import { Link, useNavigate } from "react-router";
 import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
-import { linkTo } from "@truedat/core/routes";
+import { linkTo, RULES } from "@truedat/core/routes";
 import { deleteRule } from "../routines";
 
-const ModalDelete = ({ deleteRule, id }) => (
+const ModalDelete = ({ handleDelete, id, name }) => (
   <ConfirmModal
     icon="trash"
     trigger={
@@ -25,11 +25,18 @@ const ModalDelete = ({ deleteRule, id }) => (
         values={{ name: <i>{name}</i> }}
       />
     }
-    onConfirm={() => deleteRule({ id })}
+    onConfirm={() => handleDelete({ id })}
   />
 );
 
 export const RuleActions = ({ deleteRule, manageRule, rule: { id, name } }) => {
+  const navigate = useNavigate();
+
+  const onConfirmDelete = async ({ id }) => {
+    await deleteRule({ id });
+    navigate(RULES);
+  };
+
   const generateAvailableActions = () => {
     const actions = {
       edit: manageRule,
@@ -53,7 +60,7 @@ export const RuleActions = ({ deleteRule, manageRule, rule: { id, name } }) => {
         icon: "trash",
         value: "delete",
         as: ModalDelete,
-        deleteRule,
+        handleDelete: onConfirmDelete,
         id,
         name,
         selected: false,

package/src/components/RuleImplementationTabs.js

@@ -28,14 +28,21 @@ export const RuleImplementationTabs = ({
   canViewDraftConcepts,
   canViewPendingApprovalConcepts,
 }) => {
-  const implementationActive =
-    useActiveRoute(IMPLEMENTATION) || useActiveRoute(IMPLEMENTATION_MOVE);
+  const implActive = useActiveRoute(IMPLEMENTATION);
+  const implMove = useActiveRoute(IMPLEMENTATION_MOVE);
+  const implementationActive = implActive || implMove;
+
+  const implConceptLinksActive = useActiveRoute(IMPLEMENTATION_CONCEPT_LINKS);
+  const implConceptLinksNewActive = useActiveRoute(
+    IMPLEMENTATION_CONCEPT_LINKS_NEW
+  );
   const conceptLinksActive =
-    useActiveRoute(IMPLEMENTATION_CONCEPT_LINKS) ||
-    useActiveRoute(IMPLEMENTATION_CONCEPT_LINKS_NEW);
-  const structuresActive =
-    useActiveRoute(IMPLEMENTATION_STRUCTURES) ||
-    useActiveRoute(IMPLEMENTATION_STRUCTURES_NEW);
+    implConceptLinksActive || implConceptLinksNewActive;
+
+  const implStructuresActive = useActiveRoute(IMPLEMENTATION_STRUCTURES);
+  const implStructuresNewActive = useActiveRoute(IMPLEMENTATION_STRUCTURES_NEW);
+  const structuresActive = implStructuresActive || implStructuresNewActive;
+
   const resultsActive = useActiveRoute(IMPLEMENTATION_RESULTS);
   const executionsActive = useActiveRoute(IMPLEMENTATION_EXECUTIONS);
   const resultsDetailsActive = useActiveRoute(IMPLEMENTATION_RESULTS_DETAILS);