@truedat/dd 4.28.1 → 4.28.5

package/src/reducers/grantCount.js

@@ -0,0 +1,20 @@
+import _ from "lodash/fp";
+import { fetchGrants, clearGrants } from "../routines";
+
+const initialState = 0;
+
+const grantCount = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearGrants.TRIGGER:
+      return initialState;
+    case fetchGrants.SUCCESS: {
+      const headers = _.propOr({}, "headers")(payload);
+      const count = _.propOr("0", "x-total-count")(headers);
+      return parseInt(count);
+    }
+    default:
+      return state;
+  }
+};
+
+export { grantCount };

package/src/reducers/grantDateFilter.js

@@ -0,0 +1,31 @@
+import {
+  applyGrantDateFilter,
+  clearGrantFilters,
+  toggleGrantDateFilter,
+} from "../routines";
+
+export const initialState = {
+  active: false,
+  name: "start_date,end_date",
+  type: "range",
+  range: "",
+  unit: "d",
+  value: "1",
+};
+
+export const grantDateFilter = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearGrantFilters.TRIGGER:
+      return initialState;
+    case toggleGrantDateFilter.TRIGGER: {
+      const { active } = state;
+      return { ...state, active: !active };
+    }
+    case applyGrantDateFilter.TRIGGER: {
+      const { active } = state;
+      return { ...payload, active };
+    }
+    default:
+      return state;
+  }
+};

package/src/reducers/grantFilters.js

@@ -0,0 +1,19 @@
+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 };

package/src/reducers/grantLoading.js

@@ -0,0 +1,16 @@
+import { fetchGrant } from "../routines";
+
+const grantLoading = (state = false, { type }) => {
+  switch (type) {
+    case fetchGrant.REQUEST:
+      return true;
+    case fetchGrant.SUCCESS:
+      return false;
+    case fetchGrant.FAILURE:
+      return false;
+    default:
+      return state;
+  }
+};
+
+export { grantLoading };

package/src/reducers/grantQuery.js

@@ -0,0 +1,62 @@
+import _ from "lodash/fp";
+import {
+  clearGrantFilters,
+  removeGrantFilter,
+  searchGrants,
+  selectGrantPage,
+  sortGrants,
+  toggleGrantFilterValue,
+  clearGrantsSort,
+} from "../routines";
+
+const defaultPage = 1;
+const defaultSize = 20;
+const defaultSearchSort = [
+  { _score: "desc" },
+  { "data_structure_version.name.raw": "asc" },
+];
+const byNameSort = [{ "data_structure_version.name.raw": "asc" }];
+
+export const initialState = {
+  query: "",
+  page: defaultPage,
+  size: defaultSize,
+  sort: byNameSort,
+};
+
+const grantQuery = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearGrantFilters.TRIGGER:
+      const page = defaultPage;
+      return { ...state, page, query: "" };
+    case removeGrantFilter.TRIGGER: {
+      const page = defaultPage;
+      return { ...state, page };
+    }
+    case toggleGrantFilterValue.TRIGGER: {
+      const page = defaultPage;
+      return { ...state, page };
+    }
+    case searchGrants.TRIGGER: {
+      const page = defaultPage;
+      const query = _.propOr("", "query")(payload);
+      const sort = query != "" ? defaultSearchSort : byNameSort;
+      return { ...state, query, page, sort };
+    }
+    case selectGrantPage.TRIGGER: {
+      const { activePage } = payload;
+      return { ...state, page: activePage };
+    }
+    case sortGrants.TRIGGER: {
+      const sort = payload;
+      return { ...state, sort, page: defaultPage };
+    }
+    case clearGrantsSort.TRIGGER: {
+      return { ...state, sort: byNameSort };
+    }
+    default:
+      return state;
+  }
+};
+
+export { grantQuery };

package/src/reducers/grantSelectedFilter.js

@@ -0,0 +1,34 @@
+import {
+  addGrantFilter,
+  closeGrantFilter,
+  openGrantFilter,
+  removeGrantFilter,
+  resetGrantFilters,
+} from "../routines";
+
+/** @type {string} */
+export const initialState = null;
+
+export const grantSelectedFilter = (
+  state = initialState,
+  { type, payload }
+) => {
+  switch (type) {
+    case addGrantFilter.TRIGGER: {
+      const { filter } = payload;
+      return filter;
+    }
+    case closeGrantFilter.TRIGGER:
+      return initialState;
+    case openGrantFilter.TRIGGER: {
+      const { filter } = payload;
+      return filter;
+    }
+    case removeGrantFilter.TRIGGER:
+      return initialState;
+    case resetGrantFilters.TRIGGER:
+      return initialState;
+    default:
+      return state;
+  }
+};

package/src/reducers/grants.js

@@ -0,0 +1,24 @@
+import _ from "lodash/fp";
+import { clearGrants, fetchGrants, updateGrant } from "../routines";
+
+export const initialState = [];
+
+const pickFields = _.pick(["id", "user_id", "end_date"]);
+
+const grants = (state = initialState, { type, payload }) => {
+  switch (type) {
+    case clearGrants.TRIGGER:
+      return initialState;
+    case fetchGrants.SUCCESS:
+      return _.pathOr({}, "data.data")(payload);
+    case updateGrant.SUCCESS:
+      const data = payload?.data;
+      return data?.id
+        ? _.map((o) => (o?.id == data.id ? pickFields(data) : o))(state)
+        : state;
+    default:
+      return state;
+  }
+};
+
+export { grants };

package/src/reducers/grantsFilters.js

@@ -0,0 +1,19 @@
+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 };

package/src/reducers/grantsPageSize.js

@@ -0,0 +1,15 @@
+import { fetchGrants } from "../routines";
+
+const defaultPageSize = 20;
+
+const grantsPageSize = (state = defaultPageSize, { type, payload }) => {
+  switch (type) {
+    case fetchGrants.TRIGGER:
+      const { size } = payload;
+      return size || state;
+    default:
+      return state;
+  }
+};
+
+export { grantsPageSize };

package/src/reducers/index.js

@@ -3,6 +3,15 @@ import { childrenRelations, parentRelations } from "./structureRelations";
 import { csvGraphDownloading } from "./csvGraphDownloading";
 import { ddMessage } from "./ddMessage";
 import { deletingStructureTags } from "./deletingStructureTags";
+import { grantActiveFilters } from "./grantActiveFilters";
+import { grantCount } from "./grantCount";
+import { grantDateFilter } from "./grantDateFilter";
+import { grantFilters } from "./grantFilters";
+import { grantLoading } from "./grantLoading";
+import { grantQuery } from "./grantQuery";
+import { grants } from "./grants";
+import { grantSelectedFilter } from "./grantSelectedFilter";
+import { grantsPageSize } from "./grantsPageSize";
 import { graph } from "./graph";
 import { graphLoading } from "./graphLoading";
 import { graphRedirect } from "./graphRedirect";
@@ -80,6 +89,15 @@ export {
   csvGraphDownloading,
   ddMessage,
   deletingStructureTags,
+  grantActiveFilters,
+  grantCount,
+  grantDateFilter,
+  grantFilters,
+  grantLoading,
+  grantQuery,
+  grants,
+  grantSelectedFilter,
+  grantsPageSize,
   graph,
   graphLoading,
   graphRedirect,

package/src/reducers/structureDateFilter.js

@@ -1,7 +1,7 @@
 import {
   applyStructureDateFilter,
   clearStructureFilters,
-  toggleStructureDateFilter
+  toggleStructureDateFilter,
 } from "../routines";
 
 export const initialState = {
@@ -9,7 +9,7 @@ export const initialState = {
   name: "updated_at",
   type: "since",
   unit: "d",
-  value: "1"
+  value: "1",
 };
 
 export const structureDateFilter = (

package/src/reducers/structureQuery.js

@@ -7,7 +7,7 @@ import {
   selectStructurePage,
   sortStructures,
   toggleStructureFilterValue,
-  clearStructuresSort
+  clearStructuresSort,
 } from "../routines";
 
 const defaultPage = 1;
@@ -19,7 +19,7 @@ export const initialState = {
   query: "",
   page: defaultPage,
   size: defaultSize,
-  sort: byNameSort
+  sort: byNameSort,
 };
 
 const structureQuery = (state = initialState, { type, payload }) => {

package/src/routines.js

@@ -1,9 +1,11 @@
 import { createRoutine } from "redux-saga-routines";
 
+export const addGrantFilter = createRoutine("ADD_GRANT_FILTER");
 export const addStructureFilter = createRoutine("ADD_STRUCTURE_FILTER");
 export const addStructureSelectedFilter = createRoutine(
   "ADD_STRUCTURE_SELECTED_FILTER"
 );
+export const applyGrantDateFilter = createRoutine("APPLY_GRANT_DATE_FILTER");
 export const applyStructureDateFilter = createRoutine(
   "APPLY_STRUCTURE_DATE_FILTER"
 );
@@ -11,6 +13,9 @@ export const applyStructureUserFilter = createRoutine(
   "APPLY_STRUCTURE_USER_FILTER"
 );
 export const bulkUpdateStructures = createRoutine("BULK_UPDATE_STRUCTURES");
+export const clearGrantFilters = createRoutine("CLEAR_GRANT_FILTERS");
+export const clearGrants = createRoutine("CLEAR_GRANTS");
+export const clearGrantsSort = createRoutine("CLEAR_GRANTS_SORT");
 export const clearGraph = createRoutine("CLEAR_GRAPH");
 export const clearGroups = createRoutine("CLEAR_GROUPS");
 export const clearMetadataFields = createRoutine("CLEAR_METADATA_FIELDS");
@@ -34,6 +39,7 @@ export const clearStructuresSort = createRoutine("CLEAR_STRUCTURES_SORT");
 export const clearSystem = createRoutine("CLEAR_SYSTEM");
 export const clearSystemStructures = createRoutine("CLEAR_SYSTEM_STRUCTURES");
 export const clearSystems = createRoutine("CLEAR_SYSTEMS");
+export const closeGrantFilter = createRoutine("CLOSE_GRANT_FILTER");
 export const closeStructureFilter = createRoutine("CLOSE_STRUCTURE_FILTER");
 export const createGraph = createRoutine("CREATE_GRAPH");
 export const createProfileGroup = createRoutine("CREATE_PROFILE_GROUP");
@@ -54,6 +60,9 @@ export const downloadCsvGraph = createRoutine("DOWNLOAD_CSV_GRAPH");
 export const downloadStructures = createRoutine("DOWNLOAD_STRUCTURES");
 export const excludeNode = createRoutine("EXCLUDE_NODE");
 export const fetchDomains = createRoutine("FETCH_DOMAINS"); // TODO: Is there a way to avoid repeating this routine here?
+export const fetchGrant = createRoutine("FETCH_GRANT");
+export const fetchGrantFilters = createRoutine("FETCH_GRANT_FILTERS");
+export const fetchGrants = createRoutine("FETCH_GRANTS");
 export const fetchGraph = createRoutine("FETCH_GRAPH");
 export const fetchLinksStructureTags = createRoutine(
   "FETCH_LINKS_STRUCTURE_TAGS"
@@ -81,29 +90,40 @@ export const filterStructures = createRoutine("FILTER_STRUCTURES");
 export const hoverNode = createRoutine("HOVER_NODE");
 export const initSvg = createRoutine("INIT_SVG");
 export const linkStructureTag = createRoutine("LINK_STRUCTURE_TAG");
+export const openGrantFilter = createRoutine("OPEN_GRANT_FILTER");
 export const openStructureFilter = createRoutine("OPEN_STRUCTURE_FILTER");
+export const removeGrantFilter = createRoutine("REMOVE_GRANT_FILTER");
 export const removeStructureFilter = createRoutine("REMOVE_STRUCTURE_FILTER");
 export const removeStructureSelectedFilter = createRoutine(
   "REMOVE_STRUCTURE_SELECTED_FILTER"
 );
+export const resetGrantFilters = createRoutine("RESET_GRANT_FILTERS");
 export const resetStructureFilters = createRoutine("RESET_STRUCTURE_FILTERS");
 export const saveStructureUserFilters = createRoutine(
   "SAVE_STRUCTURE_USER_FILTERS"
 );
+export const searchGrants = createRoutine("SEARCH_GRANTS");
 export const searchStructures = createRoutine("SEARCH_STRUCTURES");
+export const selectGrantPage = createRoutine("SELECT_GRANT_PAGE");
 export const selectGroup = createRoutine("SELECT_GROUP");
 export const selectNode = createRoutine("SELECT_NODE");
 export const selectPath = createRoutine("SELECT_PATH");
 export const selectResources = createRoutine("SELECT_RESOURCES");
 export const selectStructure = createRoutine("SELECT_STRUCTURE");
 export const selectStructurePage = createRoutine("SELECT_STRUCTURE_PAGE");
+export const sortGrants = createRoutine("SORT_GRANTS");
 export const sortStructures = createRoutine("SORT_STRUCTURES");
+export const toggleGrantDateFilter = createRoutine("TOGGLE_GRANT_DATE_FILTER");
+export const toggleGrantFilterValue = createRoutine(
+  "TOGGLE_GRANT_FILTER_VALUE"
+);
 export const toggleStructureDateFilter = createRoutine(
   "TOGGLE_STRUCTURE_DATE_FILTER"
 );
 export const toggleStructureFilterValue = createRoutine(
   "TOGGLE_STRUCTURE_FILTER_VALUE"
 );
+export const updateGrant = createRoutine("UPDATE_GRANT");
 export const updateStructure = createRoutine("UPDATE_STRUCTURE");
 export const updateStructureTag = createRoutine("UPDATE_STRUCTURE_TAG");
 export const updateStructureType = createRoutine("UPDATE_STRUCTURE_TYPE");

package/src/sagas/__tests__/fetchGrants.spec.js

@@ -0,0 +1,74 @@
+import { debounce } from "redux-saga/effects";
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchGrantsRequestSaga, fetchGrantsSaga } from "../fetchGrants";
+import { fetchGrants } from "../../routines";
+import { API_GRANTS_SEARCH } from "../../api";
+
+describe("sagas: fetchGrantsRequestSaga", () => {
+  it("should invoke fetchGrantsSaga on trigger", () => {
+    expect(() => {
+      testSaga(fetchGrantsRequestSaga)
+        .next()
+        .is(debounce(200, fetchGrants.TRIGGER, fetchGrantsSaga))
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(fetchGrantsRequestSaga)
+        .next()
+        .takeLatest("FOO", fetchGrantsSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: fetchGrantsSaga", () => {
+  const grantQuery = {};
+  const data = {
+    collection: [
+      { id: 1, user_id: 1, data_structure_id: 1, description: "desc1" },
+      { id: 2, user_id: 1, data_structure_id: 1, description: "desc2" },
+    ],
+  };
+  const headers = {
+    "x-total-count": "123",
+  };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(fetchGrantsSaga, { payload: grantQuery })
+        .next()
+        .put(fetchGrants.request(grantQuery))
+        .next()
+        .call(apiJsonPost, API_GRANTS_SEARCH, grantQuery, JSON_OPTS)
+        .next({ data, headers })
+        .put(fetchGrants.success({ data, headers }))
+        .next()
+        .put(fetchGrants.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should put a failure action when the call returns an error", () => {
+    const message = "Request failed";
+    const error = { message };
+
+    expect(() => {
+      testSaga(fetchGrantsSaga, { payload: grantQuery })
+        .next()
+        .put(fetchGrants.request(grantQuery))
+        .next()
+        .call(apiJsonPost, API_GRANTS_SEARCH, grantQuery, JSON_OPTS)
+        .throw(error)
+        .put(fetchGrants.failure(message))
+        .next()
+        .put(fetchGrants.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});