@truedat/dd 4.28.1 → 4.28.5

package/src/selectors/getGrantSelectedFilterValues.js

@@ -0,0 +1,13 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+import { formatFilterValues } from "@truedat/core/services/filters";
+
+export const getGrantSelectedFilterValues = createSelector(
+  [_.prop("grantSelectedFilter"), _.prop("grantFilters")],
+  (grantSelectedFilter, grantFilters) => {
+    return _.flow(
+      _.propOr([], grantSelectedFilter),
+      formatFilterValues(grantSelectedFilter)
+    )(grantFilters);
+  }
+);

package/src/selectors/getGrantSelectedFilters.js

@@ -0,0 +1,7 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+
+export const getGrantSelectedFilters = createSelector(
+  [_.prop("grantActiveFilters")],
+  _.keys
+);

package/src/selectors/getGrantsColumns.js

@@ -7,6 +7,7 @@ import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
 import Moment from "react-moment";
 import PropTypes from "prop-types";
+import { findDOMNode } from "react-dom";
 
 export const GrantUserDecorator = ({ authentication, user }) => {
   const { formatMessage } = useIntl();
@@ -42,7 +43,7 @@ export const GrantStructureDecorator = ({
   data_structure,
 }) => {
   const { formatMessage } = useIntl();
-  const direct = grant_structure.id === data_structure.id;
+  const direct = grant_structure?.id === data_structure?.id;
 
   const path =
     !direct &&
@@ -69,8 +70,36 @@ GrantStructureDecorator.propTypes = {
   grant_structure: PropTypes.object,
 };
 
-export const structureDecorator = (structure) => (props) =>
-  GrantStructureDecorator({ grant_structure: structure, ...props });
+export const structureDecorator = (structure) => (props) => {
+  return GrantStructureDecorator({ grant_structure: structure, ...props });
+};
+
+export const GrantTableStructureDecorator = ({ data_structure_version }) => {
+  return (
+    <Link
+      to={linkTo.STRUCTURE({ id: data_structure_version.data_structure_id })}
+    >
+      {data_structure_version.name}
+    </Link>
+  );
+};
+
+GrantTableStructureDecorator.propTypes = {
+  data_structure_version: PropTypes.object,
+};
+
+export const GenericObjectDecorator = ({
+  data_structure_version: { metadata },
+}) =>
+  Object.entries(metadata).map(([k, v], i) => [
+    <div key={i}>
+      {k}: {v}
+    </div>,
+  ]);
+
+GenericObjectDecorator.propTypes = {
+  metadata: PropTypes.object,
+};
 
 export const StartDateDecorator = ({ start_date }) => {
   const { locale } = useIntl();
@@ -140,7 +169,7 @@ export const defaultGrantsColumns = [
   {
     name: "start_date",
     fieldSelector: _.pick(["start_date"]),
-    fieldDecorator: StartDateDecorator,
+    fieldDecorator: (field) => field.start_date,
   },
   {
     name: "end_date",
@@ -154,12 +183,57 @@ export const getGrantsColumns = createSelector(
   (grantsColumns, structure, authentication) =>
     _.flow(
       _.defaultTo(defaultGrantsColumns),
-      _.map((c) =>
-        c.name === "data_structure"
+      _.map((c) => {
+        return c.name === "data_structure"
           ? { ...c, fieldDecorator: c.fieldDecorator(structure) }
           : c.name === "user"
           ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }
-          : c
-      )
+          : c;
+      })
+    )(grantsColumns)
+);
+
+export const defaultGrantsTableColumns = [
+  {
+    name: "user",
+    sort: { name: "user.user_name.raw" },
+    fieldSelector: _.pick(["user"]),
+    fieldDecorator: userDecorator,
+  },
+  {
+    name: "data_structure_version",
+    sort: { name: "data_structure_version.name.raw" },
+    fieldSelector: _.pick(["data_structure", "data_structure_version"]),
+    fieldDecorator: GrantTableStructureDecorator,
+  },
+  {
+    name: "start_date",
+    sort: { name: "start_date" },
+    fieldSelector: _.pick(["start_date"]),
+    fieldDecorator: StartDateDecorator,
+  },
+  {
+    name: "end_date",
+    sort: { name: "end_date" },
+    fieldSelector: _.pick(["end_date"]),
+    fieldDecorator: EndDateDecorator,
+  },
+  {
+    name: "metadata",
+    fieldSelector: _.pick(["data_structure_version.metadata"]),
+    fieldDecorator: GenericObjectDecorator,
+  },
+];
+
+export const getGrantsTableColumns = createSelector(
+  [_.prop("grantsColumns"), _.prop("authentication")],
+  (grantsColumns, authentication) =>
+    _.flow(
+      _.defaultTo(defaultGrantsTableColumns),
+      _.map((c) => {
+        return c.name === "user"
+          ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }
+          : c;
+      })
     )(grantsColumns)
 );

package/src/selectors/getStructureSelectedFilterValues.js

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

package/src/selectors/getTabVisibility.js

@@ -3,7 +3,7 @@ import { getStructureToConceptLinks } from "./getStructureLinks";
 import { metadataViewsSelector } from "./metadataViewsSelector";
 
 const notEmpty = _.negate(_.isEmpty);
-const notEmptyPath = path => _.flow(_.path(path), notEmpty);
+const notEmptyPath = (path) => _.flow(_.path(path), notEmpty);
 const hasProfile = notEmptyPath("profile");
 
 const fieldsTabVisible = _.conformsTo({ structureFields: notEmpty });
@@ -11,14 +11,14 @@ const fieldsTabVisible = _.conformsTo({ structureFields: notEmpty });
 const profileTabVisible = ({
   userPermissions,
   structureFields,
-  structureProfile
+  structureProfile,
 }) =>
   _.anyPass([_.prop("view_profiling_permission")])(userPermissions) &&
   (_.some(hasProfile)(structureFields) ||
     notEmpty(structureProfile?.most_frequent) ||
     notEmpty(structureProfile?.patterns));
 
-const linksTabVisible = state => {
+const linksTabVisible = (state) => {
   const { conceptCount } = state;
   const structureLinks = getStructureToConceptLinks(state);
   return conceptCount > 0 || !_.isEmpty(structureLinks);
@@ -29,7 +29,7 @@ const notesTabVisible = ({
   templates,
   structure,
   structureTypes,
-  structureTypesLoading
+  structureTypesLoading,
 }) =>
   !templatesLoading &&
   notEmpty(templates) &&
@@ -38,7 +38,7 @@ const notesTabVisible = ({
   notEmpty(structureTypes) &&
   _.flow(
     _.find({
-      name: _.prop("type")(structure)
+      name: _.prop("type")(structure),
     }),
     _.get("template"),
     _.negate(_.isNil)
@@ -56,7 +56,7 @@ const grantsTabVisible = _.flow(
   _.negate(_.isEmpty)
 );
 
-export const getTabVisibility = state => ({
+export const getTabVisibility = (state) => ({
   fields: fieldsTabVisible(state),
   profile: profileTabVisible(state),
   links: linksTabVisible(state),
@@ -69,5 +69,5 @@ export const getTabVisibility = state => ({
   impact: impactTabVisible(state),
   parents: parentsTabVisible(state),
   children: childrenTabVisible(state),
-  grants: grantsTabVisible(state)
+  grants: grantsTabVisible(state),
 });

package/src/selectors/index.js

@@ -3,6 +3,10 @@ export {
   structureColumnsSelector,
   structureRowsSelector,
 } from "./structureColumnsSelector";
+export { getGrantAvailableFilters } from "./getGrantAvailableFilters";
+export { getGrantSelectedFilters } from "./getGrantSelectedFilters";
+export { getGrantSelectedFilterValues } from "./getGrantSelectedFilterValues";
+export { getGrantSelectedFilterActiveValues } from "./getGrantSelectedFilterActiveValues";
 export {
   defaultStructureProperties,
   getStructureProperties,