udp-stencil-component-library 25.18.1 → 25.18.2-beta.10

package/dist/collection/components/forms/udp-forms/udp-forms-renderer/udp-forms-renderer-follow-up-list-card/udp-forms-follow-up-list-card.js

@@ -1,9 +1,9 @@
 import { h, Fragment } from "@stencil/core";
-import { UdpFormsTypeEnum } from "../../utils/enums";
+import { UdpFormsTypeEnum } from "../../udp-forms-utils/enums";
 export class UdpFormsFollowUpListCard {
     render() {
-        const contentJsx = (h(Fragment, { key: 'd67d7a230c12e69973d0e1c56aa1a52d5de14514' }, h("unity-typography", { key: '935db9e805f8d548db030aa70fa3d2a2dd52a999', variant: "body1", color: "textSecondary" }, "Version: ", this.listItemData.version), h("unity-typography", { key: '5b350311889787722925ef5f510f305edaaa341a', variant: "body1", color: "textSecondary" }, "Form Type: ", UdpFormsTypeEnum[this.listItemData.type])));
-        return (h("udp-card", { key: '17f8a8a0bab34b8d05c636b0fa8b5f0ccd779406', cardTitle: this.listItemData.name, subheader: this.listItemData.description, onTitleClick: () => this.handleLaunchFollowUpForm(), disableContentPadding: true, adornmentStatus: 'info' }, contentJsx));
+        const contentJsx = (h(Fragment, { key: '0148fa047cd997bc9cff28cd98833074e8dc8f64' }, h("unity-typography", { key: 'e6d1704c0d97d94253cfda377818114234bd46c9', variant: "body1", color: "textSecondary" }, "Version: ", this.listItemData.version), h("unity-typography", { key: 'f6e98358257ddf8596abfdb100f5a633c063752a', variant: "body1", color: "textSecondary" }, "Form Type: ", UdpFormsTypeEnum[this.listItemData.type])));
+        return (h("udp-card", { key: '6a5285ec5d718bb09965e61621544e81b900e9eb', cardTitle: this.listItemData.name, subheader: this.listItemData.description, onTitleClick: () => this.handleLaunchFollowUpForm(), disableContentPadding: true, adornmentStatus: 'info' }, contentJsx));
     }
     static get is() { return "udp-forms-follow-up-list-card"; }
     static get encapsulation() { return "shadow"; }
@@ -72,4 +72,3 @@ export class UdpFormsFollowUpListCard {
         };
     }
 }
-//# sourceMappingURL=udp-forms-follow-up-list-card.js.map

package/dist/collection/components/forms/udp-forms/udp-forms-renderer/udp-forms-renderer-ui/udp-forms-ui.js

@@ -1,10 +1,10 @@
 import { h } from "@stencil/core";
-import { UdpFormsFieldTypeEnum } from "../../utils/enums";
-import { fontOverrideMapping, overrideFont } from "../../utils/utils";
+import { UdpFormsFieldTypeEnum, UdpFormsSubmissionStatusEnum } from "../../udp-forms-utils/enums";
+import { fontOverrideMapping, overrideFont } from "../../udp-forms-utils/utils";
 import { getIconFromName } from "../../../../data-display/icons/iconUtils";
 export class UdpFormsUi {
     constructor() {
-        this.initialValues = {};
+        this.currentValues = {};
         this.submitSuccessful = false;
         this.isLoading = false;
         this.isSaving = false;
@@ -12,10 +12,13 @@ export class UdpFormsUi {
         this.showAutoSaveStatus = false;
         this.disabled = false;
         this.readonly = false;
-        this.userId = null;
+        this.clientUserInfo = {
+            id: null,
+            displayName: null,
+            email: null,
+        };
         this.isSubmitted = false;
         this.isShowManualSaveIcon = false;
-        this.isCommentAllowed = false;
         this.showSavedMessage = false;
         this.isDialogOpen = false;
         this.dialogMessage = 'Are you sure you want to delete this section? This section contains links to follow-up forms. Deleting it will remove those links.';
@@ -35,10 +38,8 @@ export class UdpFormsUi {
         }
     }
     watchIsSaving(newValue, oldValue) {
-        console.log('isSaving watcher triggered:', { oldValue, newValue, saveErrorMessage: this.saveErrorMessage });
         // When isSaving changes from true to false (save completed successfully)
         if (oldValue === true && newValue === false && !this.saveErrorMessage) {
-            console.log('Setting showSavedMessage to true');
             this.showSavedMessage = true;
             // Clear any existing timeout
             if (this.savedMessageTimeoutId) {
@@ -46,7 +47,6 @@ export class UdpFormsUi {
             }
             // Hide the "Saved" message after 5 seconds
             this.savedMessageTimeoutId = setTimeout(() => {
-                console.log('Hiding saved message after 5 seconds');
                 this.showSavedMessage = false;
             }, 5000);
         }
@@ -96,7 +96,7 @@ export class UdpFormsUi {
         else if ((_f = (_e = (_d = this.udpForm) === null || _d === void 0 ? void 0 : _d.styleOverrides) === null || _e === void 0 ? void 0 : _e.background) === null || _f === void 0 ? void 0 : _f.backgroundColor) {
             backgroundOverrides.backgroundColor = (_j = (_h = (_g = this.udpForm) === null || _g === void 0 ? void 0 : _g.styleOverrides) === null || _h === void 0 ? void 0 : _h.background) === null || _j === void 0 ? void 0 : _j.backgroundColor;
         }
-        return (h("div", { class: 'background', style: backgroundOverrides }, h("udp-container", { maxWidth: "md" }, h("div", { class: "form-container" }, !this.submitSuccessful ? (h("stencil-form", { handleSubmit: this.handleSubmit, initialValues: this.initialValues, handleChange: this.handleChange, onDirtyChange: event => this.formDirtyChange.emit(event.detail) }, this.readonly &&
+        return (h("div", { class: 'background', style: backgroundOverrides }, h("udp-container", { maxWidth: "md" }, h("div", { class: "form-container" }, !this.submitSuccessful ? (h("stencil-form", { handleSubmit: this.handleSubmit, initialValues: this.currentValues, handleChange: this.handleChange, onDirtyChange: event => this.formDirtyChange.emit(event.detail) }, this.readonly &&
             (h("div", { class: "error-banner" }, h("unity-typography", { variant: "body2" }, "View Only Mode. The contents of this form cannot be changed."))), h("fluent-dialog", { open: this.isDialogOpen, message: this.dialogMessage, labelOne: 'Confirm', labelTwo: 'Cancel', actionOne: () => this.dialogAction(), actionTwo: () => (this.isDialogOpen = false) }), h("div", null, h("div", { class: "form-section-block" }, h("div", { class: "form-renderer-header", style: Object.assign({}, (((_l = (_k = this.udpForm) === null || _k === void 0 ? void 0 : _k.styleOverrides) === null || _l === void 0 ? void 0 : _l.headerBackgroundColor) && {
                 backgroundColor: this.udpForm.styleOverrides.headerBackgroundColor,
             })) }, h("unity-typography", { id: this.titleId, variant: 'h6', color: "inherit" }, this.udpForm.name), this.showAutoSaveStatus && (h("div", { class: "auto-save-status" }, this.saveErrorMessage && (h("unity-typography", { variant: "body", color: "secondary" }, this.saveErrorMessage)))), this.isShowManualSaveIcon && (h("udp-save-draft-button", { isVisible: this.isShowManualSaveIcon, isSaving: this.isSaving,
@@ -126,10 +126,10 @@ export class UdpFormsUi {
                         helperText: (_a = this.udpForm.styleOverrides) === null || _a === void 0 ? void 0 : _a.helperText,
                         paragraphText: (_b = this.udpForm.styleOverrides) === null || _b === void 0 ? void 0 : _b.paragraphText,
                         questionText: (_c = this.udpForm.styleOverrides) === null || _c === void 0 ? void 0 : _c.questionText,
-                    }, question: question, questionNumber: num, value: (_g = (_f = (_e = (_d = this.initialValues) === null || _d === void 0 ? void 0 : _d[sectionKey]) === null || _e === void 0 ? void 0 : _e[question.name]) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : '', disabled: this.disabled, readonly: this.readonly, key: question.questionIdentifierKey, initialValues: this.initialValues, userId: this.userId, isCommentAllowed: this.isCommentAllowed })));
+                    }, question: question, questionNumber: num, value: (_g = (_f = (_e = (_d = this.currentValues) === null || _d === void 0 ? void 0 : _d[sectionKey]) === null || _e === void 0 ? void 0 : _e[question.name]) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : '', disabled: this.disabled, readonly: this.readonly, key: question.questionIdentifierKey, currentValues: this.currentValues, clientUserInfo: this.clientUserInfo, udpFormSubmission: this.udpFormSubmission })));
             }))))));
-        }), ((_r = this.udpFormSubmission) === null || _r === void 0 ? void 0 : _r.status) != 2 && (h("div", { class: "footer" }, h("input", { disabled: this.isLoading || this.disabled || this.readonly, type: "submit", value: "Submit", class: "submit", id: "udpRecord-udp-forms-renderer-Submit", onClick: () => {
-                console.log('Submit button clicked');
+        }), ((_r = this.udpFormSubmission) === null || _r === void 0 ? void 0 : _r.status) != UdpFormsSubmissionStatusEnum.Submitted && (h("div", { class: "footer" }, h("input", { disabled: this.isLoading || this.disabled || this.readonly, type: "submit", value: "Submit", class: "submit", id: "udpRecord-udp-forms-renderer-Submit", onClick: () => {
+                // console.log('Submit button clicked');
                 // Let the form handle the submit naturally
             } })))))) : (
         //if the form has been submit, display success message with a button to trigger the action associated to the form
@@ -158,8 +158,9 @@ export class UdpFormsUi {
                     "references": {
                         "UdpForm": {
                             "location": "import",
-                            "path": "../../utils/classes/UdpForm",
-                            "id": "src/components/forms/udp-forms/utils/classes/UdpForm.ts::UdpForm"
+                            "path": "../../udp-forms-utils/classes/UdpForm",
+                            "id": "src/components/forms/udp-forms/udp-forms-utils/classes/UdpForm.ts::UdpForm",
+                            "referenceLocation": "UdpForm"
                         }
                     }
                 },
@@ -172,7 +173,7 @@ export class UdpFormsUi {
                 "getter": false,
                 "setter": false
             },
-            "initialValues": {
+            "currentValues": {
                 "type": "unknown",
                 "mutable": false,
                 "complexType": {
@@ -199,8 +200,9 @@ export class UdpFormsUi {
                     "references": {
                         "UdpFormSubmission": {
                             "location": "import",
-                            "path": "../../utils/classes/UdpFormSubmission",
-                            "id": "src/components/forms/udp-forms/utils/classes/UdpFormSubmission.ts::UdpFormSubmission"
+                            "path": "../../udp-forms-utils/classes/UdpFormSubmission",
+                            "id": "src/components/forms/udp-forms/udp-forms-utils/classes/UdpFormSubmission.ts::UdpFormSubmission",
+                            "referenceLocation": "UdpFormSubmission"
                         }
                     }
                 },
@@ -423,8 +425,9 @@ export class UdpFormsUi {
                     "references": {
                         "Guid": {
                             "location": "import",
-                            "path": "../../utils/types",
-                            "id": "src/components/forms/udp-forms/utils/types.ts::Guid"
+                            "path": "../../udp-forms-utils/types",
+                            "id": "src/components/forms/udp-forms/udp-forms-utils/types.ts::Guid",
+                            "referenceLocation": "Guid"
                         },
                         "Object": {
                             "location": "global",
@@ -458,19 +461,13 @@ export class UdpFormsUi {
                 "getter": false,
                 "setter": false
             },
-            "userId": {
-                "type": "string",
+            "clientUserInfo": {
+                "type": "unknown",
                 "mutable": false,
                 "complexType": {
-                    "original": "Guid | null",
-                    "resolved": "string",
-                    "references": {
-                        "Guid": {
-                            "location": "import",
-                            "path": "../../utils/types",
-                            "id": "src/components/forms/udp-forms/utils/types.ts::Guid"
-                        }
-                    }
+                    "original": "{ id: string | null; displayName: string | null; email: string | null }",
+                    "resolved": "{ id: string; displayName: string; email: string; }",
+                    "references": {}
                 },
                 "required": false,
                 "optional": false,
@@ -480,9 +477,7 @@ export class UdpFormsUi {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "user-id",
-                "defaultValue": "null"
+                "defaultValue": "{\n    id: null,\n    displayName: null,\n    email: null,\n  }"
             },
             "isSubmitted": {
                 "type": "boolean",
@@ -600,26 +595,6 @@ export class UdpFormsUi {
                 },
                 "getter": false,
                 "setter": false
-            },
-            "isCommentAllowed": {
-                "type": "boolean",
-                "mutable": false,
-                "complexType": {
-                    "original": "boolean",
-                    "resolved": "boolean",
-                    "references": {}
-                },
-                "required": false,
-                "optional": false,
-                "docs": {
-                    "tags": [],
-                    "text": ""
-                },
-                "getter": false,
-                "setter": false,
-                "reflect": false,
-                "attribute": "is-comment-allowed",
-                "defaultValue": "false"
             }
         };
     }
@@ -657,4 +632,3 @@ export class UdpFormsUi {
             }];
     }
 }
-//# sourceMappingURL=udp-forms-ui.js.map

package/dist/collection/components/forms/udp-forms/udp-forms-renderer/udp-forms-renderer-utils/comments-crud-utils.js

@@ -0,0 +1,152 @@
+import { v4 as uuidv4 } from "uuid";
+/**
+ * Pure comment CRUD logic.
+ *
+ * - Updates submissionResponseData structure for comments/draftComments.
+ * - Does NOT perform any network calls.
+ * - Returns persistence intent for caller.
+ */
+export function applyQuestionCommentCrud(params) {
+    var _a, _b, _c, _d, _e;
+    const { actionType, questionIdentifierKey, commentId, currentSubmissionResponseData, clientUserInfo } = params;
+    const parts = (questionIdentifierKey || '').split('.');
+    const sectionKey = parts[0] || '';
+    const questionKey = parts[1] || '';
+    // Defensive: if malformed key, do nothing.
+    if (!sectionKey || !questionKey) {
+        return {
+            sectionKey,
+            questionKey,
+            nextSubmissionResponseData: currentSubmissionResponseData || {},
+            didMutate: false,
+            shouldPersist: false,
+            persistIntent: 'none',
+            commentId,
+        };
+    }
+    const next = structuredClone(currentSubmissionResponseData || {});
+    // ensure structure exists WITHOUT overwriting existing data
+    if (!next[sectionKey])
+        next[sectionKey] = {};
+    if (!next[sectionKey][questionKey]) {
+        // create defaults but do not clobber any existing saved shape from submissionResponseData
+        next[sectionKey][questionKey] = {
+            value: '',
+            comments: [],
+            draftComments: [],
+            metadata: {},
+        };
+    }
+    else {
+        // ensure arrays/objects exist so later code can safely push/filter
+        next[sectionKey][questionKey].comments = (_a = next[sectionKey][questionKey].comments) !== null && _a !== void 0 ? _a : [];
+        next[sectionKey][questionKey].draftComments = (_b = next[sectionKey][questionKey].draftComments) !== null && _b !== void 0 ? _b : [];
+        next[sectionKey][questionKey].metadata = (_c = next[sectionKey][questionKey].metadata) !== null && _c !== void 0 ? _c : {};
+    }
+    // normalize draftComments to array if needed (back-compat)
+    const maybeDraft = next[sectionKey][questionKey].draftComments;
+    if (maybeDraft && !Array.isArray(maybeDraft)) {
+        next[sectionKey][questionKey].draftComments = [maybeDraft];
+    }
+    else if (!maybeDraft) {
+        next[sectionKey][questionKey].draftComments = [];
+    }
+    const commentsArr = next[sectionKey][questionKey].comments || [];
+    const draftsArr = next[sectionKey][questionKey].draftComments || [];
+    let didMutate = false;
+    switch (actionType) {
+        case 'add': {
+            const newDraft = {
+                value: '',
+                commentId: uuidv4(),
+                isTempComment: true,
+                timestamp: null,
+            };
+            // put new draft first so activeDraft === draftComments[0] matches UX
+            next[sectionKey][questionKey].draftComments = [newDraft, ...draftsArr];
+            didMutate = true;
+            break;
+        }
+        case 'save': {
+            const draftIdx = draftsArr.findIndex((d) => d.commentId === commentId);
+            if (draftIdx === -1) {
+                return {
+                    sectionKey,
+                    questionKey,
+                    nextSubmissionResponseData: next,
+                    didMutate: false,
+                    shouldPersist: false,
+                    persistIntent: 'none',
+                    commentId,
+                };
+            }
+            const draft = draftsArr[draftIdx];
+            const saveTimestamp = draft.timestamp || new Date().toISOString();
+            const savedComment = Object.assign(Object.assign({}, draft), { timestamp: saveTimestamp, editedTimestamp: new Date().toISOString(), userId: clientUserInfo === null || clientUserInfo === void 0 ? void 0 : clientUserInfo.id, userDisplayName: clientUserInfo === null || clientUserInfo === void 0 ? void 0 : clientUserInfo.displayName, isDraftComment: false });
+            const existingIdx = commentsArr.findIndex((c) => c.commentId === commentId);
+            if (existingIdx !== -1) {
+                const newComments = [...commentsArr];
+                newComments[existingIdx] = Object.assign({}, savedComment);
+                next[sectionKey][questionKey].comments = newComments;
+            }
+            else {
+                next[sectionKey][questionKey].comments = [...commentsArr, savedComment];
+            }
+            next[sectionKey][questionKey].draftComments = draftsArr.filter((d) => d.commentId !== commentId);
+            didMutate = true;
+            break;
+        }
+        case 'edit': {
+            const saved = commentsArr.find((c) => c.commentId === commentId);
+            if (!saved) {
+                return {
+                    sectionKey,
+                    questionKey,
+                    nextSubmissionResponseData: next,
+                    didMutate: false,
+                    shouldPersist: false,
+                    persistIntent: 'none',
+                    commentId,
+                };
+            }
+            const draftFromSaved = Object.assign(Object.assign({}, saved), { isDraftComment: true, timestamp: null });
+            next[sectionKey][questionKey].draftComments = [draftFromSaved, ...draftsArr];
+            next[sectionKey][questionKey].comments = commentsArr;
+            didMutate = true;
+            break;
+        }
+        case 'delete': {
+            next[sectionKey][questionKey].comments = commentsArr.map((c) => {
+                if (c.commentId === commentId) {
+                    return Object.assign(Object.assign({}, c), { isDeleted: true, value: '', editedTimestamp: new Date().toISOString() });
+                }
+                return c;
+            });
+            didMutate = true;
+            break;
+        }
+        case 'editClose': {
+            next[sectionKey][questionKey].draftComments = draftsArr.filter((d) => d.commentId !== commentId);
+            didMutate = true;
+            break;
+        }
+    }
+    const shouldPersist = actionType === 'save' || actionType === 'delete';
+    // For the dedicated comments API we only ever need the saved comment value.
+    let valueToPersist;
+    if (actionType === 'save') {
+        const saved = (((_e = (_d = next === null || next === void 0 ? void 0 : next[sectionKey]) === null || _d === void 0 ? void 0 : _d[questionKey]) === null || _e === void 0 ? void 0 : _e.comments) || []).find((c) => c.commentId === commentId);
+        valueToPersist = saved === null || saved === void 0 ? void 0 : saved.value;
+    }
+    return {
+        sectionKey,
+        questionKey,
+        nextSubmissionResponseData: next,
+        didMutate,
+        shouldPersist,
+        // Caller decides if this becomes public-add vs private-update.
+        persistIntent: 'none',
+        commentId,
+        valueToPersist,
+    };
+}

package/dist/collection/components/forms/udp-forms/udp-forms-renderer/udp-forms-renderer-utils/repeated-section-utils.js

@@ -0,0 +1,103 @@
+import { findRepeatGroupKeys } from "./utils";
+import { UdpFormsFieldTypeEnum } from "../../udp-forms-utils/enums";
+const getSectionKey = (section) => {
+    return section.isOriginalSection ? section.name : `${section.name}_${section.sectionPositionSuffix}`;
+};
+const safeParseFieldProperties = (fieldProperties) => {
+    if (!fieldProperties)
+        return {};
+    if (typeof fieldProperties === 'object')
+        return fieldProperties;
+    if (typeof fieldProperties !== 'string')
+        return {};
+    try {
+        return JSON.parse(fieldProperties || '{}');
+    }
+    catch (_a) {
+        return {};
+    }
+};
+export const computeDuplicateRepeatableSection = (params) => {
+    var _a, _b, _c;
+    const { dynamicSections, values, index } = params;
+    const sectionToClone = dynamicSections[index];
+    if (!sectionToClone)
+        return { nextDynamicSections: dynamicSections, nextValues: values };
+    const cloningSectionName = sectionToClone.name;
+    // Find existing repeat group indices
+    const repeatKeys = findRepeatGroupKeys(cloningSectionName, values);
+    const nextRepeatIndex = repeatKeys.length > 0 ? Math.max(...repeatKeys) + 1 : 2;
+    const clonedSection = Object.assign(Object.assign({}, structuredClone(sectionToClone)), { formQuestions: (sectionToClone.formQuestions || []).map(q => {
+            const newQuestionObj = structuredClone(q);
+            newQuestionObj.questionIdentifierKey = `${cloningSectionName}_${nextRepeatIndex}.${q.name}`;
+            return newQuestionObj;
+        }), isOriginalSection: false, sectionPositionSuffix: nextRepeatIndex });
+    // Find the last index of this section group
+    let insertAtIndex = index;
+    for (let i = index + 1; i < dynamicSections.length; i++) {
+        const s = dynamicSections[i];
+        if (s.name === cloningSectionName)
+            insertAtIndex = i;
+        else
+            break;
+    }
+    const nextDynamicSections = [
+        ...dynamicSections.slice(0, insertAtIndex + 1),
+        clonedSection,
+        ...dynamicSections.slice(insertAtIndex + 1),
+    ];
+    const nextValues = structuredClone(values || {});
+    const newSectionKey = `${cloningSectionName}_${nextRepeatIndex}`;
+    const sourceSectionKey = getSectionKey(sectionToClone);
+    for (const q of clonedSection.formQuestions || []) {
+        if (!nextValues[newSectionKey])
+            nextValues[newSectionKey] = {};
+        let value = '';
+        if (q.fieldTypeId === UdpFormsFieldTypeEnum.Paragraph) {
+            const sourceVal = (_b = (_a = values === null || values === void 0 ? void 0 : values[sourceSectionKey]) === null || _a === void 0 ? void 0 : _a[q.name]) === null || _b === void 0 ? void 0 : _b.value;
+            const props = safeParseFieldProperties(q.fieldProperties);
+            const paragraphDefault = (_c = props === null || props === void 0 ? void 0 : props.paragraphText) !== null && _c !== void 0 ? _c : '';
+            value = sourceVal !== null && sourceVal !== void 0 ? sourceVal : paragraphDefault;
+        }
+        nextValues[newSectionKey][q.name] = { value, comments: [], metadata: {} };
+    }
+    return { nextDynamicSections, nextValues };
+};
+export const computeDeleteRepeatableSection = (params) => {
+    const { dynamicSections, values, index } = params;
+    const sectionToDelete = dynamicSections[index];
+    if (!sectionToDelete || sectionToDelete.isOriginalSection) {
+        return { nextDynamicSections: dynamicSections, nextValues: values };
+    }
+    const deleteSectionName = sectionToDelete.name;
+    const deleteSuffix = sectionToDelete.sectionPositionSuffix;
+    const sectionKeyToDelete = `${deleteSectionName}_${deleteSuffix}`;
+    const nextValues = Object.assign({}, (values || {}));
+    delete nextValues[sectionKeyToDelete];
+    const updatedSections = structuredClone(dynamicSections);
+    updatedSections.splice(index, 1);
+    // Shift all later repeatable sections backward by 1
+    updatedSections.forEach(section => {
+        var _a;
+        if (section.name !== deleteSectionName ||
+            section.isOriginalSection ||
+            ((_a = section.sectionPositionSuffix) !== null && _a !== void 0 ? _a : 0) <= (deleteSuffix !== null && deleteSuffix !== void 0 ? deleteSuffix : 0)) {
+            return;
+        }
+        const oldSuffix = section.sectionPositionSuffix;
+        const oldSectionKey = `${deleteSectionName}_${oldSuffix}`;
+        const newSuffix = oldSuffix - 1;
+        const newSectionKey = `${deleteSectionName}_${newSuffix}`;
+        section.sectionPositionSuffix = newSuffix;
+        section.formQuestions = (section.formQuestions || []).map(q => {
+            const newSectionQuestion = structuredClone(q);
+            newSectionQuestion.questionIdentifierKey = `${newSectionKey}.${q.name}`;
+            return newSectionQuestion;
+        });
+        if (nextValues[oldSectionKey]) {
+            nextValues[newSectionKey] = structuredClone(nextValues[oldSectionKey]);
+            delete nextValues[oldSectionKey];
+        }
+    });
+    return { nextDynamicSections: updatedSections, nextValues };
+};