@truedat/bg 5.6.2 → 5.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "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": "5.6.2",
+    "@truedat/test": "5.6.3",
     "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": "5.6.2",
-    "@truedat/df": "5.6.2",
-    "@truedat/lm": "5.6.2",
+    "@truedat/core": "5.6.3",
+    "@truedat/df": "5.6.3",
+    "@truedat/lm": "5.6.3",
     "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": "a667767fbb979e9c12142aabad58f49d3fb68fea"
+  "gitHead": "c79bc612b29e41c6c600c2e029ae762b36147193"
 }

package/src/concepts/components/ConceptSelectedFiltersPublished.js

@@ -18,6 +18,7 @@ import {
   getConceptSelectedFilterActiveValues,
   getConceptSelectedFilters,
   getConceptSelectedFilterValues,
+  getConceptFilterTypes,
 } from "../selectors";
 import { translations } from "../utils/filterOptions";
 
@@ -36,6 +37,7 @@ export const mapStateToProps = (state, ownProps) => {
   return {
     activeFilters,
     loading,
+    filterTypes: getConceptFilterTypes(state),
     selectedFilter,
     selectedFilters: _.flow(
       getConceptSelectedFilters,

package/src/concepts/components/ConceptsUpdateButton.js

@@ -31,32 +31,32 @@ export const ConceptsUpdateButton = ({ updateUrl }) => {
 };
 
 ConceptsUpdateButton.propTypes = {
-  updateUrl: PropTypes.string
+  updateUrl: PropTypes.string,
 };
 
-const withoutTemplate = filters =>
+const withoutTemplate = (filters) =>
   _.negate(_.isEmpty)(filters) && _.negate(_.has("template"))(filters);
 
-const singleTemplate = filters =>
-  _.flow(_.propOr([], "template"), verifyTemplateSize)(filters);
+const singleTemplate = (filters, key) =>
+  _.flow(_.propOr([], key), verifyTemplateSize)(filters);
 
-const existigTemplate = (conceptFilters, conceptActiveFilters) =>
+const existingTemplate = (conceptFilters, conceptActiveFilters) =>
   withoutTemplate(conceptFilters) ||
-  singleTemplate(conceptActiveFilters) ||
-  singleTemplate(conceptFilters);
-const verifyTemplateSize = template => _.size(template) === 1;
+  singleTemplate(conceptActiveFilters, "template") ||
+  singleTemplate(conceptFilters, "template.values");
+const verifyTemplateSize = (template) => _.size(template) === 1;
 
 const mapStateToProps = ({
   conceptActiveFilters,
   conceptFilters,
   conceptCount,
-  conceptsLoading
+  conceptsLoading,
 }) => ({
   updateUrl:
     conceptCount !== 0 &&
     !conceptsLoading &&
-    existigTemplate(conceptFilters, conceptActiveFilters) &&
-    CONCEPTS_BULK_UPDATE
+    existingTemplate(conceptFilters, conceptActiveFilters) &&
+    CONCEPTS_BULK_UPDATE,
 });
 
 export default connect(mapStateToProps)(ConceptsUpdateButton);

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

@@ -3,7 +3,10 @@ import { render } from "@truedat/test/render";
 import ConceptFilters from "../ConceptFilters";
 
 const state = {
-  conceptFilters: { domain_id: [1, 2], confidential: ["yes", "no"] },
+  conceptFilters: {
+    domain_id: { values: [1, 2] },
+    confidential: { values: ["yes", "no"] },
+  },
   conceptActiveFilters: { domain_id: [1] },
 };
 const renderOpts = { state };

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

@@ -17,28 +17,28 @@ describe("reducers: conceptFilters", () => {
     ).toEqual(initialState);
   });
 
-  it("should handle the fetchConceptFilters.REQUEST action", () => {
-    expect(
-      conceptFilters(fooState, { type: fetchConceptFilters.REQUEST })
-    ).toEqual(initialState);
-  });
-
   it("should handle the fetchConceptFilters.SUCCESS action", () => {
-    const data = { filter1: ["value1", "value2"], filter2: ["value1"] };
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      filter2: { values: ["value1"] },
+    };
     expect(
       conceptFilters(fooState, {
         type: fetchConceptFilters.SUCCESS,
-        payload: { data }
+        payload: { data },
       })
     ).toEqual(data);
   });
 
   it("should handle the fetchConceptFilters.SUCCESS action and omit field current", () => {
-    const data = { filter1: ["value1", "value2"], current: ["value1"] };
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      current: { values: ["value1"] },
+    };
     expect(
       conceptFilters(fooState, {
         type: fetchConceptFilters.SUCCESS,
-        payload: { data }
+        payload: { data },
       })
     ).toEqual(_.omit(["current"])(data));
   });

package/src/concepts/reducers/conceptFilters.js

@@ -7,13 +7,11 @@ const conceptFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearConceptFilters.TRIGGER:
       return initialState;
-    case fetchConceptFilters.REQUEST:
-      return initialState;
     case fetchConceptFilters.SUCCESS:
       return _.flow(
         _.propOr({}, "data"),
         _.omit(["current", "domain_ids"]),
-        _.omitBy(_.isEmpty)
+        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
       )(payload);
     default:
       return state;

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

@@ -1,9 +1,9 @@
 import { getConceptAvailableFilters } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const bay = ["bay1"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const bay = { values: ["bay1"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getConceptAvailableFilters", () => {
   const conceptFilters = { foo, bar, bay, baz };

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

@@ -0,0 +1,19 @@
+import { getConceptFilterTypes } from "..";
+
+const foo = { type: "fooType", values: ["foo1", "foo2"] };
+const bar = { type: "barType", values: ["bar1", "bar2"] };
+const bay = { values: ["bay1"] };
+
+describe("selectors: getConceptFilterTypes", () => {
+  const state = { conceptFilters: { foo, bar, bay } };
+
+  const expected = {
+    foo: "fooType",
+    bar: "barType",
+    bay: undefined,
+  };
+
+  it("should return a map with filter types", () => {
+    expect(getConceptFilterTypes(state)).toEqual(expected);
+  });
+});

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

@@ -1,8 +1,8 @@
 import { getConceptSelectedFilterValues } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getConceptSelectedFilterValues", () => {
   const conceptFilters = { foo, bar, baz };
@@ -10,6 +10,6 @@ describe("selectors: getConceptSelectedFilterValues", () => {
   const state = { conceptFilters, conceptSelectedFilter };
 
   it("should return the values of the currently selected concept filters", () => {
-    expect(getConceptSelectedFilterValues(state)).toEqual(foo);
+    expect(getConceptSelectedFilterValues(state)).toEqual(foo.values);
   });
 });

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

@@ -7,7 +7,7 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
     const statuses = ["s1", "s2"];
     const state = {
       conceptSelectedFilter: "status",
-      conceptFilters: { status: ["s1", "s2"] },
+      conceptFilters: { status: { values: ["s1", "s2"] } },
     };
     expect(
       mapSelectedFilterStateToPropsByStatus(statuses)(state, ownProps)
@@ -23,7 +23,7 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
     const statuses = ["s1", "s2"];
     const state = {
       conceptSelectedFilter: "status",
-      conceptFilters: { status: ["s1", "s2"] },
+      conceptFilters: { status: { values: ["s1", "s2"] } },
     };
     expect(
       mapSelectedFilterStateToPropsByStatus(statuses)(state)

package/src/concepts/selectors/getConceptAvailableFilters.js

@@ -8,7 +8,7 @@ export const getConceptAvailableFilters = createSelector(
   [getConceptFilters, getConceptSelectedFilters],
   (conceptFilters, conceptSelectedFilters) =>
     _.flow(
-      _.omitBy((values) => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(conceptSelectedFilters)
     )(conceptFilters)

package/src/concepts/selectors/getConceptFilterTypes.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getConceptFilterTypes = createSelector(
+  _.prop("conceptFilters"),
+  _.mapValues("type")
+);

package/src/concepts/selectors/getConceptSelectedFilterActiveValues.js

@@ -1,15 +1,9 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
-import { toFilterValues } from "@truedat/core/services/filters";
-import { getConceptSelectedFilterValues } from "./getConceptSelectedFilterValues";
 
 export const getConceptSelectedFilterActiveValues = createSelector(
   _.prop("conceptSelectedFilter"),
   _.prop("conceptActiveFilters"),
-  getConceptSelectedFilterValues,
-  (conceptSelectedFilter, conceptActiveFilters, selectedFilterValues) =>
-    _.flow(
-      _.propOr([], conceptSelectedFilter),
-      _.intersection(toFilterValues(selectedFilterValues))
-    )(conceptActiveFilters)
+  (conceptSelectedFilter, conceptActiveFilters) =>
+    _.flow(_.propOr([], conceptSelectedFilter))(conceptActiveFilters)
 );

package/src/concepts/selectors/getConceptSelectedFilterValues.js

@@ -6,7 +6,7 @@ export const getConceptSelectedFilterValues = createSelector(
   [_.prop("conceptSelectedFilter"), _.prop("conceptFilters")],
   (conceptSelectedFilter, conceptFilters) =>
     _.flow(
-      _.propOr([], conceptSelectedFilter),
-      formatFilterValues(conceptSelectedFilter)
+      _.propOr({ values: [] }, conceptSelectedFilter),
+      formatFilterValues
     )(conceptFilters)
 );

package/src/concepts/selectors/index.js

@@ -1,6 +1,7 @@
 export { getConceptsRows, getConceptColumns } from "./getConceptColumns";
 export { getConceptAvailableFilters } from "./getConceptAvailableFilters";
 export { getConceptDomainPath } from "./getConceptDomainPath";
+export { getConceptFilterTypes } from "./getConceptFilterTypes";
 export { getConceptSelectedFilters } from "./getConceptSelectedFilters";
 export { getConceptSelectedFilterActiveValues } from "./getConceptSelectedFilterActiveValues";
 export { getConceptSelectedFilterValues } from "./getConceptSelectedFilterValues";

package/src/concepts/selectors/mapSelectedFilterStateToPropsByStatus.js

@@ -5,6 +5,7 @@ import {
   getConceptSelectedFilters,
   getConceptSelectedFilterValues,
   getConceptSelectedFilterActiveValues,
+  getConceptFilterTypes,
 } from ".";
 
 export const mapSelectedFilterStateToPropsByStatus =
@@ -33,6 +34,7 @@ export const mapSelectedFilterStateToPropsByStatus =
     return {
       activeFilters,
       loading,
+      filterTypes: getConceptFilterTypes(state),
       selectedFilter,
       selectedFilters,
       selectedFilterActiveValues,