@truedat/bg 7.5.10 → 7.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "7.5.10",
+  "version": "7.5.11",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,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"
@@ -82,5 +82,5 @@
     "semantic-ui-react": "^3.0.0-beta.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "8a8c49e9d5d6bb4e5f2b503b063bfd6dd20a503d"
+  "gitHead": "cbb92d5206752fe2add4195432b0401da17a0f23"
 }

package/src/concepts/components/ConceptActions.js

@@ -2,10 +2,10 @@ import _ from "lodash/fp";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";
-import { Link } from "react-router";
+import { Link, useNavigate } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";
-import { linkTo } from "@truedat/core/routes";
+import { CONCEPTS, linkTo } from "@truedat/core/routes";
 import { conceptAction } from "../routines";
 import { mapActionProps } from "../constants/mappings";
 import ConceptDeleteModalBody from "./ConceptDeleteModalBody";
@@ -45,37 +45,43 @@ const ModalDelete = ({
   deleteAction,
   conceptVersion,
   concept,
-}) => (
-  <ConfirmModal
-    icon="trash"
-    trigger={
-      <Button
-        icon={<Icon name="trash alternate outline" color="red" />}
-        content={<FormattedMessage id="actions.delete" />}
-      />
-    }
-    header={
-      <FormattedMessage id="concepts.actions.delete.confirmation.header" />
-    }
-    content={
-      <>
-        {conceptVersion === 1 ? (
-          <ConceptDeleteModalBody
-            conceptName={_.prop("name")(concept)}
-            conceptDomain={_.prop("domain.name")(concept)}
-            linkCount={_.prop("link_count")(concept)}
-            ruleCount={_.prop("rule_count")(concept)}
-            conceptCount={_.prop("concept_count")(concept)}
-            conceptVersion={_.prop("version")(concept)}
-          />
-        ) : (
-          <FormattedMessage id="concepts.actions.delete.confirmation.content" />
-        )}
-      </>
-    }
-    onConfirm={() => conceptAction({ action: "delete", ...deleteAction })}
-  />
-);
+}) => {
+  const navigate = useNavigate();
+  return (
+    <ConfirmModal
+      icon="trash"
+      trigger={
+        <Button
+          icon={<Icon name="trash alternate outline" color="red" />}
+          content={<FormattedMessage id="actions.delete" />}
+        />
+      }
+      header={
+        <FormattedMessage id="concepts.actions.delete.confirmation.header" />
+      }
+      content={
+        <>
+          {conceptVersion === 1 ? (
+            <ConceptDeleteModalBody
+              conceptName={_.prop("name")(concept)}
+              conceptDomain={_.prop("domain.name")(concept)}
+              linkCount={_.prop("link_count")(concept)}
+              ruleCount={_.prop("rule_count")(concept)}
+              conceptCount={_.prop("concept_count")(concept)}
+              conceptVersion={_.prop("version")(concept)}
+            />
+          ) : (
+            <FormattedMessage id="concepts.actions.delete.confirmation.content" />
+          )}
+        </>
+      }
+      onConfirm={() => {
+        conceptAction({ action: "delete", ...deleteAction });
+        navigate(CONCEPTS);
+      }}
+    />
+  );
+};
 
 ModalDelete.propTypes = {
   concept: PropTypes.object,

package/src/concepts/components/ConceptEdit.js

@@ -46,7 +46,7 @@ export const ConceptEdit = ({
 
     const business_concept_version = {
       name: defaultContent.name,
-      domain_id: domain.id,
+      domain_id: domain?.id,
       type: template.name,
       content: newContent,
       i18n_content: i18nSendConcept,
@@ -63,7 +63,7 @@ export const ConceptEdit = ({
     <>
       <ConceptForm
         actionKey={actionKey}
-        domainId={domain.id}
+        domainId={domain?.id}
         template={template}
         i18nConcept={i18nConcept}
         loading={templateLoading || localesLoading}
@@ -94,7 +94,7 @@ export const ConceptEditLoader = (props) => {
   const { locales } = useLanguage();
   const { data, loading: templateLoading } = useTemplate({
     name: templateName,
-    domainIds: [domain.id],
+    domainIds: [domain?.id],
   });
 
   const template = _.prop("template")(data);

package/src/concepts/reducers/conceptRedirect.js

@@ -26,11 +26,9 @@ export const conceptRedirect = (
       return initialState;
     case conceptAction.SUCCESS:
       const data = _.prop("data")(payload);
-      return _.propEq("method", "DELETE")(meta)
-        ? CONCEPTS
-        : _.includes(_.prop("action")(meta))(["version", "update", "create"])
-          ? conceptUrl(_.pick(["id", "business_concept_id"])(data))
-          : state;
+      return _.includes(_.prop("action")(meta))(["version", "update", "create"])
+        ? conceptUrl(_.pick(["id", "business_concept_id"])(data))
+        : state;
     case linkConcept.SUCCESS: {
       const { redirectUrl } = meta;
       return redirectUrl;

package/src/concepts/relations/components/ConceptRelations.js

@@ -211,7 +211,8 @@ export const ConceptRelations = ({
                 maxDepth={maxDepth}
               />
               <RelationGraph
-                navigateToConcept={navigateToConcept}
+                key={`graph-${depth}-${_.size(limitedRelationGraph?.nodes)}`}
+                navigate={navigateToConcept}
                 currentId={currentId}
                 relationsGraph={limitedRelationGraph}
               />