@truedat/dd 6.10.0 → 6.10.2
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.
- package/package.json +5 -5
- package/src/components/GrantRequestBulkActions.js +67 -90
- package/src/components/GrantRequestBulkApprovalForm.js +1 -0
- package/src/components/GrantRequestBulkRoleSelector.js +0 -3
- package/src/components/GrantRequestRow.js +6 -8
- package/src/components/GrantRequestsLabelResults.js +31 -42
- package/src/components/GrantRequestsSearchResults.js +88 -107
- package/src/components/GrantRequestsTable.js +22 -51
- package/src/components/GrantRoutes.js +32 -19
- package/src/components/__tests__/GrantRequestBulkActions.spec.js +101 -8
- package/src/components/__tests__/GrantRequestRow.spec.js +3 -4
- package/src/components/__tests__/GrantRequestsLabelResults.spec.js +21 -9
- package/src/components/__tests__/GrantRequestsSearchResults.spec.js +21 -21
- package/src/components/__tests__/GrantRequestsTable.spec.js +26 -9
- package/src/components/__tests__/__snapshots__/GrantRequestBulkActions.spec.js.snap +48 -34
- package/src/components/__tests__/__snapshots__/GrantRequestBulkApprovalForm.spec.js.snap +1 -0
- package/src/components/__tests__/__snapshots__/GrantRequestBulkRoleSelector.spec.js.snap +0 -1
- package/src/components/__tests__/__snapshots__/GrantRequestRow.spec.js.snap +20 -0
- package/src/components/__tests__/__snapshots__/GrantRequestsLabelResults.spec.js.snap +25 -12
- package/src/components/__tests__/__snapshots__/GrantRequestsSearchResults.spec.js.snap +182 -120
- package/src/components/__tests__/__snapshots__/GrantRequestsTable.spec.js.snap +109 -11
- package/src/components/index.js +0 -4
- package/src/hooks/useGrantRequest.js +13 -0
- package/src/reducers/index.js +0 -24
- package/src/routines.js +2 -33
- package/src/sagas/index.js +0 -3
- package/src/selectors/index.js +0 -6
- package/src/components/GrantRequestPagination.js +0 -18
- package/src/components/GrantRequestSearchFilters.js +0 -23
- package/src/components/GrantRequestsFiltersLoader.js +0 -33
- package/src/components/GrantRequestsSearch.js +0 -35
- package/src/components/GrantRequestsSearchLoader.js +0 -47
- package/src/components/GrantRequestsSelectedFilters.js +0 -55
- package/src/components/__tests__/GrantRequestFiltersLoader.spec.js +0 -20
- package/src/components/__tests__/GrantRequestSearchFilters.spec.js +0 -19
- package/src/components/__tests__/GrantRequestsSearch.spec.js +0 -23
- package/src/components/__tests__/GrantRequestsSearchLoader.spec.js +0 -15
- package/src/components/__tests__/__snapshots__/GrantRequestSearchFilters.spec.js.snap +0 -47
- package/src/components/__tests__/__snapshots__/GrantRequestsSearch.spec.js.snap +0 -50
- package/src/components/__tests__/__snapshots__/GrantRequestsSearchLoader.spec.js.snap +0 -3
- package/src/reducers/__tests__/grantRequestCount.spec.js +0 -38
- package/src/reducers/__tests__/grantRequestPageSize.spec.js +0 -36
- package/src/reducers/__tests__/grantRequestPermissions.spec.js +0 -66
- package/src/reducers/__tests__/grantRequestsActiveFilters.spec.js +0 -90
- package/src/reducers/__tests__/grantRequestsFiltersLoading.spec.js +0 -34
- package/src/reducers/__tests__/grantRequestsSearch.spec.js +0 -38
- package/src/reducers/__tests__/grantRequestsSearchLoading.spec.js +0 -36
- package/src/reducers/__tests__/grantRequestsSearchQuery.spec.js +0 -96
- package/src/reducers/__tests__/grantRequestsSelectedFilter.spec.js +0 -72
- package/src/reducers/grantRequestCount.js +0 -23
- package/src/reducers/grantRequestPageSize.js +0 -15
- package/src/reducers/grantRequestPermissions.js +0 -36
- package/src/reducers/grantRequestSearchQuery.js +0 -60
- package/src/reducers/grantRequestsActiveFilters.js +0 -58
- package/src/reducers/grantRequestsFilters.js +0 -23
- package/src/reducers/grantRequestsFiltersLoading.js +0 -14
- package/src/reducers/grantRequestsSearch.js +0 -19
- package/src/reducers/grantRequestsSearchLoading.js +0 -14
- package/src/reducers/grantRequestsSelectedFilter.js +0 -34
- package/src/sagas/__tests__/fetchGrantRequestsSearch.spec.js +0 -92
- package/src/sagas/fetchGrantRequestsSearch.js +0 -30
- package/src/selectors/__tests__/getGrantRequestsAvailableFilters.spec.js +0 -15
- package/src/selectors/__tests__/getGrantRequestsFilterTypes.spec.js +0 -19
- package/src/selectors/__tests__/getGrantRequestsSearchQuery.spec.js +0 -24
- package/src/selectors/__tests__/getGrantRequestsSelectedFilterActiveValues.spec.js +0 -15
- package/src/selectors/__tests__/getGrantRequestsSelectedFilterValues.spec.js +0 -15
- package/src/selectors/__tests__/getGrantRequestsSelectedFilters.spec.js +0 -13
- package/src/selectors/getGrantRequestsAvailableFilters.js +0 -17
- package/src/selectors/getGrantRequestsFilterTypes.js +0 -7
- package/src/selectors/getGrantRequestsSearchQuery.js +0 -19
- package/src/selectors/getGrantRequestsSelectedFilterActiveValues.js +0 -8
- package/src/selectors/getGrantRequestsSelectedFilterValues.js +0 -12
- package/src/selectors/getGrantRequestsSelectedFilters.js +0 -10
package/src/reducers/index.js
CHANGED
|
@@ -11,26 +11,13 @@ import { grantFiltersLoading } from "./grantFiltersLoading";
|
|
|
11
11
|
import { grantLoading } from "./grantLoading";
|
|
12
12
|
import { grantQuery } from "./grantQuery";
|
|
13
13
|
import { grantRequest } from "./grantRequest";
|
|
14
|
-
import { grantRequestCount } from "./grantRequestCount";
|
|
15
|
-
import {
|
|
16
|
-
grantRequestPermissions,
|
|
17
|
-
grantRequestPermissionsLoading,
|
|
18
|
-
} from "./grantRequestPermissions";
|
|
19
14
|
import { grantRequests } from "./grantRequests";
|
|
20
|
-
import { grantRequestsActiveFilters } from "./grantRequestsActiveFilters";
|
|
21
15
|
import { grantRequestsCart } from "./grantRequestsCart";
|
|
22
|
-
import { grantRequestSearchQuery } from "./grantRequestSearchQuery";
|
|
23
|
-
import { grantRequestsFilters } from "./grantRequestsFilters";
|
|
24
|
-
import { grantRequestsFiltersLoading } from "./grantRequestsFiltersLoading";
|
|
25
16
|
import { grantRequestsLoading } from "./grantRequestsLoading";
|
|
26
17
|
import { grantRequestsQuery } from "./grantRequestsQuery";
|
|
27
|
-
import { grantRequestsSearch } from "./grantRequestsSearch";
|
|
28
|
-
import { grantRequestsSearchLoading } from "./grantRequestsSearchLoading";
|
|
29
|
-
import { grantRequestsSelectedFilter } from "./grantRequestsSelectedFilter";
|
|
30
18
|
import { grants } from "./grants";
|
|
31
19
|
import { grantSelectedFilter } from "./grantSelectedFilter";
|
|
32
20
|
import { grantsPageSize } from "./grantsPageSize";
|
|
33
|
-
import { grantRequestPageSize } from "./grantRequestPageSize";
|
|
34
21
|
|
|
35
22
|
import { graph } from "./graph";
|
|
36
23
|
import { graphLoading } from "./graphLoading";
|
|
@@ -111,24 +98,13 @@ export {
|
|
|
111
98
|
grantLoading,
|
|
112
99
|
grantQuery,
|
|
113
100
|
grantRequest,
|
|
114
|
-
grantRequestCount,
|
|
115
|
-
grantRequestPermissions,
|
|
116
|
-
grantRequestPermissionsLoading,
|
|
117
101
|
grantRequests,
|
|
118
|
-
grantRequestsActiveFilters,
|
|
119
102
|
grantRequestsCart,
|
|
120
|
-
grantRequestSearchQuery,
|
|
121
|
-
grantRequestsFilters,
|
|
122
|
-
grantRequestsFiltersLoading,
|
|
123
103
|
grantRequestsLoading,
|
|
124
104
|
grantRequestsQuery,
|
|
125
|
-
grantRequestsSearch,
|
|
126
|
-
grantRequestsSearchLoading,
|
|
127
|
-
grantRequestsSelectedFilter,
|
|
128
105
|
grants,
|
|
129
106
|
grantSelectedFilter,
|
|
130
107
|
grantsPageSize,
|
|
131
|
-
grantRequestPageSize,
|
|
132
108
|
graph,
|
|
133
109
|
graphLoading,
|
|
134
110
|
graphRedirect,
|
package/src/routines.js
CHANGED
|
@@ -2,9 +2,6 @@
|
|
|
2
2
|
import { createRoutine } from "redux-saga-routines";
|
|
3
3
|
|
|
4
4
|
export const addGrantFilter = createRoutine("ADD_GRANT_FILTER");
|
|
5
|
-
export const addGrantRequestsFilter = createRoutine(
|
|
6
|
-
"ADD_GRANT_REQUESTS_FILTER"
|
|
7
|
-
);
|
|
8
5
|
export const addGrantRequestToCart = createRoutine("ADD_GRANT_REQUEST_TO_CART");
|
|
9
6
|
export const addStructureSelectedFilter = createRoutine(
|
|
10
7
|
"ADD_STRUCTURE_SELECTED_FILTER"
|
|
@@ -17,15 +14,6 @@ export const checkoutGrantRequest = createRoutine("CHECKOUT_GRANT_REQUEST");
|
|
|
17
14
|
export const clearGrantFilters = createRoutine("CLEAR_GRANT_FILTERS");
|
|
18
15
|
export const clearGrantRequest = createRoutine("CLEAR_GRANT_REQUEST");
|
|
19
16
|
export const clearGrantRequests = createRoutine("CLEAR_GRANT_REQUESTS");
|
|
20
|
-
export const clearGrantRequestsFilters = createRoutine(
|
|
21
|
-
"CLEAR_GRANT_REQUESTS_FILTERS"
|
|
22
|
-
);
|
|
23
|
-
export const clearGrantRequestsSearch = createRoutine(
|
|
24
|
-
"CLEAR_GRANT_REQUESTS_SEARCH"
|
|
25
|
-
);
|
|
26
|
-
export const clearGrantRequestsSort = createRoutine(
|
|
27
|
-
"CLEAR_GRANT_REQUESTS_SORT"
|
|
28
|
-
);
|
|
29
17
|
export const clearGrants = createRoutine("CLEAR_GRANTS");
|
|
30
18
|
export const clearGrantsSort = createRoutine("CLEAR_GRANTS_SORT");
|
|
31
19
|
export const clearGraph = createRoutine("CLEAR_GRAPH");
|
|
@@ -50,9 +38,6 @@ export const clearUserSearchFilters = createRoutine(
|
|
|
50
38
|
"CLEAR_USER_SEARCH_FILTERS"
|
|
51
39
|
);
|
|
52
40
|
export const closeGrantFilter = createRoutine("CLOSE_GRANT_FILTER");
|
|
53
|
-
export const closeGrantRequestsFilter = createRoutine(
|
|
54
|
-
"CLOSE_GRANT_REQUESTS_FILTERS"
|
|
55
|
-
);
|
|
56
41
|
export const createGrantApprovalRule = createRoutine(
|
|
57
42
|
"CREATE_GRANT_APPROVAL_RULE"
|
|
58
43
|
);
|
|
@@ -101,12 +86,11 @@ export const fetchGrant = createRoutine("FETCH_GRANT");
|
|
|
101
86
|
export const fetchGrantFilters = createRoutine("FETCH_GRANT_FILTERS");
|
|
102
87
|
export const fetchGrantRequest = createRoutine("FETCH_GRANT_REQUEST");
|
|
103
88
|
export const fetchGrantRequests = createRoutine("FETCH_GRANT_REQUESTS");
|
|
89
|
+
|
|
104
90
|
export const fetchGrantRequestsFilters = createRoutine(
|
|
105
91
|
"FETCH_GRANT_REQUESTS_FILTERS"
|
|
106
92
|
);
|
|
107
|
-
|
|
108
|
-
"FETCH_GRANT_REQUESTS_SEARCH"
|
|
109
|
-
);
|
|
93
|
+
|
|
110
94
|
export const fetchGrants = createRoutine("FETCH_GRANTS");
|
|
111
95
|
export const fetchGraph = createRoutine("FETCH_GRAPH");
|
|
112
96
|
export const fetchLineageEvents = createRoutine("FETCH_LINEAGE_EVENTS");
|
|
@@ -136,16 +120,10 @@ export const linkStructureToStructure = createRoutine(
|
|
|
136
120
|
);
|
|
137
121
|
export const loadLineageEvents = createRoutine("LOAD_LINEAGE_EVENTS");
|
|
138
122
|
export const openGrantFilter = createRoutine("OPEN_GRANT_FILTER");
|
|
139
|
-
export const openGrantRequestsFilter = createRoutine(
|
|
140
|
-
"OPEN_GRANT_REQUESTS_FILTER"
|
|
141
|
-
);
|
|
142
123
|
export const removeGrantFilter = createRoutine("REMOVE_GRANT_FILTER");
|
|
143
124
|
export const removeGrantRequestFromCart = createRoutine(
|
|
144
125
|
"REMOVE_GRANT_REQUEST_FROM_CART"
|
|
145
126
|
);
|
|
146
|
-
export const removeGrantRequestsFilter = createRoutine(
|
|
147
|
-
"REMOVE_GRANT_REQUESTS_FILTER"
|
|
148
|
-
);
|
|
149
127
|
export const removeGrantRequestsQuery = createRoutine(
|
|
150
128
|
"REMOVE_GRANT_REQUESTS_QUERY"
|
|
151
129
|
);
|
|
@@ -154,16 +132,11 @@ export const removeStructureSelectedFilter = createRoutine(
|
|
|
154
132
|
);
|
|
155
133
|
export const requestGrantRemoval = createRoutine("REQUEST_GRANT_REMOVAL");
|
|
156
134
|
export const resetGrantFilters = createRoutine("RESET_GRANT_FILTERS");
|
|
157
|
-
export const resetGrantRequestsFilters = createRoutine(
|
|
158
|
-
"RESERT_GRANT_REQUESTS_FILTERS"
|
|
159
|
-
);
|
|
160
135
|
export const saveNavFilter = createRoutine("SAVE_BUCKET_FILTER");
|
|
161
136
|
export const saveUserSearchFilters = createRoutine("SAVE_USER_SEARCH_FILTERS");
|
|
162
|
-
export const searchGrantRequests = createRoutine("SEARCH_GRANT_REQUESTS");
|
|
163
137
|
export const searchGrants = createRoutine("SEARCH_GRANTS");
|
|
164
138
|
export const searchStructures = createRoutine("SEARCH_STRUCTURES");
|
|
165
139
|
export const selectGrantPage = createRoutine("SELECT_GRANT_PAGE");
|
|
166
|
-
export const selectGrantRequestPage = createRoutine("SELECT_GRANT_REQUEST_PAGE");
|
|
167
140
|
|
|
168
141
|
export const selectGrantRequestTemplate = createRoutine(
|
|
169
142
|
"SELECT_GRANT_REQUEST_TEMPLATE"
|
|
@@ -177,7 +150,6 @@ export const setGrantChangeRequestCart = createRoutine(
|
|
|
177
150
|
"SET_GRANT_CHANGE_REQUEST_CART"
|
|
178
151
|
);
|
|
179
152
|
export const setGrantRequestsQuery = createRoutine("SET_GRANT_REQUESTS_QUERY");
|
|
180
|
-
export const sortGrantRequests = createRoutine("SORT_GRANT_REQUESTS");
|
|
181
153
|
export const sortGrants = createRoutine("SORT_GRANTS");
|
|
182
154
|
export const tagStructure = createRoutine("TAG_STRUCTURE");
|
|
183
155
|
export const structureSearchQuery = createRoutine("STRUCTURES_SEARCH_QUERY");
|
|
@@ -185,9 +157,6 @@ export const toggleGrantDateFilter = createRoutine("TOGGLE_GRANT_DATE_FILTER");
|
|
|
185
157
|
export const toggleGrantFilterValue = createRoutine(
|
|
186
158
|
"TOGGLE_GRANT_FILTER_VALUE"
|
|
187
159
|
);
|
|
188
|
-
export const toggleGrantRequestsFilterValue = createRoutine(
|
|
189
|
-
"TOGGLE_GRANT_REQUESTS_FILTER_VALUE"
|
|
190
|
-
);
|
|
191
160
|
export const toggleStructureFilterValue = createRoutine(
|
|
192
161
|
"TOGGLE_STRUCTURE_FILTER_VALUE"
|
|
193
162
|
);
|
package/src/sagas/index.js
CHANGED
|
@@ -24,7 +24,6 @@ import { downloadReferenceDatasetRequestSaga } from "./downloadReferenceDataset"
|
|
|
24
24
|
import { downloadStructuresRequestSaga } from "./downloadStructures";
|
|
25
25
|
import { fetchGrantFiltersRequestSaga } from "./fetchGrantFilters";
|
|
26
26
|
import { fetchGrantRequestsFiltersRequestSaga } from "./fetchGrantRequestsFilters";
|
|
27
|
-
import { fetchGrantRequestsSearchRequestSaga } from "./fetchGrantRequestsSearch";
|
|
28
27
|
import { fetchGrantRequestRequestSaga } from "./fetchGrantRequest";
|
|
29
28
|
import { fetchGrantRequestsRequestSaga } from "./fetchGrantRequests";
|
|
30
29
|
import { fetchGrantsRequestSaga } from "./fetchGrants";
|
|
@@ -87,7 +86,6 @@ export {
|
|
|
87
86
|
fetchGrantFiltersRequestSaga,
|
|
88
87
|
fetchGrantRequestRequestSaga,
|
|
89
88
|
fetchGrantRequestsFiltersRequestSaga,
|
|
90
|
-
fetchGrantRequestsSearchRequestSaga,
|
|
91
89
|
fetchGrantRequestsRequestSaga,
|
|
92
90
|
fetchGrantsRequestSaga,
|
|
93
91
|
fetchGraphRequestSaga,
|
|
@@ -151,7 +149,6 @@ export default [
|
|
|
151
149
|
fetchGrantRequestRequestSaga(),
|
|
152
150
|
fetchGrantRequestsRequestSaga(),
|
|
153
151
|
fetchGrantRequestsFiltersRequestSaga(),
|
|
154
|
-
fetchGrantRequestsSearchRequestSaga(),
|
|
155
152
|
fetchGrantsRequestSaga(),
|
|
156
153
|
fetchGraphRequestSaga(),
|
|
157
154
|
fetchLineageEventsRequestSaga(),
|
package/src/selectors/index.js
CHANGED
|
@@ -2,16 +2,10 @@ export {
|
|
|
2
2
|
defaultStructureColumns,
|
|
3
3
|
structureColumnsSelector,
|
|
4
4
|
} from "./structureColumnsSelector";
|
|
5
|
-
export { getGrantRequestsSelectedFilterActiveValues } from "./getGrantRequestsSelectedFilterActiveValues";
|
|
6
|
-
export { getGrantRequestsFilterTypes } from "./getGrantRequestsFilterTypes";
|
|
7
|
-
export { getGrantRequestsSelectedFilterValues } from "./getGrantRequestsSelectedFilterValues";
|
|
8
|
-
export { getGrantRequestsSelectedFilters } from "./getGrantRequestsSelectedFilters";
|
|
9
5
|
export {
|
|
10
6
|
getGrantRequestsSearchColumns,
|
|
11
7
|
defaultGrantRequestsSearchTableColumns,
|
|
12
8
|
} from "./getGrantRequestsSearchColumns";
|
|
13
|
-
export { getGrantRequestsSearchQuery } from "./getGrantRequestsSearchQuery";
|
|
14
|
-
export { getGrantRequestsAvailableFilters } from "./getGrantRequestsAvailableFilters";
|
|
15
9
|
export { getGrantAvailableFilters } from "./getGrantAvailableFilters";
|
|
16
10
|
export { getGrantSelectedFilters } from "./getGrantSelectedFilters";
|
|
17
11
|
export { getGrantFilterTypes } from "./getGrantFilterTypes";
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { connect } from "react-redux";
|
|
2
|
-
import { bindActionCreators } from "redux";
|
|
3
|
-
import { Pagination } from "@truedat/core/components";
|
|
4
|
-
import { selectGrantRequestPage } from "../routines";
|
|
5
|
-
|
|
6
|
-
const mapDispatchToProps = (dispatch) =>
|
|
7
|
-
bindActionCreators({ selectPage: selectGrantRequestPage }, dispatch);
|
|
8
|
-
|
|
9
|
-
const mapStateToProps = ({
|
|
10
|
-
grantRequestsQuery,
|
|
11
|
-
grantRequestCount,
|
|
12
|
-
grantRequestPageSize,
|
|
13
|
-
}) => ({
|
|
14
|
-
activePage: grantRequestsQuery?.page,
|
|
15
|
-
totalPages: Math.ceil(grantRequestCount / grantRequestPageSize),
|
|
16
|
-
});
|
|
17
|
-
|
|
18
|
-
export default connect(mapStateToProps, mapDispatchToProps)(Pagination);
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { connect } from "react-redux";
|
|
3
|
-
import { bindActionCreators } from "redux";
|
|
4
|
-
import { AvailableFilters } from "@truedat/core/components";
|
|
5
|
-
import { addGrantRequestsFilter, resetGrantRequestsFilters } from "../routines";
|
|
6
|
-
import { getGrantRequestsAvailableFilters } from "../selectors";
|
|
7
|
-
|
|
8
|
-
const mapStateToProps = (state) => ({
|
|
9
|
-
filters: getGrantRequestsAvailableFilters(state),
|
|
10
|
-
disabled: state.grantRequestsFiltersLoading,
|
|
11
|
-
loading: state.grantRequestsFiltersLoading,
|
|
12
|
-
});
|
|
13
|
-
|
|
14
|
-
const mapDispatchToProps = (dispatch) =>
|
|
15
|
-
bindActionCreators(
|
|
16
|
-
{
|
|
17
|
-
addFilter: addGrantRequestsFilter,
|
|
18
|
-
resetFilters: resetGrantRequestsFilters,
|
|
19
|
-
},
|
|
20
|
-
dispatch
|
|
21
|
-
);
|
|
22
|
-
|
|
23
|
-
export default connect(mapStateToProps, mapDispatchToProps)(AvailableFilters);
|
|
@@ -1,33 +0,0 @@
|
|
|
1
|
-
import { connect } from "react-redux";
|
|
2
|
-
import { bindActionCreators } from "redux";
|
|
3
|
-
import { FiltersLoader } from "@truedat/core/components";
|
|
4
|
-
import { makeActiveFiltersSelector } from "@truedat/core/selectors";
|
|
5
|
-
import {
|
|
6
|
-
clearGrantRequestsFilters,
|
|
7
|
-
fetchGrantRequestsFilters,
|
|
8
|
-
} from "../routines";
|
|
9
|
-
|
|
10
|
-
const mapDispatchToProps = (dispatch) =>
|
|
11
|
-
bindActionCreators(
|
|
12
|
-
{
|
|
13
|
-
clearFilters: clearGrantRequestsFilters,
|
|
14
|
-
fetchFilters: fetchGrantRequestsFilters,
|
|
15
|
-
},
|
|
16
|
-
dispatch
|
|
17
|
-
);
|
|
18
|
-
|
|
19
|
-
export const makeMapStateToProps = ({}) => {
|
|
20
|
-
const activeFiltersSelector = makeActiveFiltersSelector(
|
|
21
|
-
"grantRequestsActiveFilters"
|
|
22
|
-
);
|
|
23
|
-
const mapStateToProps = (state, props) => {
|
|
24
|
-
return {
|
|
25
|
-
selectedFilter: state.grantRequestsSelectedFilter,
|
|
26
|
-
filters: activeFiltersSelector(state, props),
|
|
27
|
-
defaultFilters: props?.defaultFilters,
|
|
28
|
-
};
|
|
29
|
-
};
|
|
30
|
-
return mapStateToProps;
|
|
31
|
-
};
|
|
32
|
-
|
|
33
|
-
export default connect(makeMapStateToProps, mapDispatchToProps)(FiltersLoader);
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import PropTypes from "prop-types";
|
|
3
|
-
import { connect } from "react-redux";
|
|
4
|
-
import { Input } from "semantic-ui-react";
|
|
5
|
-
import { useIntl } from "react-intl";
|
|
6
|
-
import { searchGrantRequests } from "../routines";
|
|
7
|
-
import GrantRequestSearchFilters from "./GrantRequestSearchFilters";
|
|
8
|
-
|
|
9
|
-
export const GrantRequestsSearch = ({ query, searchGrantRequests }) => {
|
|
10
|
-
const { formatMessage } = useIntl();
|
|
11
|
-
|
|
12
|
-
return (
|
|
13
|
-
<Input
|
|
14
|
-
value={query}
|
|
15
|
-
onChange={(_e, data) => searchGrantRequests({ query: data.value })}
|
|
16
|
-
icon={{ name: "search", link: true }}
|
|
17
|
-
iconPosition="left"
|
|
18
|
-
action={<GrantRequestSearchFilters />}
|
|
19
|
-
placeholder={formatMessage({ id: "grantRequest.search.placeholder" })}
|
|
20
|
-
/>
|
|
21
|
-
);
|
|
22
|
-
};
|
|
23
|
-
|
|
24
|
-
GrantRequestsSearch.propTypes = {
|
|
25
|
-
query: PropTypes.string,
|
|
26
|
-
searchGrantRequests: PropTypes.func,
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
const mapStateToProps = ({ grantRequestSearchQuery }) => ({
|
|
30
|
-
query: grantRequestSearchQuery?.query,
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
export default connect(mapStateToProps, {
|
|
34
|
-
searchGrantRequests,
|
|
35
|
-
})(GrantRequestsSearch);
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
import { useEffect } from "react";
|
|
2
|
-
import PropTypes from "prop-types";
|
|
3
|
-
import { connect } from "react-redux";
|
|
4
|
-
import { makeSearchQuerySelector } from "@truedat/core/selectors";
|
|
5
|
-
import {
|
|
6
|
-
clearGrantRequestsSearch,
|
|
7
|
-
fetchGrantRequestsSearch,
|
|
8
|
-
} from "../routines";
|
|
9
|
-
|
|
10
|
-
export const GrantRequestsSearchLoader = ({
|
|
11
|
-
clearGrantRequestsSearch,
|
|
12
|
-
fetchGrantRequestsSearch,
|
|
13
|
-
query,
|
|
14
|
-
}) => {
|
|
15
|
-
useEffect(() => {
|
|
16
|
-
return () => {
|
|
17
|
-
clearGrantRequestsSearch();
|
|
18
|
-
};
|
|
19
|
-
}, [clearGrantRequestsSearch]);
|
|
20
|
-
useEffect(() => {
|
|
21
|
-
fetchGrantRequestsSearch(query);
|
|
22
|
-
}, [fetchGrantRequestsSearch, query]);
|
|
23
|
-
return null;
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
GrantRequestsSearchLoader.propTypes = {
|
|
27
|
-
clearGrantRequestsSearch: PropTypes.func,
|
|
28
|
-
fetchGrantRequestsSearch: PropTypes.func,
|
|
29
|
-
query: PropTypes.object,
|
|
30
|
-
};
|
|
31
|
-
|
|
32
|
-
const makeMapStateToProps = () => {
|
|
33
|
-
const searchQuerySelector = makeSearchQuerySelector(
|
|
34
|
-
"grantRequestSearchQuery",
|
|
35
|
-
"grantRequestsActiveFilters"
|
|
36
|
-
);
|
|
37
|
-
|
|
38
|
-
const mapStateToProps = (state, props) => ({
|
|
39
|
-
query: searchQuerySelector(state, { ...props, pageSize: 20 }),
|
|
40
|
-
});
|
|
41
|
-
return mapStateToProps;
|
|
42
|
-
};
|
|
43
|
-
|
|
44
|
-
export default connect(makeMapStateToProps, {
|
|
45
|
-
clearGrantRequestsSearch,
|
|
46
|
-
fetchGrantRequestsSearch,
|
|
47
|
-
})(GrantRequestsSearchLoader);
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import _ from "lodash/fp";
|
|
3
|
-
import { bindActionCreators } from "redux";
|
|
4
|
-
import { connect } from "react-redux";
|
|
5
|
-
import { makeOption } from "@truedat/core/services/i18n";
|
|
6
|
-
import { SelectedFilters } from "@truedat/core/components";
|
|
7
|
-
import {
|
|
8
|
-
closeGrantRequestsFilter,
|
|
9
|
-
openGrantRequestsFilter,
|
|
10
|
-
removeGrantRequestsFilter,
|
|
11
|
-
resetGrantRequestsFilters,
|
|
12
|
-
toggleGrantRequestsFilterValue,
|
|
13
|
-
} from "../routines";
|
|
14
|
-
import {
|
|
15
|
-
getGrantRequestsSelectedFilterActiveValues,
|
|
16
|
-
getGrantRequestsSelectedFilters,
|
|
17
|
-
getGrantRequestsSelectedFilterValues,
|
|
18
|
-
getGrantRequestsFilterTypes,
|
|
19
|
-
} from "../selectors";
|
|
20
|
-
|
|
21
|
-
export const mapStateToProps = (state) => {
|
|
22
|
-
const {
|
|
23
|
-
grantRequestsFiltersLoading: loading,
|
|
24
|
-
grantRequestsSelectedFilter: selectedFilter,
|
|
25
|
-
} = state;
|
|
26
|
-
|
|
27
|
-
const i18nValues = _.flow(
|
|
28
|
-
getGrantRequestsSelectedFilterValues,
|
|
29
|
-
_.map(makeOption({}, selectedFilter))
|
|
30
|
-
)(state);
|
|
31
|
-
|
|
32
|
-
return {
|
|
33
|
-
loading,
|
|
34
|
-
filterTypes: getGrantRequestsFilterTypes(state),
|
|
35
|
-
selectedFilter,
|
|
36
|
-
selectedFilters: getGrantRequestsSelectedFilters(state),
|
|
37
|
-
selectedFilterActiveValues:
|
|
38
|
-
getGrantRequestsSelectedFilterActiveValues(state),
|
|
39
|
-
selectedFilterValues: i18nValues,
|
|
40
|
-
};
|
|
41
|
-
};
|
|
42
|
-
|
|
43
|
-
const mapDispatchToProps = (dispatch) =>
|
|
44
|
-
bindActionCreators(
|
|
45
|
-
{
|
|
46
|
-
closeFilter: closeGrantRequestsFilter,
|
|
47
|
-
openFilter: openGrantRequestsFilter,
|
|
48
|
-
removeFilter: removeGrantRequestsFilter,
|
|
49
|
-
resetFilters: resetGrantRequestsFilters,
|
|
50
|
-
toggleFilterValue: toggleGrantRequestsFilterValue,
|
|
51
|
-
},
|
|
52
|
-
dispatch
|
|
53
|
-
);
|
|
54
|
-
|
|
55
|
-
export default connect(mapStateToProps, mapDispatchToProps)(SelectedFilters);
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { makeMapStateToProps } from "../GrantRequestsFiltersLoader";
|
|
2
|
-
|
|
3
|
-
describe("makeMapStateToProps", () => {
|
|
4
|
-
const defaultFilters = { status: ["draft"] };
|
|
5
|
-
const mapStateToProps = makeMapStateToProps({});
|
|
6
|
-
|
|
7
|
-
it("returns a function which selects a combination of active and default filters", () => {
|
|
8
|
-
const state = {
|
|
9
|
-
grantRequestsActiveFilters: { foo: ["bar"] },
|
|
10
|
-
grantRequestsSelectedFilter: "status",
|
|
11
|
-
};
|
|
12
|
-
const props = { defaultFilters };
|
|
13
|
-
|
|
14
|
-
expect(mapStateToProps(state, props)).toEqual({
|
|
15
|
-
filters: { status: ["draft"], foo: ["bar"] },
|
|
16
|
-
selectedFilter: "status",
|
|
17
|
-
defaultFilters,
|
|
18
|
-
});
|
|
19
|
-
});
|
|
20
|
-
});
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { render } from "@truedat/test/render";
|
|
3
|
-
import GrantRequestSearchFilters from "../GrantRequestSearchFilters";
|
|
4
|
-
|
|
5
|
-
const state = {
|
|
6
|
-
grantRequestsFilters: {
|
|
7
|
-
domain_id: { values: [1, 2] },
|
|
8
|
-
confidential: { values: ["yes", "no"] },
|
|
9
|
-
},
|
|
10
|
-
grantRequestsActiveFilters: { domain_id: [1] },
|
|
11
|
-
};
|
|
12
|
-
const renderOpts = { state };
|
|
13
|
-
|
|
14
|
-
describe("<GrantRequestSearchFilters />", () => {
|
|
15
|
-
it("matches the latest snapshot", () => {
|
|
16
|
-
const { container } = render(<GrantRequestSearchFilters />, renderOpts);
|
|
17
|
-
expect(container).toMatchSnapshot();
|
|
18
|
-
});
|
|
19
|
-
});
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { render } from "@truedat/test/render";
|
|
3
|
-
import GrantRequestsSearch from "../GrantRequestsSearch";
|
|
4
|
-
|
|
5
|
-
describe("<GrantRequestsSearch />", () => {
|
|
6
|
-
const renderOpts = {
|
|
7
|
-
messages: {
|
|
8
|
-
en: {
|
|
9
|
-
"grantRequest.search.placeholder": "placeholder",
|
|
10
|
-
},
|
|
11
|
-
},
|
|
12
|
-
};
|
|
13
|
-
const searchGrantRequests = jest.fn();
|
|
14
|
-
const props = { query: "", searchGrantRequests };
|
|
15
|
-
|
|
16
|
-
it("matches the latest snapshot", () => {
|
|
17
|
-
const { container } = render(
|
|
18
|
-
<GrantRequestsSearch {...props} />,
|
|
19
|
-
renderOpts
|
|
20
|
-
);
|
|
21
|
-
expect(container).toMatchSnapshot();
|
|
22
|
-
});
|
|
23
|
-
});
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { render } from "@truedat/test/render";
|
|
3
|
-
import GrantRequestsSearchLoader from "../GrantRequestsSearchLoader";
|
|
4
|
-
|
|
5
|
-
describe("<GrantRequestsSearchLoader />", () => {
|
|
6
|
-
const clearGrantRequestsSearch = jest.fn();
|
|
7
|
-
const fetchGrantRequestsSearch = jest.fn();
|
|
8
|
-
|
|
9
|
-
const props = { clearGrantRequestsSearch, fetchGrantRequestsSearch };
|
|
10
|
-
|
|
11
|
-
it("matches the latest snapshot", () => {
|
|
12
|
-
const { container } = render(<GrantRequestsSearchLoader {...props} />);
|
|
13
|
-
expect(container).toMatchSnapshot();
|
|
14
|
-
});
|
|
15
|
-
});
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
2
|
-
|
|
3
|
-
exports[`<GrantRequestSearchFilters /> matches the latest snapshot 1`] = `
|
|
4
|
-
<div>
|
|
5
|
-
<div
|
|
6
|
-
aria-expanded="false"
|
|
7
|
-
class="ui button floating labeled scrolling dropdown icon"
|
|
8
|
-
role="listbox"
|
|
9
|
-
tabindex="0"
|
|
10
|
-
>
|
|
11
|
-
<div
|
|
12
|
-
aria-atomic="true"
|
|
13
|
-
aria-live="polite"
|
|
14
|
-
class="divider text"
|
|
15
|
-
role="alert"
|
|
16
|
-
>
|
|
17
|
-
Filters
|
|
18
|
-
</div>
|
|
19
|
-
<i
|
|
20
|
-
aria-hidden="true"
|
|
21
|
-
class="filter icon"
|
|
22
|
-
/>
|
|
23
|
-
<div
|
|
24
|
-
class="menu transition"
|
|
25
|
-
>
|
|
26
|
-
<div
|
|
27
|
-
class="item"
|
|
28
|
-
role="option"
|
|
29
|
-
>
|
|
30
|
-
<em>
|
|
31
|
-
(reset all filters)
|
|
32
|
-
</em>
|
|
33
|
-
</div>
|
|
34
|
-
<div
|
|
35
|
-
class="item"
|
|
36
|
-
role="option"
|
|
37
|
-
>
|
|
38
|
-
<span
|
|
39
|
-
class="text"
|
|
40
|
-
>
|
|
41
|
-
confidential
|
|
42
|
-
</span>
|
|
43
|
-
</div>
|
|
44
|
-
</div>
|
|
45
|
-
</div>
|
|
46
|
-
</div>
|
|
47
|
-
`;
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
2
|
-
|
|
3
|
-
exports[`<GrantRequestsSearch /> matches the latest snapshot 1`] = `
|
|
4
|
-
<div>
|
|
5
|
-
<div
|
|
6
|
-
class="ui action left icon input"
|
|
7
|
-
>
|
|
8
|
-
<input
|
|
9
|
-
placeholder="placeholder"
|
|
10
|
-
type="text"
|
|
11
|
-
value=""
|
|
12
|
-
/>
|
|
13
|
-
<i
|
|
14
|
-
aria-hidden="true"
|
|
15
|
-
class="search link icon"
|
|
16
|
-
/>
|
|
17
|
-
<div
|
|
18
|
-
aria-expanded="false"
|
|
19
|
-
class="ui button floating labeled scrolling dropdown icon"
|
|
20
|
-
role="listbox"
|
|
21
|
-
tabindex="0"
|
|
22
|
-
>
|
|
23
|
-
<div
|
|
24
|
-
aria-atomic="true"
|
|
25
|
-
aria-live="polite"
|
|
26
|
-
class="divider text"
|
|
27
|
-
role="alert"
|
|
28
|
-
>
|
|
29
|
-
Filters
|
|
30
|
-
</div>
|
|
31
|
-
<i
|
|
32
|
-
aria-hidden="true"
|
|
33
|
-
class="filter icon"
|
|
34
|
-
/>
|
|
35
|
-
<div
|
|
36
|
-
class="menu transition"
|
|
37
|
-
>
|
|
38
|
-
<div
|
|
39
|
-
class="item"
|
|
40
|
-
role="option"
|
|
41
|
-
>
|
|
42
|
-
<em>
|
|
43
|
-
(reset filters)
|
|
44
|
-
</em>
|
|
45
|
-
</div>
|
|
46
|
-
</div>
|
|
47
|
-
</div>
|
|
48
|
-
</div>
|
|
49
|
-
</div>
|
|
50
|
-
`;
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
clearGrantRequestsSearch,
|
|
3
|
-
fetchGrantRequestsSearch,
|
|
4
|
-
} from "../../routines";
|
|
5
|
-
import { grantRequestCount } from "..";
|
|
6
|
-
|
|
7
|
-
const fooState = { foo: "bar" };
|
|
8
|
-
|
|
9
|
-
describe("reducers: grantRequestCount", () => {
|
|
10
|
-
const initialState = 0;
|
|
11
|
-
|
|
12
|
-
it("should provide the initial state", () => {
|
|
13
|
-
expect(grantRequestCount(undefined, {})).toEqual(initialState);
|
|
14
|
-
});
|
|
15
|
-
|
|
16
|
-
it("should handle the clearGrantRequestsSearch.TRIGGER action", () => {
|
|
17
|
-
expect(
|
|
18
|
-
grantRequestCount(fooState, {
|
|
19
|
-
type: clearGrantRequestsSearch.TRIGGER,
|
|
20
|
-
})
|
|
21
|
-
).toEqual(initialState);
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
it("should handle the fetchGrantRequestsSearch.SUCCESS action", () => {
|
|
25
|
-
const count = 123;
|
|
26
|
-
const headers = { "x-total-count": `${count}` };
|
|
27
|
-
expect(
|
|
28
|
-
grantRequestCount(fooState, {
|
|
29
|
-
type: fetchGrantRequestsSearch.SUCCESS,
|
|
30
|
-
payload: { headers },
|
|
31
|
-
})
|
|
32
|
-
).toEqual(count);
|
|
33
|
-
});
|
|
34
|
-
|
|
35
|
-
it("should ignore unknown actions", () => {
|
|
36
|
-
expect(grantRequestCount(fooState, { type: "FOO" })).toBe(fooState);
|
|
37
|
-
});
|
|
38
|
-
});
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import { fetchGrantRequestsSearch } from "../../routines";
|
|
2
|
-
import { grantRequestPageSize } from "..";
|
|
3
|
-
|
|
4
|
-
const fooState = { foo: "bar" };
|
|
5
|
-
const initialState = 20;
|
|
6
|
-
|
|
7
|
-
describe("reducers: grantRequestPageSize", () => {
|
|
8
|
-
it("should provide the initial state", () => {
|
|
9
|
-
expect(grantRequestPageSize(undefined, {})).toEqual(initialState);
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
describe("action: fetchGrantRequestsSearch.TRIGGER", () => {
|
|
13
|
-
describe("with an empty payload", () => {
|
|
14
|
-
it("should return the passed state if no size is specified", () => {
|
|
15
|
-
const payload = {};
|
|
16
|
-
expect(
|
|
17
|
-
grantRequestPageSize(fooState, {
|
|
18
|
-
type: fetchGrantRequestsSearch.TRIGGER,
|
|
19
|
-
payload,
|
|
20
|
-
})
|
|
21
|
-
).toEqual(fooState);
|
|
22
|
-
});
|
|
23
|
-
});
|
|
24
|
-
|
|
25
|
-
it("should set size value if specified", () => {
|
|
26
|
-
const size = 1234;
|
|
27
|
-
|
|
28
|
-
expect(
|
|
29
|
-
grantRequestPageSize(fooState, {
|
|
30
|
-
type: fetchGrantRequestsSearch.TRIGGER,
|
|
31
|
-
payload: { size },
|
|
32
|
-
})
|
|
33
|
-
).toBe(1234);
|
|
34
|
-
});
|
|
35
|
-
});
|
|
36
|
-
});
|