@truedat/dd 6.10.1 → 6.10.3

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 (73) hide show
  1. package/package.json +5 -5
  2. package/src/components/GrantRequestBulkActions.js +67 -90
  3. package/src/components/GrantRequestBulkApprovalForm.js +1 -0
  4. package/src/components/GrantRequestBulkRoleSelector.js +0 -3
  5. package/src/components/GrantRequestRow.js +6 -8
  6. package/src/components/GrantRequestsLabelResults.js +31 -42
  7. package/src/components/GrantRequestsSearchResults.js +88 -107
  8. package/src/components/GrantRequestsTable.js +22 -51
  9. package/src/components/GrantRoutes.js +32 -19
  10. package/src/components/__tests__/GrantRequestBulkActions.spec.js +101 -8
  11. package/src/components/__tests__/GrantRequestRow.spec.js +3 -4
  12. package/src/components/__tests__/GrantRequestsLabelResults.spec.js +21 -9
  13. package/src/components/__tests__/GrantRequestsSearchResults.spec.js +21 -21
  14. package/src/components/__tests__/GrantRequestsTable.spec.js +26 -9
  15. package/src/components/__tests__/__snapshots__/GrantRequestBulkActions.spec.js.snap +48 -34
  16. package/src/components/__tests__/__snapshots__/GrantRequestBulkApprovalForm.spec.js.snap +1 -0
  17. package/src/components/__tests__/__snapshots__/GrantRequestBulkRoleSelector.spec.js.snap +0 -1
  18. package/src/components/__tests__/__snapshots__/GrantRequestRow.spec.js.snap +20 -0
  19. package/src/components/__tests__/__snapshots__/GrantRequestsLabelResults.spec.js.snap +25 -12
  20. package/src/components/__tests__/__snapshots__/GrantRequestsSearchResults.spec.js.snap +182 -120
  21. package/src/components/__tests__/__snapshots__/GrantRequestsTable.spec.js.snap +109 -11
  22. package/src/components/index.js +0 -4
  23. package/src/hooks/useGrantRequest.js +13 -0
  24. package/src/reducers/index.js +0 -24
  25. package/src/routines.js +2 -33
  26. package/src/sagas/index.js +0 -3
  27. package/src/selectors/index.js +0 -6
  28. package/src/components/GrantRequestPagination.js +0 -18
  29. package/src/components/GrantRequestSearchFilters.js +0 -23
  30. package/src/components/GrantRequestsFiltersLoader.js +0 -33
  31. package/src/components/GrantRequestsSearch.js +0 -35
  32. package/src/components/GrantRequestsSearchLoader.js +0 -47
  33. package/src/components/GrantRequestsSelectedFilters.js +0 -55
  34. package/src/components/__tests__/GrantRequestFiltersLoader.spec.js +0 -20
  35. package/src/components/__tests__/GrantRequestSearchFilters.spec.js +0 -19
  36. package/src/components/__tests__/GrantRequestsSearch.spec.js +0 -23
  37. package/src/components/__tests__/GrantRequestsSearchLoader.spec.js +0 -15
  38. package/src/components/__tests__/__snapshots__/GrantRequestSearchFilters.spec.js.snap +0 -47
  39. package/src/components/__tests__/__snapshots__/GrantRequestsSearch.spec.js.snap +0 -50
  40. package/src/components/__tests__/__snapshots__/GrantRequestsSearchLoader.spec.js.snap +0 -3
  41. package/src/reducers/__tests__/grantRequestCount.spec.js +0 -38
  42. package/src/reducers/__tests__/grantRequestPageSize.spec.js +0 -36
  43. package/src/reducers/__tests__/grantRequestPermissions.spec.js +0 -66
  44. package/src/reducers/__tests__/grantRequestsActiveFilters.spec.js +0 -90
  45. package/src/reducers/__tests__/grantRequestsFiltersLoading.spec.js +0 -34
  46. package/src/reducers/__tests__/grantRequestsSearch.spec.js +0 -38
  47. package/src/reducers/__tests__/grantRequestsSearchLoading.spec.js +0 -36
  48. package/src/reducers/__tests__/grantRequestsSearchQuery.spec.js +0 -96
  49. package/src/reducers/__tests__/grantRequestsSelectedFilter.spec.js +0 -72
  50. package/src/reducers/grantRequestCount.js +0 -23
  51. package/src/reducers/grantRequestPageSize.js +0 -15
  52. package/src/reducers/grantRequestPermissions.js +0 -36
  53. package/src/reducers/grantRequestSearchQuery.js +0 -60
  54. package/src/reducers/grantRequestsActiveFilters.js +0 -58
  55. package/src/reducers/grantRequestsFilters.js +0 -23
  56. package/src/reducers/grantRequestsFiltersLoading.js +0 -14
  57. package/src/reducers/grantRequestsSearch.js +0 -19
  58. package/src/reducers/grantRequestsSearchLoading.js +0 -14
  59. package/src/reducers/grantRequestsSelectedFilter.js +0 -34
  60. package/src/sagas/__tests__/fetchGrantRequestsSearch.spec.js +0 -92
  61. package/src/sagas/fetchGrantRequestsSearch.js +0 -30
  62. package/src/selectors/__tests__/getGrantRequestsAvailableFilters.spec.js +0 -15
  63. package/src/selectors/__tests__/getGrantRequestsFilterTypes.spec.js +0 -19
  64. package/src/selectors/__tests__/getGrantRequestsSearchQuery.spec.js +0 -24
  65. package/src/selectors/__tests__/getGrantRequestsSelectedFilterActiveValues.spec.js +0 -15
  66. package/src/selectors/__tests__/getGrantRequestsSelectedFilterValues.spec.js +0 -15
  67. package/src/selectors/__tests__/getGrantRequestsSelectedFilters.spec.js +0 -13
  68. package/src/selectors/getGrantRequestsAvailableFilters.js +0 -17
  69. package/src/selectors/getGrantRequestsFilterTypes.js +0 -7
  70. package/src/selectors/getGrantRequestsSearchQuery.js +0 -19
  71. package/src/selectors/getGrantRequestsSelectedFilterActiveValues.js +0 -8
  72. package/src/selectors/getGrantRequestsSelectedFilterValues.js +0 -12
  73. package/src/selectors/getGrantRequestsSelectedFilters.js +0 -10
@@ -1,14 +0,0 @@
1
- import { fetchGrantRequestsSearch } from "../routines";
2
-
3
- export const initialState = false;
4
-
5
- export const grantRequestsSearchLoading = (state = initialState, { type }) => {
6
- switch (type) {
7
- case fetchGrantRequestsSearch.TRIGGER:
8
- return true;
9
- case fetchGrantRequestsSearch.FULFILL:
10
- return initialState;
11
- default:
12
- return state;
13
- }
14
- };
@@ -1,34 +0,0 @@
1
- import {
2
- addGrantRequestsFilter,
3
- closeGrantRequestsFilter,
4
- openGrantRequestsFilter,
5
- removeGrantRequestsFilter,
6
- resetGrantRequestsFilters,
7
- } from "../routines";
8
-
9
- /** @type {string} */
10
- export const initialState = null;
11
-
12
- export const grantRequestsSelectedFilter = (
13
- state = initialState,
14
- { type, payload }
15
- ) => {
16
- switch (type) {
17
- case addGrantRequestsFilter.TRIGGER: {
18
- const { filter } = payload;
19
- return filter;
20
- }
21
- case closeGrantRequestsFilter.TRIGGER:
22
- return initialState;
23
- case openGrantRequestsFilter.TRIGGER: {
24
- const { filter } = payload;
25
- return filter;
26
- }
27
- case removeGrantRequestsFilter.TRIGGER:
28
- return initialState;
29
- case resetGrantRequestsFilters.TRIGGER:
30
- return initialState;
31
- default:
32
- return state;
33
- }
34
- };
@@ -1,92 +0,0 @@
1
- import { testSaga } from "redux-saga-test-plan";
2
- import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
3
- import {
4
- fetchGrantRequestsSearchRequestSaga,
5
- fetchGrantRequestsSearchSaga,
6
- } from "../fetchGrantRequestsSearch";
7
- import { fetchGrantRequestsSearch } from "../../routines";
8
- import { API_GRANT_REQUESTS_SEARCH } from "../../api";
9
-
10
- const body = {
11
- must: {
12
- current_status: ["pending"],
13
- },
14
- };
15
- const payload = body;
16
-
17
- describe("sagas: fetchGrantRequestsSearchRequestSaga", () => {
18
- it("should invoke fetchGrantRequestsSearchSaga on fetchGrantRequestsSearch.TRIGGER", () => {
19
- expect(() => {
20
- testSaga(fetchGrantRequestsSearchRequestSaga)
21
- .next()
22
- .debounce(
23
- 200,
24
- fetchGrantRequestsSearch.TRIGGER,
25
- fetchGrantRequestsSearchSaga
26
- )
27
- .finish()
28
- .isDone();
29
- }).not.toThrow();
30
- });
31
-
32
- it("should throw exception if an unhandled action is received", () => {
33
- expect(() => {
34
- testSaga(fetchGrantRequestsSearchRequestSaga)
35
- .next()
36
- .takeLatest("FOO", fetchGrantRequestsSearchRequestSaga);
37
- }).toThrow();
38
- });
39
- });
40
-
41
- describe("sagas: fetchGrantRequestsSearchSaga", () => {
42
- const data = {
43
- _permissions: ["Role1", "Role2"],
44
- data: [
45
- {
46
- id: 385,
47
- },
48
- {
49
- id: 385,
50
- },
51
- ],
52
- };
53
-
54
- const headers = {
55
- "x-total-count": "2",
56
- };
57
-
58
- it("should put a success action when a response is returned", () => {
59
- expect(() => {
60
- testSaga(fetchGrantRequestsSearchSaga, { payload })
61
- .next()
62
- .put(fetchGrantRequestsSearch.request(body))
63
- .next()
64
- .call(apiJsonPost, API_GRANT_REQUESTS_SEARCH, body, JSON_OPTS)
65
- .next({ data, headers })
66
- .put(fetchGrantRequestsSearch.success({ data, headers }))
67
- .next()
68
- .put(fetchGrantRequestsSearch.fulfill())
69
- .next()
70
- .isDone();
71
- }).not.toThrow();
72
- });
73
-
74
- it("should put a failure action when the call returns an error", () => {
75
- const message = "Request failed";
76
- const error = { message };
77
-
78
- expect(() => {
79
- testSaga(fetchGrantRequestsSearchSaga, { payload })
80
- .next()
81
- .put(fetchGrantRequestsSearch.request(body))
82
- .next()
83
- .call(apiJsonPost, API_GRANT_REQUESTS_SEARCH, body, JSON_OPTS)
84
- .throw(error)
85
- .put(fetchGrantRequestsSearch.failure(message))
86
- .next()
87
- .put(fetchGrantRequestsSearch.fulfill())
88
- .next()
89
- .isDone();
90
- }).not.toThrow();
91
- });
92
- });
@@ -1,30 +0,0 @@
1
- import { call, put, debounce } from "redux-saga/effects";
2
- import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
3
- import { fetchGrantRequestsSearch } from "../routines";
4
- import { API_GRANT_REQUESTS_SEARCH } from "../api";
5
-
6
- export function* fetchGrantRequestsSearchSaga({ payload: body }) {
7
- try {
8
- const url = API_GRANT_REQUESTS_SEARCH;
9
- yield put(fetchGrantRequestsSearch.request(body));
10
- const { data, headers } = yield call(apiJsonPost, url, body, JSON_OPTS);
11
- yield put(fetchGrantRequestsSearch.success({ data, headers }));
12
- } catch (error) {
13
- if (error.response) {
14
- const { status, data } = error.response;
15
- yield put(fetchGrantRequestsSearch.failure({ status, data }));
16
- } else {
17
- yield put(fetchGrantRequestsSearch.failure(error.message));
18
- }
19
- } finally {
20
- yield put(fetchGrantRequestsSearch.fulfill());
21
- }
22
- }
23
-
24
- export function* fetchGrantRequestsSearchRequestSaga() {
25
- yield debounce(
26
- 200,
27
- fetchGrantRequestsSearch.TRIGGER,
28
- fetchGrantRequestsSearchSaga
29
- );
30
- }
@@ -1,15 +0,0 @@
1
- import { getGrantRequestsAvailableFilters } from "..";
2
-
3
- const foo = { values: ["foo1", "foo2"] };
4
- const bar = { values: ["bar1", "bar2"] };
5
- const baz = { values: ["baz1", "baz2"] };
6
-
7
- describe("selectors: getGrantRequestsAvailableFilters", () => {
8
- const grantRequestsFilters = { foo, bar, baz };
9
- const grantRequestsActiveFilters = { baz: [] };
10
- const state = { grantRequestsFilters, grantRequestsActiveFilters };
11
-
12
- it("should return the keys of the grant request filters which are not currently active", () => {
13
- expect(getGrantRequestsAvailableFilters(state)).toEqual(["foo", "bar"]);
14
- });
15
- });
@@ -1,19 +0,0 @@
1
- import { getGrantRequestsFilterTypes } from "..";
2
-
3
- const foo = { type: "fooType", values: ["foo1", "foo2"] };
4
- const bar = { type: "barType", values: ["bar1", "bar2"] };
5
- const bay = { values: ["bay1"] };
6
-
7
- describe("selectors: getGrantRequestsFilterTypes", () => {
8
- const state = { grantRequestsFilters: { foo, bar, bay } };
9
-
10
- const expected = {
11
- foo: "fooType",
12
- bar: "barType",
13
- bay: undefined,
14
- };
15
-
16
- it("should return a map with filter types", () => {
17
- expect(getGrantRequestsFilterTypes(state)).toEqual(expected);
18
- });
19
- });
@@ -1,24 +0,0 @@
1
- import { getGrantRequestsSearchQuery } from "..";
2
-
3
- const grantRequestSearchQuery = { query: "foo" };
4
- const grantRequestsActiveFilters = { foo: "bar", bar: "baz" };
5
- const grantRequestsDefaultFilters = { status: "some status" };
6
-
7
- describe("selectors: getGrantRequestsSearchQuery", () => {
8
- const state = {
9
- grantRequestsDefaultFilters,
10
- grantRequestsActiveFilters,
11
- grantRequestSearchQuery,
12
- };
13
- it("get query merged with defaults", () => {
14
- const res = getGrantRequestsSearchQuery({
15
- grantRequestSearchQuery,
16
- grantRequestsDefaultFilters,
17
- grantRequestsActiveFilters,
18
- });
19
- expect(res).toEqual({
20
- query: "foo",
21
- filters: { foo: "bar", bar: "baz", status: "some status" },
22
- });
23
- });
24
- });
@@ -1,15 +0,0 @@
1
- import { getGrantRequestsSelectedFilterActiveValues } from "..";
2
-
3
- const foo = ["foo1", "foo2"];
4
- const bar = ["bar1", "bar2"];
5
- const baz = ["baz1", "baz2"];
6
-
7
- describe("selectors: getGrantRequestsSelectedFilterActiveValues", () => {
8
- const grantRequestsActiveFilters = { foo: ["foo1"] };
9
- const grantRequestsSelectedFilter = "foo";
10
- const state = { grantRequestsActiveFilters, grantRequestsSelectedFilter };
11
-
12
- it("should return the active values of the currently selected grant filters", () => {
13
- expect(getGrantRequestsSelectedFilterActiveValues(state)).toEqual(["foo1"]);
14
- });
15
- });
@@ -1,15 +0,0 @@
1
- import { getGrantRequestsSelectedFilterValues } from "../../../../dd/src/selectors";
2
-
3
- const foo = { values: ["foo1", "foo2"] };
4
- const bar = { values: ["bar1", "bar2"] };
5
- const baz = { values: ["baz1", "baz2"] };
6
-
7
- describe("selectors: getGrantRequestsSelectedFilterValues", () => {
8
- const grantRequestsSelectedFilter = "foo";
9
- const grantRequestsFilters = { foo, bar, baz };
10
- const state = { grantRequestsSelectedFilter, grantRequestsFilters };
11
-
12
- it("should return the values of the currently selected Grant Request filters", () => {
13
- expect(getGrantRequestsSelectedFilterValues(state)).toEqual(foo.values);
14
- });
15
- });
@@ -1,13 +0,0 @@
1
- import { getGrantRequestsSelectedFilters } from "..";
2
-
3
- describe("selectors: getGrantRequestsSelectedFilters", () => {
4
- const grantRequestsActiveFilters = {
5
- baz: ["baz1", "baz2"],
6
- must_not_approved_by: ["approver 1"],
7
- };
8
- const state = { grantRequestsActiveFilters };
9
-
10
- it("should return the keys of the structure filters which are currently active", () => {
11
- expect(getGrantRequestsSelectedFilters(state)).toEqual(["baz"]);
12
- });
13
- });
@@ -1,17 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
- import { getGrantRequestsSelectedFilters } from "./getGrantRequestsSelectedFilters";
4
-
5
- const getGrantRequestsFilters = _.propOr({}, "grantRequestsFilters");
6
-
7
- export const getGrantRequestsAvailableFilters = createSelector(
8
- getGrantRequestsFilters,
9
- getGrantRequestsSelectedFilters,
10
- (grantRequestsFilters, grantRequestsSelectedFilters) => {
11
- return _.flow(
12
- _.omitBy(({ values }) => _.size(values) < 2),
13
- _.keys,
14
- _.without(grantRequestsSelectedFilters)
15
- )(grantRequestsFilters);
16
- }
17
- );
@@ -1,7 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
-
4
- export const getGrantRequestsFilterTypes = createSelector(
5
- _.prop("grantRequestsFilters"),
6
- _.mapValues("type")
7
- );
@@ -1,19 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
-
4
- export const getGrantRequestsSearchQuery = createSelector(
5
- _.prop("grantRequestSearchQuery"),
6
- _.prop("grantRequestsActiveFilters"),
7
- _.prop("grantRequestsDefaultFilters"),
8
- (grantRequestQuery, grantRequestsActiveFilters, defaultFilters) => {
9
- const query = _.trim(grantRequestQuery?.query);
10
- const filters = _.omitBy(_.isEmpty)(grantRequestsActiveFilters);
11
- const filtersWithDefaults = {
12
- ...defaultFilters,
13
- ...filters,
14
- };
15
- return query
16
- ? { filters: filtersWithDefaults, query }
17
- : { filters: filtersWithDefaults };
18
- }
19
- );
@@ -1,8 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
-
4
- export const getGrantRequestsSelectedFilterActiveValues = createSelector(
5
- [_.prop("grantRequestsSelectedFilter"), _.prop("grantRequestsActiveFilters")],
6
- (grantRequestsSelectedFilter, grantRequestsActiveFilters) =>
7
- _.propOr([], grantRequestsSelectedFilter)(grantRequestsActiveFilters)
8
- );
@@ -1,12 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
- import { formatFilterValues } from "@truedat/core/services/filters";
4
-
5
- export const getGrantRequestsSelectedFilterValues = createSelector(
6
- [_.prop("grantRequestsSelectedFilter"), _.prop("grantRequestsFilters")],
7
- (grantRequestsSelectedFilter, grantRequestsFilters) =>
8
- _.flow(
9
- _.propOr({ values: [] }, grantRequestsSelectedFilter),
10
- formatFilterValues
11
- )(grantRequestsFilters)
12
- );
@@ -1,10 +0,0 @@
1
- import _ from "lodash/fp";
2
- import { createSelector } from "reselect";
3
-
4
- export const getGrantRequestsSelectedFilters = createSelector(
5
- [_.prop("grantRequestsActiveFilters")],
6
- (grantRequestsActiveFilters) =>
7
- _.without(["must_not_approved_by", "group_id"])(
8
- _.keys(grantRequestsActiveFilters)
9
- )
10
- );