@truedat/bg 4.37.3 → 4.37.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/package.json +4 -4
  3. package/src/concepts/components/ConceptSelectedFiltersPublished.js +8 -4
  4. package/src/concepts/selectors/__tests__/mapSelectedFilterStateToPropsByStatus.spec.js +6 -6
  5. package/src/concepts/selectors/mapSelectedFilterStateToPropsByStatus.js +36 -28
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## [4.37.4] 2022-02-04
4
+
5
+ ### Changed
6
+
7
+ - [TD-4424] Disable user filters while concept filters are loading
8
+
3
9
  ## [4.35.3] 2021-12-20
4
10
 
5
11
  ### Fixed
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/bg",
3
- "version": "4.37.3",
3
+ "version": "4.37.4",
4
4
  "description": "Truedat Web Business Glossary",
5
5
  "sideEffects": false,
6
6
  "jsnext:main": "src/index.js",
@@ -81,8 +81,8 @@
81
81
  ]
82
82
  },
83
83
  "dependencies": {
84
- "@truedat/core": "4.37.3",
85
- "@truedat/df": "4.37.3",
84
+ "@truedat/core": "4.37.4",
85
+ "@truedat/df": "4.37.4",
86
86
  "file-saver": "^2.0.5",
87
87
  "moment": "^2.24.0",
88
88
  "path-to-regexp": "^1.7.0",
@@ -102,5 +102,5 @@
102
102
  "react-dom": ">= 16.8.6 < 17",
103
103
  "semantic-ui-react": ">= 0.88.2 < 2.1"
104
104
  },
105
- "gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
105
+ "gitHead": "d6a390c1a843d164c28cf7ae174126b6c0e24618"
106
106
  }
package/src/concepts/components/ConceptSelectedFiltersPublished.js CHANGED
@@ -23,15 +23,19 @@ import { translations } from "../utils/filterOptions";
23
23
 
24
24
  export const mapStateToProps = (state, ownProps) => {
25
25
  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
26
- const { conceptSelectedFilter: selectedFilter } = state;
27
- const { conceptSelectedUserFilter: selectedUserFilter } = state;
28
- const { conceptActiveFilters: activeFilters } = state;
29
- const { conceptUserFilters: userFilters } = state;
26
+ const {
27
+ conceptSelectedFilter: selectedFilter,
28
+ conceptSelectedUserFilter: selectedUserFilter,
29
+ conceptActiveFilters: activeFilters,
30
+ conceptUserFilters: userFilters,
31
+ conceptFiltersLoading: loading,
32
+ } = state;
30
33
  const selectedFilterValues = getConceptSelectedFilterValues(state);
31
34
  const selectedFilterActiveValues =
32
35
  getConceptSelectedFilterActiveValues(state);
33
36
  return {
34
37
  activeFilters,
38
+ loading,
35
39
  selectedFilter,
36
40
  selectedFilters: _.flow(
37
41
  getConceptSelectedFilters,
package/src/concepts/selectors/__tests__/mapSelectedFilterStateToPropsByStatus.spec.js CHANGED
@@ -7,15 +7,15 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
7
7
  const statuses = ["s1", "s2"];
8
8
  const state = {
9
9
  conceptSelectedFilter: "status",
10
- conceptFilters: { status: ["s1", "s2"] }
10
+ conceptFilters: { status: ["s1", "s2"] },
11
11
  };
12
12
  expect(
13
13
  mapSelectedFilterStateToPropsByStatus(statuses)(state, ownProps)
14
14
  ).toMatchObject({
15
15
  selectedFilterValues: expect.arrayContaining([
16
16
  { text: "intl.concepts.status.s1", value: "s1" },
17
- { text: "intl.concepts.status.s2", value: "s2" }
18
- ])
17
+ { text: "intl.concepts.status.s2", value: "s2" },
18
+ ]),
19
19
  });
20
20
  });
21
21
 
@@ -23,15 +23,15 @@ describe("selectors: mapSelectedFilterStateToPropsByStatus", () => {
23
23
  const statuses = ["s1", "s2"];
24
24
  const state = {
25
25
  conceptSelectedFilter: "status",
26
- conceptFilters: { status: ["s1", "s2"] }
26
+ conceptFilters: { status: ["s1", "s2"] },
27
27
  };
28
28
  expect(
29
29
  mapSelectedFilterStateToPropsByStatus(statuses)(state)
30
30
  ).toMatchObject({
31
31
  selectedFilterValues: expect.arrayContaining([
32
32
  { text: "concepts.status.s1", value: "s1" },
33
- { text: "concepts.status.s2", value: "s2" }
34
- ])
33
+ { text: "concepts.status.s2", value: "s2" },
34
+ ]),
35
35
  });
36
36
  });
37
37
  });
package/src/concepts/selectors/mapSelectedFilterStateToPropsByStatus.js CHANGED
@@ -4,34 +4,42 @@ import { translations } from "../utils/filterOptions";
4
4
  import {
5
5
  getConceptSelectedFilters,
6
6
  getConceptSelectedFilterValues,
7
- getConceptSelectedFilterActiveValues
7
+ getConceptSelectedFilterActiveValues,
8
8
  } from ".";
9
9
 
10
- export const mapSelectedFilterStateToPropsByStatus = statuses => (
11
- state,
12
- ownProps
13
- ) => {
14
- const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
15
- const { conceptSelectedFilter: selectedFilter } = state;
16
- const { conceptSelectedUserFilter: selectedUserFilter } = state;
17
- const { conceptActiveFilters: activeFilters } = state;
18
- const { conceptUserFilters: userFilters } = state;
19
- const selectedFilterValues =
20
- selectedFilter == "status"
21
- ? _.flow(getConceptSelectedFilterValues, _.intersection(statuses))(state)
22
- : getConceptSelectedFilterValues(state);
23
- const selectedFilterActiveValues = getConceptSelectedFilterActiveValues(
24
- state
25
- );
26
- return {
27
- activeFilters,
28
- selectedFilter,
29
- selectedFilters: getConceptSelectedFilters(state),
30
- selectedFilterActiveValues,
31
- selectedFilterValues: _.map(
32
- makeOption(translations(formatMessage), selectedFilter)
33
- )(selectedFilterValues),
34
- selectedUserFilter,
35
- userFilters
10
+ export const mapSelectedFilterStateToPropsByStatus =
11
+ (statuses) => (state, ownProps) => {
12
+ const formatMessage = _.pathOr(
13
+ _.prop("id"),
14
+ "intl.formatMessage"
15
+ )(ownProps);
16
+ const {
17
+ conceptActiveFilters: activeFilters,
18
+ conceptFiltersLoading: loading,
19
+ conceptSelectedFilter: selectedFilter,
20
+ conceptSelectedUserFilter: selectedUserFilter,
21
+ conceptUserFilters: userFilters,
22
+ } = state;
23
+ const selectedFilterValues =
24
+ selectedFilter == "status"
25
+ ? _.flow(
26
+ getConceptSelectedFilterValues,
27
+ _.intersection(statuses)
28
+ )(state)
29
+ : getConceptSelectedFilterValues(state);
30
+ const selectedFilterActiveValues =
31
+ getConceptSelectedFilterActiveValues(state);
32
+ const selectedFilters = getConceptSelectedFilters(state);
33
+ return {
34
+ activeFilters,
35
+ loading,
36
+ selectedFilter,
37
+ selectedFilters,
38
+ selectedFilterActiveValues,
39
+ selectedFilterValues: _.map(
40
+ makeOption(translations(formatMessage), selectedFilter)
41
+ )(selectedFilterValues),
42
+ selectedUserFilter,
43
+ userFilters,
44
+ };
36
45
  };
37
- };