@truedat/bg 6.6.0 → 6.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "6.6.0",
+  "version": "6.6.2",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "6.6.0",
+    "@truedat/test": "6.6.2",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,9 +86,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "6.6.0",
-    "@truedat/df": "6.6.0",
-    "@truedat/lm": "6.6.0",
+    "@truedat/core": "6.6.2",
+    "@truedat/df": "6.6.2",
+    "@truedat/lm": "6.6.2",
     "decode-uri-component": "^0.2.2",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
@@ -111,5 +111,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "84d52d5067ff09b8d9c9b8a9bc8018c53a8e700c"
+  "gitHead": "b5defab13b213876e57046dc7d9885c6adc4a64d"
 }

package/src/concepts/components/ConceptsLinksManagement.js

@@ -4,18 +4,7 @@ import PropTypes from "prop-types";
 import { useIntl } from "react-intl";
 import { connect } from "react-redux";
 import { Header, Icon, Segment, Grid } from "semantic-ui-react";
-import {
-  makeTagOptionsSelector,
-  makeSearchQuerySelector,
-} from "@truedat/core/selectors";
-
-import {
-  clearStructures,
-  fetchStructures,
-  clearStructureFilters,
-  fetchStructureFilters,
-  resetStructureFilters,
-} from "@truedat/dd/routines";
+import { makeTagOptionsSelector } from "@truedat/core/selectors";
 import { createRelation, deleteRelation } from "@truedat/core/routines";
 import ConceptSelector from "../relations/components/ConceptSelector";
 import { pickConceptAttrs } from "../relations/components/ConceptRelationForm";
@@ -58,12 +47,6 @@ export const ConceptsLinksManagement = ({
   tagStructureOptions,
   tagConceptOptions,
   selectedRelationTags,
-  clearStructures,
-  clearStructureFilters,
-  fetchStructureFilters,
-  resetStructureFilters,
-  fetchStructures,
-  structurePayload,
 }) => {
   const { formatMessage } = useIntl();
   const [selectedLinkType, setSelectedLinkType] = useState("structures");
@@ -117,14 +100,6 @@ export const ConceptsLinksManagement = ({
     setSelectedSourceConcept(selectedSourceConcept);
     setSelectedStructure(null);
     setSelectedTargetConcept(null);
-
-    if (selectedLinkType == "structures") {
-      clearStructures();
-      clearStructureFilters();
-      fetchStructureFilters();
-      resetStructureFilters();
-      fetchStructures({ ...structurePayload, size: 7, page: 0 });
-    }
   };
 
   const handleTargetConceptSelected = (concept) => {
@@ -300,12 +275,6 @@ ConceptsLinksManagement.propTypes = {
   header: PropTypes.string,
   icon: PropTypes.string,
   subheader: PropTypes.string,
-  structurePayload: PropTypes.object,
-  fetchStructures: PropTypes.func,
-  clearStructures: PropTypes.func,
-  clearStructureFilters: PropTypes.func,
-  fetchStructureFilters: PropTypes.func,
-  resetStructureFilters: PropTypes.func,
   createRelation: PropTypes.func,
   deleteRelation: PropTypes.func,
   selectedRelationTags: PropTypes.array,
@@ -317,14 +286,8 @@ ConceptsLinksManagement.propTypes = {
 const makeMapStateToProps = () => {
   const getTagStructureOptions = makeTagOptionsSelector("data_field");
   const getTagConceptOptions = makeTagOptionsSelector("business_concept");
-  const structureSearchQuerySelector = makeSearchQuerySelector(
-    "structureQuery",
-    "structureActiveFilters",
-    "structureDateFilter"
-  );
-  const mapStateToProps = (state, props) => ({
+  const mapStateToProps = (state) => ({
     selectedRelationTags: state.selectedRelationTags,
-    structurePayload: structureSearchQuerySelector(state, props),
     tagStructureOptions: getTagStructureOptions(state),
     tagConceptOptions: getTagConceptOptions(state),
     conceptLinks: state.relations,
@@ -336,9 +299,4 @@ const makeMapStateToProps = () => {
 export default connect(makeMapStateToProps, {
   createRelation,
   deleteRelation,
-  fetchStructures,
-  clearStructures,
-  clearStructureFilters,
-  fetchStructureFilters,
-  resetStructureFilters,
 })(ConceptsLinksManagement);

package/src/concepts/components/ConceptsPanel.js

@@ -49,6 +49,7 @@ export const ConceptsPanel = ({ defaultFilters, actions, filtersGroup }) => {
     userFiltersType: "business_concept_user_filters",
     omitFilters: ["current", "domain_ids"],
     translations,
+    pageSize: 20,
     filtersGroup,
   };
 
@@ -65,7 +66,7 @@ ConceptsPanel.propTypes = {
 };
 
 const mapStateToProps = (state) => ({
-  filtersGroup: state.conceptFiltersGroup || [],
+  filtersGroup: state?.conceptFiltersGroup,
 });
 
 export default connect(mapStateToProps)(ConceptsPanel);

package/src/concepts/components/__tests__/ConceptsActions.spec.js

@@ -30,8 +30,6 @@ const useSearch = () => ({
   }),
 });
 
-const defaultFilters = {};
-
 const searchProps = {
   initialSortColumn: "name.raw",
   initialSortDirection: "ascending",
@@ -67,7 +65,7 @@ describe("<ConceptsActions />", () => {
 
   it("matches the latest snapshot", () => {
     const { container } = render(
-      <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
+      <SearchContextProvider {...searchProps}>
         <ConceptsActions {...props} />
       </SearchContextProvider>,
       renderOpts

package/src/concepts/components/__tests__/ConceptsPanel.spec.js

@@ -27,7 +27,7 @@ jest.mock("@truedat/bg/concepts/hooks/useConcepts", () => {
       trigger: () => ({
         then: (callback) =>
           callback({
-            data: [],
+            data: {},
           }),
       }),
     }),

package/src/concepts/components/__tests__/ConceptsTable.spec.js

@@ -50,6 +50,15 @@ const searchProps = {
   translations: jest.fn(),
 };
 
+const renderOpts = {
+  messages: {
+    en: {
+      "concepts.props.type": "Type",
+      "concepts.props.name": "Term",
+    },
+  },
+};
+
 describe("<ConceptsTable />", () => {
   it("matches the latest snapshot", () => {
     const defaultColumns = ["name", "status"].map((name) => ({ name }));
@@ -62,7 +71,8 @@ describe("<ConceptsTable />", () => {
     const { container } = render(
       <SearchContextProvider {...searchProps} defaultFilters={defaultFilters}>
         <ConceptsTable {...props} />
-      </SearchContextProvider>
+      </SearchContextProvider>,
+      renderOpts
     );
     expect(container).toMatchSnapshot();
   });

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

@@ -128,15 +128,15 @@ exports[`<ConceptsLinksManagement /> matches the latest snapshot 1`] = `
                 <div
                   class="ui action left icon input"
                 >
+                  <i
+                    aria-hidden="true"
+                    class="search link icon"
+                  />
                   <input
                     placeholder="Search concepts..."
                     type="text"
                     value=""
                   />
-                  <i
-                    aria-hidden="true"
-                    class="search link icon"
-                  />
                   <div
                     aria-busy="false"
                     aria-disabled="false"

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

@@ -29,15 +29,15 @@ exports[`<Concepts /> matches the latest snapshot 1`] = `
       <div
         class="ui action left icon input"
       >
+        <i
+          aria-hidden="true"
+          class="search link icon"
+        />
         <input
           placeholder="Search concepts..."
           type="text"
           value=""
         />
-        <i
-          aria-hidden="true"
-          class="search link icon"
-        />
         <div
           aria-busy="false"
           aria-disabled="false"

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

@@ -5,15 +5,15 @@ exports[`<ConceptsPanel /> matches latest snapshot 1`] = `
   <div
     class="ui action left icon input"
   >
+    <i
+      aria-hidden="true"
+      class="search link icon"
+    />
     <input
       placeholder="Search concepts..."
       type="text"
       value=""
     />
-    <i
-      aria-hidden="true"
-      class="search link icon"
-    />
     <div
       aria-busy="false"
       aria-disabled="false"

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

@@ -19,7 +19,7 @@ exports[`<ConceptsTable /> matches the latest snapshot 1`] = `
         <th
           class="disabled"
         >
-          concepts.props.type
+          Type
         </th>
       </tr>
     </thead>

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

@@ -183,8 +183,13 @@ export const ConceptSelector = (props) => {
   );
 };
 
+ConceptSelector.propTypes = {
+  defaultFilters: PropTypes.object,
+  filtersGroup: PropTypes.array,
+};
+
 const mapStateToProps = (state) => ({
-  filtersGroup: state.conceptFiltersGroup || [],
+  filtersGroup: state?.conceptFiltersGroup,
 });
 
 export default connect(mapStateToProps)(ConceptSelector);

package/src/concepts/relations/components/__tests__/ConceptSelector.spec.js

@@ -70,7 +70,7 @@ const messages = {
     "search.save_filters": "save filters",
     "search.clear_filters": "clear filters",
     "search.applied_filters": "apply filters",
-    "search.placeholder": "Search concepts...",
+    "search.placeholder": "Search...",
   },
 };
 const renderOpts = { messages };

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

@@ -18,15 +18,15 @@ exports[`<ConceptRelationForm /> matches the latest snapshot 1`] = `
     <div
       class="ui action left icon input"
     >
+      <i
+        aria-hidden="true"
+        class="search link icon"
+      />
       <input
         placeholder="Search concepts..."
         type="text"
         value=""
       />
-      <i
-        aria-hidden="true"
-        class="search link icon"
-      />
       <div
         aria-busy="false"
         aria-disabled="false"

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

@@ -11,15 +11,15 @@ exports[`<ConceptSelector /> matches the latest snapshot 1`] = `
     <div
       class="ui action left icon input"
     >
-      <input
-        placeholder="Search concepts..."
-        type="text"
-        value=""
-      />
       <i
         aria-hidden="true"
         class="search link icon"
       />
+      <input
+        placeholder="Search..."
+        type="text"
+        value=""
+      />
       <div
         aria-busy="false"
         aria-disabled="false"

package/src/taxonomy/components/Domain.js

@@ -72,14 +72,7 @@ export const Domain = ({ hasChildren, domain, domainLoading }) => {
               exact
               path={DOMAIN_STRUCTURES}
               render={() =>
-                ddAuthorized ? (
-                  <>
-                    <UserSearchFiltersLoader scope="data_structure" />
-                    <DomainStructures />
-                  </>
-                ) : (
-                  <Unauthorized />
-                )
+                ddAuthorized ? <DomainStructures /> : <Unauthorized />
               }
             />
             <Route

package/src/taxonomy/components/DomainStructures.js

@@ -1,21 +1,13 @@
 import React from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import StructureFiltersLoader from "@truedat/dd/components/StructureFiltersLoader";
-import StructuresLoader from "@truedat/dd/components/StructuresLoader";
 import StructuresView from "@truedat/dd/components/StructuresView";
 
 export const DomainStructures = ({ domain = {} }) => {
   const defaultFilters = {
     taxonomy: [domain.id],
   };
-  return (
-    <>
-      <StructureFiltersLoader defaultFilters={defaultFilters} />
-      <StructuresLoader defaultFilters={defaultFilters} />
-      <StructuresView embedded />
-    </>
-  );
+  return <StructuresView embedded defaultFilters={defaultFilters} />;
 };
 
 DomainStructures.propTypes = {

package/src/taxonomy/components/__tests__/DomainStructures.spec.js

@@ -1,12 +1,83 @@
 import React from "react";
 import { render } from "@truedat/test/render";
+import SearchContextWrapper from "@truedat/core/components/common/SearchContextWrapper";
 import DomainStructures from "../DomainStructures";
 
+jest.mock("@truedat/dd/hooks/useStructures", () => {
+  const originalModule = jest.requireActual("@truedat/dd/hooks/useStructures");
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useDataStructureFilters: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data: { data: {} },
+          }),
+      }),
+    }),
+    useDataStructureSearch: () => ({
+      trigger: () => ({
+        then: (callback) =>
+          callback({
+            data: { data: [] },
+            headers: {},
+          }),
+      }),
+    }),
+  };
+});
+
 describe("<DomainStructures />", () => {
-  const renderOpts = { state: { domain: { id: 1, name: "domain" } } };
+  const renderOpts = {
+    messages: {
+      en: {
+        "search.placeholder": "Search...",
+        "structures.loading.header": "Loading structures...",
+        "structures.actions.download.tooltip": "Download structures metadata",
+        "structures.actions.download.popup":
+          "You must search or filter to download structures",
+        "structures.actions.editableDownload.tooltip":
+          "Download editable structures metadata",
+        "structures.props.deleted_at": "Deleted",
+        "structures.props.inserted_at": "Inserted",
+        "structures.props.description": "Description",
+        "structures.props.path": "Path",
+        "structures.props.metadata": "Metadata",
+        "structures.props.system": "System",
+        "structures.props.domain": "Domain",
+        "structures.props.group": "Group",
+        "structures.props.external_id": "External Id",
+        "structures.props.link_to_structure": "Link to structure",
+        "structures.props.alias_name": "Alias",
+        "structures.props.tech_name": "Technical Name",
+        "structures.props.type": "Type",
+        "structure.type.undefined.text": "text",
+        "structure.updated_at": "updated_at",
+        "search.placeholder": "Search...",
+        "structure.group": "Group",
+        "structure.system": "System",
+        "structure.name": "Name",
+        "structures.retrieved.results": "Results",
+        "structures.loading.header": "Header",
+        "structure.relation.relation_type_name": "type",
+        "structure.type": "type",
+        "structures.not_found.header": "Header",
+        "structures.not_found.body":
+          "No structures have been found matching these filters.",
+      },
+    },
+    state: { domain: { id: 1, name: "domain" } },
+  };
 
   it("matches the latest snapshot", () => {
-    const { container } = render(<DomainStructures />, renderOpts);
+    const { container } = render(
+      <SearchContextWrapper>
+        <DomainStructures />
+      </SearchContextWrapper>,
+      renderOpts
+    );
     expect(container).toMatchSnapshot();
   });
 });

package/src/taxonomy/components/__tests__/__snapshots__/DomainStructures.spec.js.snap

@@ -67,7 +67,7 @@ exports[`<DomainStructures /> matches the latest snapshot 1`] = `
       class="search link icon"
     />
     <input
-      placeholder="Search structures..."
+      placeholder="Search..."
       type="text"
       value=""
     />
@@ -80,6 +80,8 @@ exports[`<DomainStructures /> matches the latest snapshot 1`] = `
       />
     </button>
     <div
+      aria-busy="false"
+      aria-disabled="false"
       aria-expanded="false"
       class="ui button floating labeled scrolling dropdown icon"
       role="listbox"
@@ -105,7 +107,7 @@ exports[`<DomainStructures /> matches the latest snapshot 1`] = `
           role="option"
         >
           <em>
-            (reset all filters)
+            (reset filters)
           </em>
         </div>
       </div>
@@ -119,6 +121,7 @@ exports[`<DomainStructures /> matches the latest snapshot 1`] = `
   >
     <div
       class="ui inverted dimmer"
+      style=""
     >
       <div
         class="content"
@@ -141,7 +144,7 @@ exports[`<DomainStructures /> matches the latest snapshot 1`] = `
         <div
           class="header"
         >
-          Nothing found...
+          Header
         </div>
         No structures have been found matching these filters.
       </div>