@truedat/dd 4.37.3 → 4.38.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.37.4] 2022-02-04
+
+### Changed
+
+- [TD-4424] Disable user filters while structure filters are loading. Replaced
+  the `linked_concepts_count` filter with the `linked_concepts` filter.
+
 ## [4.37.3] 2022-02-03
 
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "4.37.3",
+  "version": "4.38.1",
   "description": "Truedat Web Data Dictionary",
   "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",
@@ -84,9 +84,9 @@
     ]
   },
   "dependencies": {
-    "@truedat/auth": "4.37.3",
-    "@truedat/core": "4.37.3",
-    "@truedat/df": "4.37.3",
+    "@truedat/auth": "4.38.1",
+    "@truedat/core": "4.38.1",
+    "@truedat/df": "4.38.1",
     "lodash": "^4.17.21",
     "path-to-regexp": "^1.7.0",
     "prop-types": "^15.7.2",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
+  "gitHead": "57c37e235514a51bad3496fbdde37bd3438a220b"
 }

package/src/components/GrantSelectedFilters.js

@@ -24,23 +24,16 @@ const translations = (formatMessage) => ({
 
 export const mapStateToProps = (state, ownProps) => {
   const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { grantSelectedFilter: selectedFilter } = state;
+  const { grantFiltersLoading: loading, grantSelectedFilter: selectedFilter } =
+    state;
 
   const i18nValues = _.flow(
     getGrantSelectedFilterValues,
     _.map(makeOption(translations(formatMessage), selectedFilter))
   )(state);
 
-  // const values = _.flow(
-  //   getGrantSelectedFilterValues,
-  //   _.map((v) => ({ text: v, value: v }))
-  // )(state);
-
-  // _.map(
-  //   makeOption(translations(formatMessage, structureTypes), selectedFilter)
-  // )(selectedFilterValues),
-
   return {
+    loading,
     selectedFilter,
     selectedFilters: getGrantSelectedFilters(state),
     selectedFilterActiveValues: getGrantSelectedFilterActiveValues(state),

package/src/components/StructureSelectedFilters.js

@@ -37,27 +37,25 @@ const translations = (formatMessage, structureTypes) => ({
       id: `filters.with_profiling.raw.${v}`,
       defaultMessage: v,
     }),
-  linked_concepts_count: (v) =>
-    formatMessage({
-      id: `filters.linked_concepts_count.${v}`,
-      defaultMessage: v,
-    }),
+  linked_concepts: (v) =>
+    formatMessage({ id: `filters.linked_concepts.${v}`, defaultMessage: v }),
 });
 
 export const mapStateToProps = (state, ownProps) => {
   const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const loading = _.prop("structureFiltersLoading")(state);
-  const selectedFilter = _.prop("structureSelectedFilter")(state);
-  const selectedFilterValues = getStructureSelectedFilterValues(state);
-  const selectedFilterActiveValues =
-    getStructureSelectedFilterActiveValues(state);
-  const selectedFilters = getStructureSelectedFilters(state);
-  const structureTypes = _.prop("structureTypes")(state);
   const {
     selectedUserSearchFilter: selectedUserFilter,
     structureActiveFilters: activeFilters,
+    structureFiltersLoading: loading,
+    structureSelectedFilter: selectedFilter,
+    structureTypes,
     userSearchFilters: userFilters,
   } = state;
+  const selectedFilterValues = getStructureSelectedFilterValues(state);
+  const selectedFilterActiveValues =
+    getStructureSelectedFilterActiveValues(state);
+  const selectedFilters = getStructureSelectedFilters(state);
+
   return {
     loading,
     selectedFilter,

package/src/messages/en.js

@@ -19,9 +19,9 @@ export default {
   "filters.domain.name.raw": "Domain",
   "filters.field_type.raw": "Field Type",
   "filters.group.raw": "Group",
-  "filters.linked_concepts_count": "Concepts",
-  "filters.linked_concepts_count.linked": "With concepts",
-  "filters.linked_concepts_count.unlinked": "Without concepts",
+  "filters.linked_concepts": "Concepts",
+  "filters.linked_concepts.false": "Without concepts",
+  "filters.linked_concepts.true": "With concepts",
   "filters.name.raw": "Name",
   "filters.system.name.raw": "System",
   "filters.tags.raw": "Tags",
@@ -211,7 +211,7 @@ export default {
   "structure.group": "Group",
   "structure.inserted_at": "Created at",
   "structure.lineage": "Lineage",
-  "structure.linked_concepts_count": "Linked to Concept",
+  "structure.linked_concepts": "Linked to Concept",
   "structure.lopd": "LOPD sensibility",
   "structure.mark_as_confidential": "Mark as confidential",
   "structure.mark_as_public": "Mark as public",

package/src/messages/es.js

@@ -20,9 +20,9 @@ export default {
   "filters.domain.name.raw": "Dominio",
   "filters.field_type.raw": "Tipo de Campo",
   "filters.group.raw": "Grupo",
-  "filters.linked_concepts_count": "Conceptos",
-  "filters.linked_concepts_count.linked": "Con conceptos enlazados",
-  "filters.linked_concepts_count.unlinked": "Sin conceptos enlazados",
+  "filters.linked_concepts": "Conceptos",
+  "filters.linked_concepts.false": "Sin conceptos enlazados",
+  "filters.linked_concepts.true": "Con conceptos enlazados",
   "filters.name.raw": "Nombre",
   "filters.system.name.raw": "Sistema",
   "filters.tags.raw": "Etiquetas",
@@ -215,7 +215,7 @@ export default {
   "structure.group": "Grupo",
   "structure.inserted_at": "Importada",
   "structure.lineage": "Trazabilidad",
-  "structure.linked_concepts_count": "Conectado a concepto",
+  "structure.linked_concepts": "Conectado a concepto",
   "structure.lopd": "Sensibilidad LOPD",
   "structure.mark_as_confidential": "Marcar como confidencial",
   "structure.mark_as_public": "Marcar como público",

package/src/reducers/grantFiltersLoading.js

@@ -0,0 +1,14 @@
+import { fetchGrantFilters } from "../routines";
+
+const grantFiltersLoading = (state = false, { type }) => {
+  switch (type) {
+    case fetchGrantFilters.REQUEST:
+      return true;
+    case fetchGrantFilters.FULFILL:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export { grantFiltersLoading };

package/src/reducers/index.js

@@ -8,6 +8,7 @@ import { grantActiveFilters } from "./grantActiveFilters";
 import { grantCount } from "./grantCount";
 import { grantDateFilter } from "./grantDateFilter";
 import { grantFilters } from "./grantFilters";
+import { grantFiltersLoading } from "./grantFiltersLoading";
 import { grantLoading } from "./grantLoading";
 import { grantQuery } from "./grantQuery";
 import { grantRequest } from "./grantRequest";
@@ -103,6 +104,7 @@ export {
   grantCount,
   grantDateFilter,
   grantFilters,
+  grantFiltersLoading,
   grantLoading,
   grantQuery,
   grants,

package/src/reducers/structures.js

@@ -14,7 +14,7 @@ const pickFields = _.pick([
   "type",
   "url",
   "external_id",
-  "linked_concepts_count",
+  "linked_concepts",
   "updated_at",
   "domain",
   "metadata",

package/src/selectors/getStructureSelectedFilterValues.js

@@ -4,11 +4,9 @@ import { formatFilterValues } from "@truedat/core/services/filters";
 
 export const getStructureSelectedFilterValues = createSelector(
   [_.prop("structureSelectedFilter"), _.prop("structureFilters")],
-  (structureSelectedFilter, structureFilters) => {
-    const result = _.flow(
+  (structureSelectedFilter, structureFilters) =>
+    _.flow(
       _.propOr([], structureSelectedFilter),
       formatFilterValues(structureSelectedFilter)
-    )(structureFilters);
-    return result;
-  }
+    )(structureFilters)
 );