@truedat/cx 5.6.2 → 5.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/cx",
-  "version": "5.6.2",
+  "version": "5.6.4",
   "description": "Truedat Web Connectors",
   "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.4",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -91,7 +91,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/core": "5.6.2",
+    "@truedat/core": "5.6.4",
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.1",
     "moment": "^2.29.4",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "a667767fbb979e9c12142aabad58f49d3fb68fea"
+  "gitHead": "fbecd33735354811f674678337ae16aaa15b4794"
 }

package/src/jobs/components/JobSelectedFilters.js

@@ -13,6 +13,7 @@ import {
   getJobSelectedFilterActiveValues,
   getJobSelectedFilters,
   getJobSelectedFilterValues,
+  getJobFilterTypes,
 } from "../selectors";
 
 export const mapStateToProps = (state) => {
@@ -24,6 +25,7 @@ export const mapStateToProps = (state) => {
   )(state);
   return {
     loading,
+    filterTypes: getJobFilterTypes(state),
     selectedFilter,
     selectedFilters: getJobSelectedFilters(state),
     selectedFilterActiveValues: getJobSelectedFilterActiveValues(state),

package/src/jobs/reducers/__tests__/jobFilters.spec.js

@@ -16,18 +16,15 @@ describe("reducers: jobFilters", () => {
     );
   });
 
-  it("should handle the fetchJobFilters.REQUEST action", () => {
-    expect(jobFilters(fooState, { type: fetchJobFilters.REQUEST })).toEqual(
-      initialState
-    );
-  });
-
   it("should handle the fetchJobFilters.SUCCESS action", () => {
-    const data = { filter1: ["value1", "value2"], filter2: ["value1"] };
+    const data = {
+      filter1: { values: ["value1", "value2"] },
+      filter2: { values: ["value1"] },
+    };
     expect(
       jobFilters(fooState, {
         type: fetchJobFilters.SUCCESS,
-        payload: { data: { data } }
+        payload: { data: { data } },
       })
     ).toEqual(data);
   });

package/src/jobs/reducers/index.js

@@ -20,5 +20,5 @@ export {
   jobSelectedFilter,
   jobs,
   jobsLoading,
-  jobsPageSize
+  jobsPageSize,
 };

package/src/jobs/reducers/jobFilters.js

@@ -7,10 +7,11 @@ const jobFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearJobFilters.TRIGGER:
       return initialState;
-    case fetchJobFilters.REQUEST:
-      return initialState;
     case fetchJobFilters.SUCCESS:
-      return _.flow(_.propOr({}, "data.data"), _.omitBy(_.isEmpty))(payload);
+      return _.flow(
+        _.propOr({}, "data.data"),
+        _.omitBy(_.flow(_.getOr([], "values"), _.isEmpty))
+      )(payload);
     default:
       return state;
   }

package/src/jobs/selectors/__tests__/getJobAvailableFilters.spec.js

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

package/src/jobs/selectors/__tests__/getJobSelectedFilterValues.spec.js

@@ -1,8 +1,8 @@
 import { getJobSelectedFilterValues } 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: getJobSelectedFilterValues", () => {
   const jobFilters = { foo, bar, baz };
@@ -10,6 +10,6 @@ describe("selectors: getJobSelectedFilterValues", () => {
   const state = { jobFilters, jobSelectedFilter };
 
   it("should return the values of the currently selected job filters", () => {
-    expect(getJobSelectedFilterValues(state)).toEqual(foo);
+    expect(getJobSelectedFilterValues(state)).toEqual(foo.values);
   });
 });

package/src/jobs/selectors/getJobAvailableFilters.js

@@ -8,7 +8,7 @@ export const getJobAvailableFilters = createSelector(
   [getJobFilters, getJobSelectedFilters],
   (jobFilters, jobSelectedFilters) =>
     _.flow(
-      _.omitBy(values => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(jobSelectedFilters)
     )(jobFilters)

package/src/jobs/selectors/getJobFilterTypes.js

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

package/src/jobs/selectors/getJobSelectedFilterValues.js

@@ -1,7 +1,12 @@
 import _ from "lodash/fp";
 import { createSelector } from "reselect";
+import { formatFilterValues } from "@truedat/core/services/filters";
 
 export const getJobSelectedFilterValues = createSelector(
   [_.prop("jobSelectedFilter"), _.prop("jobFilters")],
-  (jobSelectedFilter, jobFilters) => _.propOr([], jobSelectedFilter)(jobFilters)
+  (jobSelectedFilter, jobFilters) =>
+    _.flow(
+      _.propOr({ values: [] }, jobSelectedFilter),
+      formatFilterValues
+    )(jobFilters)
 );

package/src/jobs/selectors/index.js

@@ -1,4 +1,5 @@
 export { getJobAvailableFilters } from "./getJobAvailableFilters";
+export { getJobFilterTypes } from "./getJobFilterTypes";
 export { getJobSelectedFilterActiveValues } from "./getJobSelectedFilterActiveValues";
 export { getJobSelectedFilters } from "./getJobSelectedFilters";
 export { getJobSelectedFilterValues } from "./getJobSelectedFilterValues";