@truedat/ie 5.6.2 → 5.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/ie",
-  "version": "5.6.2",
+  "version": "5.6.3",
   "description": "Truedat Web Ingests",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.6.2",
+    "@truedat/test": "5.6.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -86,8 +86,8 @@
     ]
   },
   "dependencies": {
-    "@truedat/core": "5.6.2",
-    "@truedat/df": "5.6.2",
+    "@truedat/core": "5.6.3",
+    "@truedat/df": "5.6.3",
     "file-saver": "^2.0.5",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -107,5 +107,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "a667767fbb979e9c12142aabad58f49d3fb68fea"
+  "gitHead": "c79bc612b29e41c6c600c2e029ae762b36147193"
 }

package/src/ingests/components/IngestSelectedFiltersPublished.js

@@ -16,6 +16,7 @@ import {
   getIngestSelectedFilterActiveValues,
   getIngestSelectedFilters,
   getIngestSelectedFilterValues,
+  getIngestFilterTypes,
 } from "../selectors";
 
 export const mapStateToProps = (state, ownProps) => {
@@ -28,6 +29,7 @@ export const mapStateToProps = (state, ownProps) => {
   const selectedFilterActiveValues = getIngestSelectedFilterActiveValues(state);
   return {
     loading,
+    filterTypes: getIngestFilterTypes(state),
     selectedFilter,
     selectedFilters: _.flow(
       getIngestSelectedFilters,

package/src/ingests/components/__tests__/IngestFilters.spec.js

@@ -3,7 +3,10 @@ import { render } from "@truedat/test/render";
 import IngestFilters from "../IngestFilters";
 
 const state = {
-  ingestFilters: { domain_id: [1, 2], confidential: ["yes", "no"] },
+  ingestFilters: {
+    domain_id: { values: [1, 2] },
+    confidential: { values: ["yes", "no"] },
+  },
   ingestActiveFilters: { domain_id: [1] },
 };
 const renderOpts = { state };

package/src/ingests/reducers/__tests__/ingestFilters.spec.js

@@ -16,20 +16,14 @@ describe("reducers: ingestFilters", () => {
     ).toEqual(initialState);
   });
 
-  it("should handle the fetchIngestFilters.REQUEST action", () => {
-    expect(
-      ingestFilters(fooState, { type: fetchIngestFilters.REQUEST })
-    ).toEqual(initialState);
-  });
-
   it("should handle the fetchIngestFilters.SUCCESS action", () => {
-    const data = { data: { filter1: ["value1", "value2"] } };
+    const data = { data: { filter1: { values: ["value1", "value2"] } } };
     expect(
       ingestFilters(fooState, {
         type: fetchIngestFilters.SUCCESS,
-        payload: { data }
+        payload: { data },
       })
-    ).toEqual({ filter1: ["value1", "value2"] });
+    ).toEqual({ filter1: { values: ["value1", "value2"] } });
   });
 
   it("should ignore unknown actions", () => {

package/src/ingests/reducers/index.js

@@ -43,5 +43,5 @@ export {
   ingestExecutions,
   ingestExecutionsLoading,
   ingestsPageSize,
-  previousIngestQuery
+  previousIngestQuery,
 };

package/src/ingests/reducers/ingestFilters.js

@@ -7,13 +7,11 @@ const ingestFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearIngestFilters.TRIGGER:
       return initialState;
-    case fetchIngestFilters.REQUEST:
-      return initialState;
     case fetchIngestFilters.SUCCESS:
       return _.flow(
         _.propOr({}, "data.data"),
         _.omit(["ingest_id", "domain", "domain_id", "current", "in_progress"]),
-        _.omitBy(_.isEmpty)
+        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
       )(payload);
     default:
       return state;

package/src/ingests/selectors/__tests__/getIngestAvailableFilters.spec.js

@@ -1,8 +1,8 @@
 import { getIngestAvailableFilters } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getIngestAvailableFilters", () => {
   const ingestFilters = { foo, bar, baz };

package/src/ingests/selectors/__tests__/getIngestSelectedFilterValues.spec.js

@@ -1,8 +1,8 @@
 import { getIngestSelectedFilterValues } from "..";
 
-const foo = ["foo1", "foo2"];
-const bar = ["bar1", "bar2"];
-const baz = ["baz1", "baz2"];
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
 
 describe("selectors: getIngestSelectedFilterValues", () => {
   const ingestFilters = { foo, bar, baz };
@@ -10,6 +10,6 @@ describe("selectors: getIngestSelectedFilterValues", () => {
   const state = { ingestFilters, ingestSelectedFilter };
 
   it("should return the values of the currently selected ingest filters", () => {
-    expect(getIngestSelectedFilterValues(state)).toEqual(foo);
+    expect(getIngestSelectedFilterValues(state)).toEqual(foo.values);
   });
 });

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

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

package/src/ingests/selectors/getIngestAvailableFilters.js

@@ -8,7 +8,7 @@ export const getIngestAvailableFilters = createSelector(
   [getIngestFilters, getIngestSelectedFilters],
   (ingestFilters, ingestSelectedFilters) =>
     _.flow(
-      _.omitBy(values => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(ingestSelectedFilters)
     )(ingestFilters)

package/src/ingests/selectors/getIngestFilterTypes.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getIngestFilterTypes = createSelector(
+  _.prop("ingestFilters"),
+  _.mapValues("type")
+);

package/src/ingests/selectors/getIngestSelectedFilterActiveValues.js

@@ -1,15 +1,9 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
-import { toFilterValues } from "@truedat/core/services/filters";
-import { getIngestSelectedFilterValues } from "./getIngestSelectedFilterValues";
 
 export const getIngestSelectedFilterActiveValues = createSelector(
   _.prop("ingestSelectedFilter"),
   _.prop("ingestActiveFilters"),
-  getIngestSelectedFilterValues,
-  (ingestSelectedFilter, ingestActiveFilters, selectedFilterValues) =>
-    _.flow(
-      _.propOr([], ingestSelectedFilter),
-      _.intersection(toFilterValues(selectedFilterValues))
-    )(ingestActiveFilters)
+  (ingestSelectedFilter, ingestActiveFilters) =>
+    _.flow(_.propOr([], ingestSelectedFilter))(ingestActiveFilters)
 );

package/src/ingests/selectors/getIngestSelectedFilterValues.js

@@ -6,7 +6,7 @@ export const getIngestSelectedFilterValues = createSelector(
   [_.prop("ingestSelectedFilter"), _.prop("ingestFilters")],
   (ingestSelectedFilter, ingestFilters) =>
     _.flow(
-      _.propOr([], ingestSelectedFilter),
-      formatFilterValues(ingestSelectedFilter)
+      _.propOr({ values: [] }, ingestSelectedFilter),
+      formatFilterValues
     )(ingestFilters)
 );

package/src/ingests/selectors/index.js

@@ -3,6 +3,7 @@ export { getTemplateFields } from "./getTemplateFields";
 export { getTemplateGroups } from "./getTemplateGroups";
 export { getIngestsRows, getIngestColumns } from "./getIngestColumns";
 export { getIngestAvailableFilters } from "./getIngestAvailableFilters";
+export { getIngestFilterTypes } from "./getIngestFilterTypes";
 export { getIngestSelectedFilters } from "./getIngestSelectedFilters";
 export { getIngestSelectedFilterActiveValues } from "./getIngestSelectedFilterActiveValues";
 export { mapSelectedFilterStateToPropsByStatus } from "./mapSelectedFilterStateToPropsByStatus";

package/src/ingests/selectors/mapSelectedFilterStateToPropsByStatus.js

@@ -4,6 +4,7 @@ import { translations } from "../utils/filterOptions";
 import { getIngestSelectedFilters } from "./getIngestSelectedFilters";
 import { getIngestSelectedFilterValues } from "./getIngestSelectedFilterValues";
 import { getIngestSelectedFilterActiveValues } from "./getIngestSelectedFilterActiveValues";
+import { getIngestFilterTypes } from "./getIngestFilterTypes";
 
 export const mapSelectedFilterStateToPropsByStatus =
   (statuses) => (state, ownProps) => {
@@ -23,6 +24,7 @@ export const mapSelectedFilterStateToPropsByStatus =
       getIngestSelectedFilterActiveValues(state);
     return {
       loading,
+      filterTypes: getIngestFilterTypes(state),
       selectedFilter,
       selectedFilters: getIngestSelectedFilters(state),
       selectedFilterActiveValues,