@truedat/dd 8.12.2 → 8.12.4

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

@@ -149,3 +149,298 @@ describe("EndDateDecorator", () => {
     expect(container).toMatchSnapshot();
   });
 });
+
+describe("user or group column", () => {
+  const authentication = { user_name: "baz" };
+
+  const userColumn = () =>
+    _.find({ name: "user" })(getGrantsTableColumns({ authentication }));
+
+  const deletedMessages = {
+    en: {
+      "deleted.user": "Deleted user",
+      "deleted.group": "Deleted group",
+    },
+  };
+
+  it("shows user group alias when grant is for a group", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+  });
+
+  it("shows user group name when alias is empty", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      user_group: { id: 10, name: "foo", alias: "" },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+    );
+    expect(rendered.getByText(/^foo$/i)).toBeInTheDocument();
+  });
+
+  it("shows Deleted group when grant has user_group_id and no user_group", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      user_group_id: 10,
+      user_group: null,
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages: deletedMessages },
+    );
+    expect(rendered.getByText(/^deleted group$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^deleted user$/i)).not.toBeInTheDocument();
+  });
+
+  it("shows user full name when grant is for a user", () => {
+    const column = userColumn();
+    const grant = {
+      user: {
+        full_name: "foo user",
+        email: "foo@ext",
+        user_name: "foo",
+      },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages: deletedMessages },
+    );
+    expect(rendered.getByText(/foo user/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^deleted group$/i)).not.toBeInTheDocument();
+  });
+
+  it("shows Deleted user when grant has user_id and no usable user", () => {
+    const column = userColumn();
+    const grant = {
+      user_id: 7,
+      user: null,
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages: deletedMessages },
+    );
+    expect(rendered.getByText(/^deleted user$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^deleted group$/i)).not.toBeInTheDocument();
+  });
+
+  it("shows source_group_name when grant has only origin group", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      source_group_name: "baz",
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+    );
+    expect(rendered.getByText(/^baz$/i)).toBeInTheDocument();
+  });
+
+  it("sorts the user column by user_or_group.raw", () => {
+    const column = _.find({ name: "user" })(defaultGrantsTableColumns);
+    expect(column.sort.name).toBe("user_or_group.raw");
+  });
+});
+
+describe("structure grants user or group column", () => {
+  const authentication = { user_name: "baz" };
+  const structure = { id: 1, name: "foo" };
+
+  const userColumn = () =>
+    _.find({ name: "user" })(getGrantsColumns({ authentication, structure }));
+
+  const deletedMessages = {
+    en: {
+      "deleted.user": "Deleted user",
+      "deleted.group": "Deleted group",
+    },
+  };
+
+  it("shows user group alias when structure grant is for a group", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+  });
+
+  it("shows Deleted group when structure grant has user_group_id and no user_group", () => {
+    const column = userColumn();
+    const grant = {
+      user: null,
+      user_group_id: 10,
+      user_group: null,
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages: deletedMessages },
+    );
+    expect(rendered.getByText(/^deleted group$/i)).toBeInTheDocument();
+  });
+
+  it("shows user full name when structure grant is for a user", () => {
+    const column = userColumn();
+    const grant = {
+      user: {
+        full_name: "foo user",
+        email: "foo@ext",
+        user_name: "foo",
+      },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages: deletedMessages },
+    );
+    expect(rendered.getByText(/foo user/i)).toBeInTheDocument();
+  });
+});
+
+describe("my grants user or group column", () => {
+  const authentication = { user_name: "baz" };
+
+  it("includes the user column when onlyMyGrants is true", () => {
+    const columns = getGrantsTableColumns({
+      authentication,
+      onlyMyGrants: true,
+    });
+    expect(_.map("name")(columns)).toContain("user");
+  });
+
+  it("shows user group alias when my grants hit is for a group", () => {
+    const column = _.find({ name: "user" })(
+      getGrantsTableColumns({ authentication, onlyMyGrants: true }),
+    );
+    const grant = {
+      user: null,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+  });
+
+  it("does not show same_user label for a group grant in my grants", () => {
+    const column = _.find({ name: "user" })(
+      getGrantsTableColumns({ authentication, onlyMyGrants: true }),
+    );
+    const grant = {
+      user: null,
+      user_group: { id: 10, name: "foo", alias: "bar" },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      {
+        messages: {
+          en: {
+            "grant.cell.end_date.same_user": "Same",
+          },
+        },
+      },
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^same$/i)).not.toBeInTheDocument();
+  });
+});
+
+describe("structure grants group member label", () => {
+  const authentication = { user_name: "baz" };
+  const structure = { id: 1, name: "foo" };
+
+  const messages = {
+    en: {
+      "grant.cell.group_member": "Group member",
+      "grant.cell.end_date.same_user": "Same",
+    },
+  };
+
+  const userColumn = () =>
+    _.find({ name: "user" })(getGrantsColumns({ authentication, structure }));
+
+  const groupGrant = {
+    user: null,
+    user_group: { id: 10, name: "foo", alias: "bar" },
+    user_group_id: 10,
+  };
+
+  it("shows group member label when the logged user belongs to the grant group", () => {
+    const column = userColumn();
+    const grant = { ...groupGrant, current_user_group_member: true };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages },
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+    expect(rendered.getByText(/^group member$/i)).toBeInTheDocument();
+  });
+
+  it("does not show group member label when the logged user does not belong to the grant group", () => {
+    const column = userColumn();
+    const grant = { ...groupGrant, current_user_group_member: false };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages },
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^group member$/i)).not.toBeInTheDocument();
+  });
+
+  it("shows same user label for a personal grant and not the group member label", () => {
+    const column = userColumn();
+    const grant = {
+      user: {
+        full_name: "foo user",
+        email: "foo@ext",
+        user_name: "baz",
+      },
+    };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages },
+    );
+    expect(rendered.getByText(/foo user/i)).toBeInTheDocument();
+    expect(rendered.getByText(/^same$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^group member$/i)).not.toBeInTheDocument();
+  });
+
+  it("does not show group member label in my grants", () => {
+    const column = _.find({ name: "user" })(
+      getGrantsTableColumns({ authentication, onlyMyGrants: true }),
+    );
+    const grant = { ...groupGrant, current_user_group_member: true };
+    const FieldDecorator = column.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...column.fieldSelector(grant)} />,
+      { messages },
+    );
+    expect(rendered.getByText(/^bar$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^group member$/i)).not.toBeInTheDocument();
+  });
+});

package/src/selectors/getBusinessConceptsLinksToStructuresColumnsSelector.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
 import { Link } from "react-router";
-import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 import { Icon, Label } from "semantic-ui-react";
@@ -73,7 +72,6 @@ export const defaultBusinessConceptsLinksToStructuresColumns = [
   },
 ];
 
-export const getBusinessConceptsLinksToStructuresColumns = createSelector(
-  _.prop("businessConceptsLinksToStructuresColumns"),
-  _.defaultTo(defaultBusinessConceptsLinksToStructuresColumns),
-);
+export const getBusinessConceptsLinksToStructuresColumns = (state) =>
+  state.businessConceptsLinksToStructuresColumns ??
+  defaultBusinessConceptsLinksToStructuresColumns;

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -27,7 +27,7 @@ export const UserDecorator = ({ user, user_group, user_id, user_group_id }) => {
     return (
       <Header as="h4">
         <Header.Content>
-          {formatMessage({ id: "grantRequest.deleted.group" })}
+          {formatMessage({ id: "deleted.group" })}
         </Header.Content>
       </Header>
     );
@@ -44,9 +44,7 @@ export const UserDecorator = ({ user, user_group, user_id, user_group_id }) => {
   if (user_id || user) {
     return (
       <Header as="h4">
-        <Header.Content>
-          {formatMessage({ id: "grantRequest.deleted.user" })}
-        </Header.Content>
+        <Header.Content>{formatMessage({ id: "deleted.user" })}</Header.Content>
       </Header>
     );
   }
@@ -139,7 +137,7 @@ StatusDecorator.propTypes = {
 export const defaultGrantRequestsSearchTableColumns = [
   {
     name: "user",
-    sort: { name: "user.user_name" },
+    sort: { name: "user_or_group.raw" },
     fieldSelector: (grantRequest) => ({
       user: grantRequest?.user,
       user_group: grantRequest?.user_group,

package/src/selectors/getGrantsColumns.js

@@ -7,11 +7,58 @@ import { useIntl } from "react-intl";
 import Moment from "react-moment";
 import PropTypes from "prop-types";
 
-export const GrantUserDecorator = ({ authentication, user }) => {
+export const GrantUserDecorator = ({
+  authentication,
+  user,
+  user_group,
+  user_id,
+  user_group_id,
+  source_group_name,
+  current_user_group_member,
+}) => {
   const { formatMessage } = useIntl();
-  const sameUser = user?.user_name === authentication?.user_name;
-  return (
-    user && (
+  const userGroupText = user_group
+    ? _.isEmpty(user_group.alias)
+      ? user_group.name
+      : user_group.alias
+    : undefined;
+
+  if (userGroupText) {
+    return (
+      <Header as="h4">
+        <Header.Content>
+          {userGroupText}{" "}
+          {current_user_group_member && (
+            <Label color="teal" size="small">
+              {formatMessage({ id: "grant.cell.group_member" })}
+            </Label>
+          )}
+        </Header.Content>
+      </Header>
+    );
+  }
+
+  if (user_group_id) {
+    return (
+      <Header as="h4">
+        <Header.Content>
+          {formatMessage({ id: "deleted.group" })}
+        </Header.Content>
+      </Header>
+    );
+  }
+
+  if (source_group_name) {
+    return (
+      <Header as="h4">
+        <Header.Content>{source_group_name}</Header.Content>
+      </Header>
+    );
+  }
+
+  if (!_.isEmpty(user?.full_name)) {
+    const sameUser = user?.user_name === authentication?.user_name;
+    return (
       <Header as="h4">
         <Header.Content>
           {user.full_name}{" "}
@@ -23,13 +70,28 @@ export const GrantUserDecorator = ({ authentication, user }) => {
           <Header.Subheader>{user.email}</Header.Subheader>
         </Header.Content>
       </Header>
-    )
-  );
+    );
+  }
+
+  if (user_id || user) {
+    return (
+      <Header as="h4">
+        <Header.Content>{formatMessage({ id: "deleted.user" })}</Header.Content>
+      </Header>
+    );
+  }
+
+  return null;
 };
 
 GrantUserDecorator.propTypes = {
   authentication: PropTypes.object,
   user: PropTypes.object,
+  user_group: PropTypes.object,
+  user_id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  user_group_id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  source_group_name: PropTypes.string,
+  current_user_group_member: PropTypes.bool,
 };
 
 export const userDecorator = (authentication) => (props) =>
@@ -160,7 +222,14 @@ EndDateDecorator.propTypes = {
 export const defaultGrantsColumns = [
   {
     name: "user",
-    fieldSelector: _.pick(["user"]),
+    fieldSelector: _.pick([
+      "user",
+      "user_group",
+      "user_id",
+      "user_group_id",
+      "source_group_name",
+      "current_user_group_member",
+    ]),
     fieldDecorator: userDecorator,
   },
   {
@@ -198,8 +267,14 @@ export const getGrantsColumns = createSelector(
 export const defaultGrantsTableColumns = [
   {
     name: "user",
-    sort: { name: "user.full_name.raw" },
-    fieldSelector: _.pick(["user"]),
+    sort: { name: "user_or_group.raw" },
+    fieldSelector: _.pick([
+      "user",
+      "user_group",
+      "user_id",
+      "user_group_id",
+      "source_group_name",
+    ]),
     fieldDecorator: userDecorator,
   },
   {
@@ -228,10 +303,9 @@ export const getGrantsTableColumns = createSelector(
     _.prop("authentication"),
     _.prop("onlyMyGrants"),
   ],
-  (grantsColumns, authentication, onlyMyGrants) => {
+  (grantsColumns, authentication) => {
     return _.flow(
       _.defaultTo(defaultGrantsTableColumns),
-      _.reject((c) => (onlyMyGrants ? c.name === "user" : false)),
       _.map((c) => {
         return c.name === "user"
           ? { ...c, fieldDecorator: c.fieldDecorator(authentication) }

package/src/selectors/getLinkedImplementationsToStructuresColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import DateTime from "@truedat/core/components/DateTime";
 import { formatNumber } from "@truedat/core/services/format";
@@ -86,9 +85,6 @@ export const defaultImplementationToStructuresColumns = [
   },
 ];
 
-const getColumns = (state) => state.ruleImplementationToStructuresColumns;
-
-export const getLinkedImplementationsToStructuresColumns = createSelector(
-  [getColumns],
-  _.defaultTo(defaultImplementationToStructuresColumns),
-);
+export const getLinkedImplementationsToStructuresColumns = (state) =>
+  state.ruleImplementationToStructuresColumns ??
+  defaultImplementationToStructuresColumns;

package/src/selectors/getStructureFieldColumns.js

@@ -1,7 +1,6 @@
 import _ from "lodash/fp";
 import { Icon, List } from "semantic-ui-react";
 import { FormattedMessage } from "react-intl";
-import { createSelector } from "reselect";
 import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { accentInsensitivePathOrder } from "@truedat/core/services/sort";
@@ -49,7 +48,11 @@ const lineageLinkDecorator = ({ degree, data_structure_id: id }) =>
   ) : null;
 
 export const linksDecorator = (links) => {
-  const sortedLinks = _.sortBy(accentInsensitivePathOrder("name"))(links);
+  const sortedLinks = _.flow(
+    _.defaultTo([]),
+    _.filter((resource) => resource?.resource_id && resource?.name),
+    _.sortBy(accentInsensitivePathOrder("name")),
+  )(links);
   return _.isEmpty(sortedLinks) ? null : (
     <List>
       {sortedLinks.map((resource, i) => (
@@ -95,7 +98,5 @@ export const defaultStructureFieldColumns = [
   },
 ];
 
-export const getStructureFieldColumns = createSelector(
-  _.prop("structureFieldsColumns"),
-  _.defaultTo(defaultStructureFieldColumns),
-);
+export const getStructureFieldColumns = (state) =>
+  state.structureFieldsColumns ?? defaultStructureFieldColumns;

package/src/selectors/getStructureProperties.js

@@ -1,6 +1,5 @@
 import _ from "lodash/fp";
 import { useState } from "react";
-import { createSelector } from "reselect";
 import { FormattedMessage, useIntl } from "react-intl";
 import { Button, Label, Popup } from "semantic-ui-react";
 import { useDomainPath } from "@truedat/bg/taxonomy/components/DomainPath";
@@ -81,7 +80,5 @@ export const defaultStructureProperties = [
   { name: "group", width: 8 },
 ];
 
-export const getStructureProperties = createSelector(
-  _.prop("structureProperties"),
-  _.defaultTo(defaultStructureProperties),
-);
+export const getStructureProperties = (state) =>
+  state.structureProperties ?? defaultStructureProperties;

package/src/selectors/getStructuresUploadEventColumns.js

@@ -1,5 +1,4 @@
 import _ from "lodash/fp";
-import { createSelector } from "reselect";
 import { FormattedMessage } from "react-intl";
 import Moment from "react-moment";
 import { AlertExporter } from "@truedat/core/components/AlertExporter";
@@ -65,9 +64,5 @@ export const defaultStructuresUploadEventColumns = [
   },
 ];
 
-const getColumns = (state) => state.structuresUploadEventColumns;
-
-export const getStructuresUploadEventColumns = createSelector(
-  [getColumns],
-  (columns) => _.defaultTo(defaultStructuresUploadEventColumns)(columns),
-);
+export const getStructuresUploadEventColumns = (state) =>
+  state.structuresUploadEventColumns ?? defaultStructuresUploadEventColumns;

package/src/selectors/structureColumnsSelector.js

@@ -64,23 +64,20 @@ export const defaultStructureColumns = [
   },
 ];
 
-// If default filters include "system.name.raw", exclude the "system" column
-const filterExcludes = { "system.name.raw": "system" };
-
-const columnsToExclude = (defaultFilters) =>
-  _.flow(_.pick(_.keys(defaultFilters)), _.values)(filterExcludes);
+const filteredStructureColumns = createSelector(
+  (state) => state.structuresColumns ?? defaultStructureColumns,
+  _.reject(({ name }) => name === "system"),
+);
 
-export const structureColumnsSelector = (state, defaultFilters, ownColumns) =>
-  createSelector(_.prop("structuresColumns"), (columns) => {
-    const excludes = columnsToExclude(defaultFilters);
-    const res = ownColumns
-      ? ownColumns
-      : _.flow(
-          _.defaultTo(defaultStructureColumns),
-          _.reject(({ name }) => _.includes(name)(excludes)),
-        )(columns);
-    return res;
-  })(state);
+export const structureColumnsSelector = (state, defaultFilters, ownColumns) => {
+  if (ownColumns) return ownColumns;
+  return Object.prototype.hasOwnProperty.call(
+    defaultFilters || {},
+    "system.name.raw",
+  )
+    ? filteredStructureColumns(state)
+    : (state.structuresColumns ?? defaultStructureColumns);
+};
 
 const rawName = {
   name: "name",