@truedat/dd 5.16.2 → 5.16.4

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

@@ -0,0 +1,92 @@
+import { testSaga } from "redux-saga-test-plan";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import {
+  fetchGrantRequestsSearchRequestSaga,
+  fetchGrantRequestsSearchSaga,
+} from "../fetchGrantRequestsSearch";
+import { fetchGrantRequestsSearch } from "../../routines";
+import { API_GRANT_REQUESTS_SEARCH } from "../../api";
+
+const body = {
+  must: {
+    current_status: ["pending"],
+  },
+};
+const payload = body;
+
+describe("sagas: fetchGrantRequestsSearchRequestSaga", () => {
+  it("should invoke fetchGrantRequestsSearchSaga on fetchGrantRequestsSearch.TRIGGER", () => {
+    expect(() => {
+      testSaga(fetchGrantRequestsSearchRequestSaga)
+        .next()
+        .debounce(
+          200,
+          fetchGrantRequestsSearch.TRIGGER,
+          fetchGrantRequestsSearchSaga
+        )
+        .finish()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should throw exception if an unhandled action is received", () => {
+    expect(() => {
+      testSaga(fetchGrantRequestsSearchRequestSaga)
+        .next()
+        .takeLatest("FOO", fetchGrantRequestsSearchRequestSaga);
+    }).toThrow();
+  });
+});
+
+describe("sagas: fetchGrantRequestsSearchSaga", () => {
+  const data = {
+    _permissions: ["Role1", "Role2"],
+    data: [
+      {
+        id: 385,
+      },
+      {
+        id: 385,
+      },
+    ],
+  };
+
+  const headers = {
+    "x-total-count": "2",
+  };
+
+  it("should put a success action when a response is returned", () => {
+    expect(() => {
+      testSaga(fetchGrantRequestsSearchSaga, { payload })
+        .next()
+        .put(fetchGrantRequestsSearch.request(body))
+        .next()
+        .call(apiJsonPost, API_GRANT_REQUESTS_SEARCH, body, JSON_OPTS)
+        .next({ data, headers })
+        .put(fetchGrantRequestsSearch.success({ data, headers }))
+        .next()
+        .put(fetchGrantRequestsSearch.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(fetchGrantRequestsSearchSaga, { payload })
+        .next()
+        .put(fetchGrantRequestsSearch.request(body))
+        .next()
+        .call(apiJsonPost, API_GRANT_REQUESTS_SEARCH, body, JSON_OPTS)
+        .throw(error)
+        .put(fetchGrantRequestsSearch.failure(message))
+        .next()
+        .put(fetchGrantRequestsSearch.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+});

package/src/sagas/fetchGrantRequestsFilters.js

@@ -0,0 +1,32 @@
+import _ from "lodash/fp";
+import { call, put, takeLatest } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchGrantRequestsFilters } from "../routines";
+import { API_GRANT_REQUESTS_FILTERS_SEARCH } from "../api";
+
+export function* fetchGrantRequestsFiltersSaga(payload) {
+  try {
+    yield put(fetchGrantRequestsFilters.request());
+    const url = API_GRANT_REQUESTS_FILTERS_SEARCH;
+    const filters = _.propOr({}, "payload.filters")(payload);
+    const body = { filters };
+    const { data } = yield call(apiJsonPost, url, body, JSON_OPTS);
+    yield put(fetchGrantRequestsFilters.success({ data }));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(fetchGrantRequestsFilters.failure({ status, data }));
+    } else {
+      yield put(fetchGrantRequestsFilters.failure(error.message));
+    }
+  } finally {
+    yield put(fetchGrantRequestsFilters.fulfill());
+  }
+}
+
+export function* fetchGrantRequestsFiltersRequestSaga() {
+  yield takeLatest(
+    fetchGrantRequestsFilters.TRIGGER,
+    fetchGrantRequestsFiltersSaga
+  );
+}

package/src/sagas/fetchGrantRequestsSearch.js

@@ -0,0 +1,30 @@
+import { call, put, debounce } from "redux-saga/effects";
+import { apiJsonPost, JSON_OPTS } from "@truedat/core/services/api";
+import { fetchGrantRequestsSearch } from "../routines";
+import { API_GRANT_REQUESTS_SEARCH } from "../api";
+
+export function* fetchGrantRequestsSearchSaga({ payload: body }) {
+  try {
+    const url = API_GRANT_REQUESTS_SEARCH;
+    yield put(fetchGrantRequestsSearch.request(body));
+    const { data, headers } = yield call(apiJsonPost, url, body, JSON_OPTS);
+    yield put(fetchGrantRequestsSearch.success({ data, headers }));
+  } catch (error) {
+    if (error.response) {
+      const { status, data } = error.response;
+      yield put(fetchGrantRequestsSearch.failure({ status, data }));
+    } else {
+      yield put(fetchGrantRequestsSearch.failure(error.message));
+    }
+  } finally {
+    yield put(fetchGrantRequestsSearch.fulfill());
+  }
+}
+
+export function* fetchGrantRequestsSearchRequestSaga() {
+  yield debounce(
+    200,
+    fetchGrantRequestsSearch.TRIGGER,
+    fetchGrantRequestsSearchSaga
+  );
+}

package/src/sagas/index.js

@@ -23,6 +23,8 @@ import { downloadGrantsRequestSaga } from "./downloadGrants";
 import { downloadReferenceDatasetRequestSaga } from "./downloadReferenceDataset";
 import { downloadStructuresRequestSaga } from "./downloadStructures";
 import { fetchGrantFiltersRequestSaga } from "./fetchGrantFilters";
+import { fetchGrantRequestsFiltersRequestSaga } from "./fetchGrantRequestsFilters";
+import { fetchGrantRequestsSearchRequestSaga } from "./fetchGrantRequestsSearch";
 import { fetchGrantRequestRequestSaga } from "./fetchGrantRequest";
 import { fetchGrantRequestsRequestSaga } from "./fetchGrantRequests";
 import { fetchGrantsRequestSaga } from "./fetchGrants";
@@ -85,6 +87,8 @@ export {
   downloadStructuresRequestSaga,
   fetchGrantFiltersRequestSaga,
   fetchGrantRequestRequestSaga,
+  fetchGrantRequestsFiltersRequestSaga,
+  fetchGrantRequestsSearchRequestSaga,
   fetchGrantRequestsRequestSaga,
   fetchGrantsRequestSaga,
   fetchGraphRequestSaga,
@@ -148,6 +152,8 @@ export default [
   fetchGrantFiltersRequestSaga(),
   fetchGrantRequestRequestSaga(),
   fetchGrantRequestsRequestSaga(),
+  fetchGrantRequestsFiltersRequestSaga(),
+  fetchGrantRequestsSearchRequestSaga(),
   fetchGrantsRequestSaga(),
   fetchGraphRequestSaga(),
   fetchLineageEventsRequestSaga(),

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

@@ -0,0 +1,15 @@
+import { getGrantRequestsAvailableFilters } from "..";
+
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
+
+describe("selectors: getGrantRequestsAvailableFilters", () => {
+  const grantRequestsFilters = { foo, bar, baz };
+  const grantRequestsActiveFilters = { baz: [] };
+  const state = { grantRequestsFilters, grantRequestsActiveFilters };
+
+  it("should return the keys of the grant request filters which are not currently active", () => {
+    expect(getGrantRequestsAvailableFilters(state)).toEqual(["foo", "bar"]);
+  });
+});

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

@@ -0,0 +1,19 @@
+import { getGrantRequestsFilterTypes } from "..";
+
+const foo = { type: "fooType", values: ["foo1", "foo2"] };
+const bar = { type: "barType", values: ["bar1", "bar2"] };
+const bay = { values: ["bay1"] };
+
+describe("selectors: getGrantRequestsFilterTypes", () => {
+  const state = { grantRequestsFilters: { foo, bar, bay } };
+
+  const expected = {
+    foo: "fooType",
+    bar: "barType",
+    bay: undefined,
+  };
+
+  it("should return a map with filter types", () => {
+    expect(getGrantRequestsFilterTypes(state)).toEqual(expected);
+  });
+});

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

@@ -0,0 +1,30 @@
+import _ from "lodash/fp";
+import {
+  defaultGrantRequestsSearchTableColumns,
+  getGrantRequestsSearchColumns,
+} from "..";
+
+describe("selectors: getGrantRequestsSearchColumns", () => {
+  const state = {};
+
+  it("get default grant requests columns", () => {
+    const columns = getGrantRequestsSearchColumns(state);
+    expect(_.map("name")(columns)).toEqual(
+      _.flow(_.map("name"))(defaultGrantRequestsSearchTableColumns)
+    );
+  });
+
+  it("get specified columns in reducer", () => {
+    const grantRequestsSearchColumns = [
+      {
+        name: "foo",
+        fieldDecorator: _.identity,
+      },
+    ];
+    const columns = getGrantRequestsSearchColumns({
+      ...state,
+      grantRequestsSearchColumns,
+    });
+    expect(columns).toStrictEqual(grantRequestsSearchColumns);
+  });
+});

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

@@ -0,0 +1,24 @@
+import { getGrantRequestsSearchQuery } from "..";
+
+const grantRequestSearchQuery = { query: "foo" };
+const grantRequestsActiveFilters = { foo: "bar", bar: "baz" };
+const grantRequestsDefaultFilters = { status: "some status" };
+
+describe("selectors: getGrantRequestsSearchQuery", () => {
+  const state = {
+    grantRequestsDefaultFilters,
+    grantRequestsActiveFilters,
+    grantRequestSearchQuery,
+  };
+  it("get query merged with defaults", () => {
+    const res = getGrantRequestsSearchQuery({
+      grantRequestSearchQuery,
+      grantRequestsDefaultFilters,
+      grantRequestsActiveFilters,
+    });
+    expect(res).toEqual({
+      query: "foo",
+      filters: { foo: "bar", bar: "baz", status: "some status" },
+    });
+  });
+});

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

@@ -0,0 +1,15 @@
+import { getGrantRequestsSelectedFilterActiveValues } from "..";
+
+const foo = ["foo1", "foo2"];
+const bar = ["bar1", "bar2"];
+const baz = ["baz1", "baz2"];
+
+describe("selectors: getGrantRequestsSelectedFilterActiveValues", () => {
+  const grantRequestsActiveFilters = { foo: ["foo1"] };
+  const grantRequestsSelectedFilter = "foo";
+  const state = { grantRequestsActiveFilters, grantRequestsSelectedFilter };
+
+  it("should return the active values of the currently selected grant filters", () => {
+    expect(getGrantRequestsSelectedFilterActiveValues(state)).toEqual(["foo1"]);
+  });
+});

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

@@ -0,0 +1,15 @@
+import { getGrantRequestsSelectedFilterValues } from "../../../../dd/src/selectors";
+
+const foo = { values: ["foo1", "foo2"] };
+const bar = { values: ["bar1", "bar2"] };
+const baz = { values: ["baz1", "baz2"] };
+
+describe("selectors: getGrantRequestsSelectedFilterValues", () => {
+  const grantRequestsSelectedFilter = "foo";
+  const grantRequestsFilters = { foo, bar, baz };
+  const state = { grantRequestsSelectedFilter, grantRequestsFilters };
+
+  it("should return the values of the currently selected Grant Request filters", () => {
+    expect(getGrantRequestsSelectedFilterValues(state)).toEqual(foo.values);
+  });
+});

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

@@ -0,0 +1,13 @@
+import { getGrantRequestsSelectedFilters } from "..";
+
+describe("selectors: getGrantRequestsSelectedFilters", () => {
+  const grantRequestsActiveFilters = {
+    baz: ["baz1", "baz2"],
+    must_not_approved_by: ["approver 1"],
+  };
+  const state = { grantRequestsActiveFilters };
+
+  it("should return the keys of the structure filters which are currently active", () => {
+    expect(getGrantRequestsSelectedFilters(state)).toEqual(["baz"]);
+  });
+});

package/src/selectors/getGrantRequestsAvailableFilters.js

@@ -0,0 +1,17 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+import { getGrantRequestsSelectedFilters } from "./getGrantRequestsSelectedFilters";
+
+const getGrantRequestsFilters = _.propOr({}, "grantRequestsFilters");
+
+export const getGrantRequestsAvailableFilters = createSelector(
+  getGrantRequestsFilters,
+  getGrantRequestsSelectedFilters,
+  (grantRequestsFilters, grantRequestsSelectedFilters) => {
+    return _.flow(
+      _.omitBy(({ values }) => _.size(values) < 2),
+      _.keys,
+      _.without(grantRequestsSelectedFilters)
+    )(grantRequestsFilters);
+  }
+);

package/src/selectors/getGrantRequestsFilterTypes.js

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

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -0,0 +1,119 @@
+import _ from "lodash/fp";
+import React from "react";
+import { Header, Icon, Popup } from "semantic-ui-react";
+import { createSelector } from "reselect";
+import { useIntl } from "react-intl";
+import PropTypes from "prop-types";
+import Moment from "react-moment";
+
+export const UserDecorator = ({ user }) => {
+  return user ? (
+    <Header as="h4">
+      <Header.Content>{user.full_name}</Header.Content>
+    </Header>
+  ) : (
+    "null"
+  );
+};
+
+UserDecorator.propTypes = {
+  user: PropTypes.object,
+};
+
+export const PathDecorator = ({ data_structure_version }) => {
+  const path = _.flow(_.prop("path"), _.join(" › "))(data_structure_version);
+  return <>{path}</>;
+};
+
+PathDecorator.propTypes = {
+  data_structure: PropTypes.object,
+};
+
+export const StructureDecorator = ({ name, modificationGrant }) => {
+  const { formatMessage } = useIntl();
+  return (
+    <>
+      {modificationGrant ? (
+        <Popup
+          content={formatMessage({ id: "grantRequest.modification_grant_id" })}
+          trigger={<Icon name="edit" />}
+        />
+      ) : null}
+      {name}
+    </>
+  );
+};
+
+StructureDecorator.propTypes = {
+  name: PropTypes.string,
+  modificationGrant: PropTypes.string,
+};
+
+const DateDecorator = ({ date }) => {
+  const { locale } = useIntl();
+  return date ? (
+    <Moment locale={locale} date={date} format="YYYY-MM-DD HH:mm" />
+  ) : null;
+};
+
+DateDecorator.propTypes = {
+  date: PropTypes.string,
+};
+
+const StatusDecorator = ({ status }) => {
+  const { formatMessage } = useIntl();
+  return status ? (
+    <>{formatMessage({ id: `grantRequest.content.${status}` })}</>
+  ) : null;
+};
+
+StatusDecorator.propTypes = {
+  status: PropTypes.string,
+};
+
+export const defaultGrantRequestsSearchTableColumns = [
+  {
+    name: "user",
+    sort: { name: "user.user_name" },
+    fieldSelector: (grantRequest) => ({
+      user: grantRequest?.user,
+    }),
+    fieldDecorator: UserDecorator,
+  },
+  {
+    name: "data_structure",
+    sort: { name: "data_structure_version.name.raw" },
+    fieldSelector: (grantRequest) => ({
+      name: grantRequest?.data_structure_version?.name,
+      modificationGrant: _.prop("modification_grant_id")(grantRequest),
+    }),
+    fieldDecorator: StructureDecorator,
+  },
+  {
+    name: "path",
+    fieldSelector: (grantRequest) => ({
+      data_structure_version: grantRequest?.data_structure_version,
+    }),
+    fieldDecorator: PathDecorator,
+  },
+  {
+    name: "inserted_at",
+    sort: { name: "inserted_at" },
+    fieldSelector: (grantRequest) => ({
+      date: grantRequest?.inserted_at,
+    }),
+    fieldDecorator: DateDecorator,
+    textAlign: "center",
+    width: 2,
+  },
+];
+
+export const getGrantRequestsSearchColumns = createSelector(
+  [_.prop("grantRequestsSearchColumns")],
+  (grantRequestsSearchColumns) => {
+    return _.flow(
+      _.defaultTo(defaultGrantRequestsSearchTableColumns),
+      _.reject({ name: "status" })
+    )(grantRequestsSearchColumns);
+  }
+);

package/src/selectors/getGrantRequestsSearchQuery.js

@@ -0,0 +1,19 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getGrantRequestsSearchQuery = createSelector(
+  _.prop("grantRequestSearchQuery"),
+  _.prop("grantRequestsActiveFilters"),
+  _.prop("grantRequestsDefaultFilters"),
+  (grantRequestQuery, grantRequestsActiveFilters, defaultFilters) => {
+    const query = _.trim(grantRequestQuery?.query);
+    const filters = _.omitBy(_.isEmpty)(grantRequestsActiveFilters);
+    const filtersWithDefaults = {
+      ...defaultFilters,
+      ...filters,
+    };
+    return query
+      ? { filters: filtersWithDefaults, query }
+      : { filters: filtersWithDefaults };
+  }
+);

package/src/selectors/getGrantRequestsSelectedFilterActiveValues.js

@@ -0,0 +1,8 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getGrantRequestsSelectedFilterActiveValues = createSelector(
+  [_.prop("grantRequestsSelectedFilter"), _.prop("grantRequestsActiveFilters")],
+  (grantRequestsSelectedFilter, grantRequestsActiveFilters) =>
+    _.propOr([], grantRequestsSelectedFilter)(grantRequestsActiveFilters)
+);

package/src/selectors/getGrantRequestsSelectedFilterValues.js

@@ -0,0 +1,12 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+import { formatFilterValues } from "@truedat/core/services/filters";
+
+export const getGrantRequestsSelectedFilterValues = createSelector(
+  [_.prop("grantRequestsSelectedFilter"), _.prop("grantRequestsFilters")],
+  (grantRequestsSelectedFilter, grantRequestsFilters) =>
+    _.flow(
+      _.propOr({ values: [] }, grantRequestsSelectedFilter),
+      formatFilterValues
+    )(grantRequestsFilters)
+);

package/src/selectors/getGrantRequestsSelectedFilters.js

@@ -0,0 +1,8 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getGrantRequestsSelectedFilters = createSelector(
+  [_.prop("grantRequestsActiveFilters")],
+  (grantRequestsActiveFilters) =>
+    _.without(["must_not_approved_by"])(_.keys(grantRequestsActiveFilters))
+);

package/src/selectors/index.js

@@ -3,6 +3,16 @@ export {
   structureColumnsSelector,
   structureRowsSelector,
 } from "./structureColumnsSelector";
+export { getGrantRequestsSelectedFilterActiveValues } from "./getGrantRequestsSelectedFilterActiveValues";
+export { getGrantRequestsFilterTypes } from "./getGrantRequestsFilterTypes";
+export { getGrantRequestsSelectedFilterValues } from "./getGrantRequestsSelectedFilterValues";
+export { getGrantRequestsSelectedFilters } from "./getGrantRequestsSelectedFilters";
+export {
+  getGrantRequestsSearchColumns,
+  defaultGrantRequestsSearchTableColumns,
+} from "./getGrantRequestsSearchColumns";
+export { getGrantRequestsSearchQuery } from "./getGrantRequestsSearchQuery";
+export { getGrantRequestsAvailableFilters } from "./getGrantRequestsAvailableFilters";
 export { getGrantAvailableFilters } from "./getGrantAvailableFilters";
 export { getGrantSelectedFilters } from "./getGrantSelectedFilters";
 export { getGrantFilterTypes } from "./getGrantFilterTypes";

package/src/components/GrantRequestApprovals.js

@@ -1,41 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { Header, Icon, Segment } from "semantic-ui-react";
-import {
-  getGrantRequests,
-  getGrantRequestsApprovalColumns
-} from "../selectors";
-import GrantRequests from "./GrantRequests";
-
-export const GrantRequestApprovals = ({ columns, grantRequests }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <Segment>
-      <Header as="h2">
-        <Icon circular name="key" />
-        <Header.Content>
-          {formatMessage({ id: "grantRequests.header.approve" })}
-          <Header.Subheader>
-            {formatMessage({ id: "grantRequests.subheader.approve" })}
-          </Header.Subheader>
-        </Header.Content>
-      </Header>
-      <GrantRequests columns={columns} grantRequests={grantRequests} />
-    </Segment>
-  );
-};
-
-const mapStateToProps = state => ({
-  columns: getGrantRequestsApprovalColumns(state),
-  grantRequests: getGrantRequests(state)
-});
-
-GrantRequestApprovals.propTypes = {
-  columns: PropTypes.array,
-  grantRequests: PropTypes.array
-};
-
-export default connect(mapStateToProps)(GrantRequestApprovals);