@truedat/dd 8.11.0 → 8.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.11.0",
+  "version": "8.11.2",
   "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.11.0",
+    "@truedat/test": "8.11.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -89,5 +89,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "89b12f5fa7ff2d0fb790d88830938ccff9cb3d91"
+  "gitHead": "5c0ce3c555de4c9e89021b4d0ab785ed27a87305"
 }

package/src/api/queries.js

@@ -102,6 +102,10 @@ export const LATEST_GRANT_REQUEST_BY_DS_QUERY = gql`
         grant {
           id
         }
+        userGroupId
+        createdBy {
+          userName
+        }
       }
       requestType
       status {

package/src/components/GrantRequest.js

@@ -1,14 +1,22 @@
 import _ from "lodash/fp";
-import { lazy } from "react";
+import { lazy, useState } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { Link } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { useIntl } from "react-intl";
-import { Grid, Segment, List, Label } from "semantic-ui-react";
+import {
+  Grid,
+  Segment,
+  List,
+  Label,
+  Icon,
+  Accordion,
+  Table,
+} from "semantic-ui-react";
 import GenericCrumbs from "@truedat/core/components/GenericCrumbs";
 import { getGrantRequestTemplate } from "../selectors";
-import GrantRequestHeader from "./GrantRequestHeader";
+import { GrantRequestHeader } from "./GrantRequestHeader";
 import GrantRequestSummary from "./GrantRequestSummary";
 
 const DynamicFormViewer = lazy(
@@ -21,6 +29,7 @@ const ConditionSummary = lazy(
 
 export const GrantRequest = ({ grantRequest, template }) => {
   const { formatMessage } = useIntl();
+  const [membersOpen, setMembersOpen] = useState(false);
   const dynamic_content = grantRequest?.dynamic_content;
   const data_structure = grantRequest?._embedded?.data_structure;
   const path = _.flow(
@@ -29,7 +38,24 @@ export const GrantRequest = ({ grantRequest, template }) => {
     _.join(" › "),
   )(data_structure?.path);
   const rows = grantRequest?.filters?.rows;
-  const user = grantRequest?._embedded?.group?._embedded?.user?.user_name;
+  const group = grantRequest?._embedded?.group;
+  const user = group?._embedded?.user?.user_name;
+  const userGroup = group?._embedded?.user_group;
+  const userGroupId = group?.user_group_id;
+  const userGroupText = userGroup
+    ? _.isEmpty(userGroup.alias)
+      ? userGroup.name
+      : userGroup.alias
+    : undefined;
+  const requestFor =
+    user ||
+    userGroupText ||
+    (userGroupId
+      ? formatMessage({ id: "grantRequest.deleted.group" })
+      : group
+        ? formatMessage({ id: "grantRequest.deleted.user" })
+        : undefined);
+  const members = _.isArray(userGroup?.users) ? userGroup.users : [];
   const createdBy =
     grantRequest?._embedded?.group?._embedded?.created_by?.user_name;
 
@@ -46,7 +72,7 @@ export const GrantRequest = ({ grantRequest, template }) => {
       <Grid columns="equal" style={{ marginTop: 0 }}>
         <Grid.Column width={12}>
           <Segment>
-            <GrantRequestHeader />
+            <GrantRequestHeader grantRequest={grantRequest} />
             <List size="big" relaxed="very">
               {data_structure ? (
                 <List.Item>
@@ -73,13 +99,53 @@ export const GrantRequest = ({ grantRequest, template }) => {
                   ) : null}
                 </List.Item>
               ) : null}
-              {user && (
+              {requestFor && (
                 <List.Item>
                   <List.Header>
-                    {formatMessage({ id: "grantRequest.header.user" })}
+                    {formatMessage({
+                      id:
+                        userGroup || userGroupId
+                          ? "grantRequest.header.group"
+                          : "grantRequest.header.user",
+                    })}
                   </List.Header>
                   <List.Description>
-                    <Label>{user}</Label>
+                    {userGroup ? (
+                      <Accordion>
+                        <Accordion.Title
+                          active={membersOpen}
+                          icon={false}
+                          onClick={() => setMembersOpen(!membersOpen)}
+                        >
+                          <Label>{requestFor}</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>
+                    ) : (
+                      <Label>{requestFor}</Label>
+                    )}
                   </List.Description>
                 </List.Item>
               )}

package/src/components/GrantRequestCancel.js

@@ -11,6 +11,7 @@ export const GrantRequestCancel = ({
   createGrantRequestStatus,
   children,
   previousStructureQuery,
+  onSuccess,
 }) => {
   const { formatMessage } = useIntl();
   if (!grantRequest) return;
@@ -31,6 +32,7 @@ export const GrantRequestCancel = ({
           setLatestGrantRequest,
           status: "cancelled",
           previousStructureQuery,
+          onSuccess,
         })
       }
       onOpen={(e) => e.stopPropagation()}
@@ -46,6 +48,7 @@ GrantRequestCancel.propTypes = {
   children: PropTypes.node,
   previousStructureQuery: PropTypes.object,
   setLatestGrantRequest: PropTypes.func,
+  onSuccess: PropTypes.func,
 };
 
 export default connect(null, { createGrantRequestStatus })(GrantRequestCancel);

package/src/components/GrantRequestHeader.js

@@ -1,9 +1,11 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import { connect } from "react-redux";
+import { connect, useDispatch, useSelector } from "react-redux";
 import { useIntl } from "react-intl";
-import { Header, Grid, Icon } from "semantic-ui-react";
+import { Button, Grid, Header, Icon } from "semantic-ui-react";
+import { fetchGrantRequest } from "../routines";
 import GrantRequestApprovalPopup from "./GrantRequestApprovalPopup";
+import GrantRequestCancel from "./GrantRequestCancel";
 
 const selectGrantTypeOptions = (grantRequest) => {
   const [color, translationId] =
@@ -17,11 +19,23 @@ const selectGrantTypeOptions = (grantRequest) => {
 
 export const GrantRequestHeader = ({ grantRequest }) => {
   const { formatMessage } = useIntl();
+  const dispatch = useDispatch();
+  const userName = useSelector((state) => state.authentication?.user_name);
   const { translationId: grantTypeTranslationId } =
     selectGrantTypeOptions(grantRequest);
   const canApprove =
     grantRequest?.status === "pending" &&
     !_.isEmpty(grantRequest?.pending_roles);
+  const isGroupRequest = !_.isNil(
+    grantRequest?._embedded?.group?._embedded?.user_group,
+  );
+  const createdBy =
+    grantRequest?._embedded?.group?._embedded?.created_by?.user_name;
+  const canCancel =
+    (grantRequest?.status === "pending" ||
+      grantRequest?.status === "approved") &&
+    (!isGroupRequest || (createdBy && userName === createdBy));
+  const structureId = grantRequest?._embedded?.data_structure?.id;
   return (
     <Grid>
       <Grid.Column width={12}>
@@ -40,19 +54,36 @@ export const GrantRequestHeader = ({ grantRequest }) => {
           </Header.Content>
         </Header>
       </Grid.Column>
-      {canApprove ? (
+      {canApprove || canCancel ? (
         <Grid.Column width={4} textAlign="right">
-          <GrantRequestApprovalPopup
-            content={formatMessage({ id: "grantRequest.actions.approve" })}
-            primary
-            grantRequest={grantRequest}
-          />
-          <GrantRequestApprovalPopup
-            content={formatMessage({ id: "grantRequest.actions.reject" })}
-            secondary
-            isRejection
-            grantRequest={grantRequest}
-          />
+          {canApprove ? (
+            <>
+              <GrantRequestApprovalPopup
+                content={formatMessage({ id: "grantRequest.actions.approve" })}
+                primary
+                grantRequest={grantRequest}
+              />
+              <GrantRequestApprovalPopup
+                content={formatMessage({ id: "grantRequest.actions.reject" })}
+                secondary
+                isRejection
+                grantRequest={grantRequest}
+              />
+            </>
+          ) : null}
+          {canCancel ? (
+            <GrantRequestCancel
+              structureId={structureId}
+              grantRequest={grantRequest}
+              onSuccess={() =>
+                dispatch(fetchGrantRequest({ id: grantRequest?.id }))
+              }
+            >
+              <Button>
+                {formatMessage({ id: "structure.grant.cancel_grant_request" })}
+              </Button>
+            </GrantRequestCancel>
+          ) : null}
         </Grid.Column>
       ) : null}
     </Grid>

package/src/components/GrantRequestsDownloadButton.js

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

package/src/components/GrantRequestsTable.js

@@ -46,7 +46,10 @@ export const GrantRequestsTable = ({
               key={key}
               width={column.width}
               content={formatMessage({
-                id: `grantRequest.header.${column.name}`,
+                id:
+                  column.name === "user"
+                    ? "grantRequests.props.user_or_group"
+                    : `grantRequest.header.${column.name}`,
                 defaultMessage: column.name,
               })}
               sorted={

package/src/components/StructureGrantCartCheckout.js

@@ -132,6 +132,7 @@ export const StructureGrantCartCheckout = ({
     modificationGrant,
     validCart,
     user,
+    user_group_id,
     structures = [],
     groupTemplates = {},
   } = grantRequestsCart;
@@ -293,6 +294,12 @@ export const StructureGrantCartCheckout = ({
 
   const canSubmit = isMultiGroup ? validCartMulti : validCart && user?.valid;
 
+  const grantRequestGroupIds = _.omitBy(_.isNil)({
+    user_id: _.isNil(user_group_id) ? user?.id : null,
+    user_group_id,
+    created_by_id: user?.id,
+  });
+
   const domainNamesByKey = useMemo(() => {
     const domainIdToName = {};
     (structures ?? []).forEach((structure) => {
@@ -344,8 +351,7 @@ export const StructureGrantCartCheckout = ({
             requests,
             type: templateName,
             modification_grant_id: modificationGrant?.id ?? null,
-            user_id: user?.id,
-            created_by_id: user?.id,
+            ...grantRequestGroupIds,
           });
         });
       // eslint-disable-next-line fp/no-mutation
@@ -362,8 +368,7 @@ export const StructureGrantCartCheckout = ({
           requests,
           type: template,
           modification_grant_id: modificationGrant?.id ?? null,
-          user_id: user?.id,
-          created_by_id: user?.id,
+          ...grantRequestGroupIds,
         }),
       };
     }

package/src/components/StructureGrantCartUserSelector.js

@@ -24,7 +24,7 @@ export const StructureGrantCartUserSelector = ({
   const [selectedRoles, setSelectedRoles] = useState([]);
   const [selectedRoleIds, setSelectedRoleIds] = useState([]);
   const [userId, setUserId] = useState(null);
-  const { users, trigger } = useGrantRequestableUsers();
+  const { users, groups, trigger } = useGrantRequestableUsers();
 
   const structuresDomainIds = useMemo(
     () =>
@@ -38,12 +38,19 @@ export const StructureGrantCartUserSelector = ({
   const { modificationGrant } = grantRequestsCart;
   const updateGrant = !_.isEmpty(modificationGrant);
   const domainActions = ["publishGrantRequest"];
-  const options = _.map(({ full_name, id }) => ({
+  const userOptions = _.map(({ full_name, id }) => ({
     key: id,
     text: full_name,
     value: id,
     icon: "user",
   }))(users);
+  const groupOptions = _.map(({ name, alias, id }) => ({
+    key: `group:${id}`,
+    text: _.isEmpty(alias) ? name : alias,
+    value: `group:${id}`,
+    icon: "users",
+  }))(groups || []);
+  const options = [...(userOptions || []), ...groupOptions];
 
   const { data: roles } = useRoles();
 
@@ -62,10 +69,18 @@ export const StructureGrantCartUserSelector = ({
   }, [grantRequestsCart?.user?.id, modificationGrant?.user_id, options]);
 
   useEffect(() => {
+    const valid =
+      !thirdParty || (thirdParty && !(_.isNil(userId) && _.isEmpty(userId)));
+
+    if (_.isString(userId) && _.startsWith("group:")(userId)) {
+      const user_group_id = Number(userId.slice("group:".length));
+      updateGrantRequestUser({ user_group_id, valid });
+      return;
+    }
+
     updateGrantRequestUser({
       id: userId,
-      valid:
-        !thirdParty || (thirdParty && !(_.isNil(userId) && _.isEmpty(userId))),
+      valid,
     });
   }, [thirdParty, updateGrantRequestUser, userId]);
 

package/src/components/StructureGrantDropdown.js

@@ -1,7 +1,8 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
-import { Button, Dropdown, Popup, Header } from "semantic-ui-react";
+import { Button, Dropdown, Popup, Header, Icon } from "semantic-ui-react";
 import { FormattedMessage, useIntl } from "react-intl";
+import { useSelector } from "react-redux";
 import { useNavigate } from "react-router";
 import { linkTo } from "@truedat/core/routes";
 import { Date } from "@truedat/core/components";
@@ -22,10 +23,26 @@ export const StructureGrantDropdown = ({
   authorized,
   requested,
   previousStructureQuery,
+  onSuccess,
   size,
 }) => {
   const navigate = useNavigate();
   const { formatMessage } = useIntl();
+  const userName = useSelector((state) => state.authentication?.user_name);
+  const isGroupRequest = !_.isNil(
+    grantRequest?.group?.user_group_id ??
+      grantRequest?.group?.userGroupId ??
+      grantRequest?.group?._embedded?.user_group ??
+      grantRequest?._embedded?.group?.user_group_id ??
+      grantRequest?._embedded?.group?.userGroupId ??
+      grantRequest?._embedded?.group?._embedded?.user_group,
+  );
+  const createdBy =
+    grantRequest?.group?._embedded?.created_by?.user_name ??
+    grantRequest?.group?.createdBy?.userName ??
+    grantRequest?._embedded?.group?._embedded?.created_by?.user_name ??
+    grantRequest?._embedded?.group?.createdBy?.userName;
+  const canCancel = !isGroupRequest || (createdBy && userName === createdBy);
 
   const hasPendingGrantRequest = _.includes(grantRequestStatus)([
     "pending",
@@ -77,6 +94,7 @@ export const StructureGrantDropdown = ({
         structureId={structure.id}
         grantRequest={grantRequest}
         previousStructureQuery={previousStructureQuery}
+        onSuccess={onSuccess}
       >
         <Dropdown.Item
           icon="delete"
@@ -91,7 +109,9 @@ export const StructureGrantDropdown = ({
   const dropdownStates = {
     pendingRequest: {
       color: "yellow",
-      options: [actions["viewRequest"], actions["cancelRequest"]],
+      options: canCancel
+        ? [actions["viewRequest"], actions["cancelRequest"]]
+        : [actions["viewRequest"]],
 
       header: isModification
         ? "structure.grant.requested_modification"
@@ -145,8 +165,13 @@ export const StructureGrantDropdown = ({
   const popupContent = (
     <>
       {stateProps?.header ? (
-        <Header as="h6">{formatMessage({ id: stateProps.header })}</Header>
+        <Header as="h6">
+          <Header.Content>
+            {formatMessage({ id: stateProps.header })}
+          </Header.Content>
+        </Header>
       ) : null}
+      {isGroupRequest ? <Icon name="users" /> : null}
       {grantRequest ? grantRequestDetails : grantDetails}
     </>
   );
@@ -200,6 +225,7 @@ StructureGrantDropdown.propTypes = {
   authorized: PropTypes.bool,
   requested: PropTypes.bool,
   previousStructureQuery: PropTypes.object,
+  onSuccess: PropTypes.func,
   size: PropTypes.string,
 };
 

package/src/components/StructureGrantListButton.js

@@ -12,7 +12,8 @@ export const StructureGrantListButton = ({
   authorized_request,
   requested,
 }) => {
-  const { filterParams: previousStructureQuery } = useSearchContext();
+  const { filterParams: previousStructureQuery, refreshSearch } =
+    useSearchContext();
 
   const grant = _.flow(_.prop("my_grants"), _.first)(structure);
   const grantRequest = _.prop("my_grant_request")(structure);
@@ -34,6 +35,7 @@ export const StructureGrantListButton = ({
       grantRequest={isActiveRequest ? grantRequest : null}
       grantRequestStatus={grantRequestStatus}
       previousStructureQuery={previousStructureQuery}
+      onSuccess={refreshSearch}
       size="mini"
     />
   ) : (

package/src/components/StructureGrantSummaryButton.js

@@ -16,10 +16,13 @@ export const StructureGrantSummaryButton = ({
 }) => {
   const { grant, id } = structure;
 
-  const { loading, error, data } = useQuery(LATEST_GRANT_REQUEST_BY_DS_QUERY, {
-    fetchPolicy: "cache-and-network",
-    variables: { id },
-  });
+  const { loading, error, data, refetch } = useQuery(
+    LATEST_GRANT_REQUEST_BY_DS_QUERY,
+    {
+      fetchPolicy: "cache-and-network",
+      variables: { id },
+    },
+  );
   if (error) return null;
   if (loading) return <Loading />;
 
@@ -40,6 +43,7 @@ export const StructureGrantSummaryButton = ({
       requested={requested}
       grantRequest={isActiveRequest ? grantRequest : null}
       grantRequestStatus={grantRequestStatus}
+      onSuccess={refetch}
     />
   ) : (
     <StructureGrantRequestButton