@truedat/dd 4.28.3 → 4.28.7

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -42,6 +42,16 @@ exports[`GrantStructureDecorator matches the latest snapshot when structure is n
 </div>
 `;
 
+exports[`GrantTableStructureDecorator matches the latest snapshot when structure is direct 1`] = `
+<div>
+  <a
+    href="/structures/1"
+  >
+    foo
+  </a>
+</div>
+`;
+
 exports[`GrantUserDecorator matches the latest snapshot 1`] = `
 <div>
   <h4

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

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

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

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

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

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

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

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

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

@@ -3,9 +3,12 @@ import React from "react";
 import { render } from "@truedat/test/render";
 import {
   defaultGrantsColumns,
+  defaultGrantsTableColumns,
   getGrantsColumns,
+  getGrantsTableColumns,
   GrantUserDecorator,
   GrantStructureDecorator,
+  GrantTableStructureDecorator,
   StartDateDecorator,
   EndDateDecorator,
 } from "..";
@@ -49,6 +52,30 @@ describe("selectors: getGrantsColumns", () => {
   });
 });
 
+describe("selectors: getGrantsTableColumns", () => {
+  const state = {
+    authentication,
+  };
+
+  it("get default grant columns", () => {
+    const columns = getGrantsTableColumns(state);
+    expect(_.map("name")(columns)).toEqual(
+      _.map("name")(defaultGrantsTableColumns)
+    );
+  });
+
+  it("get specified columns in reducer", () => {
+    const grantsColumns = [
+      {
+        name: "foo",
+        fieldDecorator: _.identity,
+      },
+    ];
+    const columns = getGrantsTableColumns({ ...state, grantsColumns });
+    expect(columns).toStrictEqual(grantsColumns);
+  });
+});
+
 describe("GrantUserDecorator", () => {
   it("matches the latest snapshot", () => {
     const props = {
@@ -91,6 +118,19 @@ describe("GrantStructureDecorator", () => {
   });
 });
 
+describe("GrantTableStructureDecorator", () => {
+  it("matches the latest snapshot when structure is direct", () => {
+    const props = {
+      data_structure_version: { data_structure_id: 1, name: "foo" },
+    };
+    const { container } = render(
+      <GrantTableStructureDecorator {...props} />,
+      renderOpts
+    );
+    expect(container).toMatchSnapshot();
+  });
+});
+
 describe("StartDateDecorator", () => {
   it("matches the latest snapshot", () => {
     const props = {

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

@@ -3,10 +3,10 @@ import { getTabVisibility } from "../getTabVisibility";
 describe("selectors: getTabVisibility", () => {
   it("should include fields iff structureFields is not empty", () => {
     expect(getTabVisibility({ structureFields: [1] })).toMatchObject({
-      fields: true
+      fields: true,
     });
     expect(getTabVisibility({ structureFields: [] })).toMatchObject({
-      fields: false
+      fields: false,
     });
   });
 
@@ -32,7 +32,7 @@ describe("selectors: getTabVisibility", () => {
     const structureFields = [{ profile: { foo: "foo" } }];
     const userPermissions = { view_profiling_permission: true };
     expect(getTabVisibility({ structureFields })).toMatchObject({
-      profile: false
+      profile: false,
     });
     expect(
       getTabVisibility({ structureFields, userPermissions })
@@ -42,44 +42,44 @@ describe("selectors: getTabVisibility", () => {
   it("should include profile if permission is present and a structure has a profile", () => {
     const userPermissions = { view_profiling_permission: true };
     expect(getTabVisibility({ structure: {} })).toMatchObject({
-      profile: false
+      profile: false,
     });
     expect(
       getTabVisibility({
         structure: { profile: { foo: "foo" } },
-        userPermissions
+        userPermissions,
       })
     ).toMatchObject({ profile: false });
     expect(
       getTabVisibility({
         structureProfile: { patterns: "foo" },
-        userPermissions
+        userPermissions,
       })
     ).toMatchObject({ profile: true });
     expect(
       getTabVisibility({
         structureProfile: { most_frequent: "foo" },
-        userPermissions
+        userPermissions,
       })
     ).toMatchObject({ profile: true });
   });
 
   it("should include links iff conceptCount is non-zero or structure has links", () => {
     expect(getTabVisibility({ conceptCount: 1 })).toMatchObject({
-      links: true
+      links: true,
     });
     expect(getTabVisibility({ conceptCount: 0 })).toMatchObject({
-      links: false
+      links: false,
     });
     expect(
       getTabVisibility({ structureLinks: [{ resource_type: "concept" }] })
     ).toMatchObject({
-      links: true
+      links: true,
     });
     expect(
       getTabVisibility({ structureLinks: [{ resource_type: "foo" }] })
     ).toMatchObject({
-      links: false
+      links: false,
     });
   });
 
@@ -88,17 +88,17 @@ describe("selectors: getTabVisibility", () => {
     const templates = [{ name: "foo" }];
     const structureTypes = [{ name: "foo", template: { id: 1, name: "n" } }];
     expect(getTabVisibility({ templatesLoading: true })).toMatchObject({
-      notes: false
+      notes: false,
     });
     expect(
       getTabVisibility({
         structure,
         templates,
         structureTypes,
-        structureTypesLoading: false
+        structureTypesLoading: false,
       })
     ).toMatchObject({
-      notes: true
+      notes: true,
     });
   });
 
@@ -107,80 +107,80 @@ describe("selectors: getTabVisibility", () => {
     const templates = [{ name: "foo" }];
     const structureTypes = [{ name: "foo" }];
     expect(getTabVisibility({ templatesLoading: true })).toMatchObject({
-      notes: false
+      notes: false,
     });
     expect(
       getTabVisibility({
         structure,
         templates,
         structureTypes,
-        structureTypesLoading: false
+        structureTypesLoading: false,
       })
     ).toMatchObject({
-      notes: false
+      notes: false,
     });
   });
 
   it("should include versions iff structureVersions is not empty", () => {
     expect(getTabVisibility({})).toMatchObject({ versions: false });
     expect(getTabVisibility({ structureVersions: [] })).toMatchObject({
-      versions: false
+      versions: false,
     });
     expect(getTabVisibility({ structureVersions: [{}] })).toMatchObject({
-      versions: true
+      versions: true,
     });
   });
 
   it("should include events iff structureVersion is empty", () => {
     expect(getTabVisibility({})).toMatchObject({ events: true });
     expect(getTabVisibility({ structureVersion: {} })).toMatchObject({
-      events: true
+      events: true,
     });
     expect(getTabVisibility({ structureVersion: "whatever" })).toMatchObject({
-      events: false
+      events: false,
     });
   });
 
   it("should include rules iff ruleImplementations is not empty", () => {
     expect(getTabVisibility({})).toMatchObject({ rules: false });
     expect(getTabVisibility({ ruleImplementations: [] })).toMatchObject({
-      rules: false
+      rules: false,
     });
     expect(getTabVisibility({ ruleImplementations: [{}] })).toMatchObject({
-      rules: true
+      rules: true,
     });
   });
 
   it("should include parents iff parentRelations is not empty", () => {
     expect(getTabVisibility({})).toMatchObject({ parents: false });
     expect(getTabVisibility({ parentRelations: [] })).toMatchObject({
-      parents: false
+      parents: false,
     });
     expect(getTabVisibility({ parentRelations: [{}] })).toMatchObject({
-      parents: true
+      parents: true,
     });
   });
 
   it("should include children iff childrenRelations is not empty", () => {
     expect(getTabVisibility({})).toMatchObject({ children: false });
     expect(getTabVisibility({ childrenRelations: [] })).toMatchObject({
-      children: false
+      children: false,
     });
     expect(getTabVisibility({ childrenRelations: [{}] })).toMatchObject({
-      children: true
+      children: true,
     });
   });
 
   it("should include grants if grants is not empty or nil", () => {
     expect(getTabVisibility({})).toMatchObject({ grants: false });
     expect(getTabVisibility({ structure: {} })).toMatchObject({
-      grants: false
+      grants: false,
     });
     expect(getTabVisibility({ structure: { grants: [] } })).toMatchObject({
-      grants: false
+      grants: false,
     });
     expect(getTabVisibility({ structure: { grants: [{}] } })).toMatchObject({
-      grants: true
+      grants: true,
     });
   });
 });

package/src/selectors/getGrantAvailableFilters.js

@@ -0,0 +1,17 @@
+import _ from "lodash/fp";
+import { createSelector } from "reselect";
+import { getGrantSelectedFilters } from "./getGrantSelectedFilters";
+
+const getGrantFilters = _.propOr({}, "grantFilters");
+
+export const getGrantAvailableFilters = createSelector(
+  getGrantFilters,
+  getGrantSelectedFilters,
+  (grantFilters, grantSelectedFilters) => {
+    return _.flow(
+      _.omitBy((values) => _.size(values) < 2),
+      _.keys,
+      _.without(grantSelectedFilters)
+    )(grantFilters);
+  }
+);

package/src/selectors/getGrantSelectedFilterActiveValues.js

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

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,59 @@ 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"), _.prop("onlyMyGrants")],
+  (grantsColumns, authentication, onlyMyGrants) => {
+    return _.flow(
+      _.defaultTo(defaultGrantsTableColumns),
+      _.reject((c) => (onlyMyGrants ? c.name === "user" : false)),
+      _.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,