@truedat/dd 5.8.4 → 5.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.8.4",
+  "version": "5.8.5",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "5.8.4",
+    "@truedat/test": "5.8.5",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -87,9 +87,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.8.4",
-    "@truedat/core": "5.8.4",
-    "@truedat/df": "5.8.4",
+    "@truedat/auth": "5.8.5",
+    "@truedat/core": "5.8.5",
+    "@truedat/df": "5.8.5",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -114,5 +114,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "7dfd208b88f5e98b40dde7797a58db8a64fef37d"
+  "gitHead": "df5ac2e52199ef8054cad09f1e4142c3d6af9d9f"
 }

package/src/components/GrantRoutes.js

@@ -37,6 +37,10 @@ import StructuresLoader from "./StructuresLoader";
 import StructureFiltersLoader from "./StructureFiltersLoader";
 import UserSearchFiltersLoader from "./UserSearchFiltersLoader";
 
+const RolesLoader = React.lazy(() =>
+  import("@truedat/auth/roles/components/RolesLoader")
+);
+
 const TemplatesLoader = React.lazy(() =>
   import("@truedat/df/templates/components/TemplatesLoader")
 );
@@ -46,7 +50,12 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
     <>
       <Route
         path={GRANTS_REQUESTS_CHECKOUT}
-        render={() => <StructureGrantCartCheckout />}
+        render={() => (
+          <>
+            <RolesLoader />
+            <StructureGrantCartCheckout />
+          </>
+        )}
       />
       <Switch>
         <Route exact path={GRANT} render={() => <GrantView />} />

package/src/components/StructureGrantCartInformation.js

@@ -32,16 +32,24 @@ export const StructureGrantCartInformation = ({
 
   return (
     <Segment loading={loading}>
-      <Header
-        title={`${formatMessage({ id: `structure.grant.cart.template` })}`}
-      >
-        {formatMessage({ id: `structure.grant.cart.template` })}
-      </Header>
-      <Divider />
       <Form>
         {!loading && !_.isEmpty(data?.domains) ? (
-          <StructureGrantCartUserSelector />
+          <>
+            <Header>
+              <Header.Content>
+                {formatMessage({ id: "grants.props.user_name" })}
+              </Header.Content>
+            </Header>
+            <Header title={formatMessage({ id: "grants.props.user_name" })} />
+            <StructureGrantCartUserSelector />
+            <Divider />
+          </>
         ) : null}
+        <Header
+          title={`${formatMessage({ id: `structure.grant.cart.template` })}`}
+        >
+          {formatMessage({ id: `structure.grant.cart.template` })}
+        </Header>
         <SelectableDynamicForm
           scope="gr"
           content={templateContent}

package/src/components/StructureGrantCartUserSelector.js

@@ -1,10 +1,19 @@
 import _ from "lodash/fp";
 import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
-import { Form, Checkbox, Header } from "semantic-ui-react";
+import {
+  Form,
+  Dropdown,
+  Checkbox,
+  Header,
+  Label,
+  Popup,
+} from "semantic-ui-react";
 import { connect } from "react-redux";
 import { useIntl } from "react-intl";
 import { lowerDeburrTrim } from "@truedat/core/services/sort";
+import { DomainSelector } from "@truedat/core/components";
+import { RoleSelector } from "@truedat/auth/roles/components";
 import { updateGrantRequestUser } from "../routines";
 
 const UsersSearchLoader = React.lazy(() =>
@@ -15,15 +24,21 @@ export const StructureGrantCartUserSelector = ({
   grantRequestsCart,
   updateGrantRequestUser,
   options,
+  rolesRaw,
 }) => {
   const { formatMessage } = useIntl();
   const [usersGroupsQuery, setUsersGroupsQuery] = useState("");
   const [thirdParty, setThirdParty] = useState(false);
+  const [domainIds, setDomainIds] = useState([]);
+  const [roles, setRoles] = useState([]);
+  const [roleIds, setRoleIds] = useState([]);
+
   const [userId, setUserId] = useState(_.path("user.id")(grantRequestsCart));
 
   const { modificationGrant } = grantRequestsCart;
   const updateGrant = !_.isEmpty(modificationGrant);
 
+  const domainActions = ["publishGrantRequest"];
   useEffect(() => {
     updateGrantRequestUser({
       id: userId,
@@ -32,7 +47,30 @@ export const StructureGrantCartUserSelector = ({
     });
     if (updateGrant && modificationGrant.user_id)
       setUserId(modificationGrant.user_id);
-  }, [userId, thirdParty]);
+  }, [
+    modificationGrant,
+    thirdParty,
+    updateGrant,
+    updateGrantRequestUser,
+    userId,
+  ]);
+
+  useEffect(() => {
+    _.flow(
+      _.filter({ value: userId }),
+      _.first,
+      _.pathOr(null, "value"),
+      selectUser
+    )(options);
+  }, [userId, options]);
+
+  useEffect(() => {
+    _.flow(
+      _.filter(({ name }) => _.includes(name)(roles)),
+      _.map(({ id }) => id),
+      setRoleIds
+    )(rolesRaw);
+  }, [roles, rolesRaw]);
 
   const onSearch = (_currentOptions, { searchQuery }) =>
     setUsersGroupsQuery(lowerDeburrTrim(searchQuery));
@@ -43,6 +81,58 @@ export const StructureGrantCartUserSelector = ({
     if (userId === "") setThirdParty(false);
   };
 
+  const userFilters = () => (
+    <>
+      {formatMessage({ id: "filters" })}:
+      <Label.Group>
+        <Popup
+          basic
+          position="bottom left"
+          on="click"
+          content={
+            <DomainSelector
+              action={"DomainSelectorGrantCart"}
+              value={domainIds}
+              onChange={(_e, { value }) => setDomainIds(value)}
+              domainActions={domainActions}
+              labels
+              multiple
+            />
+          }
+          trigger={
+            <Label as="a">
+              {formatMessage({ id: "userDomainsFilter.placeholder" })}
+              {domainIds.length > 0 ? (
+                <Label.Detail>{domainIds.length}</Label.Detail>
+              ) : null}
+            </Label>
+          }
+        />
+        <Popup
+          basic
+          position="bottom left"
+          on="click"
+          content={
+            <RoleSelector
+              onChange={(_e, { value }) => setRoles(value)}
+              value={roles}
+              labels
+              multiple={true}
+            />
+          }
+          trigger={
+            <Label as="a">
+              {formatMessage({ id: "roles.header" })}
+              {roles.length > 0 ? (
+                <Label.Detail>{roles.length}</Label.Detail>
+              ) : null}
+            </Label>
+          }
+        />
+      </Label.Group>
+    </>
+  );
+
   return updateGrant ? (
     <Header as="h4">
       <Header.Content>
@@ -55,6 +145,8 @@ export const StructureGrantCartUserSelector = ({
     <>
       <UsersSearchLoader
         query={usersGroupsQuery}
+        domains={domainIds}
+        roles={roleIds}
         permission="allow_foreign_grant_request"
         hideLoading
       />
@@ -82,6 +174,7 @@ export const StructureGrantCartUserSelector = ({
         options={options}
         value={userId}
       />
+      {userFilters()}
     </>
   );
 };
@@ -90,15 +183,17 @@ StructureGrantCartUserSelector.propTypes = {
   grantRequestsCart: PropTypes.object,
   options: PropTypes.array,
   updateGrantRequestUser: PropTypes.func,
+  rolesRaw: PropTypes.array,
 };
 
-const mapStateToProps = ({ grantRequestsCart, usersSearch }) => ({
+const mapStateToProps = ({ grantRequestsCart, usersSearch, roles }) => ({
   grantRequestsCart,
   options: _.map(({ full_name, id }) => ({
     text: full_name,
     value: id,
     icon: "user",
   }))(usersSearch),
+  rolesRaw: roles,
 });
 
 export default connect(mapStateToProps, { updateGrantRequestUser })(

package/src/components/__tests__/__snapshots__/StructureGrantCartInformation.spec.js.snap

@@ -6,18 +6,16 @@ exports[`<StructureGrantCartInformation /> matches the latest snapshot 1`] = `
     class="ui loading segment"
     style="display: none;"
   >
-    <div
-      class="ui header"
-      title="template"
-    >
-      template
-    </div>
-    <div
-      class="ui divider"
-    />
     <form
       class="ui form"
-    />
+    >
+      <div
+        class="ui header"
+        title="template"
+      >
+        template
+      </div>
+    </form>
   </div>
 </div>
 `;

package/src/components/__tests__/__snapshots__/StructureGrantCartUserSelector.spec.js.snap

@@ -36,14 +36,14 @@ exports[`<StructureGrantCartUserSelector /> matches the latest snapshot 1`] = `
       <div
         aria-atomic="true"
         aria-live="polite"
-        class="divider text"
+        class="divider default text"
         role="alert"
       >
         Select user
       </div>
       <i
         aria-hidden="true"
-        class="dropdown icon clear"
+        class="dropdown icon"
       />
       <div
         class="menu transition"
@@ -69,6 +69,23 @@ exports[`<StructureGrantCartUserSelector /> matches the latest snapshot 1`] = `
       </div>
     </div>
   </div>
+  
+  
+  <div
+    class="ui labels"
+    style="display: none;"
+  >
+    <a
+      class="ui label"
+    >
+      Domains
+    </a>
+    <a
+      class="ui label"
+    >
+      Roles
+    </a>
+  </div>
   lazy
 </div>
 `;