@truedat/bg 4.37.3 → 4.38.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.37.4] 2022-02-04
+
+### Changed
+
+- [TD-4424] Disable user filters while concept filters are loading
+
 ## [4.35.3] 2021-12-20
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/bg",
-  "version": "4.37.3",
+  "version": "4.38.1",
   "description": "Truedat Web Business Glossary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.34.0",
+    "@truedat/test": "4.38.1",
     "babel-jest": "^27.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -42,6 +42,7 @@
     "babel-plugin-transform-semantic-ui-react-imports": "^1.4.1",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
+    "identity-obj-proxy": "^3.0.0",
     "jest": "^27.0.6",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
@@ -58,6 +59,7 @@
       "@truedat/test/setup"
     ],
     "moduleNameMapper": {
+      "\\.(css|less|png)$": "identity-obj-proxy",
       "^@truedat/([^/]+)$": "<rootDir>/../$1/src/index",
       "^@truedat/([^/]+)/(.*)$": "<rootDir>/../$1/src/$2"
     },
@@ -81,8 +83,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.37.3",
-    "@truedat/df": "4.37.3",
+    "@truedat/core": "4.38.1",
+    "@truedat/df": "4.38.1",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -102,5 +104,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
+  "gitHead": "57c37e235514a51bad3496fbdde37bd3438a220b"
 }

package/src/concepts/components/ConceptSelectedFiltersPublished.js

@@ -23,15 +23,19 @@ import { translations } from "../utils/filterOptions";
 
 export const mapStateToProps = (state, ownProps) => {
   const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { conceptSelectedFilter: selectedFilter } = state;
-  const { conceptSelectedUserFilter: selectedUserFilter } = state;
-  const { conceptActiveFilters: activeFilters } = state;
-  const { conceptUserFilters: userFilters } = state;
+  const {
+    conceptSelectedFilter: selectedFilter,
+    conceptSelectedUserFilter: selectedUserFilter,
+    conceptActiveFilters: activeFilters,
+    conceptUserFilters: userFilters,
+    conceptFiltersLoading: loading,
+  } = state;
   const selectedFilterValues = getConceptSelectedFilterValues(state);
   const selectedFilterActiveValues =
     getConceptSelectedFilterActiveValues(state);
   return {
     activeFilters,
+    loading,
     selectedFilter,
     selectedFilters: _.flow(
       getConceptSelectedFilters,

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

@@ -7,15 +7,15 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
     const statuses = ["s1", "s2"];
     const state = {
       conceptSelectedFilter: "status",
-      conceptFilters: { status: ["s1", "s2"] }
+      conceptFilters: { status: ["s1", "s2"] },
     };
     expect(
       mapSelectedFilterStateToPropsByStatus(statuses)(state, ownProps)
     ).toMatchObject({
       selectedFilterValues: expect.arrayContaining([
         { text: "intl.concepts.status.s1", value: "s1" },
-        { text: "intl.concepts.status.s2", value: "s2" }
-      ])
+        { text: "intl.concepts.status.s2", value: "s2" },
+      ]),
     });
   });
 
@@ -23,15 +23,15 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
     const statuses = ["s1", "s2"];
     const state = {
       conceptSelectedFilter: "status",
-      conceptFilters: { status: ["s1", "s2"] }
+      conceptFilters: { status: ["s1", "s2"] },
     };
     expect(
       mapSelectedFilterStateToPropsByStatus(statuses)(state)
     ).toMatchObject({
       selectedFilterValues: expect.arrayContaining([
         { text: "concepts.status.s1", value: "s1" },
-        { text: "concepts.status.s2", value: "s2" }
-      ])
+        { text: "concepts.status.s2", value: "s2" },
+      ]),
     });
   });
 });

package/src/concepts/selectors/mapSelectedFilterStateToPropsByStatus.js

@@ -4,34 +4,42 @@ import { translations } from "../utils/filterOptions";
 import {
   getConceptSelectedFilters,
   getConceptSelectedFilterValues,
-  getConceptSelectedFilterActiveValues
+  getConceptSelectedFilterActiveValues,
 } from ".";
 
-export const mapSelectedFilterStateToPropsByStatus = statuses => (
-  state,
-  ownProps
-) => {
-  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { conceptSelectedFilter: selectedFilter } = state;
-  const { conceptSelectedUserFilter: selectedUserFilter } = state;
-  const { conceptActiveFilters: activeFilters } = state;
-  const { conceptUserFilters: userFilters } = state;
-  const selectedFilterValues =
-    selectedFilter == "status"
-      ? _.flow(getConceptSelectedFilterValues, _.intersection(statuses))(state)
-      : getConceptSelectedFilterValues(state);
-  const selectedFilterActiveValues = getConceptSelectedFilterActiveValues(
-    state
-  );
-  return {
-    activeFilters,
-    selectedFilter,
-    selectedFilters: getConceptSelectedFilters(state),
-    selectedFilterActiveValues,
-    selectedFilterValues: _.map(
-      makeOption(translations(formatMessage), selectedFilter)
-    )(selectedFilterValues),
-    selectedUserFilter,
-    userFilters
+export const mapSelectedFilterStateToPropsByStatus =
+  (statuses) => (state, ownProps) => {
+    const formatMessage = _.pathOr(
+      _.prop("id"),
+      "intl.formatMessage"
+    )(ownProps);
+    const {
+      conceptActiveFilters: activeFilters,
+      conceptFiltersLoading: loading,
+      conceptSelectedFilter: selectedFilter,
+      conceptSelectedUserFilter: selectedUserFilter,
+      conceptUserFilters: userFilters,
+    } = state;
+    const selectedFilterValues =
+      selectedFilter == "status"
+        ? _.flow(
+            getConceptSelectedFilterValues,
+            _.intersection(statuses)
+          )(state)
+        : getConceptSelectedFilterValues(state);
+    const selectedFilterActiveValues =
+      getConceptSelectedFilterActiveValues(state);
+    const selectedFilters = getConceptSelectedFilters(state);
+    return {
+      activeFilters,
+      loading,
+      selectedFilter,
+      selectedFilters,
+      selectedFilterActiveValues,
+      selectedFilterValues: _.map(
+        makeOption(translations(formatMessage), selectedFilter)
+      )(selectedFilterValues),
+      selectedUserFilter,
+      userFilters,
+    };
   };
-};

package/src/messages/en.js

@@ -13,7 +13,8 @@ export default {
     "Repeated Concept name",
   "bulkUpdate.no.concepts.body": "No concepts selected",
   "bulkUpdate.no.concepts.header": "Empty Search",
-  business_concept_to_field_master: "Master Relation",
+  "conceptRelations.relationType.business_concept_to_field_master":
+    "Master Relation",
   "concept.error.existing.business.concept":
     "({text}) There is already a business term with the indicated name",
   "domain.error.domain.existing.external_id":

package/src/messages/es.js

@@ -15,7 +15,8 @@ export default {
     "Nombre de concepto repetido",
   "bulkUpdate.no.concepts.body": "Ningún concepto seleccionado",
   "bulkUpdate.no.concepts.header": "Búsqueda vacía",
-  business_concept_to_field_master: "Relación master",
+  "conceptRelations.relationType.business_concept_to_field_master":
+    "Relación master",
   "concept.error.existing.business.concept":
     "({text}) Ya existe un termino de negocio con el nombre indicado",
   "domain.error.domain.existing.external_id":