@truedat/dd 5.16.4 → 5.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "5.16.4",
+  "version": "5.17.0",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "5.16.4",
-    "@truedat/core": "5.16.4",
-    "@truedat/df": "5.16.4",
+    "@truedat/auth": "5.17.0",
+    "@truedat/core": "5.17.0",
+    "@truedat/df": "5.17.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "cf52894dd17d128c97fc65f97b6976fb07bcb171"
+  "gitHead": "5fbcca7a428b2b92de1c610eb44f2d4a281c1655"
 }

package/src/components/GrantRoutes.js

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

package/src/components/StructureGrantCartUserSelector.js

@@ -1,19 +1,13 @@
 import _ from "lodash/fp";
 import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
-import {
-  Form,
-  Dropdown,
-  Checkbox,
-  Header,
-  Label,
-  Popup,
-} from "semantic-ui-react";
+import { Form, 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 { useRoles } from "@truedat/auth/hooks/useRoles";
 import { updateGrantRequestUser } from "../routines";
 
 const UsersSearchLoader = React.lazy(() =>
@@ -24,14 +18,13 @@ 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 [selectedRoles, setSelectedRoles] = useState([]);
+  const [selectedRoleIds, setSelectedRoleIds] = useState([]);
 
   const [userId, setUserId] = useState(_.path("user.id")(grantRequestsCart));
 
@@ -39,6 +32,9 @@ export const StructureGrantCartUserSelector = ({
   const updateGrant = !_.isEmpty(modificationGrant);
 
   const domainActions = ["publishGrantRequest"];
+
+  const { data: roles } = useRoles();
+
   useEffect(() => {
     updateGrantRequestUser({
       id: userId,
@@ -66,11 +62,11 @@ export const StructureGrantCartUserSelector = ({
 
   useEffect(() => {
     _.flow(
-      _.filter(({ name }) => _.includes(name)(roles)),
+      _.filter(({ name }) => _.includes(name)(selectedRoles)),
       _.map(({ id }) => id),
-      setRoleIds
-    )(rolesRaw);
-  }, [roles, rolesRaw]);
+      setSelectedRoleIds
+    )(roles);
+  }, [selectedRoles, roles]);
 
   const onSearch = (_currentOptions, { searchQuery }) =>
     setUsersGroupsQuery(lowerDeburrTrim(searchQuery));
@@ -114,8 +110,9 @@ export const StructureGrantCartUserSelector = ({
           on="click"
           content={
             <RoleSelector
-              onChange={(_e, { value }) => setRoles(value)}
-              value={roles}
+              onChange={(_e, { value }) => setSelectedRoles(value)}
+              value={selectedRoles}
+              roles={roles}
               labels
               multiple={true}
             />
@@ -123,8 +120,8 @@ export const StructureGrantCartUserSelector = ({
           trigger={
             <Label as="a">
               {formatMessage({ id: "roles.header" })}
-              {roles.length > 0 ? (
-                <Label.Detail>{roles.length}</Label.Detail>
+              {selectedRoles.length > 0 ? (
+                <Label.Detail>{selectedRoles.length}</Label.Detail>
               ) : null}
             </Label>
           }
@@ -146,7 +143,7 @@ export const StructureGrantCartUserSelector = ({
       <UsersSearchLoader
         query={usersGroupsQuery}
         domains={domainIds}
-        roles={roleIds}
+        roles={selectedRoleIds}
         permission="allow_foreign_grant_request"
         hideLoading
       />
@@ -183,17 +180,15 @@ StructureGrantCartUserSelector.propTypes = {
   grantRequestsCart: PropTypes.object,
   options: PropTypes.array,
   updateGrantRequestUser: PropTypes.func,
-  rolesRaw: PropTypes.array,
 };
 
-const mapStateToProps = ({ grantRequestsCart, usersSearch, roles }) => ({
+const mapStateToProps = ({ grantRequestsCart, usersSearch }) => ({
   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__/StructureGrantCartInformation.spec.js

@@ -3,6 +3,25 @@ import { render } from "@truedat/test/render";
 import { singleTemplateMock } from "@truedat/test/mocks";
 import { StructureGrantCartInformation } from "../StructureGrantCartInformation";
 
+jest.mock("@truedat/auth/hooks/useRoles", () => {
+  const originalModule = jest.requireActual("@truedat/auth/hooks/useRoles");
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    useRoles: jest.fn(() => ({
+      data: {
+        data: {
+          data: {
+            roles: [],
+          },
+        },
+      },
+      loading: false,
+    })),
+  };
+});
+
 describe("<StructureGrantCartInformation />", () => {
   const selectGrantRequestTemplate = jest.fn();
   const updateGrantRequestTemplateContent = jest.fn();