@truedat/dd 8.11.0 → 8.11.2

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

@@ -1,4 +1,5 @@
 import _ from "lodash/fp";
+import { render } from "@truedat/test/render";
 import {
   defaultGrantRequestsSearchTableColumns,
   getGrantRequestsSearchColumns,
@@ -27,4 +28,85 @@ describe("selectors: getGrantRequestsSearchColumns", () => {
     });
     expect(columns).toStrictEqual(grantRequestsSearchColumns);
   });
+
+  it("shows user group alias and users icon when hit is for a group", () => {
+    const userColumn = _.find({ name: "user" })(
+      defaultGrantRequestsSearchTableColumns,
+    );
+    const grantRequest = {
+      user_group: { id: 10, name: "finance", alias: "Fin" },
+    };
+    const FieldDecorator = userColumn.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...userColumn.fieldSelector(grantRequest)} />,
+    );
+    expect(rendered.getByText(/fin/i)).toBeInTheDocument();
+  });
+
+  it("shows user group name when alias is empty", () => {
+    const userColumn = _.find({ name: "user" })(
+      defaultGrantRequestsSearchTableColumns,
+    );
+    const grantRequest = {
+      user_group: { id: 11, name: "legal", alias: "" },
+    };
+    const FieldDecorator = userColumn.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...userColumn.fieldSelector(grantRequest)} />,
+    );
+    expect(rendered.getByText(/legal/i)).toBeInTheDocument();
+  });
+
+  it("shows Deleted user when the hit user has empty names", () => {
+    const userColumn = _.find({ name: "user" })(
+      defaultGrantRequestsSearchTableColumns,
+    );
+    const grantRequest = {
+      user_id: 7,
+      user: { email: "", full_name: "", user_name: "" },
+    };
+    const FieldDecorator = userColumn.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...userColumn.fieldSelector(grantRequest)} />,
+      {
+        messages: {
+          en: {
+            "grantRequest.header.user": "User",
+            "grantRequest.header.group": "User group",
+            "grantRequest.deleted.user": "Deleted user",
+            "grantRequest.deleted.group": "Deleted group",
+          },
+        },
+      },
+    );
+    expect(rendered.getByText(/^deleted user$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^deleted group$/i)).not.toBeInTheDocument();
+  });
+
+  it("shows Deleted group when the hit has user_group_id and no user_group", () => {
+    const userColumn = _.find({ name: "user" })(
+      defaultGrantRequestsSearchTableColumns,
+    );
+    const grantRequest = {
+      user_group_id: 10,
+      user_group: null,
+      user: { email: "", full_name: "", user_name: "" },
+    };
+    const FieldDecorator = userColumn.fieldDecorator;
+    const rendered = render(
+      <FieldDecorator {...userColumn.fieldSelector(grantRequest)} />,
+      {
+        messages: {
+          en: {
+            "grantRequest.header.user": "User",
+            "grantRequest.header.group": "User group",
+            "grantRequest.deleted.user": "Deleted user",
+            "grantRequest.deleted.group": "Deleted group",
+          },
+        },
+      },
+    );
+    expect(rendered.getByText(/^deleted group$/i)).toBeInTheDocument();
+    expect(rendered.queryByText(/^deleted user$/i)).not.toBeInTheDocument();
+  });
 });

package/src/selectors/getGrantRequestsSearchColumns.js

@@ -7,18 +7,58 @@ 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"
-  );
+export const UserDecorator = ({ user, user_group, user_id, user_group_id }) => {
+  const { formatMessage } = useIntl();
+  const userGroupText = user_group
+    ? _.isEmpty(user_group.alias)
+      ? user_group.name
+      : user_group.alias
+    : undefined;
+
+  if (userGroupText) {
+    return (
+      <Header as="h4">
+        <Header.Content>{userGroupText}</Header.Content>
+      </Header>
+    );
+  }
+
+  if (user_group_id) {
+    return (
+      <Header as="h4">
+        <Header.Content>
+          {formatMessage({ id: "grantRequest.deleted.group" })}
+        </Header.Content>
+      </Header>
+    );
+  }
+
+  if (!_.isEmpty(user?.full_name)) {
+    return (
+      <Header as="h4">
+        <Header.Content>{user.full_name}</Header.Content>
+      </Header>
+    );
+  }
+
+  if (user_id || user) {
+    return (
+      <Header as="h4">
+        <Header.Content>
+          {formatMessage({ id: "grantRequest.deleted.user" })}
+        </Header.Content>
+      </Header>
+    );
+  }
+
+  return "null";
 };
 
 UserDecorator.propTypes = {
   user: PropTypes.object,
+  user_group: PropTypes.object,
+  user_id: PropTypes.number,
+  user_group_id: PropTypes.number,
 };
 
 export const PathDecorator = ({ data_structure_version }) => {
@@ -102,6 +142,9 @@ export const defaultGrantRequestsSearchTableColumns = [
     sort: { name: "user.user_name" },
     fieldSelector: (grantRequest) => ({
       user: grantRequest?.user,
+      user_group: grantRequest?.user_group,
+      user_id: grantRequest?.user_id,
+      user_group_id: grantRequest?.user_group_id,
     }),
     fieldDecorator: UserDecorator,
   },