@truedat/dd 4.37.1 → 4.37.5

package/src/sagas/index.js

@@ -9,7 +9,7 @@ import { deleteStructureRequestSaga } from "./deleteStructure";
 import { createSystemRequestSaga } from "./createSystem";
 import { deleteLinkStructureTagRequestSaga } from "./deleteLinkStructureTag";
 import { deleteStructureTagRequestSaga } from "./deleteStructureTag";
-import { deleteStructureUserFilterRequestSaga } from "./deleteStructureUserFilter";
+import { deleteUserSearchFilterRequestSaga } from "./deleteUserSearchFilter";
 import { doStructureNoteActionRequestSaga } from "./doStructureNoteAction";
 import { downloadCsvGraphRequestSaga } from "./downloadCsvGraph";
 import { downloadGrantsRequestSaga } from "./downloadGrants";
@@ -33,14 +33,14 @@ import { fetchStructureTagRequestSaga } from "./fetchStructureTag";
 import { fetchStructureTagsRequestSaga } from "./fetchStructureTags";
 import { fetchStructureTypeRequestSaga } from "./fetchStructureType";
 import { fetchStructureTypesRequestSaga } from "./fetchStructureTypes";
-import { fetchStructureUserFiltersRequestSaga } from "./fetchStructureUserFilters";
+import { fetchUserSearchFiltersRequestSaga } from "./fetchUserSearchFilters";
 import { fetchStructuresRequestSaga } from "./fetchStructures";
 import { fetchSystemRequestSaga } from "./fetchSystem";
 import { fetchSystemStructuresRequestSaga } from "./fetchSystemStructures";
 import { fetchSystemsRequestSaga } from "./fetchSystems";
 import { fetchUnitDomainsRequestSaga } from "./fetchUnitDomains";
 import { linkStructureTagRequestSaga } from "./linkStructureTag";
-import { saveStructureUserFiltersRequestSaga } from "./saveStructureUserFilters";
+import { saveUserSearchFiltersRequestSaga } from "./saveUserSearchFilters";
 import { updateStructureRequestSaga } from "./updateStructure";
 import { updateStructureTagRequestSaga } from "./updateStructureTag";
 import { updateStructureTypeRequestSaga } from "./updateStructureType";
@@ -60,7 +60,7 @@ export {
   createSystemRequestSaga,
   deleteLinkStructureTagRequestSaga,
   deleteStructureTagRequestSaga,
-  deleteStructureUserFilterRequestSaga,
+  deleteUserSearchFilterRequestSaga,
   doStructureNoteActionRequestSaga,
   downloadCsvGraphRequestSaga,
   downloadGrantsRequestSaga,
@@ -84,14 +84,14 @@ export {
   fetchStructureTagsRequestSaga,
   fetchStructureTypeRequestSaga,
   fetchStructureTypesRequestSaga,
-  fetchStructureUserFiltersRequestSaga,
+  fetchUserSearchFiltersRequestSaga,
   fetchStructuresRequestSaga,
   fetchSystemRequestSaga,
   fetchSystemStructuresRequestSaga,
   fetchSystemsRequestSaga,
   fetchUnitDomainsRequestSaga,
   linkStructureTagRequestSaga,
-  saveStructureUserFiltersRequestSaga,
+  saveUserSearchFiltersRequestSaga,
   updateStructureRequestSaga,
   updateStructureTagRequestSaga,
   updateStructureTypeRequestSaga,
@@ -112,7 +112,7 @@ export default [
   createSystemRequestSaga(),
   deleteLinkStructureTagRequestSaga(),
   deleteStructureTagRequestSaga(),
-  deleteStructureUserFilterRequestSaga(),
+  deleteUserSearchFilterRequestSaga(),
   doStructureNoteActionRequestSaga(),
   downloadCsvGraphRequestSaga(),
   downloadGrantsRequestSaga(),
@@ -136,14 +136,14 @@ export default [
   fetchStructureTagsRequestSaga(),
   fetchStructureTypeRequestSaga(),
   fetchStructureTypesRequestSaga(),
-  fetchStructureUserFiltersRequestSaga(),
+  fetchUserSearchFiltersRequestSaga(),
   fetchStructuresRequestSaga(),
   fetchSystemRequestSaga(),
   fetchSystemStructuresRequestSaga(),
   fetchSystemsRequestSaga(),
   fetchUnitDomainsRequestSaga(),
   linkStructureTagRequestSaga(),
-  saveStructureUserFiltersRequestSaga(),
+  saveUserSearchFiltersRequestSaga(),
   updateStructureRequestSaga(),
   updateStructureTagRequestSaga(),
   updateStructureTypeRequestSaga(),

package/src/sagas/saveUserSearchFilters.js

@@ -0,0 +1,30 @@
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { saveUserSearchFilters } from "../routines";
+import { API_USER_SEARCH_FILTERS } from "../api";
+
+export function* saveUserSearchFiltersSaga({ payload }) {
+  try {
+    const { filterName, filters, scope } = payload;
+    const url = API_USER_SEARCH_FILTERS;
+    const requestData = {
+      user_search_filter: { name: filterName, filters, scope },
+    };
+    yield put({ ...saveUserSearchFilters.request() });
+    const { data } = yield call(apiJsonPost, url, requestData, JSON_OPTS);
+    yield put({ ...saveUserSearchFilters.success(data) });
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(saveUserSearchFilters.failure({ status, data }));
+    } else {
+      yield put(saveUserSearchFilters.failure(error.message));
+    }
+  } finally {
+    yield put(saveUserSearchFilters.fulfill());
+  }
+}
+
+export function* saveUserSearchFiltersRequestSaga() {
+  yield takeLatest(saveUserSearchFilters.TRIGGER, saveUserSearchFiltersSaga);
+}

package/src/selectors/getStructureSelectedFilterValues.js

@@ -4,11 +4,9 @@ import { formatFilterValues } from "@truedat/core/services/filters";
 
 export const getStructureSelectedFilterValues = createSelector(
   [_.prop("structureSelectedFilter"), _.prop("structureFilters")],
-  (structureSelectedFilter, structureFilters) => {
-    const result = _.flow(
+  (structureSelectedFilter, structureFilters) =>
+    _.flow(
       _.propOr([], structureSelectedFilter),
       formatFilterValues(structureSelectedFilter)
-    )(structureFilters);
-    return result;
-  }
+    )(structureFilters)
 );

package/src/components/StructureUserFiltersLoader.js

@@ -1,30 +0,0 @@
-import { useEffect } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import {
-  clearStructureUserFilters,
-  fetchStructureUserFilters,
-} from "../routines";
-
-export const StructureUserFiltersLoader = ({
-  clearStructureUserFilters,
-  fetchStructureUserFilters,
-}) => {
-  useEffect(() => {
-    fetchStructureUserFilters();
-    return () => {
-      clearStructureUserFilters();
-    };
-  }, [clearStructureUserFilters, fetchStructureUserFilters]);
-  return null;
-};
-
-StructureUserFiltersLoader.propTypes = {
-  clearStructureUserFilters: PropTypes.func,
-  fetchStructureUserFilters: PropTypes.func,
-};
-
-export default connect(null, {
-  clearStructureUserFilters,
-  fetchStructureUserFilters,
-})(StructureUserFiltersLoader);

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

@@ -1,27 +0,0 @@
-import React from "react";
-import { shallow, mount } from "enzyme";
-import { StructureUserFiltersLoader } from "../StructureUserFiltersLoader";
-
-describe("<StructureUserFiltersLoader />", () => {
-  const fetchStructureUserFilters = jest.fn();
-  const clearStructureUserFilters = jest.fn();
-
-  it("matches the latest snapshot", () => {
-    const props = { clearStructureUserFilters, fetchStructureUserFilters };
-    const wrapper = shallow(<StructureUserFiltersLoader {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("calls fetchStructureUserFilters when component mounts, clearStructureUserFilters when component unmounts", () => {
-    const fetchStructureUserFilters = jest.fn();
-    const clearStructureUserFilters = jest.fn();
-
-    const props = { fetchStructureUserFilters, clearStructureUserFilters };
-    const wrapper = mount(<StructureUserFiltersLoader {...props} />);
-    expect(clearStructureUserFilters.mock.calls.length).toBe(0);
-    expect(fetchStructureUserFilters.mock.calls.length).toBe(1);
-    wrapper.unmount();
-    expect(clearStructureUserFilters.mock.calls.length).toBe(1);
-    expect(fetchStructureUserFilters.mock.calls.length).toBe(1);
-  });
-});

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

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<StructureUserFiltersLoader /> matches the latest snapshot 1`] = `""`;

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

@@ -1,64 +0,0 @@
-import { initialState } from "../structureSelectedUserFilter";
-import {
-  applyStructureUserFilter,
-  clearStructureUserFilters,
-  removeStructureFilter,
-  resetStructureFilters
-} from "../../routines";
-import { structureSelectedUserFilter } from "..";
-
-const fooState = { foo: "bar" };
-
-describe("reducers: structureActiveFilters", () => {
-  it("should provide the initial state", () => {
-    expect(structureSelectedUserFilter(undefined, {})).toEqual(initialState);
-  });
-
-  it("should handle the applyStructureUserFilter.TRIGGER action", () => {
-    const name = "by country";
-    const payload = { userFilter: { name } };
-    expect(
-      structureSelectedUserFilter(fooState, {
-        type: applyStructureUserFilter.TRIGGER,
-        payload
-      })
-    ).toEqual(name);
-
-    expect(
-      structureSelectedUserFilter(name, {
-        type: applyStructureUserFilter.TRIGGER,
-        payload
-      })
-    ).toEqual(null);
-  });
-
-  it("should handle the removeStructureFilter.TRIGGER action", () => {
-    expect(
-      structureSelectedUserFilter(fooState, {
-        type: removeStructureFilter.TRIGGER
-      })
-    ).toEqual(initialState);
-  });
-
-  it("should handle the resetStructureFilters.TRIGGER action", () => {
-    expect(
-      structureSelectedUserFilter(fooState, {
-        type: resetStructureFilters.TRIGGER
-      })
-    ).toEqual(initialState);
-  });
-
-  it("should handle the clearStructureUserFilters.TRIGGER action", () => {
-    expect(
-      structureSelectedUserFilter(fooState, {
-        type: clearStructureUserFilters.TRIGGER
-      })
-    ).toEqual(initialState);
-  });
-
-  it("should ignore unknown actions", () => {
-    expect(structureSelectedUserFilter(fooState, { type: "FOO" })).toBe(
-      fooState
-    );
-  });
-});

package/src/reducers/structureSelectedUserFilter.js

@@ -1,34 +0,0 @@
-import {
-  applyStructureUserFilter,
-  clearStructureUserFilters,
-  removeStructureFilter,
-  resetStructureFilters
-} from "../routines";
-
-/** @type {string} */
-export const initialState = null;
-
-export const structureSelectedUserFilter = (
-  state = initialState,
-  { type, payload }
-) => {
-  switch (type) {
-    case applyStructureUserFilter.TRIGGER:
-      const {
-        userFilter: { name: name }
-      } = payload;
-      if (state == name) {
-        return initialState;
-      } else {
-        return name;
-      }
-    case clearStructureUserFilters.TRIGGER:
-      return initialState;
-    case removeStructureFilter.TRIGGER:
-      return initialState;
-    case resetStructureFilters.TRIGGER:
-      return initialState;
-    default:
-      return state;
-  }
-};

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

@@ -1,75 +0,0 @@
-import { compile } from "path-to-regexp";
-import { testSaga } from "redux-saga-test-plan";
-import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
-import {
-  deleteStructureUserFilterSaga,
-  deleteStructureUserFilterRequestSaga
-} from "../deleteStructureUserFilter";
-import { deleteStructureUserFilter } from "../../routines";
-import { API_STRUCTURE_USER_FILTER } from "../../api";
-
-describe("sagas: deleteStructureUserFilterRequestSaga", () => {
-  it("should invoke deleteStructureUserFilterSaga on deleteStructureUserFilter.TRIGGER", () => {
-    expect(() => {
-      testSaga(deleteStructureUserFilterRequestSaga)
-        .next()
-        .takeLatest(
-          deleteStructureUserFilter.TRIGGER,
-          deleteStructureUserFilterSaga
-        )
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(deleteStructureUserFilterRequestSaga)
-        .next()
-        .takeLatest("FOO", deleteStructureUserFilterRequestSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: deleteStructureUserFilterSaga", () => {
-  const payload = { id: 1 };
-  const { id } = payload;
-  const url = compile(API_STRUCTURE_USER_FILTER)({ id });
-  const meta = { id };
-
-  it("should put a success action when a response is returned", () => {
-    expect(() => {
-      testSaga(deleteStructureUserFilterSaga, { payload })
-        .next()
-        .put({ meta, ...deleteStructureUserFilter.request() })
-        .next()
-        .call(apiJsonDelete, url, JSON_OPTS)
-        .next({ data: payload })
-        .put({ meta, ...deleteStructureUserFilter.success(payload) })
-        .next()
-        .put(deleteStructureUserFilter.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should put a failure action when the call returns an error", () => {
-    const message = "Request failed";
-    const error = { message };
-    const meta = { id: 1 };
-
-    expect(() => {
-      testSaga(deleteStructureUserFilterSaga, { payload })
-        .next()
-        .put({ meta, ...deleteStructureUserFilter.request() })
-        .next()
-        .call(apiJsonDelete, url, JSON_OPTS)
-        .throw(error)
-        .put(deleteStructureUserFilter.failure(message))
-        .next()
-        .put(deleteStructureUserFilter.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

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

@@ -1,70 +0,0 @@
-import { testSaga } from "redux-saga-test-plan";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import {
-  fetchStructureUserFiltersRequestSaga,
-  fetchStructureUserFiltersSaga
-} from "../fetchStructureUserFilters";
-import { fetchStructureUserFilters } from "../../routines";
-import { API_GET_STRUCTURE_USER_FILTERS } from "../../api";
-
-describe("sagas: fetchStructureUserFiltersRequestSaga", () => {
-  it("should invoke fetchStructureUserFiltersSaga on fetchStructureUserFilters.TRIGGER", () => {
-    expect(() => {
-      testSaga(fetchStructureUserFiltersRequestSaga)
-        .next()
-        .takeLatest(
-          fetchStructureUserFilters.TRIGGER,
-          fetchStructureUserFiltersSaga
-        )
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(fetchStructureUserFiltersRequestSaga)
-        .next()
-        .takeLatest("FOO", fetchStructureUserFiltersRequestSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: fetchStructureUserFiltersSaga", () => {
-  const data = [{ id: 1, name: "a" }];
-
-  it("should put a success action when a response is returned", () => {
-    expect(() => {
-      testSaga(fetchStructureUserFiltersSaga)
-        .next()
-        .put(fetchStructureUserFilters.request())
-        .next()
-        .call(apiJson, API_GET_STRUCTURE_USER_FILTERS, JSON_OPTS)
-        .next({ data })
-        .put(fetchStructureUserFilters.success(data))
-        .next()
-        .put(fetchStructureUserFilters.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(fetchStructureUserFiltersSaga)
-        .next()
-        .put(fetchStructureUserFilters.request())
-        .next()
-        .call(apiJson, API_GET_STRUCTURE_USER_FILTERS, JSON_OPTS)
-        .throw(error)
-        .put(fetchStructureUserFilters.failure(message))
-        .next()
-        .put(fetchStructureUserFilters.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

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

@@ -1,73 +0,0 @@
-import { testSaga } from "redux-saga-test-plan";
-import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import {
-  saveStructureUserFiltersRequestSaga,
-  saveStructureUserFiltersSaga
-} from "../saveStructureUserFilters";
-import { saveStructureUserFilters } from "../../routines";
-import { API_STRUCTURE_USER_FILTERS } from "../../api";
-
-describe("sagas: saveStructureFiltersRequestSaga", () => {
-  it("should invoke saveStructureFiltersSaga on saveStructureFilters.TRIGGER", () => {
-    expect(() => {
-      testSaga(saveStructureUserFiltersRequestSaga)
-        .next()
-        .takeLatest(
-          saveStructureUserFilters.TRIGGER,
-          saveStructureUserFiltersSaga
-        )
-        .finish()
-        .isDone();
-    }).not.toThrow();
-  });
-
-  it("should throw exception if an unhandled action is received", () => {
-    expect(() => {
-      testSaga(saveStructureUserFiltersRequestSaga)
-        .next()
-        .takeLatest("FOO", saveStructureUserFiltersRequestSaga);
-    }).toThrow();
-  });
-});
-
-describe("sagas: saveStructureFiltersSaga", () => {
-  const data = { user_search_filter: { id: 1, name: "a" } };
-  const payload = { filterName: "a", filters: { country: ["A"] } };
-  const requestData = {
-    user_search_filter: { name: "a", filters: { country: ["A"] } }
-  };
-  it("should put a success action when a response is returned", () => {
-    expect(() => {
-      testSaga(saveStructureUserFiltersSaga, { payload })
-        .next()
-        .put(saveStructureUserFilters.request())
-        .next()
-        .call(apiJsonPost, API_STRUCTURE_USER_FILTERS, requestData, JSON_OPTS)
-        .next({ data })
-        .put(saveStructureUserFilters.success(data))
-        .next()
-        .put(saveStructureUserFilters.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(saveStructureUserFiltersSaga, { payload })
-        .next()
-        .put(saveStructureUserFilters.request())
-        .next()
-        .call(apiJsonPost, API_STRUCTURE_USER_FILTERS, requestData, JSON_OPTS)
-        .throw(error)
-        .put(saveStructureUserFilters.failure(message))
-        .next()
-        .put(saveStructureUserFilters.fulfill())
-        .next()
-        .isDone();
-    }).not.toThrow();
-  });
-});

package/src/sagas/deleteStructureUserFilter.js

@@ -1,34 +0,0 @@
-import { compile } from "path-to-regexp";
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonDelete, JSON_OPTS } from "@truedat/core/services/api";
-import { deleteStructureUserFilter } from "../routines";
-import { API_STRUCTURE_USER_FILTER } from "../api";
-
-const toApiPath = compile(API_STRUCTURE_USER_FILTER);
-
-export function* deleteStructureUserFilterSaga({ payload }) {
-  try {
-    const url = toApiPath(payload);
-    const { id } = payload;
-    const meta = { id };
-    yield put({ meta, ...deleteStructureUserFilter.request() });
-    const { data } = yield call(apiJsonDelete, url, JSON_OPTS);
-    yield put({ meta, ...deleteStructureUserFilter.success(data) });
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(deleteStructureUserFilter.failure({ status, data }));
-    } else {
-      yield put(deleteStructureUserFilter.failure(error.message));
-    }
-  } finally {
-    yield put(deleteStructureUserFilter.fulfill());
-  }
-}
-
-export function* deleteStructureUserFilterRequestSaga() {
-  yield takeLatest(
-    deleteStructureUserFilter.TRIGGER,
-    deleteStructureUserFilterSaga
-  );
-}

package/src/sagas/fetchStructureUserFilters.js

@@ -1,29 +0,0 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJson, JSON_OPTS } from "@truedat/core/services/api";
-import { fetchStructureUserFilters } from "../routines";
-import { API_GET_STRUCTURE_USER_FILTERS } from "../api";
-
-export function* fetchStructureUserFiltersSaga() {
-  try {
-    const url = API_GET_STRUCTURE_USER_FILTERS;
-    yield put(fetchStructureUserFilters.request());
-    const { data } = yield call(apiJson, url, JSON_OPTS);
-    yield put(fetchStructureUserFilters.success(data));
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(fetchStructureUserFilters.failure({ status, data }));
-    } else {
-      yield put(fetchStructureUserFilters.failure(error.message));
-    }
-  } finally {
-    yield put(fetchStructureUserFilters.fulfill());
-  }
-}
-
-export function* fetchStructureUserFiltersRequestSaga() {
-  yield takeLatest(
-    fetchStructureUserFilters.TRIGGER,
-    fetchStructureUserFiltersSaga
-  );
-}

package/src/sagas/saveStructureUserFilters.js

@@ -1,31 +0,0 @@
-import { call, put, takeLatest } from "redux-saga/effects";
-import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
-import { saveStructureUserFilters } from "../routines";
-import { API_STRUCTURE_USER_FILTERS } from "../api";
-
-export function* saveStructureUserFiltersSaga({ payload }) {
-  try {
-    const { filterName, filters } = payload;
-    const url = API_STRUCTURE_USER_FILTERS;
-    const requestData = { user_search_filter: { name: filterName, filters } };
-    yield put({ ...saveStructureUserFilters.request() });
-    const { data } = yield call(apiJsonPost, url, requestData, JSON_OPTS);
-    yield put({ ...saveStructureUserFilters.success(data) });
-  } catch (error) {
-    if (error.response) {
-      const { status, data } = error.response;
-      yield put(saveStructureUserFilters.failure({ status, data }));
-    } else {
-      yield put(saveStructureUserFilters.failure(error.message));
-    }
-  } finally {
-    yield put(saveStructureUserFilters.fulfill());
-  }
-}
-
-export function* saveStructureUserFiltersRequestSaga() {
-  yield takeLatest(
-    saveStructureUserFilters.TRIGGER,
-    saveStructureUserFiltersSaga
-  );
-}