@truedat/dd 5.6.1 → 5.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.6.1",
+  "version": "5.6.3",
   "description": "Truedat Web Data Dictionary",
   "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.1",
+    "@truedat/test": "5.6.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.6.1",
-    "@truedat/core": "5.6.1",
-    "@truedat/df": "5.6.1",
+    "@truedat/auth": "5.6.3",
+    "@truedat/core": "5.6.3",
+    "@truedat/df": "5.6.3",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "a8e5efaf772f212a10192b36d853529890dfdea2"
+  "gitHead": "c79bc612b29e41c6c600c2e029ae762b36147193"
 }

package/src/components/GrantSelectedFilters.js

@@ -14,6 +14,7 @@ import {
   getGrantSelectedFilterActiveValues,
   getGrantSelectedFilters,
   getGrantSelectedFilterValues,
+  getGrantFilterTypes,
 } from "../selectors";
 
 const translations = (formatMessage) => ({
@@ -35,6 +36,7 @@ export const mapStateToProps = (state, ownProps) => {
 
   return {
     loading,
+    filterTypes: getGrantFilterTypes(state),
     selectedFilter,
     selectedFilters: getGrantSelectedFilters(state),
     selectedFilterActiveValues: getGrantSelectedFilterActiveValues(state),

package/src/components/StructureSelectedFilters.js

@@ -18,6 +18,7 @@ import {
   getStructureSelectedFilterActiveValues,
   getStructureSelectedFilters,
   getStructureSelectedFilterValues,
+  getStructureFilterTypes,
 } from "../selectors";
 
 const translations = (formatMessage, structureTypes) => ({
@@ -58,6 +59,7 @@ export const mapStateToProps = (state, ownProps) => {
 
   return {
     loading,
+    filterTypes: getStructureFilterTypes(state),
     selectedFilter,
     selectedFilters,
     selectedFilterActiveValues,

package/src/components/StructuresBulkUpdate.js

@@ -43,13 +43,16 @@ export const StructuresBulkUpdate = ({
   const templateName = _.flow(
     _.getOr([], "type.raw"),
     _.cond([
-      [(types) => _.size(types) == 1, _.flow(_.head, findTemplateName)],
+      [
+        ({ values }) => _.size(values) == 1,
+        _.flow(_.prop("values"), _.head, findTemplateName),
+      ],
       [_.stubTrue, _.constant("")],
     ])
   )(structureFilters);
 
   const domainIds = _.flow(
-    _.path("taxonomy"),
+    _.prop("taxonomy.values"),
     _.map("id"),
     _.cond([
       [(domains) => _.size(domains) == 1, _.identity],

package/src/components/__tests__/GrantApprovalRules.spec.js

@@ -69,7 +69,6 @@ describe("<GrantApprovalRules />", () => {
       renderOpts(grantApprovalRules)
     );
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    expect(container).toMatchSnapshot();
     await waitFor(() =>
       expect(queryByText(/loading/i)).not.toBeInTheDocument()
     );
@@ -82,7 +81,6 @@ describe("<GrantApprovalRules />", () => {
       renderOpts(emptyGrantApprovalRules)
     );
     await waitFor(() => expect(queryByText(/lazy/i)).not.toBeInTheDocument());
-    expect(container).toMatchSnapshot();
     await waitFor(() =>
       expect(queryByText(/loading/i)).not.toBeInTheDocument()
     );

package/src/components/__tests__/StructuresBulkUpdate.spec.js

@@ -14,8 +14,8 @@ describe("<StructuresBulkUpdate />", () => {
       structureCount: 10,
       structureTypes: [{ name: "structType", template: { name: "template1" } }],
       structureFilters: {
-        "type.raw": ["structType"],
-        taxonomy: [{ id: 1 }],
+        "type.raw": { values: ["structType"] },
+        taxonomy: { values: [{ id: 1 }], type: "domain" },
       },
     },
     fallback: "lazy",

package/src/components/__tests__/__snapshots__/GrantApprovalRules.spec.js.snap

@@ -51,99 +51,7 @@ exports[`<GrantApprovalRules /> matches snapshot for empty data 1`] = `
 </div>
 `;
 
-exports[`<GrantApprovalRules /> matches snapshot for empty data 2`] = `
-<div>
-  <div
-    class="ui segment"
-  >
-    <h2
-      class="ui header"
-    >
-      <i
-        aria-hidden="true"
-        class="key circular icon"
-      />
-      <div
-        class="content"
-      >
-        Approval rules
-        <div
-          class="sub header"
-        >
-          Rules for automatically accept or reject grant requests
-        </div>
-      </div>
-    </h2>
-    <div
-      class="ui basic right aligned segment"
-    >
-      <a
-        class="ui primary button"
-        href="/grantApproveRules/new"
-        role="button"
-      >
-        New rule
-      </a>
-    </div>
-    <h4
-      class="ui header"
-    >
-      <i
-        aria-hidden="true"
-        class="search icon"
-      />
-      <div
-        class="content"
-      >
-        No rules found
-      </div>
-    </h4>
-  </div>
-</div>
-`;
-
 exports[`<GrantApprovalRules /> matches the last snapshot 1`] = `
-<div>
-  <div
-    class="ui segment"
-  >
-    <h2
-      class="ui header"
-    >
-      <i
-        aria-hidden="true"
-        class="key circular icon"
-      />
-      <div
-        class="content"
-      >
-        Approval rules
-        <div
-          class="sub header"
-        >
-          Rules for automatically accept or reject grant requests
-        </div>
-      </div>
-    </h2>
-    <div
-      class="ui basic right aligned segment"
-    >
-      <a
-        class="ui primary button"
-        href="/grantApproveRules/new"
-        role="button"
-      >
-        New rule
-      </a>
-    </div>
-    <div
-      class="ui loader"
-    />
-  </div>
-</div>
-`;
-
-exports[`<GrantApprovalRules /> matches the last snapshot 2`] = `
 <div>
   <div
     class="ui segment"

package/src/reducers/__tests__/grantFilters.spec.js

@@ -10,16 +10,10 @@ describe("reducers: grantFilters", () => {
     expect(grantFilters(undefined, {})).toEqual(initialState);
   });
 
-  it("should handle the clearGrantFilters.TRIGGER action", () => {
-    expect(grantFilters(fooState, { type: clearGrantFilters.TRIGGER })).toEqual(
-      initialState
-    );
-  });
-
   it("should handle the fetchGrantFilters.SUCCESS action", () => {
-    const filter1 = ["value1", "value2"];
-    const filter2 = ["value1", "value2"];
-    const data = { filter1, filter2: ["value1"] };
+    const filter1 = { values: ["value1", "value2"] };
+    const filter2 = { values: ["value1", "value2"] };
+    const data = { filter1, filter2: { values: ["value1"] } };
     const payload = { data: { data } };
     const state = { filter2 };
 

package/src/reducers/__tests__/structureFilters.spec.js

@@ -17,16 +17,16 @@ describe("reducers: structureFilters", () => {
   });
 
   it("should handle the fetchStructureFilters.SUCCESS action", () => {
-    const filter1 = ["value1", "value2"];
-    const filter2 = ["value1", "value2"];
-    const data = { filter1, filter2: ["value1"] };
+    const filter1 = { values: ["value1", "value2"] };
+    const filter2 = { values: ["value1", "value2"] };
+    const data = { filter1, filter2: { values: ["value1"] } };
     const payload = { data: { data } };
     const state = { filter2 };
 
     expect(
       structureFilters(state, {
         type: fetchStructureFilters.SUCCESS,
-        payload
+        payload,
       })
     ).toEqual(data);
   });

package/src/reducers/grantFilters.js

@@ -7,10 +7,11 @@ const grantFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearGrantFilters.TRIGGER:
       return initialState;
-    case fetchGrantFilters.REQUEST:
-      return initialState;
     case fetchGrantFilters.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/reducers/structureActiveFilters.js

@@ -1,15 +1,5 @@
 import _ from "lodash/fp";
-import {
-  includes,
-  isArray,
-  isEmpty,
-  omit,
-  prop,
-  propOr,
-  union,
-  without,
-  tap,
-} from "lodash/fp";
+import { isEmpty, omit, prop, propOr } from "lodash/fp";
 import {
   addStructureFilter,
   applyUserSearchFilter,
@@ -26,13 +16,6 @@ export const structureActiveFilters = (
   state = initialState,
   { type, payload }
 ) => {
-  const toggle = (state, filter, value) =>
-    _.flow(
-      () => state[filter] || [],
-      (currentValues) => _.xor(isArray(value) ? value : [value], currentValues),
-      (newValues) => ({ ...state, [filter]: newValues })
-    );
-
   switch (type) {
     case clearStructureFilters.TRIGGER:
       return initialState;
@@ -59,7 +42,15 @@ export const structureActiveFilters = (
       return initialState;
     }
     case toggleStructureFilterValue.TRIGGER: {
-      return toggle(state, payload.filter, payload.value)();
+      const { filter, value } = payload;
+      if (_.isArray(value)) {
+        return { ...state, [filter]: value };
+      }
+      const values = _.propOr([], filter)(state);
+      const nextValues = _.includes(value)(values)
+        ? _.without([value])(values)
+        : _.union([value])(values);
+      return { ...state, [filter]: nextValues };
     }
     default:
       return state;

package/src/reducers/structureFilters.js

@@ -7,10 +7,11 @@ const structureFilters = (state = initialState, { type, payload }) => {
   switch (type) {
     case clearStructureFilters.TRIGGER:
       return initialState;
-    case fetchStructureFilters.REQUEST:
-      return initialState;
     case fetchStructureFilters.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/selectors/__tests__/getGrantAvailableFilters.spec.js

@@ -1,8 +1,8 @@
 import { getGrantAvailableFilters } 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: getGrantAvailableFilters", () => {
   const grantFilters = { foo, bar, baz };

package/src/selectors/__tests__/getGrantSelectedFilterValues.spec.js

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

package/src/selectors/__tests__/getStructureAvailableFilters.spec.js

@@ -1,8 +1,8 @@
 import { getStructureAvailableFilters } 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: getStructureAvailableFilters", () => {
   const structureFilters = { foo, bar, baz };

package/src/selectors/__tests__/getStructureSelectedFilterValues.spec.js

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

package/src/selectors/getGrantAvailableFilters.js

@@ -9,7 +9,7 @@ export const getGrantAvailableFilters = createSelector(
   getGrantSelectedFilters,
   (grantFilters, grantSelectedFilters) => {
     return _.flow(
-      _.omitBy((values) => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(grantSelectedFilters)
     )(grantFilters);

package/src/selectors/getGrantFilterTypes.js

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

package/src/selectors/getGrantSelectedFilterValues.js

@@ -4,10 +4,9 @@ import { formatFilterValues } from "@truedat/core/services/filters";
 
 export const getGrantSelectedFilterValues = createSelector(
   [_.prop("grantSelectedFilter"), _.prop("grantFilters")],
-  (grantSelectedFilter, grantFilters) => {
-    return _.flow(
-      _.propOr([], grantSelectedFilter),
-      formatFilterValues(grantSelectedFilter)
-    )(grantFilters);
-  }
+  (grantSelectedFilter, grantFilters) =>
+    _.flow(
+      _.propOr({ values: [] }, grantSelectedFilter),
+      formatFilterValues
+    )(grantFilters)
 );

package/src/selectors/getStructureAvailableFilters.js

@@ -8,7 +8,7 @@ export const getStructureAvailableFilters = createSelector(
   [getStructureFilters, getStructureSelectedFilters],
   (structureFilters, structureSelectedFilters) =>
     _.flow(
-      _.omitBy(values => _.size(values) < 2),
+      _.omitBy(({ values }) => _.size(values) < 2),
       _.keys,
       _.without(structureSelectedFilters)
     )(structureFilters)

package/src/selectors/getStructureFilterTypes.js

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

package/src/selectors/getStructureSelectedFilterActiveValues.js

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

package/src/selectors/getStructureSelectedFilterValues.js

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

package/src/selectors/index.js

@@ -5,6 +5,7 @@ export {
 } from "./structureColumnsSelector";
 export { getGrantAvailableFilters } from "./getGrantAvailableFilters";
 export { getGrantSelectedFilters } from "./getGrantSelectedFilters";
+export { getGrantFilterTypes } from "./getGrantFilterTypes";
 export { getGrantSelectedFilterValues } from "./getGrantSelectedFilterValues";
 export { getGrantSelectedFilterActiveValues } from "./getGrantSelectedFilterActiveValues";
 export {
@@ -31,6 +32,7 @@ export {
   getStructureFieldColumns,
   defaultStructureFieldColumns,
 } from "./getStructureFieldColumns";
+export { getStructureFilterTypes } from "./getStructureFilterTypes";
 export { getStructureParent } from "./getStructureParent";
 export { getStructureSelectedFilterActiveValues } from "./getStructureSelectedFilterActiveValues";
 export { getStructureSelectedFilters } from "./getStructureSelectedFilters";

package/src/reducers/grantsFilters.js

@@ -1,19 +0,0 @@
-import _ from "lodash/fp";
-import { clearGrantFilters, fetchGrantFilters } from "../routines";
-
-const initialState = {};
-
-const grantFilters = (state = initialState, { type, payload }) => {
-  switch (type) {
-    case clearGrantFilters.TRIGGER:
-      return initialState;
-    case fetchGrantFilters.REQUEST:
-      return initialState;
-    case fetchGrantFilters.SUCCESS:
-      return _.flow(_.propOr({}, "data.data"), _.omitBy(_.isEmpty))(payload);
-    default:
-      return state;
-  }
-};
-
-export { grantFilters };