@truedat/dd 8.2.3 → 8.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.2.3",
+  "version": "8.3.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": "8.2.3",
+    "@truedat/test": "8.3.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -83,5 +83,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "8e3f74fa7c3c0e071d3c46d161dde80454c26a15"
+  "gitHead": "d1abe685a3ae0cd2999e7bb62d3c0fd56522095f"
 }

package/src/api.js

@@ -17,6 +17,7 @@ const API_GRANT_REQUEST = "/api/grant_requests/:id";
 const API_GRANT_REQUEST_APPROVALS = "/api/grant_requests/:id/approvals";
 const API_GRANT_REQUEST_STATUS = "/api/grant_requests/:id/status";
 const API_GRANT_REQUEST_GROUP = "/api/grant_request_groups";
+const API_GRANT_REQUEST_GROUPS_BULK = "/api/grant_request_groups/bulk";
 const API_GRANT_REQUESTS = "/api/grant_requests";
 const API_GRANT_REQUEST_BULK_APPROVAL = "/api/grant_requests/bulk_approval";
 const API_GRANT_REQUESTS_SEARCH = "/api/grant_requests/search";
@@ -77,6 +78,7 @@ export {
   API_GRANT_REQUEST_APPROVALS,
   API_GRANT_REQUEST_STATUS,
   API_GRANT_REQUEST_GROUP,
+  API_GRANT_REQUEST_GROUPS_BULK,
   API_GRANT_REQUESTS,
   API_GRANT_REQUESTS_SEARCH,
   API_GRANT_REQUESTS_FILTERS_SEARCH,

package/src/components/GrantRequestCartResult.js

@@ -0,0 +1,132 @@
+import _ from "lodash/fp";
+import { useIntl, FormattedMessage } from "react-intl";
+import { Link, useParams } from "react-router";
+import { Message, List, Header, Segment, Button, Loader } from "semantic-ui-react";
+import { linkTo } from "@truedat/core/routes";
+import { MY_GRANT_REQUESTS } from "@truedat/core/routes";
+import { useGrantRequestGroupsByIds } from "../hooks/useGrantRequestGroupsByIds";
+
+const parseIdsFromPath = (idsParam) => {
+  if (!idsParam || typeof idsParam !== "string") return [];
+  return idsParam
+    .split("-")
+    .map((s) => parseInt(s.trim(), 10))
+    .filter((n) => !Number.isNaN(n));
+};
+
+const getStructuresFromGroup = (group) => {
+  const requests = group._embedded?.requests ?? [];
+  const byId = new Map();
+  requests.forEach((req) => {
+    const ds = req._embedded?.data_structure;
+    if (ds?.id != null && !byId.has(ds.id)) byId.set(ds.id, ds);
+  });
+  return Array.from(byId.values());
+};
+
+export const GrantRequestCartResult = () => {
+  const { ids: idsParam } = useParams();
+  const ids = parseIdsFromPath(idsParam);
+  const { groups, isLoading, error } = useGrantRequestGroupsByIds(ids);
+  const { formatMessage } = useIntl();
+
+  if (isLoading) {
+    return (
+      <Segment>
+        <Loader active inline="centered" />
+      </Segment>
+    );
+  }
+
+  if (_.isEmpty(ids) || _.isEmpty(groups)) {
+    return (
+      <Segment>
+        <Message info>
+          <Message.Header>
+            <FormattedMessage id="grantRequest.cart.result.empty" />
+          </Message.Header>
+          <Button as={Link} to={MY_GRANT_REQUESTS}>
+            <FormattedMessage id="grantRequest.cart.result.viewMyRequests" />
+          </Button>
+        </Message>
+      </Segment>
+    );
+  }
+
+  if (error) {
+    return (
+      <Segment>
+        <Message negative>
+          <Message.Header>
+            <FormattedMessage id="grantRequest.cart.result.error" defaultMessage="Error loading results" />
+          </Message.Header>
+          <Button as={Link} to={MY_GRANT_REQUESTS}>
+            <FormattedMessage id="grantRequest.cart.result.viewMyRequests" />
+          </Button>
+        </Message>
+      </Segment>
+    );
+  }
+
+  return (
+    <Segment>
+      <Header as="h2">
+        <FormattedMessage id="grantRequest.cart.result.header" />
+      </Header>
+      <Message positive>
+        <Message.Header>
+          <FormattedMessage
+            id="grantRequest.cart.result.success"
+            values={{ count: groups.length }}
+          />
+        </Message.Header>
+      </Message>
+      <List divided relaxed>
+        {groups.map((group) => {
+          const name =
+            group.type ||
+            formatMessage(
+              { id: "grantRequest.cart.result.itemDefault" },
+              { id: group.id }
+            );
+          const href = linkTo.GRANT_REQUEST_GROUP({ id: group.id });
+          const structures = getStructuresFromGroup(group);
+          return (
+            <List.Item key={group.id}>
+              <List.Content>
+                <List.Header as={Link} to={href}>
+                  {name}
+                </List.Header>
+                <List.Description>
+                  {structures.length > 0 && (
+                    <>
+                      <FormattedMessage
+                        id="grantRequest.cart.result.structuresRequested"
+                        defaultMessage="Structures requested"
+                      />
+                      {": "}
+                      <ul style={{ marginTop: "0.25em", marginBottom: 0 }}>
+                        {structures.map((ds) => (
+                          <li key={ds.id}>
+                            <Link to={linkTo.STRUCTURE({ id: ds.id })}>
+                              {ds.name ?? ds.external_id ?? ds.id}
+                            </Link>
+                          </li>
+                        ))}
+                      </ul>
+                    </>
+                  )}
+                </List.Description>
+              </List.Content>
+            </List.Item>
+          );
+        })}
+      </List>
+      <Button as={Link} to={MY_GRANT_REQUESTS} primary>
+        <FormattedMessage id="grantRequest.cart.result.viewMyRequests" />
+      </Button>
+    </Segment>
+  );
+};
+
+export default GrantRequestCartResult;

package/src/components/GrantRoutes.js

@@ -4,22 +4,6 @@ import { Route, Routes } from "react-router";
 import { useParams } from "react-router";
 import PropTypes from "prop-types";
 import { lazy } from "react";
-import {
-  GRANT_APPROVAL_RULE,
-  GRANT_APPROVAL_RULE_EDIT,
-  GRANT_APPROVAL_RULE_NEW,
-  GRANT_REQUEST,
-  GRANT_REQUEST_GROUP,
-  GRANT_REQUESTS,
-  GRANT_REQUESTS_APPROVALS_RESULT,
-  GRANTS_REQUESTS_CHECKOUT,
-  GRANTS,
-  GRANT,
-  GRANT_APPROVAL_RULES,
-  MY_GRANT_REQUESTS,
-  MY_GRANTS,
-  STRUCTURES_GRANT_REQUEST,
-} from "@truedat/core/routes";
 
 import { SearchContextProvider } from "@truedat/core/search/SearchContext";
 
@@ -41,6 +25,7 @@ import GrantRequestApprovalResults from "./GrantRequestApprovalResults";
 import Grants from "./Grants";
 import MyGrantRequests from "./MyGrantRequests";
 import StructureGrantCartCheckout from "./StructureGrantCartCheckout";
+import GrantRequestCartResult from "./GrantRequestCartResult";
 import StructuresGrantRequestView from "./StructuresGrantRequestView";
 
 const TemplatesLoader = lazy(
@@ -73,6 +58,10 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
         path="/grantsRequests/checkout"
         element={<StructureGrantCartCheckout />}
       />
+      <Route
+        path="/grantsRequests/result/:ids?"
+        element={<GrantRequestCartResult />}
+      />
       <Route path="/grants/:id" element={<GrantView />} />
       <Route
         path="/grants"

package/src/components/StructureGrantCart.js

@@ -41,17 +41,20 @@ export const StructureGrantCart = ({
   updateGrantRequestFilter,
   typeOperators,
   allowEmptyCart,
+  structureRequestGroups,
 }) => {
   const { formatMessage } = useIntl();
   const navigate = useNavigate();
   const inCartCheckout = useLocation().pathname == GRANTS_REQUESTS_CHECKOUT;
   const [openedStructureFilter, setOpenedStructureFilter] = useState();
-  const structures = _.pathOr([], "structures")(grantRequestsCart);
+  const structures = _.isArray(structureRequestGroups)
+    ? structureRequestGroups
+    : _.pathOr([], "structures")(grantRequestsCart);
 
   useEffect(() => {
     if (_.isEmpty(structures) && !allowEmptyCart)
       navigate(STRUCTURES_GRANT_REQUEST);
-  }, [history, structures, allowEmptyCart]);
+  }, [navigate, structures, allowEmptyCart]);
 
   const removeRequest = (structure) => () =>
     removeGrantRequestFromCart(structure);
@@ -60,9 +63,9 @@ export const StructureGrantCart = ({
 
   const setRowValue =
     (structureId) =>
-    ({ index, value }) => {
-      updateGrantRequestFilter({ index, value, structureId });
-    };
+      ({ index, value }) => {
+        updateGrantRequestFilter({ index, value, structureId });
+      };
 
   return (
     <div className="ui segment structure-grant-cart">
@@ -76,7 +79,7 @@ export const StructureGrantCart = ({
             key={`${s.id}`}
             content={s.external_id}
             trigger={
-              <Segment color={s.id === structure.id ? "blue" : null}>
+              <Segment color={s?.id === structure?.id ? "blue" : null}>
                 <List.Item>
                   <List.Content>
                     <Grid verticalAlign="middle" columns="2">
@@ -129,6 +132,7 @@ export const StructureGrantCart = ({
         ))}
       </List.List>
       {!inCartCheckout &&
+        !structureRequestGroups &&
         (_.isEmpty(grantRequestsCart?.structures) ? (
           <p>
             <FormattedMessage id={`structure.grant.cart.empty`} />
@@ -152,6 +156,7 @@ StructureGrantCart.propTypes = {
   removeGrantRequestFromCart: PropTypes.func,
   updateGrantRequestFilter: PropTypes.func,
   allowEmptyCart: PropTypes.bool,
+  structureRequestGroups: PropTypes.array,
 };
 
 export const StructureGrantCartLoader = (props) => {