@truedat/dd 7.5.13 → 7.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.5.13",
+  "version": "7.6.0",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -48,7 +48,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "7.5.13",
+    "@truedat/test": "7.6.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -79,10 +79,9 @@
     "redux-saga": "^1.3.0",
     "redux-saga-routines": "^3.2.3",
     "reselect": "^5.1.1",
-    "semantic-ui-calendar-react": "^0.15.3",
     "semantic-ui-react": "^3.0.0-beta.2",
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "83de799e59c0d13d4d52812070d232d24f0b5f82"
+  "gitHead": "0d9c5ee7b864fe3dc87def2be0f68191c04dee57"
 }

package/src/components/GrantDateFilter.js

@@ -7,14 +7,12 @@ import { applyGrantDateFilter } from "../routines";
 
 export const GrantDateFilter = ({ active, applyGrantDateFilter, ...props }) =>
   active ? (
-    <>
-      <DateRangeFilter
-        label={<FormattedMessage id="grant.start_date" />}
-        name="start_date,end_date"
-        onChange={applyGrantDateFilter}
-        defaultValues={props}
-      />
-    </>
+    <DateRangeFilter
+      label={<FormattedMessage id="grant.start_date" />}
+      name="start_date,end_date"
+      onChange={applyGrantDateFilter}
+      defaultValues={props}
+    />
   ) : null;
 
 GrantDateFilter.propTypes = {

package/src/components/StructureGrantCart.js

@@ -18,7 +18,10 @@ import {
 } from "semantic-ui-react";
 import { Loading } from "@truedat/core/components";
 import { useOperators } from "@truedat/core/hooks";
-import { GRANTS_REQUESTS_CHECKOUT, STRUCTURES } from "@truedat/core/routes";
+import {
+  GRANTS_REQUESTS_CHECKOUT,
+  STRUCTURES_GRANT_REQUEST,
+} from "@truedat/core/routes";
 import { FiltersGrid } from "@truedat/dq/components/ruleImplementationForm/FiltersGrid";
 import {
   removeGrantRequestFromCart,
@@ -46,7 +49,8 @@ export const StructureGrantCart = ({
   const structures = _.pathOr([], "structures")(grantRequestsCart);
 
   useEffect(() => {
-    if (_.isEmpty(structures) && !allowEmptyCart) navigate(STRUCTURES);
+    if (_.isEmpty(structures) && !allowEmptyCart)
+      navigate(STRUCTURES_GRANT_REQUEST);
   }, [history, structures, allowEmptyCart]);
 
   const removeRequest = (structure) => () =>

package/src/components/StructureGrantCartUserSelector.js

@@ -8,16 +8,12 @@ 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 { useGrantRequestableUsers } from "@truedat/auth/hooks/useUsers";
 import { updateGrantRequestUser } from "../routines";
 
-const UsersSearchLoader = lazy(
-  () => import("@truedat/auth/users/components/UsersSearchLoader")
-);
-
 export const StructureGrantCartUserSelector = ({
   grantRequestsCart,
   updateGrantRequestUser,
-  options,
 }) => {
   const { formatMessage } = useIntl();
   const [usersGroupsQuery, setUsersGroupsQuery] = useState("");
@@ -26,10 +22,17 @@ export const StructureGrantCartUserSelector = ({
   const [selectedRoles, setSelectedRoles] = useState([]);
   const [selectedRoleIds, setSelectedRoleIds] = useState([]);
   const [userId, setUserId] = useState(null);
+  const { users, trigger } = useGrantRequestableUsers();
 
   const { modificationGrant } = grantRequestsCart;
   const updateGrant = !_.isEmpty(modificationGrant);
   const domainActions = ["publishGrantRequest"];
+  const options = _.map(({ full_name, id }) => ({
+    key: id,
+    text: full_name,
+    value: id,
+    icon: "user",
+  }))(users);
 
   const { data: roles } = useRoles();
 
@@ -61,6 +64,26 @@ export const StructureGrantCartUserSelector = ({
     )(roles);
   }, [selectedRoles, roles]);
 
+  useEffect(() => {
+    const structuresDomains = _.flatMap(({ domain_ids }) => domain_ids)(
+      grantRequestsCart.structures
+    );
+    const filters = {
+      structures_domains: structuresDomains,
+      query: usersGroupsQuery,
+      filter_domains: domainIds,
+      roles: selectedRoleIds,
+    };
+    const payload = _.omitBy(_.isEmpty)(filters);
+    trigger(payload);
+  }, [
+    grantRequestsCart.structures,
+    usersGroupsQuery,
+    domainIds,
+    selectedRoleIds,
+    trigger,
+  ]);
+
   const onSearch = (_currentOptions, { searchQuery }) =>
     setUsersGroupsQuery(lowerDeburrTrim(searchQuery));
 
@@ -131,12 +154,6 @@ export const StructureGrantCartUserSelector = ({
     </Header>
   ) : (
     <>
-      <UsersSearchLoader
-        query={usersGroupsQuery}
-        domains={domainIds}
-        roles={selectedRoleIds}
-        permission="allow_foreign_grant_request"
-      />
       <Form.Dropdown
         placeholder={formatMessage({
           id: "grantRequestCart.user.placeholder",
@@ -168,17 +185,11 @@ export const StructureGrantCartUserSelector = ({
 
 StructureGrantCartUserSelector.propTypes = {
   grantRequestsCart: PropTypes.object,
-  options: PropTypes.array,
   updateGrantRequestUser: PropTypes.func,
 };
 
-const mapStateToProps = ({ grantRequestsCart, usersSearch }) => ({
+const mapStateToProps = ({ grantRequestsCart }) => ({
   grantRequestsCart,
-  options: _.map(({ full_name, id }) => ({
-    text: full_name,
-    value: id,
-    icon: "user",
-  }))(usersSearch),
 });
 
 export default connect(mapStateToProps, { updateGrantRequestUser })(

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

@@ -8,7 +8,10 @@ describe("<GrantDateFilter />", () => {
         userPermissions: { update: true },
       },
     };
-    const rendered = render(<GrantDateFilter active={true} />, renderOpts);
+    const rendered = render(
+      <GrantDateFilter active={true} applyGrantDateFilter={() => {}} />,
+      renderOpts
+    );
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });

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

@@ -1,10 +1,33 @@
 import { render, waitForLoad } from "@truedat/test/render";
+import { useGrantRequestableUsers } from "@truedat/auth/hooks/useUsers";
 import StructureGrantCartUserSelector from "../StructureGrantCartUserSelector";
 
+jest.mock("@truedat/auth/hooks/useUsers", () => ({
+  useGrantRequestableUsers: jest.fn(() => ({
+    users: [
+      {
+        id: 1,
+        full_name: "name",
+      },
+    ],
+    trigger: jest.fn(() =>
+      Promise.resolve({
+        data: {
+          data: [
+            {
+              id: 1,
+              full_name: "name",
+            },
+          ],
+        },
+      })
+    ),
+  })),
+}));
+
 const defaultRenderOpts = {
   state: {
     grantRequestsCart: { user: { id: 5 } },
-    usersSearch: [{ full_name: "name", id: 1 }],
   },
 };
 
@@ -19,6 +42,16 @@ describe("<StructureGrantCartUserSelector />", () => {
   });
 
   it("matches the latest snapshot on update grant", async () => {
+    useGrantRequestableUsers.mockImplementationOnce(() => ({
+      users: [],
+      trigger: jest.fn(() =>
+        Promise.resolve({
+          data: {
+            data: [],
+          },
+        })
+      ),
+    }));
     const renderOpts = {
       ...defaultRenderOpts,
       state: {

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

@@ -3,22 +3,31 @@
 exports[`<GrantDateFilter /> matches the latest snapshot 1`] = `
 <div>
   <div
-    class="field"
+    class="inline fields"
   >
     <div
-      class="ui left icon input"
+      class="field"
     >
-      <i
-        aria-hidden="true"
-        class="calendar alternate outline icon"
-      />
-      <input
-        name="range"
-        placeholder="yyyy-mm-dd - yyyy-mm-dd"
-        tabindex="0"
-        type="text"
-        value=""
-      />
+      <div
+        class="ui input"
+      >
+        <input
+          type="date"
+          value=""
+        />
+      </div>
+    </div>
+    <div
+      class="field"
+    >
+      <div
+        class="ui input"
+      >
+        <input
+          type="date"
+          value=""
+        />
+      </div>
     </div>
   </div>
 </div>

package/src/reducers/grantDateFilter.js

@@ -8,9 +8,8 @@ export const initialState = {
   active: false,
   name: "start_date,end_date",
   type: "range",
-  range: "",
-  unit: "d",
-  value: "1",
+  rangeStart: "",
+  rangeEnd: "",
 };
 
 export const grantDateFilter = (state = initialState, { type, payload }) => {