@truedat/ie 4.37.3 → 4.38.1

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 (4) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/package.json +6 -5
  3. package/src/ingests/components/IngestSelectedFiltersPublished.js +5 -1
  4. package/src/ingests/selectors/mapSelectedFilterStateToPropsByStatus.js +25 -19
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 ingest filters are loading
8
+
3
9
  ## [4.31.1] 2021-10-20
4
10
 
5
11
  ### Added
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@truedat/ie",
3
- "version": "4.37.3",
3
+ "version": "4.38.1",
4
4
  "description": "Truedat Web Ingests",
5
5
  "sideEffects": false,
6
6
  "jsnext:main": "src/index.js",
@@ -30,7 +30,7 @@
30
30
  "@babel/plugin-transform-modules-commonjs": "^7.15.0",
31
31
  "@babel/preset-env": "^7.15.0",
32
32
  "@babel/preset-react": "^7.14.5",
33
- "@truedat/test": "4.34.0",
33
+ "@truedat/test": "4.38.1",
34
34
  "babel-jest": "^27.0.6",
35
35
  "babel-plugin-dynamic-import-node": "^2.3.3",
36
36
  "babel-plugin-lodash": "^3.3.4",
@@ -39,6 +39,7 @@
39
39
  "enzyme": "^3.11.0",
40
40
  "enzyme-adapter-react-16": "^1.15.6",
41
41
  "enzyme-to-json": "^3.6.2",
42
+ "identity-obj-proxy": "^3.0.0",
42
43
  "jest": "^27.0.6",
43
44
  "react": "^16.14.0",
44
45
  "react-dom": "^16.14.0",
@@ -79,8 +80,8 @@
79
80
  ]
80
81
  },
81
82
  "dependencies": {
82
- "@truedat/core": "4.37.3",
83
- "@truedat/df": "4.37.3",
83
+ "@truedat/core": "4.38.1",
84
+ "@truedat/df": "4.38.1",
84
85
  "file-saver": "^2.0.5",
85
86
  "moment": "^2.24.0",
86
87
  "path-to-regexp": "^1.7.0",
@@ -99,5 +100,5 @@
99
100
  "react-dom": ">= 16.8.6 < 17",
100
101
  "semantic-ui-react": ">= 0.88.2 < 2.1"
101
102
  },
102
- "gitHead": "1c418784d34e171a6d62dd7fab3dfd05400998ba"
103
+ "gitHead": "57c37e235514a51bad3496fbdde37bd3438a220b"
103
104
  }
package/src/ingests/components/IngestSelectedFiltersPublished.js CHANGED
@@ -20,10 +20,14 @@ import {
20
20
 
21
21
  export const mapStateToProps = (state, ownProps) => {
22
22
  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
23
- const { ingestSelectedFilter: selectedFilter } = state;
23
+ const {
24
+ ingestFiltersLoading: loading,
25
+ ingestSelectedFilter: selectedFilter,
26
+ } = state;
24
27
  const selectedFilterValues = getIngestSelectedFilterValues(state);
25
28
  const selectedFilterActiveValues = getIngestSelectedFilterActiveValues(state);
26
29
  return {
30
+ loading,
27
31
  selectedFilter,
28
32
  selectedFilters: _.flow(
29
33
  getIngestSelectedFilters,
package/src/ingests/selectors/mapSelectedFilterStateToPropsByStatus.js CHANGED
@@ -5,23 +5,29 @@ import { getIngestSelectedFilters } from "./getIngestSelectedFilters";
5
5
  import { getIngestSelectedFilterValues } from "./getIngestSelectedFilterValues";
6
6
  import { getIngestSelectedFilterActiveValues } from "./getIngestSelectedFilterActiveValues";
7
7
 
8
- export const mapSelectedFilterStateToPropsByStatus = statuses => (
9
- state,
10
- ownProps
11
- ) => {
12
- const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
13
- const { ingestSelectedFilter: selectedFilter } = state;
14
- const selectedFilterValues =
15
- selectedFilter == "status"
16
- ? _.flow(getIngestSelectedFilterValues, _.intersection(statuses))(state)
17
- : getIngestSelectedFilterValues(state);
18
- const selectedFilterActiveValues = getIngestSelectedFilterActiveValues(state);
19
- return {
20
- selectedFilter,
21
- selectedFilters: getIngestSelectedFilters(state),
22
- selectedFilterActiveValues,
23
- selectedFilterValues: _.map(
24
- makeOption(translations(formatMessage), selectedFilter)
25
- )(selectedFilterValues)
8
+ export const mapSelectedFilterStateToPropsByStatus =
9
+ (statuses) => (state, ownProps) => {
10
+ const formatMessage = _.pathOr(
11
+ _.prop("id"),
12
+ "intl.formatMessage"
13
+ )(ownProps);
14
+ const {
15
+ ingestFiltersLoading: loading,
16
+ ingestSelectedFilter: selectedFilter,
17
+ } = state;
18
+ const selectedFilterValues =
19
+ selectedFilter == "status"
20
+ ? _.flow(getIngestSelectedFilterValues, _.intersection(statuses))(state)
21
+ : getIngestSelectedFilterValues(state);
22
+ const selectedFilterActiveValues =
23
+ getIngestSelectedFilterActiveValues(state);
24
+ return {
25
+ loading,
26
+ selectedFilter,
27
+ selectedFilters: getIngestSelectedFilters(state),
28
+ selectedFilterActiveValues,
29
+ selectedFilterValues: _.map(
30
+ makeOption(translations(formatMessage), selectedFilter)
31
+ )(selectedFilterValues),
32
+ };
26
33
  };
27
- };