@truedat/bg 7.5.9 → 7.5.10

package/src/concepts/relations/components/__tests__/__snapshots__/ConceptStructureLinks.spec.js.snap

@@ -4,7 +4,6 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot 1`] = `
 <div>
   <div
     class="ui bottom attached segment"
-    style=""
   >
     <div
       class="ui grid"
@@ -25,7 +24,7 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot 1`] = `
           <h3
             class="ui header"
           >
-            Links to Structures
+            conceptRelation.master.table.title
           </h3>
           <table
             class="ui table"
@@ -39,7 +38,7 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot 1`] = `
                 <th
                   class=""
                 >
-                  Structure
+                  name
                 </th>
               </tr>
             </thead>
@@ -91,7 +90,7 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot with grantVie
             <div
               class="ui label structures-label-results"
             >
-              NaN structures found
+              structures.retrieved.results
             </div>
             <table
               class="ui sortable table"
@@ -105,27 +104,27 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot with grantVie
                   <th
                     class="two wide"
                   >
-                    Structure
+                    structure.name
                   </th>
                   <th
                     class="one wide disabled"
                   >
-                    Type
+                    structure.type
                   </th>
                   <th
                     class="one wide"
                   >
-                    System
+                    structure.system
                   </th>
                   <th
                     class="one wide disabled"
                   >
-                    Relation Type
+                    structure.relation.relation_type_name
                   </th>
                   <th
                     class="one wide disabled"
                   >
-                    Group
+                    structure.group
                   </th>
                   <th
                     class="one wide"
@@ -149,6 +148,7 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot with grantVie
                     class="structure-cell-overflow"
                   >
                     <a
+                      data-discover="true"
                       href="/structures/1"
                       title="test structure"
                     >
@@ -177,7 +177,7 @@ exports[`<ConceptStructureLinksPane /> matches the latest snapshot with grantVie
                     class=""
                   >
                     <time
-                      datetime="1735725600100"
+                      datetime="1735725600050"
                     >
                       2025-01-01 10:00
                     </time>

package/src/concepts/relations/sagas/conceptLinkAction.js

@@ -5,7 +5,7 @@ import {
   apiJsonPatch,
   apiJsonPost,
   apiJsonPut,
-  JSON_OPTS
+  JSON_OPTS,
 } from "@truedat/core/services/api";
 import { conceptLinkAction } from "../routines";
 
@@ -14,7 +14,7 @@ const methodFromVerb = {
   DELETE: apiJsonDelete,
   PATCH: apiJsonPatch,
   POST: apiJsonPost,
-  PUT: apiJsonPut
+  PUT: apiJsonPut,
 };
 
 export function* conceptLinkActionSaga({ payload }) {

package/src/concepts/relations/sagas/linkConcept.js

@@ -12,7 +12,7 @@ export function* linkConceptSaga({ payload }) {
       "source_type",
       "target_id",
       "target_type",
-      "tag_ids"
+      "tag_ids",
     ])(payload);
 
     const redirectUrl = _.prop("redirectUrl")(payload);

package/src/concepts/relations/selectors/getBusinessConceptsLinksToImplementationsColumns.js

@@ -1,8 +1,7 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import DateTime from "@truedat/core/components/DateTime";
 import { formatNumber } from "@truedat/core/services/format";
 import { linkTo } from "@truedat/core/routes";

package/src/concepts/relations/selectors/getConceptLinks.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Icon, Label } from "semantic-ui-react";
 import { createSelector } from "reselect";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";

package/src/concepts/relations/selectors/getConceptRelations.js

@@ -24,7 +24,7 @@ export const getConceptToConceptRelations = createSelector(
     )
 );
 
-export const getConceptRelations = formatMessage =>
+export const getConceptRelations = (formatMessage) =>
   createSelector(
     [getRelations, getBusinessConceptId],
     (relations, business_concept_id) => {
@@ -39,10 +39,10 @@ const _getConceptSourceRelations = (relations, business_concept_id) => {
   const bcRelations = _.filter({
     source_id: _.toInteger(business_concept_id),
     target_type: "business_concept",
-    source_type: "business_concept"
+    source_type: "business_concept",
   })(relations);
 
-  return _.map(rel => {
+  return _.map((rel) => {
     return { relationSide: "source", ...rel };
   })(bcRelations);
 };
@@ -51,31 +51,31 @@ const _getConceptTargetRelations = (relations, business_concept_id) => {
   const bcRelations = _.filter({
     target_id: _.toInteger(business_concept_id),
     target_type: "business_concept",
-    source_type: "business_concept"
+    source_type: "business_concept",
   })(relations);
 
-  return _.map(rel => {
+  return _.map((rel) => {
     return { relationSide: "target", ...rel };
   })(bcRelations);
 };
 
 const groupRelationsByLabel = (bcRelations, formatMessage) => {
-  const relations = _.map(r => {
+  const relations = _.map((r) => {
     const tags = _.flow(
-      _.map(t => {
+      _.map((t) => {
         return {
           relationSide: r.relationSide,
           i18n: formatMessage({
             id: `${r.relationSide}.${t.value.type}`,
-            defaultMessage: t.value.type
+            defaultMessage: t.value.type,
           }),
-          ...t
+          ...t,
         };
       })
     )(r.tags);
     return {
       ...r,
-      tags: tags
+      tags: tags,
     };
   })(bcRelations);
 
@@ -85,10 +85,10 @@ const groupRelationsByLabel = (bcRelations, formatMessage) => {
     _.sortBy("relationSide")
   )(relations);
 
-  const tagsRelations = _.map(tag => {
-    const relationsByLabel = _.filter(r => _.find({ i18n: tag.i18n })(r.tags))(
-      relations
-    );
+  const tagsRelations = _.map((tag) => {
+    const relationsByLabel = _.filter((r) =>
+      _.find({ i18n: tag.i18n })(r.tags)
+    )(relations);
     return { ...tag, relations: relationsByLabel };
   })(labels);
   return tagsRelations;

package/src/concepts/sagas/__tests__/saveSharedTo.spec.js

@@ -26,13 +26,13 @@ describe("sagas: saveSharedToRequestSaga", () => {
 });
 
 describe("sagas: saveSharedToRequestSaga", () => {
-  const payload = { id: 1, sharedTo: [1, 2] };
+  const payload = { id: "1", sharedTo: [1, 2] };
   const body = {
-    domain_ids: [1, 2]
+    domain_ids: [1, 2],
   };
   const data = [
     { id: 1, name: "foo" },
-    { id: 2, name: "bar" }
+    { id: 2, name: "bar" },
   ];
   const url = compile(API_CONCEPT_SHARED_DOMAINS)(payload);
   it("should put a success action when a response is returned", () => {

package/src/concepts/sagas/__tests__/setConfidentialConcept.spec.js

@@ -5,7 +5,7 @@ import { setConfidentialConcept } from "../../routines";
 import { API_BUSINESS_CONCEPT_SET_CONFIDENTIAL } from "../../api";
 import {
   setConfidentialConceptRequestSaga,
-  setConfidentialConceptSaga
+  setConfidentialConceptSaga,
 } from "../setConfidentialConcept";
 
 describe("sagas: setConfidentialConceptRequestSaga", () => {
@@ -29,8 +29,8 @@ describe("sagas: setConfidentialConceptRequestSaga", () => {
 });
 
 describe("sagas: setConfidentialConceptSaga", () => {
-  const id = 5;
-  const business_concept_version = { id: 5, confidential: true };
+  const id = "5";
+  const business_concept_version = { id: "5", confidential: true };
   const url = compile(API_BUSINESS_CONCEPT_SET_CONFIDENTIAL)({ id });
   const meta = {};
   const requestData = { id: id, confidential: true };
@@ -38,7 +38,7 @@ describe("sagas: setConfidentialConceptSaga", () => {
   it("should put a success action when a response is returned", () => {
     expect(() => {
       testSaga(setConfidentialConceptSaga, {
-        payload
+        payload,
       })
         .next()
         .put({ meta, ...setConfidentialConcept.request() })
@@ -47,7 +47,7 @@ describe("sagas: setConfidentialConceptSaga", () => {
         .next({ data: payload })
         .put({
           meta,
-          ...setConfidentialConcept.success({ business_concept_version })
+          ...setConfidentialConcept.success({ business_concept_version }),
         })
         .next()
         .put(setConfidentialConcept.fulfill())

package/src/concepts/sagas/conceptAction.js

@@ -5,7 +5,7 @@ import {
   apiJsonPatch,
   apiJsonPost,
   apiJsonPut,
-  JSON_OPTS
+  JSON_OPTS,
 } from "@truedat/core/services/api";
 import { conceptAction } from "../routines";
 
@@ -14,7 +14,7 @@ const methodFromVerb = {
   DELETE: apiJsonDelete,
   PATCH: apiJsonPatch,
   POST: apiJsonPost,
-  PUT: apiJsonPut
+  PUT: apiJsonPut,
 };
 
 export function* conceptActionSaga({ payload }) {

package/src/concepts/sagas/fetchConceptArchive.js

@@ -7,7 +7,7 @@ import { API_CONCEPT_ARCHIVE } from "../api";
 export function* fetchConceptArchiveSaga({ payload }) {
   try {
     const { id } = payload;
-    const url = compile(API_CONCEPT_ARCHIVE)({ id });
+    const url = compile(API_CONCEPT_ARCHIVE)({ id: `${id}` });
     yield put(fetchConceptArchive.request());
     const { data } = yield call(apiJson, url, JSON_OPTS);
     yield put(fetchConceptArchive.success(data));

package/src/concepts/sagas/setConfidentialConcept.js

@@ -6,9 +6,9 @@ import { API_BUSINESS_CONCEPT_SET_CONFIDENTIAL } from "../api";
 
 export function* setConfidentialConceptSaga({ payload }) {
   const {
-    business_concept_version: { id, confidential }
+    business_concept_version: { id, confidential },
   } = payload;
-  const url = compile(API_BUSINESS_CONCEPT_SET_CONFIDENTIAL)({ id });
+  const url = compile(API_BUSINESS_CONCEPT_SET_CONFIDENTIAL)({ id: `${id}` });
   const requestData = { id: id, confidential };
   const meta = {};
   try {

package/src/concepts/selectors/__tests__/getConceptDomainPath.spec.js

@@ -5,10 +5,10 @@ describe("selectors: getConceptDomainPath", () => {
   const domain_parents = [
     { id: 2, name: "name2", external_id: "eid2" },
     { id: 1, name: "name1", external_id: "eid1" },
-    { id: 0, name: "name0", external_id: "eid0" }
+    { id: 0, name: "name0", external_id: "eid0" },
   ];
   const concept = {
-    domain_parents
+    domain_parents,
   };
   const state = { concept };
 

package/src/concepts/selectors/getConceptColumns.js

@@ -1,10 +1,9 @@
 import _ from "lodash/fp";
-import React from "react";
 import { Icon } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
 import { createSelector } from "reselect";
 import Moment from "react-moment";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 
 const ConceptLink = (concept) =>

package/src/concepts/selectors/getConceptTemplate.js

@@ -1,7 +1,7 @@
 import { createSelector } from "reselect";
 import { getConcept } from "./getConcept";
 
-export const getConceptTemplate = createSelector([getConcept], concept => {
+export const getConceptTemplate = createSelector([getConcept], (concept) => {
   const { template } = concept;
   return template ? template.content : {};
 });

package/src/concepts/selectors/getConceptUploadEventColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import React from "react";
 import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";

package/src/concepts/selectors/getConceptVersionPath.js

@@ -6,8 +6,8 @@ import {
   CONCEPTS_PENDING,
 } from "@truedat/core/routes";
 import { linkTo } from "@truedat/core/routes";
-import { getConceptSubscope } from "./getConceptSubscope";
-import { getSidemenuGlossarySubscopes } from "./getSidemenuGlossarySubscopes";
+import { getConceptSubscope } from "@truedat/core/selectors/getConceptSubscope";
+import { getSidemenuGlossarySubscopes } from "@truedat/core/selectors/getSidemenuGlossarySubscopes";
 
 function isPending(status) {
   return (

package/src/concepts/selectors/getParsedEvents.js

@@ -8,8 +8,8 @@ const toStr = (field) =>
   _.isObject(field)
     ? JSON.stringify(field)
     : _.isBoolean(field)
-    ? _.toString(field)
-    : field;
+      ? _.toString(field)
+      : field;
 
 const getDeleteConceptDraftEvent = (e) => {
   const msg_key = "deleted_version";

package/src/concepts/selectors/getTemplateFields.js

@@ -4,11 +4,11 @@ import { getConceptTemplate } from "./getConceptTemplate";
 
 export const getTemplateFields = createSelector(
   [getConceptTemplate],
-  template => {
+  (template) => {
     if (_.isArray(template)) {
-      const fields = _.map(f => [
+      const fields = _.map((f) => [
         _.propOr("", "name", f),
-        _.propOr("", "default", f)
+        _.propOr("", "default", f),
       ])(template);
       return _.fromPairs(fields);
     } else {

package/src/concepts/selectors/getTemplateGroups.js

@@ -4,7 +4,7 @@ import { getConceptTemplate } from "./getConceptTemplate";
 
 export const getTemplateGroups = createSelector(
   [getConceptTemplate],
-  template => {
+  (template) => {
     if (_.isArray(template)) {
       return _.toPairs(_.groupBy("group")(template));
     } else {

package/src/hooks/__mocks__/useDomains.js

@@ -0,0 +1,42 @@
+export const useDomains = jest.fn(() => ({
+  data: [],
+  actions: {},
+  error: null,
+  loading: false,
+}));
+
+export const useDomain = jest.fn((domainId) => ({
+  data: domainId
+    ? {
+        description: "DOMAIN DESCRIPTION",
+        domain_group: null,
+        external_id: "EXTERNAL ID",
+        id: domainId,
+        name: "DOMAIN NAME",
+        parent_id: 6,
+        parents: null,
+        type: null,
+      }
+    : null,
+  actions: {},
+  error: null,
+  loading: false,
+}));
+
+export const useDomainCreate = jest.fn(() => ({
+  trigger: jest.fn(() => ({
+    then: jest.fn(),
+  })),
+}));
+
+export const useDomainUpdate = jest.fn(() => ({
+  trigger: jest.fn(() => ({
+    then: jest.fn(),
+  })),
+}));
+
+export const useDomainDelete = jest.fn(() => ({
+  trigger: jest.fn(() => ({
+    then: jest.fn(),
+  })),
+}));

package/src/hooks/useDomains.js

@@ -24,7 +24,7 @@ export const useDomains = () => {
 
 export const useDomain = (id) => {
   const toApiPath = compile(API_DOMAIN, "api");
-  const url = toApiPath({ id });
+  const url = toApiPath({ id: `${id}` });
   const { data, error } = useSWR(url, apiJson);
   return {
     data: data?.data?.data,
@@ -42,7 +42,7 @@ export const useDomainCreate = () => {
 
 export const useDomainUpdate = (id) => {
   const { mutate } = useSWRConfig();
-  const url = compile(API_DOMAIN)({ id });
+  const url = compile(API_DOMAIN)({ id: `${id}` });
   const mutator = useSWRMutations(url, (url, { arg }) =>
     apiJsonPatch(url, arg)
   );
@@ -60,7 +60,7 @@ export const useDomainUpdate = (id) => {
 
 export const useDomainDelete = (id) => {
   const { mutate } = useSWRConfig();
-  const url = compile(API_DOMAIN)({ id });
+  const url = compile(API_DOMAIN)({ id: `${id}` });
   const mutator = useSWRMutations(url, (url, { arg }) =>
     apiJsonDelete(url, arg)
   );

package/src/taxonomy/components/AddDomainMember.js

@@ -1,13 +1,12 @@
-import React from "react";
 import PropTypes from "prop-types";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 
 import { linkTo } from "@truedat/core/routes";
 import AddResourceMember from "@truedat/core/components/AddResourceMember";
 
 const AddDomainMember = ({ id }) => {
-  const history = useHistory();
-  const onSuccess = () => history.push(linkTo.DOMAIN_MEMBERS({ id }));
+  const navigate = useNavigate();
+  const onSuccess = () => navigate(linkTo.DOMAIN_MEMBERS({ id }));
   return <AddResourceMember type="domain" id={`${id}`} onSuccess={onSuccess} />;
 };
 

package/src/taxonomy/components/Domain.js

@@ -1,6 +1,5 @@
-import React from "react";
 import PropTypes from "prop-types";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { Segment } from "semantic-ui-react";
 import { DOMAIN_NEW, DOMAIN_EDIT } from "@truedat/core/routes";
 import { useDomain } from "../../hooks/useDomains";
@@ -15,29 +14,26 @@ export const Domain = ({ domainId, domains, taxonomyConfig }) => {
 
   return domain ? (
     <Segment>
-      <Switch>
+      <Routes>
+        <Route path="edit" element={<EditDomain domain={domain} />} />
+        <Route path="new" element={<NewDomain domain={domain} />} />
         <Route
-          exact
-          path={DOMAIN_EDIT}
-          render={() => <EditDomain domain={domain} />}
+          path="*"
+          element={
+            <>
+              <DomainDetail id={domain.id} />
+              <DomainTabs domain={domain} taxonomyConfig={taxonomyConfig} />
+              <Segment attached="bottom">
+                <DomainContent
+                  domain={domain}
+                  domains={domains}
+                  taxonomyConfig={taxonomyConfig}
+                />
+              </Segment>
+            </>
+          }
         />
-        <Route
-          exact
-          path={DOMAIN_NEW}
-          render={() => <NewDomain domain={domain} />}
-        />
-        <>
-          <DomainDetail id={domain.id} />
-          <DomainTabs domain={domain} taxonomyConfig={taxonomyConfig} />
-          <Segment attached="bottom">
-            <DomainContent
-              domain={domain}
-              domains={domains}
-              taxonomyConfig={taxonomyConfig}
-            />
-          </Segment>
-        </>
-      </Switch>
+      </Routes>
     </Segment>
   ) : null;
 };

package/src/taxonomy/components/DomainActions.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Button, Icon } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { ConfirmModal, GroupActions } from "@truedat/core/components";

package/src/taxonomy/components/DomainCards.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { Card, Header, Icon, Message, Input } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
@@ -24,7 +24,8 @@ export const DomainCard = ({
       <Card.Meta>
         {_.get("name")(domain_group) && (
           <>
-            <Icon name="object group" /> {_.get("name")(domain_group)}
+            <Icon name="object group" />
+            {_.get("name")(domain_group)}
             <br />
           </>
         )}
@@ -85,7 +86,6 @@ export const DomainCards = ({ actions, domain, domains }) => {
           {_.isEmpty(domain) ? <DomainsActions actions={actions} /> : null}
         </Header.Content>
       </Header>
-
       {_.isEmpty(visibleDomains) && !_.isEmpty(domainChildren) ? (
         <Header as="h4">
           <Icon name="search" />
@@ -94,11 +94,9 @@ export const DomainCards = ({ actions, domain, domains }) => {
           </Header.Content>
         </Header>
       ) : null}
-
       {_.isEmpty(domainChildren) && domain && domain.id ? (
         <Message header={formatMessage({ id: "domain.children.empty" })} />
       ) : null}
-
       <Card.Group>{visibleDomains.map(DomainCard)}</Card.Group>
     </>
   );