@truedat/bg 7.5.9 → 7.5.11

package/src/concepts/components/__tests__/__snapshots__/SharedToDomains.spec.js.snap

@@ -1,40 +1,63 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<SharedToDomains /> matches the latest snapshot 1`] = `
-<DimmerDimmable
-  dimmed={false}
->
-  <Dimmer
-    active={false}
-    inverted={true}
+<div>
+  <div
+    class="dimmable"
   >
-    <Loader />
-  </Dimmer>
-  <Segment>
-    <Header
-      as="h3"
-      dividing={true}
+    <div
+      class="ui segment"
     >
-      concept.sharedDomains.header
-    </Header>
-    <List
-      divided={true}
-    >
-      <ListItem
-        key="0"
+      <h3
+        class="ui dividing header"
+      >
+        Compartido con
+      </h3>
+      <div
+        class="ui divided list"
+        role="list"
       >
-        <DomainTaxonomy
-          domain={
-            {
-              "external_id": "bar",
-              "id": 1,
-              "name": "foo",
-            }
-          }
-          key="0"
-        />
-      </ListItem>
-    </List>
-  </Segment>
-</DimmerDimmable>
+        <div
+          class="item"
+          role="listitem"
+        >
+          <div
+            class="ui horizontal list"
+            role="list"
+          >
+            <div
+              class="item"
+              role="listitem"
+            >
+              <span
+                class="highlighted"
+              >
+                parent2
+              </span>
+            </div>
+            <div
+              class="item"
+              role="listitem"
+            >
+              <i
+                aria-hidden="true"
+                class="grey right angle fitted icon"
+              />
+            </div>
+            <div
+              class="item"
+              role="listitem"
+            >
+              <span
+                class="highlighted"
+              >
+                parent1
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 `;

package/src/concepts/components/__tests__/__snapshots__/SharedToDomainsPopup.spec.js.snap

@@ -1,150 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<SharedToDomainsPopup /> matches the latest snapshot 1`] = `
-<SharedToDomainsPopup
-  saving={false}
->
-  <Popup
-    basic={true}
-    content={<Memo(Connect(SharedToForm)) />}
-    disabled={false}
-    eventsEnabled={true}
-    flowing={true}
-    on="click"
-    onClose={[Function]}
-    onOpen={[Function]}
-    open={false}
-    pinned={false}
-    popperModifiers={[]}
-    position="bottom right"
-    positionFixed={true}
-    size="large"
-    trigger={
-      <Button
-        as="button"
-        basic={true}
-        className="structureButton"
-        icon={
-          <Icon
-            as="i"
-            name="sitemap"
-          />
-        }
-      />
-    }
+<div>
+  <button
+    class="ui basic icon button structureButton"
   >
-    <Portal
-      closeOnDocumentClick={true}
-      closeOnEscape={true}
-      closeOnTriggerClick={true}
-      eventPool="default"
-      onClose={[Function]}
-      onMount={[Function]}
-      onOpen={[Function]}
-      onUnmount={[Function]}
-      open={false}
-      openOnTriggerClick={true}
-      trigger={
-        <Button
-          as="button"
-          basic={true}
-          className="structureButton"
-          icon={
-            <Icon
-              as="i"
-              name="sitemap"
-            />
-          }
-        />
-      }
-      triggerRef={
-        {
-          "current": <button
-            class="ui basic icon button structureButton"
-          >
-            <i
-              aria-hidden="true"
-              class="sitemap icon"
-            />
-          </button>,
-        }
-      }
-    >
-      <Ref
-        innerRef={[Function]}
-      >
-        <RefFindNode
-          innerRef={[Function]}
-        >
-          <Button
-            as="button"
-            basic={true}
-            className="structureButton"
-            icon={
-              <Icon
-                as="i"
-                name="sitemap"
-              />
-            }
-            onBlur={[Function]}
-            onClick={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-          >
-            <Ref
-              innerRef={
-                {
-                  "current": <button
-                    class="ui basic icon button structureButton"
-                  >
-                    <i
-                      aria-hidden="true"
-                      class="sitemap icon"
-                    />
-                  </button>,
-                }
-              }
-            >
-              <RefFindNode
-                innerRef={
-                  {
-                    "current": <button
-                      class="ui basic icon button structureButton"
-                    >
-                      <i
-                        aria-hidden="true"
-                        class="sitemap icon"
-                      />
-                    </button>,
-                  }
-                }
-              >
-                <button
-                  className="ui basic icon button structureButton"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseEnter={[Function]}
-                  onMouseLeave={[Function]}
-                >
-                  <Icon
-                    as="i"
-                    name="sitemap"
-                  >
-                    <i
-                      aria-hidden="true"
-                      className="sitemap icon"
-                      onClick={[Function]}
-                    />
-                  </Icon>
-                </button>
-              </RefFindNode>
-            </Ref>
-          </Button>
-        </RefFindNode>
-      </Ref>
-    </Portal>
-  </Popup>
-</SharedToDomainsPopup>
+    <i
+      aria-hidden="true"
+      class="sitemap icon"
+    />
+  </button>
+</div>
 `;

package/src/concepts/components/__tests__/__snapshots__/SharedToForm.spec.js.snap

@@ -9,7 +9,7 @@ exports[`<SharedToForm /> matches the latest snapshot 1`] = `
     <h2
       class="ui header"
     >
-      Share in
+      concept.sharedTo.header
     </h2>
     <form
       class="ui form"
@@ -123,7 +123,7 @@ exports[`<SharedToForm /> matches the latest snapshot 1`] = `
           tabindex="-1"
           type="submit"
         >
-          Share
+          actions.share
         </button>
       </div>
     </form>

package/src/concepts/reducers/__tests__/conceptRedirect.spec.js

@@ -8,7 +8,7 @@ import { conceptUrl } from "../conceptRedirect";
 import { conceptRedirect } from "..";
 
 const fooState = { foo: "bar" };
-const concept = { business_concept_id: 1, id: 2 };
+const concept = { business_concept_id: "1", id: "2" };
 const data = { ...concept };
 const meta = { action: "create" };
 const redirectUrl = "/foo/bar";

package/src/concepts/reducers/conceptRedirect.js

@@ -4,18 +4,18 @@ import {
   clearRedirect,
   createSubscription,
   deleteSubscription,
-  updateSubscription
+  updateSubscription,
 } from "@truedat/core/routines";
 import {
   bulkUpdate,
   conceptAction,
   linkConcept,
-  uploadConcepts
+  uploadConcepts,
 } from "../routines";
 
 const initialState = "";
 
-export const conceptUrl = concept => linkTo.CONCEPT_VERSION(concept);
+export const conceptUrl = (concept) => linkTo.CONCEPT_VERSION(concept);
 
 export const conceptRedirect = (
   state = initialState,
@@ -26,9 +26,7 @@ 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"])
+      return _.includes(_.prop("action")(meta))(["version", "update", "create"])
         ? conceptUrl(_.pick(["id", "business_concept_id"])(data))
         : state;
     case linkConcept.SUCCESS: {

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

@@ -1,11 +1,12 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import queryString from "query-string";
 import { connect } from "react-redux";
 import { Button, Segment, Header, Message } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { Link, useParams } from "react-router-dom";
+import { Link } from "react-router";
+import { useParams } from "react-router";
 import { useIntl } from "react-intl";
 import {
   IMPLEMENTATION_NEW,
@@ -16,8 +17,8 @@ import {
   getBusinessConceptsLinksToImplementationsColumns,
 } from "../selectors";
 
-const RuleImplementationsTable = React.lazy(() =>
-  import("@truedat/dq/components/RuleImplementationsTable")
+const RuleImplementationsTable = lazy(
+  () => import("@truedat/dq/components/RuleImplementationsTable")
 );
 
 export const ConceptImplementationLinks = ({

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

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { useState } from "react";
 import { PropTypes } from "prop-types";
 import { connect } from "react-redux";
 import { Button, Icon } from "semantic-ui-react";

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

@@ -1,10 +1,10 @@
 import _ from "lodash/fp";
-import React from "react";
+import { Fragment } from "react";
 import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { Checkbox } from "semantic-ui-react";
 
@@ -21,7 +21,7 @@ export const ConceptLinksActions = ({
   return createLinkUrl ? (
     <div style={{ float: "right" }}>
       {canManageGrantRequests ? (
-        <React.Fragment>
+        <Fragment>
           <Checkbox
             id="execute_checkbox"
             className="bgOrange"
@@ -31,7 +31,7 @@ export const ConceptLinksActions = ({
             style={{ top: "6px", marginRight: "7.5px" }}
           />
           <ConceptLinkstRequestGrantButton disabled={!grantView} />
-        </React.Fragment>
+        </Fragment>
       ) : null}
       <Button
         primary

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

@@ -1,9 +1,8 @@
 import _ from "lodash/fp";
-import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Button } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { FormattedMessage } from "react-intl";
 import { linkTo } from "@truedat/core/routes";
 
@@ -24,14 +23,14 @@ export const ConceptRelationActions = ({ addConceptRelation }) => (
 );
 
 ConceptRelationActions.propTypes = {
-  addConceptRelation: PropTypes.string
+  addConceptRelation: PropTypes.string,
 };
 
 const mapStateToProps = ({ concept, conceptActions }) => ({
   addConceptRelation:
     concept && concept.id && _.has("create_concept_link")(conceptActions)
       ? linkTo.CONCEPT_LINKS_CONCEPTS_NEW(concept)
-      : undefined
+      : undefined,
 });
 
 export default connect(mapStateToProps)(ConceptRelationActions);

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

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState } from "react";
+import { lazy, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { FormattedMessage, useIntl } from "react-intl";
@@ -10,8 +10,8 @@ import { makeTagOptionsSelector } from "@truedat/core/selectors";
 import { linkConcept } from "../routines";
 import ConceptSelector from "./ConceptSelector";
 
-const TagTypeDropdownSelector = React.lazy(() =>
-  import("@truedat/lm/components/TagTypeDropdownSelector")
+const TagTypeDropdownSelector = lazy(
+  () => import("@truedat/lm/components/TagTypeDropdownSelector")
 );
 
 const filters = {

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

@@ -1,19 +1,19 @@
 import _ from "lodash/fp";
-import React from "react";
+import { lazy } from "react";
 import PropTypes from "prop-types";
 import { FormattedMessage } from "react-intl";
 import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Table, Label } from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
 import { deleteConceptRelation } from "../routines";
 
-const ConfirmDeleteRelation = React.lazy(() =>
-  import("@truedat/lm/components/ConfirmDeleteRelation")
+const ConfirmDeleteRelation = lazy(
+  () => import("@truedat/lm/components/ConfirmDeleteRelation")
 );
 
-const goToConcept = ({ history, concept }) => {
-  if (concept) history.push(linkTo.CONCEPT_LINKS_CONCEPTS(concept));
+const goToConcept = ({ navigate, concept }) => {
+  if (concept) navigate(linkTo.CONCEPT_LINKS_CONCEPTS(concept));
 };
 
 export const ConceptRelationRow = ({
@@ -25,7 +25,7 @@ export const ConceptRelationRow = ({
   target_id,
   tags,
 }) => {
-  const history = useHistory();
+  const navigate = useNavigate();
   if (_.isEmpty(relationContext)) return null;
   else {
     const { target, source } = relationContext;
@@ -46,11 +46,11 @@ export const ConceptRelationRow = ({
       <Table.Row>
         <Table.Cell
           content={source.name}
-          onClick={() => goToConcept({ history, concept })}
+          onClick={() => goToConcept({ navigate, concept })}
         />
         <Table.Cell
           textAlign="center"
-          onClick={() => goToConcept({ history, concept })}
+          onClick={() => goToConcept({ navigate, concept })}
         >
           {_.isEmpty(tags) ? (
             <Label>-</Label>
@@ -68,7 +68,7 @@ export const ConceptRelationRow = ({
         <Table.Cell
           textAlign="center"
           content={target.name}
-          onClick={() => goToConcept({ history, concept })}
+          onClick={() => goToConcept({ navigate, concept })}
         />
         <Table.Cell textAlign="center">
           {canDeleteConceptRelation && (

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

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import {
@@ -11,7 +11,8 @@ import {
   Table,
 } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
-import { useHistory, useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
+import { useNavigate } from "react-router";
 
 import { RelationGraph } from "@truedat/lm/components";
 import { linkTo } from "@truedat/core/routes";
@@ -53,20 +54,18 @@ export const ConceptRelations = ({
   visible,
 }) => {
   const { formatMessage } = useIntl();
-  const history = useHistory();
+
+  const navigate = useNavigate();
   const location = useLocation();
   const [graphRender, setGraphRender] = useState(
     _.propOr(true, "state.show_graph")(location) && !_.isEmpty(conceptRelations)
   );
-  const navigate = ({ resource_id }, emptyEdges) => {
-    history.push(
+  const navigateToConcept = ({ resource_id }, emptyEdges) => {
+    navigate(
       linkTo.CONCEPT_LINKS_CONCEPTS({
         business_concept_id: resource_id,
         id: "current",
-      }),
-      {
-        show_graph: !emptyEdges,
-      }
+      })
     );
   };
 
@@ -201,7 +200,6 @@ export const ConceptRelations = ({
         ) : null}
         {visible ? <ConceptRelationActions /> : null}
       </div>
-
       {conceptRelations ? (
         <>
           {graphRender && !_.isEmpty(currentId) ? (
@@ -213,7 +211,8 @@ export const ConceptRelations = ({
                 maxDepth={maxDepth}
               />
               <RelationGraph
-                navigate={navigate}
+                key={`graph-${depth}-${_.size(limitedRelationGraph?.nodes)}`}
+                navigate={navigateToConcept}
                 currentId={currentId}
                 relationsGraph={limitedRelationGraph}
               />

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

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import React from "react";
 import PropTypes from "prop-types";
-import { Route, Switch } from "react-router-dom";
+import { Route, Routes } from "react-router";
 import { connect } from "react-redux";
 import {
   CONCEPT_LINKS_CONCEPTS,
@@ -15,54 +15,35 @@ import ConceptRelations from "./ConceptRelations";
 import ConceptRelationForm from "./ConceptRelationForm";
 import ConceptImplementationLinks from "./ConceptImplementationLinks";
 
-const ConceptStructureLinkForm = React.lazy(() =>
-  import("@truedat/lm/components/ConceptStructureLinkForm")
+const ConceptStructureLinkForm = React.lazy(
+  () => import("@truedat/lm/components/ConceptStructureLinkForm")
 );
 
-const StructureTypesLoader = React.lazy(() =>
-  import("@truedat/dd/components/StructureTypesLoader")
+const StructureTypesLoader = React.lazy(
+  () => import("@truedat/dd/components/StructureTypesLoader")
 );
 
 export const ConceptRelationsRoutes = ({ conceptLoaded, relationsLoading }) => {
-  return (
-    <Switch>
-      <Route
-        exact
-        path={CONCEPT_LINKS_STRUCTURES_NEW}
-        render={() => (conceptLoaded ? <ConceptStructureLinkForm /> : null)}
-      />
-      <Route
-        exact
-        path={CONCEPT_LINKS_STRUCTURES}
-        render={() =>
-          conceptLoaded ? (
+  return !conceptLoaded || relationsLoading ? null : (
+    <Routes>
+      <Route path="structures">
+        <Route
+          index
+          element={
             <>
               <StructureTypesLoader />
               <ConceptStructureLinks />
             </>
-          ) : null
-        }
-      />
-
-      <Route
-        exact
-        path={CONCEPT_LINKS_CONCEPTS_NEW}
-        render={() => (conceptLoaded ? <ConceptRelationForm /> : null)}
-      />
-
-      {!relationsLoading ? (
-        <Route
-          exact
-          path={CONCEPT_LINKS_CONCEPTS}
-          render={() => <ConceptRelations />}
+          }
         />
-      ) : null}
-      <Route
-        exact
-        path={CONCEPT_LINKS_IMPLEMENTATIONS}
-        render={() => (conceptLoaded ? <ConceptImplementationLinks /> : null)}
-      />
-    </Switch>
+        <Route path="new" element={<ConceptStructureLinkForm />} />
+      </Route>
+      <Route path="concepts">
+        <Route index element={<ConceptRelations />} />
+        <Route path="new" element={<ConceptRelationForm />} />
+      </Route>
+      <Route path="implementations" element={<ConceptImplementationLinks />} />
+    </Routes>
   );
 };