@truedat/dd 5.15.2 → 5.16.3

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);