@truedat/dd 8.12.2 → 8.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.12.2",
+  "version": "8.12.4",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -54,7 +54,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.12.2",
+    "@truedat/test": "8.12.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -90,5 +90,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "b0000f1b2727cad43ce3c3eb2fa29681488dd2ec"
+  "gitHead": "d5bc1af84c4d828bdec676b0da58385cf0d6015f"
 }

package/src/api/__tests__/queries.spec.js

@@ -0,0 +1,55 @@
+import { LEGACY_DATA_STRUCTURE_VERSION_QUERY, buildDSVQuery } from "../queries";
+
+const PARENT_PATH = ["dataStructureVersion", "relations", "parents"];
+const CHILD_PATH = ["dataStructureVersion", "relations", "children"];
+
+const fieldAtPath = (document, path) =>
+  path.reduce((node, name) => {
+    const selection = node.selectionSet?.selections.find(
+      (s) => s.kind === "Field" && s.name.value === name,
+    );
+    if (!selection) {
+      throw new Error(`Missing field ${path.join(".")}`);
+    }
+    return selection;
+  }, document.definitions[0]);
+
+const selectionNames = (field) =>
+  field.selectionSet.selections
+    .filter((s) => s.kind === "Field")
+    .map((s) => s.name.value);
+
+const linksField = (field) =>
+  field.selectionSet.selections.find(
+    (s) => s.kind === "Field" && s.name.value === "links",
+  );
+
+const expectRelationLinks = (document) => {
+  const parents = fieldAtPath(document, PARENT_PATH);
+  const children = fieldAtPath(document, CHILD_PATH);
+
+  expect(selectionNames(parents)).toEqual(expect.arrayContaining(["links"]));
+  expect(selectionNames(children)).toEqual(expect.arrayContaining(["links"]));
+
+  const resourceType = linksField(parents).arguments.find(
+    (argument) => argument.name.value === "resource_type",
+  );
+  expect(resourceType.value.value).toBe("business_concept");
+  expect(linksField(children).arguments).toEqual([]);
+};
+
+describe("LEGACY_DATA_STRUCTURE_VERSION_QUERY", () => {
+  it("requests concept links on parent and child structure relations", () => {
+    expectRelationLinks(LEGACY_DATA_STRUCTURE_VERSION_QUERY);
+  });
+});
+
+describe("buildDSVQuery", () => {
+  it("requests concept links on parent and child structure relations", () => {
+    expectRelationLinks(buildDSVQuery(false));
+  });
+
+  it("requests concept links on parent and child structure relations when loading metadata", () => {
+    expectRelationLinks(buildDSVQuery(true));
+  });
+});

package/src/api/queries.js

@@ -360,6 +360,13 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
           user_name
         }
         user_id
+        user_group_id
+        source_group_name
+        user_group {
+          id
+          name
+          alias
+        }
       }
       grant @skip(if: $withoutGrants) {
         data_structure {
@@ -391,6 +398,13 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
           user_name
         }
         user_id
+        user_group_id
+        source_group_name
+        user_group {
+          id
+          name
+          alias
+        }
       }
 
       classes
@@ -467,6 +481,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
             name
             description
           }
+          links(resource_type: "business_concept")
         }
         children {
           id
@@ -599,6 +614,13 @@ export const buildDSVQuery = (loadStructureMetadata) => gql`
           user_name
         }
         user_id
+        user_group_id
+        source_group_name
+        user_group {
+          id
+          name
+          alias
+        }
       }
 
       classes
@@ -651,6 +673,7 @@ export const buildDSVQuery = (loadStructureMetadata) => gql`
             name
             description
           }
+          links(resource_type: "business_concept")
         }
         children {
           id
@@ -736,6 +759,14 @@ export const DATA_STRUCTURE_VERSION_GRANTS_QUERY = gql`
           user_name
         }
         user_id
+        user_group_id
+        current_user_group_member
+        source_group_name
+        user_group {
+          id
+          name
+          alias
+        }
       }
     }
   }

package/src/components/Grant.js

@@ -1,11 +1,21 @@
 import _ from "lodash/fp";
-import { lazy } from "react";
+import { lazy, useState } from "react";
 import PropTypes from "prop-types";
 import Moment from "react-moment";
 import { useIntl } from "react-intl";
 import { Link } from "react-router";
 import { useParams } from "react-router";
-import { Grid, Segment, Header, Icon, List, Button } from "semantic-ui-react";
+import {
+  Accordion,
+  Grid,
+  Segment,
+  Header,
+  Icon,
+  Label,
+  List,
+  Button,
+  Table,
+} from "semantic-ui-react";
 import { linkTo } from "@truedat/core/routes";
 import { useGrant, useGrantRemoval, useStructure } from "../hooks/useGrant";
 import GrantCrumbs from "./GrantCrumbs";
@@ -110,8 +120,16 @@ GrantHeader.propTypes = {
   onStatusChange: PropTypes.func,
 };
 
+const groupDisplayName = (userGroup) =>
+  userGroup
+    ? _.isEmpty(userGroup.alias)
+      ? userGroup.name
+      : userGroup.alias
+    : undefined;
+
 export const Grant = ({ grant, actions, loading, onStatusChange }) => {
   const { formatMessage } = useIntl();
+  const [membersOpen, setMembersOpen] = useState(false);
 
   const data_structure_version = _.pathOr(
     undefined,
@@ -119,10 +137,37 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
   )(grant);
   const data_structure = _.pathOr(undefined, "data_structure")(grant);
 
-  const getTitle = ({ user, data_structure_version } = grant) => {
-    return `${user?.user_name ? `(${user?.user_name})` : ""} -> ${
-      data_structure_version?.name
-    }`;
+  const userGroup = grant?.user_group;
+  const userGroupId = grant?.user_group_id;
+  const user = grant?.user;
+  const userId = grant?.user_id;
+  const sourceGroupName = grant?.source_group_name;
+  const userGroupText = groupDisplayName(userGroup);
+  const hasUsableUser = user && !_.isEmpty(user.full_name);
+  const isGroup = Boolean(userGroup || userGroupId || sourceGroupName);
+  const grantFor = isGroup
+    ? userGroupText ||
+      (userGroupId ? formatMessage({ id: "deleted.group" }) : sourceGroupName)
+    : hasUsableUser
+      ? user.full_name
+      : userId
+        ? formatMessage({ id: "deleted.user" })
+        : undefined;
+  const members = _.isArray(userGroup?.users) ? userGroup.users : [];
+
+  const getTitle = ({
+    user,
+    user_group,
+    source_group_name,
+    data_structure_version,
+  } = grant) => {
+    const groupText = groupDisplayName(user_group) || source_group_name;
+    const who = user?.user_name
+      ? `(${user.user_name})`
+      : groupText
+        ? `(${groupText})`
+        : "";
+    return `${who} -> ${data_structure_version?.name}`;
   };
   const path = _.flow(
     _.map("name"),
@@ -161,20 +206,65 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
                       </List.Content>
                     </List.Item>
                   )}
-                  {grant?.user && (
+                  {grantFor && (
                     <List.Item>
                       <List.Header>
-                        {formatMessage({ id: "grant.header.user" })}
+                        {formatMessage({
+                          id: isGroup
+                            ? "grant.header.group"
+                            : "grant.header.user",
+                        })}
                       </List.Header>
                       <List.Description>
-                        <Header as="h4">
-                          <Header.Content>
-                            {grant?.user?.full_name}
-                            <Header.Subheader>
-                              {grant?.user?.email}
-                            </Header.Subheader>
-                          </Header.Content>
-                        </Header>
+                        {userGroup ? (
+                          <Accordion>
+                            <Accordion.Title
+                              active={membersOpen}
+                              icon={false}
+                              onClick={() => setMembersOpen(!membersOpen)}
+                            >
+                              <Label>{grantFor}</Label>
+                              <Icon
+                                name={
+                                  membersOpen ? "angle down" : "angle right"
+                                }
+                              />
+                            </Accordion.Title>
+                            <Accordion.Content active={membersOpen}>
+                              <Table compact collapsing size="small">
+                                <Table.Header>
+                                  <Table.Row>
+                                    <Table.HeaderCell>
+                                      {formatMessage({
+                                        id: "grantRequests.props.user_full_name",
+                                      })}
+                                    </Table.HeaderCell>
+                                  </Table.Row>
+                                </Table.Header>
+                                <Table.Body>
+                                  {members.map((member) => (
+                                    <Table.Row
+                                      key={member.id ?? member.user_name}
+                                    >
+                                      <Table.Cell>
+                                        {member.full_name}
+                                      </Table.Cell>
+                                    </Table.Row>
+                                  ))}
+                                </Table.Body>
+                              </Table>
+                            </Accordion.Content>
+                          </Accordion>
+                        ) : hasUsableUser ? (
+                          <Header as="h4">
+                            <Header.Content>
+                              {user.full_name}
+                              <Header.Subheader>{user.email}</Header.Subheader>
+                            </Header.Content>
+                          </Header>
+                        ) : (
+                          <Label>{grantFor}</Label>
+                        )}
                       </List.Description>
                     </List.Item>
                   )}

package/src/components/GrantRequest.js

@@ -51,9 +51,9 @@ export const GrantRequest = ({ grantRequest, template }) => {
     user ||
     userGroupText ||
     (userGroupId
-      ? formatMessage({ id: "grantRequest.deleted.group" })
+      ? formatMessage({ id: "deleted.group" })
       : group
-        ? formatMessage({ id: "grantRequest.deleted.user" })
+        ? formatMessage({ id: "deleted.user" })
         : undefined);
   const members = _.isArray(userGroup?.users) ? userGroup.users : [];
   const createdBy =

package/src/components/GrantRequestBulkApprovalPopup.js

@@ -21,7 +21,6 @@ export const GrantRequestBulkApprovalPopup = ({
   return (
     <Popup
       on="click"
-      modal
       onClose={() => setOpen(false)}
       onOpen={() => setOpen(true)}
       open={open}

package/src/components/GrantsDownloadButton.js

@@ -40,7 +40,15 @@ export const GrantsDownloadButton = ({
   const grants = searchData?.data;
 
   const headerLabels = _.flow(
-    _.map((l) => [l, formatMessage({ id: `grants.props.${l}` })]),
+    _.map((l) => [
+      l,
+      formatMessage({
+        id:
+          l === "user_name"
+            ? "grants.props.user_or_group"
+            : `grants.props.${l}`,
+      }),
+    ]),
     _.fromPairs,
   )(staticLabels);
 

package/src/components/GrantsTable.js

@@ -48,7 +48,10 @@ export const GrantsTable = ({ columns, setDownloading }) => {
                     key={i}
                     width={column.width}
                     content={formatMessage({
-                      id: `grant.header.${column.name}`,
+                      id:
+                        column.name === "user"
+                          ? "grants.props.user_or_group"
+                          : `grant.header.${column.name}`,
                       defaultMessage: column.name,
                     })}
                     sorted={

package/src/components/StructureFields.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import PropTypes from "prop-types";
 import queryString from "query-string";
 import { useLocation } from "react-router";
@@ -32,6 +32,7 @@ const getColumns = (columns, fields) =>
   _.filter((c) => _.any(columnPred(c))(fields))(columns);
 
 const PAGE_SIZE = 50;
+const EMPTY_FIELDS = [];
 
 const ProfileActions = ({
   emptyFields,
@@ -151,13 +152,15 @@ export const StructureFields = ({
     : { after, before, first: PAGE_SIZE, search: q };
   const variables = { ...structureVariables, ...searchVariables };
   const { data, loading } = useQuery(DATA_FIELDS_QUERY, { variables });
-  const fields = data?.dataFields?.page || [];
+  const fields = data?.dataFields?.page || EMPTY_FIELDS;
   const pageInfo = data?.dataFields?.pageInfo || {};
   const pageStructureIds = _.map("data_structure_id")(fields);
   const emptyFields = _.isEmpty(fields);
 
-  const columns = useSelector((state) =>
-    getColumns(getStructureFieldColumns(state), fields),
+  const structureFieldColumns = useSelector(getStructureFieldColumns);
+  const columns = useMemo(
+    () => getColumns(structureFieldColumns, fields),
+    [structureFieldColumns, fields],
   );
 
   const allCheckedInPage = _.every((structureId) =>

package/src/components/StructureGrantCartUserSelector.js

@@ -11,6 +11,23 @@ import { useRoles } from "@truedat/auth/hooks/useRoles";
 import { useGrantRequestableUsers } from "@truedat/auth/hooks/useUsers";
 import { updateGrantRequestUser } from "../routines";
 
+const groupDisplayName = (userGroup) =>
+  userGroup
+    ? _.isEmpty(userGroup.alias)
+      ? userGroup.name
+      : userGroup.alias
+    : undefined;
+
+const modificationBeneficiary = (grant, formatMessage) => {
+  const groupName = groupDisplayName(grant?.user_group);
+  if (!_.isEmpty(groupName)) return groupName;
+  if (!_.isNil(grant?.user_group_id)) {
+    return formatMessage({ id: "deleted.group" });
+  }
+  if (grant?.source_group_name) return grant.source_group_name;
+  return grant?.user?.full_name ?? "";
+};
+
 export const StructureGrantCartUserSelector = ({
   grantRequestsCart,
   updateGrantRequestUser,
@@ -59,6 +76,8 @@ export const StructureGrantCartUserSelector = ({
   useEffect(() => {
     if (!_.isNil(modificationGrant?.user_id)) {
       selectUser(modificationGrant?.user_id);
+    } else if (!_.isNil(modificationGrant?.user_group_id)) {
+      selectUser(`group:${modificationGrant.user_group_id}`);
     } else if (!_.isNil(grantRequestsCart?.user?.id) && !_.isEmpty(options)) {
       _.flow(
         _.find({ value: userId }),
@@ -66,7 +85,12 @@ export const StructureGrantCartUserSelector = ({
         selectUser,
       )(options);
     }
-  }, [grantRequestsCart?.user?.id, modificationGrant?.user_id, options]);
+  }, [
+    grantRequestsCart?.user?.id,
+    modificationGrant?.user_id,
+    modificationGrant?.user_group_id,
+    options,
+  ]);
 
   useEffect(() => {
     const valid =
@@ -178,9 +202,10 @@ export const StructureGrantCartUserSelector = ({
 
   return updateGrant ? (
     <Header as="h4">
-      <Header.Content>{`${formatMessage({ id: "grantRequestCart.user.label" })} ${
-        modificationGrant.user?.full_name
-      }`}</Header.Content>
+      <Header.Content>{`${formatMessage({ id: "grantRequestCart.user.label" })} ${modificationBeneficiary(
+        modificationGrant,
+        formatMessage,
+      )}`}</Header.Content>
     </Header>
   ) : (
     <>

package/src/components/StructureGrantDropdown.js

@@ -37,6 +37,12 @@ export const StructureGrantDropdown = ({
       grantRequest?._embedded?.group?.userGroupId ??
       grantRequest?._embedded?.group?._embedded?.user_group,
   );
+  const isGroupGrant = !_.isNil(
+    grant?.user_group_id ??
+      grant?.userGroupId ??
+      grant?.user_group ??
+      grant?.userGroup,
+  );
   const createdBy =
     grantRequest?.group?._embedded?.created_by?.user_name ??
     grantRequest?.group?.createdBy?.userName ??
@@ -167,11 +173,11 @@ export const StructureGrantDropdown = ({
       {stateProps?.header ? (
         <Header as="h6">
           <Header.Content>
+            {isGroupRequest || isGroupGrant ? <Icon name="users" /> : null}
             {formatMessage({ id: stateProps.header })}
           </Header.Content>
         </Header>
       ) : null}
-      {isGroupRequest ? <Icon name="users" /> : null}
       {grantRequest ? grantRequestDetails : grantDetails}
     </>
   );

package/src/components/StructureGrants.js

@@ -33,7 +33,10 @@ const StructureGrantsContent = ({
               key={i}
               textAlign={column.textAlign}
               content={formatMessage({
-                id: `grant.header.${column.name}`,
+                id:
+                  column.name === "user"
+                    ? "grants.props.user_or_group"
+                    : `grant.header.${column.name}`,
                 defaultMessage: column.name,
               })}
             />

package/src/components/StructuresUpdateOption.js

@@ -84,7 +84,7 @@ export const StructuresUpdateOption = ({
         onClick={navigateToBulkUpdate}
         disabled={disabled}
         content={
-          <>
+          <div>
             <span>
               {formatMessage({ id: "structures.actions.bulk_update" })}
             </span>
@@ -93,7 +93,7 @@ export const StructuresUpdateOption = ({
                 {formatMessage({ id: "structures.actions.bulk_update.popup" })}
               </p>
             )}
-          </>
+          </div>
         }
       />
     )

package/src/components/SystemStructures.js

@@ -1,4 +1,3 @@
-import _ from "lodash/fp";
 import { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { Grid, Segment } from "semantic-ui-react";
@@ -13,8 +12,9 @@ export default function SystemStructures() {
   const { id: systemId } = useParams();
   const dispatch = useDispatch();
 
-  const { navFilter, systemStructuresLoading } = useSelector(
-    _.pick(["navFilter", "systemStructuresLoading"]),
+  const navFilter = useSelector((state) => state.navFilter);
+  const systemStructuresLoading = useSelector(
+    (state) => state.systemStructuresLoading,
   );
   const system = useSelector((state) => getSystem(state, systemId));
 

package/src/components/__tests__/CatalogViewConfigForm.spec.js

@@ -29,6 +29,8 @@ jest.mock("react-router", () => ({
 }));
 
 describe("<CatalogViewConfigFormLoader />", () => {
+  beforeEach(() => jest.useRealTimers());
+
   it("Saves the configuration", async () => {
     const dispatch = jest.fn();
     const rendered = render(<CatalogViewConfigFormLoader />, {

package/src/components/__tests__/EditDomainForm.spec.js

@@ -4,7 +4,9 @@ import { render, waitForLoad } from "@truedat/test/render";
 import { domainsMock } from "@truedat/test/mocks";
 import { EditDomainForm } from "../EditDomainForm";
 
-const mocks = [domainsMock({ action: "manageStructuresDomain" })];
+const mocks = Array.from({ length: 3 }, () =>
+  domainsMock({ action: "manageStructuresDomain" }),
+);
 
 describe("<EditDomainForm />", () => {
   const updateStructure = jest.fn();