@truedat/dd 8.7.3 → 8.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.7.3",
+  "version": "8.7.4",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -51,7 +51,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.7.3",
+    "@truedat/test": "8.7.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -86,5 +86,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "fcd75ad6b4e43440c4889fb3d968f4cd84fc672d"
+  "gitHead": "74bf59ddf29e05b518dc206271c4f1215d66a942"
 }

package/src/components/StructureGrantCartCheckout.js

@@ -75,11 +75,11 @@ const getGroupedStructuresByDomainAndTemplate = (
 
       const templateId = isExplicitSystem
         ? (systemToTemplateId[normalizedSystemIdStr] ?? defaultTemplateId)
-        : defaultTemplateId;
+        : null;
 
       const shouldGroupByDomain = isExplicitSystem
         ? systemGroupByDomain[normalizedSystemIdStr] === true
-        : defaultGroupByDomain === true && defaultTemplateId != null;
+        : defaultGroupByDomain === true;
 
       const systemKey = isExplicitSystem ? normalizedSystemIdStr : "others";
 
@@ -161,16 +161,16 @@ export const StructureGrantCartCheckout = ({
 
   const getTemplateIdFromKey = (key) => {
     const parts = key.split("_");
-    const templatePart = parts[2];
+    const templatePart = parts[parts.length - 1];
     if (templatePart === "notype" || !templatePart) {
-      return defaultTemplateId;
+      return null;
     }
     return Number(templatePart) || templatePart;
   };
 
   const getDomainIdsFromKey = (key) => {
     const parts = key.split("_");
-    const domainPart = parts[0];
+    const domainPart = parts.slice(0, -2).join("_");
     if (domainPart === "nodomain" || !domainPart) {
       return null;
     }
@@ -240,7 +240,7 @@ export const StructureGrantCartCheckout = ({
             k,
             {
               template: undefined,
-              templateContent: {},
+              templateContent: undefined,
               valid: false,
             },
           ]),
@@ -256,20 +256,13 @@ export const StructureGrantCartCheckout = ({
     if (!allLoaded) return;
     const getTemplateById = (tid) =>
       tid != null ? (templatesById[String(tid)] ?? templatesById[tid]) : null;
-    const initial = _.fromPairs(
-      groupKeys.map((k) => {
-        const t = getTemplateById(effectiveTemplateIdByKey[k])?.name;
-        return [
-          k,
-          {
-            template: t ?? undefined,
-            templateContent: {},
-            valid: false,
-          },
-        ];
-      }),
-    );
-    initGroupTemplates(initial);
+    groupKeys.forEach((k) => {
+      const templateObj = getTemplateById(effectiveTemplateIdByKey[k]);
+      const t = templateObj?.name;
+      if (t) {
+        selectGrantRequestTemplateForGroup({ key: k, template: t });
+      }
+    });
   }, [
     isMultiGroup,
     groupKeys.join(","),
@@ -277,7 +270,7 @@ export const StructureGrantCartCheckout = ({
     defaultTemplateId,
     templatesById,
     effectiveTemplateIdByKey,
-    initGroupTemplates,
+    selectGrantRequestTemplateForGroup,
   ]);
 
   useEffect(() => {
@@ -430,6 +423,7 @@ export const StructureGrantCartCheckout = ({
               const groupDomainIds = getUniqueDomainIds(groupStructures);
               const groupData = groupTemplates[key] ?? {};
               const selectedTemplate = systemTemplates[key];
+              const autoTemplateName = selectedTemplate?.name;
               const domainName = domainNamesByKey[key];
               const systemNames = getUniqueSystemName(groupStructures);
 
@@ -462,7 +456,7 @@ export const StructureGrantCartCheckout = ({
                             >
                               {formatMessage({ id: systemMessageId })}:{" "}
                               <span style={{ fontWeight: "normal" }}>
-                                {key.split("_")[1] === "others"
+                                {key.split("_").at(-2) === "others"
                                   ? formatMessage({
                                       id: "grantRequest.cart.group.others",
                                     })
@@ -494,11 +488,11 @@ export const StructureGrantCartCheckout = ({
                       <Suspense fallback={null}>
                         <SelectableDynamicForm
                           scope="gr"
-                          content={groupData.templateContent ?? {}}
+                          content={groupData.templateContent ?? null}
                           domainIds={groupDomainIds}
                           hideLabel
                           isModification={!!modificationGrant}
-                          selectedTemplate={selectedTemplate}
+                          name={autoTemplateName}
                           disableSelector={!!selectedTemplate}
                           onChange={({ content, valid }) =>
                             updateGrantRequestTemplateContentForGroup({
@@ -536,7 +530,7 @@ export const StructureGrantCartCheckout = ({
             <Grid.Column width={5}>
               <StructureGrantCartInformation
                 isModification={!!modificationGrant}
-                selectedTemplate={singleSystemTemplate}
+                name={singleSystemTemplate?.name}
                 disableSelector={!!singleSystemTemplate}
               />
             </Grid.Column>

package/src/components/StructureGrantCartInformation.js

@@ -26,6 +26,7 @@ export const StructureGrantCartInformation = ({
   updateGrantRequestTemplateContent,
   selectedTemplate,
   disableSelector,
+  name: autoTemplateName,
 }) => {
   const { formatMessage } = useIntl();
   const templateContent = _.pathOr({}, "templateContent")(grantRequestsCart);
@@ -36,6 +37,7 @@ export const StructureGrantCartInformation = ({
     fetchPolicy: "cache-and-network",
     variables: { action: "createForeignGrantRequest" },
   });
+
   return (
     <Segment loading={loading}>
       <Form>
@@ -68,7 +70,7 @@ export const StructureGrantCartInformation = ({
             id: `structure.grant.cart.template.placeholder`,
           })}
           required
-          selectedTemplate={selectedTemplate}
+          name={autoTemplateName}
           disableSelector={disableSelector}
         />
       </Form>
@@ -83,6 +85,7 @@ StructureGrantCartInformation.propTypes = {
   isModification: PropTypes.bool,
   selectedTemplate: PropTypes.object,
   disableSelector: PropTypes.bool,
+  name: PropTypes.string,
 };
 
 const mapStateToProps = ({ grantRequestsCart }) => ({ grantRequestsCart });

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

@@ -357,4 +357,44 @@ describe("StructureGrantCartCheckout", () => {
     await waitForLoad(rendered);
     expect(rendered.container).toMatchSnapshot();
   });
+
+  it("calls selectGrantRequestTemplateForGroup (not initGroupTemplates) when templates loaded", async () => {
+    useWebContext.mockReturnValue({ scopesWithRelations: ["gr"] });
+    useTemplateRelations.mockReturnValue({
+      resource: [
+        { resource_id: 10, template_id: 1 },
+        { resource_id: 20, template_id: 2 },
+      ],
+    });
+    useTemplatesByIds.mockReturnValue({
+      1: { name: "Template A", content: [] },
+      2: { name: "Template B", content: [] },
+    });
+    const props = {
+      ...defaultProps,
+      grantRequestsCart: grantRequestsCartMultiGroup,
+    };
+    const renderOpts = {
+      state: { grantRequestsCart: grantRequestsCartMultiGroup },
+      mocks: [
+        singleTemplateMock({ scope: "gr" }),
+        domainsMock({ action: "createForeignGrantRequest" }),
+      ],
+    };
+    const rendered = render(
+      <StructureGrantCartCheckout {...props} />,
+      renderOpts,
+    );
+    await waitForLoad(rendered);
+    expect(mockSelectGrantRequestTemplateForGroup).toHaveBeenCalledTimes(2);
+    expect(mockSelectGrantRequestTemplateForGroup).toHaveBeenCalledWith({
+      key: "nodomain_10_1",
+      template: "Template A",
+    });
+    expect(mockSelectGrantRequestTemplateForGroup).toHaveBeenCalledWith({
+      key: "nodomain_20_2",
+      template: "Template B",
+    });
+    expect(mockInitGroupTemplates).not.toHaveBeenCalled();
+  });
 });

package/src/hooks/useTemplatesByIds.js

@@ -1,8 +1,10 @@
 import _ from "lodash/fp";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useMemo } from "react";
+import { useQuery } from "@apollo/client";
+import { TEMPLATES_QUERY } from "@truedat/core/api/queries";
 import { apiJson } from "@truedat/core/services/api";
 
-export const normalizeTemplate = (raw) => {
+const normalizeTemplate = (raw) => {
   if (!raw || typeof raw !== "object") return null;
   const inner = raw?.data && typeof raw.data === "object" ? raw.data : raw;
   const content = _.isArray(inner?.content)
@@ -23,25 +25,56 @@ const ensureTemplateShape = (t) => {
       };
 };
 
-export const useTemplatesByIds = (ids) => {
-  const [templatesById, setTemplatesById] = useState({});
+const TEMPLATES_SCOPE = "gr";
+
+const parseIdList = _.flow(
+  _.split(","),
+  _.map((s) => parseInt(s.trim(), 10)),
+  _.reject(Number.isNaN),
+);
+
+export const useTemplatesByIds = (ids, domainIds) => {
+  const [restTemplates, setRestTemplates] = useState({});
   const idsKey = Array.isArray(ids) && ids.length > 0 ? ids.join(",") : "";
+  const domainIdsKey =
+    Array.isArray(domainIds) && domainIds.length > 0 ? domainIds.join(",") : "";
+  const hasIds = !!idsKey;
+  const hasDomainIds = !!domainIdsKey;
+
+  const { data } = useQuery(TEMPLATES_QUERY, {
+    variables: { scope: TEMPLATES_SCOPE, domainIds },
+    skip: !hasIds || !hasDomainIds,
+    fetchPolicy: "cache-and-network",
+  });
+
+  const preprocessedTemplates = useMemo(() => {
+    if (!data?.templates || !hasIds) return null;
+    const idList = parseIdList(idsKey);
+    if (idList.length === 0) return null;
+    const map = _.reduce(
+      (acc, id) => {
+        const t = data.templates.find((tpl) => String(tpl.id) === String(id));
+        return t ? _.set(id, t, acc) : acc;
+      },
+      {},
+      idList,
+    );
+    return map;
+  }, [data, idsKey, hasIds]);
 
   useEffect(() => {
-    if (!idsKey) {
-      setTemplatesById({});
+    if (!hasIds || hasDomainIds) {
+      setRestTemplates({});
       return;
     }
-    const idList = idsKey
-      .split(",")
-      .map((s) => parseInt(s.trim(), 10))
-      .filter((n) => !Number.isNaN(n));
+    const idList = parseIdList(idsKey);
     if (idList.length === 0) {
-      setTemplatesById({});
+      setRestTemplates({});
       return;
     }
     // eslint-disable-next-line fp/no-let
     let cancelled = false;
+
     Promise.all(
       idList.map((id) =>
         apiJson(`/api/templates/${id}`).then((res) => ({
@@ -52,20 +85,22 @@ export const useTemplatesByIds = (ids) => {
     )
       .then((results) => {
         if (cancelled) return;
-        const map = {};
-        results.forEach(({ id, raw }) => {
-          const t = ensureTemplateShape(normalizeTemplate(raw) ?? raw);
-          // eslint-disable-next-line fp/no-mutation
-          if (t) map[id] = t;
-        });
-        setTemplatesById(map);
+        const map = _.reduce(
+          (acc, { id, raw }) => {
+            const t = ensureTemplateShape(normalizeTemplate(raw) ?? raw);
+            return t ? _.set(id, t, acc) : acc;
+          },
+          {},
+          results,
+        );
+        setRestTemplates(map);
       })
       .catch(() => {});
     return () => {
       // eslint-disable-next-line fp/no-mutation
       cancelled = true;
     };
-  }, [idsKey]);
+  }, [idsKey, domainIdsKey, hasIds, hasDomainIds]);
 
-  return templatesById;
+  return preprocessedTemplates !== null ? preprocessedTemplates : restTemplates;
 };

package/src/reducers/__tests__/grantRequestsCart.spec.js

@@ -140,6 +140,22 @@ describe("reducers: grantRequestsCart", () => {
     ).toEqual(expectedState);
   });
 
+  it("should reset templateContent on selectGrantRequestTemplate.TRIGGER", () => {
+    const stateWithContent = {
+      ...initialState,
+      templateContent: { field1: { value: "x", origin: "default" } },
+    };
+    expect(
+      grantRequestsCart(stateWithContent, {
+        type: selectGrantRequestTemplate.TRIGGER,
+        payload: "another_template",
+      }),
+    ).toEqual({
+      ...initialState,
+      template: "another_template",
+    });
+  });
+
   it("should handle the updateGrantRequestTemplateContent.TRIGGER with valid content", () => {
     const stateWithTemplate = {
       ...initialState,