@truedat/ie 4.37.1 → 4.37.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.37.4] 2022-02-04
+
+### Changed
+
+- [TD-4424] Disable user filters while ingest filters are loading
+
 ## [4.31.1] 2021-10-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/ie",
-  "version": "4.37.1",
+  "version": "4.37.5",
   "description": "Truedat Web Ingests",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -79,8 +79,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "4.37.1",
-    "@truedat/df": "4.37.1",
+    "@truedat/core": "4.37.5",
+    "@truedat/df": "4.37.5",
     "file-saver": "^2.0.5",
     "moment": "^2.24.0",
     "path-to-regexp": "^1.7.0",
@@ -99,5 +99,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "36ffd7e86efe27f38c3ae1bb616eb9eb4d444d12"
+  "gitHead": "98ff8669e99824ef1bdbd3d12035e6371029e4ca"
 }

package/src/ingests/components/IngestSelectedFiltersPublished.js

@@ -20,10 +20,14 @@ import {
 
 export const mapStateToProps = (state, ownProps) => {
   const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { ingestSelectedFilter: selectedFilter } = state;
+  const {
+    ingestFiltersLoading: loading,
+    ingestSelectedFilter: selectedFilter,
+  } = state;
   const selectedFilterValues = getIngestSelectedFilterValues(state);
   const selectedFilterActiveValues = getIngestSelectedFilterActiveValues(state);
   return {
+    loading,
     selectedFilter,
     selectedFilters: _.flow(
       getIngestSelectedFilters,

package/src/ingests/selectors/mapSelectedFilterStateToPropsByStatus.js

@@ -5,23 +5,29 @@ import { getIngestSelectedFilters } from "./getIngestSelectedFilters";
 import { getIngestSelectedFilterValues } from "./getIngestSelectedFilterValues";
 import { getIngestSelectedFilterActiveValues } from "./getIngestSelectedFilterActiveValues";
 
-export const mapSelectedFilterStateToPropsByStatus = statuses => (
-  state,
-  ownProps
-) => {
-  const formatMessage = _.pathOr(_.prop("id"), "intl.formatMessage")(ownProps);
-  const { ingestSelectedFilter: selectedFilter } = state;
-  const selectedFilterValues =
-    selectedFilter == "status"
-      ? _.flow(getIngestSelectedFilterValues, _.intersection(statuses))(state)
-      : getIngestSelectedFilterValues(state);
-  const selectedFilterActiveValues = getIngestSelectedFilterActiveValues(state);
-  return {
-    selectedFilter,
-    selectedFilters: getIngestSelectedFilters(state),
-    selectedFilterActiveValues,
-    selectedFilterValues: _.map(
-      makeOption(translations(formatMessage), selectedFilter)
-    )(selectedFilterValues)
+export const mapSelectedFilterStateToPropsByStatus =
+  (statuses) => (state, ownProps) => {
+    const formatMessage = _.pathOr(
+      _.prop("id"),
+      "intl.formatMessage"
+    )(ownProps);
+    const {
+      ingestFiltersLoading: loading,
+      ingestSelectedFilter: selectedFilter,
+    } = state;
+    const selectedFilterValues =
+      selectedFilter == "status"
+        ? _.flow(getIngestSelectedFilterValues, _.intersection(statuses))(state)
+        : getIngestSelectedFilterValues(state);
+    const selectedFilterActiveValues =
+      getIngestSelectedFilterActiveValues(state);
+    return {
+      loading,
+      selectedFilter,
+      selectedFilters: getIngestSelectedFilters(state),
+      selectedFilterActiveValues,
+      selectedFilterValues: _.map(
+        makeOption(translations(formatMessage), selectedFilter)
+      )(selectedFilterValues),
+    };
   };
-};