@truedat/bg 4.39.0 → 4.40.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.40.2] 2022-03-14
+
+### Added
+
+- [TD-4500] Support for data structures with multiple domain_ids
+
+## [4.40.0] 2022-03-07
+
+### Changed
+
+- [TD-4491] Simplified `getDomainSelectorOptions` selector
+
 ## [4.38.8] 2022-02-22
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.39.0",
+  "version": "4.40.2",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -83,8 +83,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.39.0",
-    "@truedat/df": "4.39.0",
+    "@truedat/core": "4.40.2",
+    "@truedat/df": "4.40.2",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -104,5 +104,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "f3d2fe3fcdec546afc22d0a79c4f4f3dfb91ea48"
+  "gitHead": "86aa7e6c6e49c8e3a975f8f4f744c44035324c7f"
 }

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

@@ -50,6 +50,7 @@ exports[`<ConceptManageDomain /> matches the latest snapshot 1`] = `
               class="dropdown icon"
             />
             <div
+              aria-multiselectable="false"
               class="menu transition"
               role="listbox"
             >

package/src/messages/en.js

@@ -242,7 +242,6 @@ export default {
   "fields.pairlist.url.value.placeholder": "https://example.com",
   "filters._confidential": "Confidential",
   "filters.domain": "Domain",
-  "filters.domain_parents": "Domain",
   "filters.filiacion": "Filiacion",
   "filters.link_count": "Data fields",
   "filters.rule_count": "Quality Rules",

package/src/messages/es.js

@@ -244,7 +244,6 @@ export default {
   "fields.pairlist.url.value.placeholder": "https://ejemplo.es",
   "filters._confidential": "Confidencial",
   "filters.domain": "Dominio",
-  "filters.domain_parents": "Dominio",
   "filters.filiacion": "Filiacion",
   "filters.link_count": "Datos",
   "filters.rule_count": "Reglas de calidad",

package/src/taxonomy/components/DomainDropdownSelector.js

@@ -37,6 +37,7 @@ export const DomainDropdownSelector = ({
   domainOptions: options,
   hideLabel,
   invalid,
+  multiple = false,
   onChange,
   value: defaultValue,
 }) => {
@@ -95,8 +96,9 @@ export const DomainDropdownSelector = ({
 
   const handleBlur = () => {
     setQuery();
-    if (!_.isNil(value)) {
-      const domain = _.find({ id: value })(options);
+    const lastesSelection = _.isNumber(value) ? value : _.last(value);
+    if (!_.isNil(lastesSelection)) {
+      const domain = _.find({ id: lastesSelection })(options);
       const ancestors = _.map("id")(domain.ancestors);
       const ids = [...ancestors, domain.id];
       setOpen(ancestors);
@@ -169,6 +171,7 @@ export const DomainDropdownSelector = ({
         )(filteredOptions)}
         placeholder={formatMessage({ id: "domain.selector.placeholder" })}
         search={_.identity}
+        multiple={multiple}
         selection
         value={value}
       />
@@ -182,8 +185,9 @@ DomainDropdownSelector.propTypes = {
   domainOptions: PropTypes.array,
   hideLabel: PropTypes.bool,
   invalid: PropTypes.bool,
+  multiple: PropTypes.bool,
   onChange: PropTypes.func,
-  value: PropTypes.number,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.array]),
 };
 
 const mapStateToProps = (state, props) => ({

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

@@ -38,6 +38,7 @@ exports[`<DomainDropdownSelector /> matches the latest snapshot 1`] = `
           class="dropdown icon"
         />
         <div
+          aria-multiselectable="false"
           class="menu transition"
           role="listbox"
         >

package/src/taxonomy/selectors/__tests__/getDomainSelectorOptions.spec.js

@@ -0,0 +1,66 @@
+import { getDomainSelectorOptions } from "..";
+
+describe("selectors: getDomainSelectorOptions", () => {
+  const domains = [
+    { id: 1, name: "domain1" },
+    { id: 2, name: "domain2", parent_id: 1 },
+    { id: 3, name: "domain3" },
+    { id: 4, name: "domain4", parent_id: 0 },
+    { id: 5, name: "domain2", parent_id: 2 },
+  ];
+
+  it("foo", () => {
+    const options = getDomainSelectorOptions({ domains });
+    expect(options).toEqual([
+      {
+        ancestors: [],
+        children: [{ id: 2, name: "domain2", parent_id: 1 }],
+        descendents: [
+          { id: 2, name: "domain2", parent_id: 1 },
+          { id: 5, name: "domain2", parent_id: 2 },
+        ],
+        id: 1,
+        level: 0,
+        name: "domain1",
+      },
+      {
+        ancestors: [{ id: 1, name: "domain1" }],
+        children: [{ id: 5, name: "domain2", parent_id: 2 }],
+        descendents: [{ id: 5, name: "domain2", parent_id: 2 }],
+        id: 2,
+        level: 1,
+        name: "domain2",
+        parent_id: 1,
+      },
+      {
+        ancestors: [
+          { id: 1, name: "domain1" },
+          { id: 2, name: "domain2", parent_id: 1 },
+        ],
+        children: [],
+        descendents: [],
+        id: 5,
+        level: 2,
+        name: "domain2",
+        parent_id: 2,
+      },
+      {
+        ancestors: [],
+        children: [],
+        descendents: [],
+        id: 3,
+        level: 0,
+        name: "domain3",
+      },
+      {
+        ancestors: [],
+        children: [],
+        descendents: [],
+        id: 4,
+        level: 0,
+        name: "domain4",
+        parent_id: 0,
+      },
+    ]);
+  });
+});

package/src/taxonomy/selectors/index.js

@@ -148,9 +148,10 @@ const reduceTaxonomy = (domains) => (domainsInLevel, level) => {
 };
 
 const getDomainSelectorOptions = createSelector([getDomains], (domains) => {
-  const roots = getChildOrRootDomains({
-    domains: _.sortBy(accentInsensitivePathOrder("name"))(domains),
-  });
+  const roots = _.flow(
+    _.filter(hasNoParentIn(domains)),
+    _.sortBy(accentInsensitivePathOrder("name"))
+  )(domains);
   return reduceTaxonomy(domains)(roots, 0);
 });