udp-stencil-component-library 25.18.2-beta.4 → 25.18.2-beta.6

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

@@ -1,22 +1,23 @@
 import { h } from "@stencil/core";
 import { throttle } from "lodash";
-import { UdpFormsFieldTypeEnum } from "../utils/enums";
 import { getCurrentTenantId } from "../../../../udp-utilities/tenant/tenantUtils";
 import { fetchLatestForms } from "../udp-forms-list/udp-form-api-utils";
-import { UdpFormsTypeEnum, UdpFormsPageIdEnum } from "../utils/enums";
-import { buildEmptyInitialValues } from "../utils/utils";
-import { FormSubmissionHandlerFactory } from "../utils/form-submission-handler/FormSubmissionHandlerFactory";
-import { UdpFormHandler } from "../utils/form-handler/UdpFormHandler";
-import { UdpFormSubmission } from "../utils/classes/UdpFormSubmission";
-import { UdpForm } from "../utils/classes/UdpForm";
+import { UdpFormsTypeEnum, UdpFormsPageIdEnum, UdpFormsSubmissionStatusEnum, UdpFormsFieldTypeEnum } from "../udp-forms-utils/enums";
+import { buildEmptyCurrentValues } from "../udp-forms-utils/utils";
+import { FormSubmissionHandlerFactory } from "../udp-forms-utils/form-submission-handler/FormSubmissionHandlerFactory";
+import { UdpFormHandler } from "../udp-forms-utils/form-handler/UdpFormHandler";
+import { UdpFormSubmission } from "../udp-forms-utils/classes/UdpFormSubmission";
+import { UdpForm } from "../udp-forms-utils/classes/UdpForm";
 import { v4 as uuidv4 } from "uuid";
+import { applyUrlSeedValuesForAll, initializeDynamicSections, initializeDynamicSectionsWithUrlContext, findRepeatGroupKeys } from "./udp-forms-renderer-utils";
 export class UdpFormsRenderer {
     constructor() {
         this.isPublic = false;
         this.autoSaveDelay = 2000; // Debounce delay for auto-save in milliseconds (currently disabled)
-        this.initialValues = {};
+        this.urlContext = {}; // additional context from URL if needed, eg. generic1, gernic2, generic3, or any initial prepopulated values for form inputs. eg section1.question1 = 'some value'
+        this.currentValues = {}; // values of the current form state
+        this.formInputSeedValues = {}; // support for a initial set of values to seed the form with
         this.submitSuccessful = false;
-        this.currentFormData = {};
         this.isLoading = false;
         this.isSaving = false;
         this.isSubmitted = false;
@@ -71,7 +72,7 @@ export class UdpFormsRenderer {
                     return;
                 const cloningSectionName = sectionToClone.name;
                 // Find existing repeat group indices
-                const repeatKeys = this.findRepeatGroupKeys(cloningSectionName, this.initialValues);
+                const repeatKeys = findRepeatGroupKeys(cloningSectionName, this.currentValues);
                 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);
@@ -96,13 +97,13 @@ export class UdpFormsRenderer {
                     ...this.dynamicSections.slice(insertAtIndex + 1),
                 ];
                 // Create new initial values structure
-                const newInitialValues = structuredClone(this.udpFormSubmission.data.submissionResponseData);
+                const newCurrentValues = structuredClone(this.udpFormSubmission.data.submissionResponseData);
                 clonedSection.formQuestions.forEach(q => {
                     var _a, _b, _c, _d;
                     const newSectionNameWithSuffix = `${cloningSectionName}_${nextRepeatIndex}`;
                     const newQuestionName = q.name;
-                    if (!newInitialValues[newSectionNameWithSuffix]) {
-                        newInitialValues[newSectionNameWithSuffix] = {};
+                    if (!newCurrentValues[newSectionNameWithSuffix]) {
+                        newCurrentValues[newSectionNameWithSuffix] = {};
                     }
                     // Preserve only Paragraph values from the source section; clear others
                     let value = '';
@@ -124,11 +125,11 @@ export class UdpFormsRenderer {
                         const paragraphDefault = (_d = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.paragraphText) !== null && _d !== void 0 ? _d : '';
                         value = sourceVal !== null && sourceVal !== void 0 ? sourceVal : paragraphDefault;
                     }
-                    newInitialValues[newSectionNameWithSuffix][newQuestionName] = { value, comments: [], metadata: {} };
+                    newCurrentValues[newSectionNameWithSuffix][newQuestionName] = { value, comments: [], metadata: {} };
                 });
                 // This will trigger a complete form re-render
-                this.initialValues = Object.assign({}, newInitialValues);
-                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newInitialValues);
+                this.currentValues = Object.assign({}, newCurrentValues);
+                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newCurrentValues);
                 this.triggerFormRerender();
             }
             finally {
@@ -152,8 +153,8 @@ export class UdpFormsRenderer {
                 const deleteSectionName = sectionToDelete.name;
                 const deleteSuffix = sectionToDelete.sectionPositionSuffix;
                 const sectionKeyToDelete = `${deleteSectionName}_${deleteSuffix}`;
-                const newInitialValues = Object.assign({}, this.udpFormSubmission.data.submissionResponseData);
-                delete newInitialValues[sectionKeyToDelete];
+                const newCurrentValues = Object.assign({}, this.udpFormSubmission.data.submissionResponseData);
+                delete newCurrentValues[sectionKeyToDelete];
                 // Remove the section from dynamicSections
                 const updatedSections = structuredClone(this.dynamicSections);
                 updatedSections.splice(index, 1);
@@ -177,14 +178,14 @@ export class UdpFormsRenderer {
                         return newSectionQuestion;
                     });
                     // Move data in initial values
-                    if (newInitialValues[oldSectionKey]) {
-                        newInitialValues[newSectionKey] = structuredClone(newInitialValues[oldSectionKey]);
-                        delete newInitialValues[oldSectionKey];
+                    if (newCurrentValues[oldSectionKey]) {
+                        newCurrentValues[newSectionKey] = structuredClone(newCurrentValues[oldSectionKey]);
+                        delete newCurrentValues[oldSectionKey];
                     }
                 });
                 this.dynamicSections = updatedSections;
-                this.initialValues = Object.assign({}, newInitialValues);
-                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newInitialValues);
+                this.currentValues = Object.assign({}, newCurrentValues);
+                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newCurrentValues);
                 this.triggerFormRerender();
             }
             finally {
@@ -202,7 +203,7 @@ export class UdpFormsRenderer {
             try {
                 const updatedUdpFormSubmission = await this.formSubmissionHandler.saveCurrentFormSubmissionState(values, this.udpFormSubmission);
                 this.udpFormSubmission = updatedUdpFormSubmission;
-                this.initialValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
+                this.currentValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
                 if (!new URLSearchParams(window.location.search).has('udpf_submissionId')) {
                     // replace the current entry's query string with udpf_submissionId without needing to know the path
                     this.replaceUrlWithSubmissionId(updatedUdpFormSubmission.id);
@@ -227,7 +228,7 @@ export class UdpFormsRenderer {
             try {
                 const updatedUdpFormSubmission = await this.formSubmissionHandler.saveFormSubmissionComments(values, this.udpFormSubmission);
                 this.udpFormSubmission = updatedUdpFormSubmission;
-                this.initialValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
+                this.currentValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
                 this.enqueueSnackbar('Saved sucessfully.', {
                     variant: 'success',
                     anchorOrigin: { vertical: 'top', horizontal: 'center' },
@@ -259,7 +260,7 @@ export class UdpFormsRenderer {
             try {
                 const updatedUdpFormSubmission = await this.formSubmissionHandler.saveCurrentFormSubmissionState(values, this.udpFormSubmission);
                 this.udpFormSubmission = updatedUdpFormSubmission;
-                this.initialValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
+                this.currentValues = Object.assign({}, (((_a = updatedUdpFormSubmission.data) === null || _a === void 0 ? void 0 : _a.submissionResponseData) || {}));
                 if (!new URLSearchParams(window.location.search).has('udpf_submissionId')) {
                     // replace the current entry's query string with udpf_submissionId without needing to know the path
                     this.replaceUrlWithSubmissionId(updatedUdpFormSubmission.id);
@@ -309,7 +310,7 @@ export class UdpFormsRenderer {
             // create a new follow up form submission instance wiht a link to the parent form submission
             const followUpMasterForm = await this.formHandler.getFormByFormIdAndFormVersion(followUpFormId, followUpFormVersion);
             const followUpSubmissionData = {
-                submissionResponseData: buildEmptyInitialValues(followUpMasterForm),
+                submissionResponseData: buildEmptyCurrentValues(followUpMasterForm),
                 submissionMetadata: {
                     ParentSubmission: {
                         submissionId: parentFormSubmissionId,
@@ -362,7 +363,7 @@ export class UdpFormsRenderer {
                 this.clientUserInfo.email = user.email || null;
             }
             this.formSubmissionHandler = FormSubmissionHandlerFactory.create(this.isPublic, this.clientUserInfo.id);
-            this.udpFormSubmission = new UdpFormSubmission({ id: this.submissionId, formId: this.formId, formVersion: this.version, unityUserId: this.clientUserInfo.id, generic1: this.generic1, generic2: this.generic2, generic3: this.generic3 });
+            this.udpFormSubmission = new UdpFormSubmission({ id: this.submissionId, formId: this.formId, formVersion: this.version, unityUserId: this.clientUserInfo.id, generic1: this.urlContext.generic1, generic2: this.urlContext.generic2, generic3: this.urlContext.generic3 });
             // fetch existing submission from Udp.FormSubmission if submissionId is provided 
             // take exisitng object, and populate with db values, and return new obj with updated values
             if (this.submissionId) {
@@ -382,18 +383,29 @@ export class UdpFormsRenderer {
             this.formHandler = new UdpFormHandler(this.tenantId);
             const formData = await this.formHandler.getFormByFormIdAndFormVersion(formId, formVersion);
             this.udpForm = new UdpForm(formData);
-            this.initialValues = buildEmptyInitialValues(this.udpForm);
+            this.currentValues = buildEmptyCurrentValues(this.udpForm);
             // if there's existing data, update the form's state
             if (this.udpFormSubmission.data.submissionResponseData) {
-                this.initialValues = Object.assign({}, this.udpFormSubmission.data.submissionResponseData);
-                if (this.udpFormSubmission.status === 2 || this.udpFormSubmission.status === 'submitted') {
+                this.currentValues = Object.assign({}, this.udpFormSubmission.data.submissionResponseData);
+                if (this.udpFormSubmission.status === UdpFormsSubmissionStatusEnum.Submitted) {
                     this.isSubmitted = true;
                 }
             }
-            this.initializeDynamicSections(); // process the master form into dynamic sections 
-            // After sections/questions are prepared, seed initial values from URL for ALL questions,
-            // with saved values taking precedence, and paragraph defaults as a fallback.
-            this.applyUrlInitialValuesForAll();
+            // For new submissions (un-instiantiated or in the 'created' status), we allow the seeding of initial values from URL params
+            // So we build dynamicSections with urlContext first, then seed values.
+            // URL params (udpf_*) may imply repeatable section instances (e.g. section1_3.question1).
+            // For existing submissions that are in progress, skip URL-based seeding and do not create additional sections from URL.
+            if ((!this.udpFormSubmission.id || this.udpFormSubmission.status === UdpFormsSubmissionStatusEnum.Created) && this.urlContext && Object.keys(this.urlContext).length > 0) {
+                this.dynamicSections = initializeDynamicSectionsWithUrlContext(this.udpForm, this.currentValues, this.urlContext);
+                const seeded = applyUrlSeedValuesForAll(this.dynamicSections, this.urlContext);
+                if (seeded) {
+                    this.currentValues = seeded;
+                    this.udpFormSubmission.data.submissionResponseData = Object.assign({}, seeded);
+                }
+            }
+            else {
+                this.dynamicSections = initializeDynamicSections(this.udpForm, this.currentValues);
+            }
             // Set up throttled manual save function (5 seconds) - fires immediately, then throttles
             this.debouncedManualSave = throttle(async (values) => {
                 await this.handleManualSave(values);
@@ -410,136 +422,6 @@ export class UdpFormsRenderer {
             this.isLoading = false;
         }
     }
-    // build dynamic sections based on the
-    initializeDynamicSections() {
-        var _a;
-        const tempDynamicSection = [];
-        const sortedSections = structuredClone(this.udpForm.udpFormUdpFormSection).sort((a, b) => a.order - b.order);
-        for (const section of sortedSections) {
-            section.sectionProperties = JSON.parse(section.sectionProperties || {});
-            const repeatGroupKeys = this.findRepeatGroupKeys(section.name, this.initialValues);
-            section.isOriginalSection = true;
-            section.sectionPositionSuffix = 1; // default position
-            // always add the original section into dynamic sections
-            tempDynamicSection.push(Object.assign(Object.assign({}, structuredClone(section)), {
-                // dynamicSectionName: section.name,
-                formQuestions: structuredClone(this.udpForm.formQuestions)
-                    .filter(q => q.formSectionId === section.id)
-                    .sort((a, b) => a.questionOrder - b.questionOrder)
-                    .map(q => (Object.assign(Object.assign({}, q), { questionIdentifierKey: `${section.name}.${q.name}`, isShowCommentInput: true })))
-            }));
-            // create then add additional sections if there are repeated sections
-            if (((_a = section.sectionProperties) === null || _a === void 0 ? void 0 : _a.isRepeatable) && repeatGroupKeys.length > 0) {
-                const maxRepeatedSectionSuffix = Math.max(...repeatGroupKeys); // create a new section for the max value of repeat group keys, even if there are no saved answers
-                // for (const repeatKey of repeatGroupKeys) { // create a section only for the suffix saved
-                for (let repeatKey = 2; repeatKey <= maxRepeatedSectionSuffix; repeatKey++) {
-                    const clonedSection = Object.assign(Object.assign({}, structuredClone(section)), { formQuestions: structuredClone(this.udpForm.formQuestions)
-                            .filter(q => q.formSectionId === section.id)
-                            .sort((a, b) => a.questionOrder - b.questionOrder)
-                            .map(q => (Object.assign(Object.assign({}, q), { questionIdentifierKey: `${section.name}_${repeatKey}.${q.name}`, isShowCommentInput: true }))), isOriginalSection: false, sectionPositionSuffix: repeatKey });
-                    tempDynamicSection.push(clonedSection);
-                }
-            }
-        }
-        this.dynamicSections = tempDynamicSection;
-    }
-    findRepeatGroupKeys(sectionName, values) {
-        const keys = Object.keys(values);
-        const repeatGroupSet = new Set();
-        // Match: sectionName_2
-        const regex = new RegExp(`^${sectionName}_(\\d+)`);
-        keys.forEach(key => {
-            const match = key.match(regex);
-            if (match && match[1]) {
-                repeatGroupSet.add(Number(match[1]));
-            }
-        });
-        return Array.from(repeatGroupSet).sort((a, b) => a - b);
-    }
-    // Build initial values from URL for ALL fields, but do NOT override saved values.
-    // For Paragraph, also fall back to the builder's default text when nothing else provided.
-    applyUrlInitialValuesForAll() {
-        if (!Array.isArray(this.dynamicSections))
-            return;
-        const urlParams = typeof window !== 'undefined' ? new URLSearchParams(window.location.search) : null;
-        // 1) Collect URL values into nested structure: { [sectionKey]: { [questionName]: { value, comments: [] } } }
-        const urlValuesNested = {};
-        if (urlParams) {
-            this.dynamicSections.forEach(section => {
-                const sectionKey = section.isOriginalSection
-                    ? section.name
-                    : `${section.name}_${section.sectionPositionSuffix}`;
-                (section.formQuestions || []).forEach(q => {
-                    if (!q)
-                        return;
-                    const candidates = [q.processedSubmissionName, q.questionIdentifierKey, q.name].filter(Boolean);
-                    let urlVal = null;
-                    for (const c of candidates) {
-                        urlVal = urlParams.get(c);
-                        if (urlVal !== null)
-                            break;
-                    }
-                    if (urlVal !== null) {
-                        if (!urlValuesNested[sectionKey])
-                            urlValuesNested[sectionKey] = {};
-                        urlValuesNested[sectionKey][q.name] = { value: urlVal, comments: [] };
-                    }
-                });
-            });
-        }
-        // 2) Merge with saved values (this.initialValues) taking precedence
-        const merged = structuredClone(this.initialValues) || {};
-        Object.entries(urlValuesNested).forEach(([sectionKey, qMap]) => {
-            if (!merged[sectionKey])
-                merged[sectionKey] = {};
-            Object.entries(qMap).forEach(([qName, valObj]) => {
-                const existing = merged[sectionKey][qName];
-                // Only set from URL if no saved value exists (null/undefined/empty-string)
-                const isMissing = existing == null ||
-                    existing.value == null ||
-                    (typeof existing.value === 'string' && existing.value.trim() === '');
-                if (isMissing) {
-                    merged[sectionKey][qName] = valObj;
-                }
-            });
-        });
-        // 3) Paragraph defaults: if still undefined/null, use fieldProperties.paragraphText
-        this.dynamicSections.forEach(section => {
-            const sectionKey = section.isOriginalSection
-                ? section.name
-                : `${section.name}_${section.sectionPositionSuffix}`;
-            if (!merged[sectionKey])
-                merged[sectionKey] = {};
-            (section.formQuestions || []).forEach(q => {
-                var _a;
-                if (!q)
-                    return;
-                if (q.fieldTypeId === UdpFormsFieldTypeEnum.Paragraph) {
-                    const existing = merged[sectionKey][q.name];
-                    const isMissing = existing == null ||
-                        existing.value == null ||
-                        (typeof existing.value === 'string' && existing.value.trim() === '');
-                    if (isMissing) {
-                        let fieldProps = q === null || q === void 0 ? void 0 : q.fieldProperties;
-                        if (typeof fieldProps === 'string') {
-                            try {
-                                fieldProps = JSON.parse(fieldProps || '{}');
-                            }
-                            catch (_b) {
-                                fieldProps = {};
-                            }
-                        }
-                        merged[sectionKey][q.name] = {
-                            value: (_a = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.paragraphText) !== null && _a !== void 0 ? _a : '',
-                            comments: [],
-                        };
-                    }
-                }
-            });
-        });
-        this.initialValues = merged;
-        this.udpFormSubmission.data.submissionResponseData = Object.assign({}, merged);
-    }
     async handleSubmit(values) {
         this.isLoading = true;
         try {
@@ -596,13 +478,13 @@ export class UdpFormsRenderer {
         try {
             const { type, questionIdentifierKey, commentId } = e.detail;
             const [sectionName, questionName] = questionIdentifierKey.split('.');
-            let newInitialValues = structuredClone(this.udpFormSubmission.data.submissionResponseData || {});
+            let newCurrentValues = structuredClone(this.udpFormSubmission.data.submissionResponseData || {});
             // ensure structure exists WITHOUT overwriting existing data
-            if (!newInitialValues[sectionName])
-                newInitialValues[sectionName] = {};
-            if (!newInitialValues[sectionName][questionName]) {
+            if (!newCurrentValues[sectionName])
+                newCurrentValues[sectionName] = {};
+            if (!newCurrentValues[sectionName][questionName]) {
                 // create defaults but do not clobber any existing saved shape from submissionResponseData
-                newInitialValues[sectionName][questionName] = {
+                newCurrentValues[sectionName][questionName] = {
                     value: '',
                     comments: [],
                     draftComments: [],
@@ -611,20 +493,20 @@ export class UdpFormsRenderer {
             }
             else {
                 // ensure arrays/objects exist so later code can safely push/filter
-                newInitialValues[sectionName][questionName].comments = (_a = newInitialValues[sectionName][questionName].comments) !== null && _a !== void 0 ? _a : [];
-                newInitialValues[sectionName][questionName].draftComments = (_b = newInitialValues[sectionName][questionName].draftComments) !== null && _b !== void 0 ? _b : [];
-                newInitialValues[sectionName][questionName].metadata = (_c = newInitialValues[sectionName][questionName].metadata) !== null && _c !== void 0 ? _c : {};
+                newCurrentValues[sectionName][questionName].comments = (_a = newCurrentValues[sectionName][questionName].comments) !== null && _a !== void 0 ? _a : [];
+                newCurrentValues[sectionName][questionName].draftComments = (_b = newCurrentValues[sectionName][questionName].draftComments) !== null && _b !== void 0 ? _b : [];
+                newCurrentValues[sectionName][questionName].metadata = (_c = newCurrentValues[sectionName][questionName].metadata) !== null && _c !== void 0 ? _c : {};
             }
             // normalize draftComments to array if needed (back-compat)
-            const maybeDraft = newInitialValues[sectionName][questionName].draftComments;
+            const maybeDraft = newCurrentValues[sectionName][questionName].draftComments;
             if (maybeDraft && !Array.isArray(maybeDraft)) {
-                newInitialValues[sectionName][questionName].draftComments = [maybeDraft];
+                newCurrentValues[sectionName][questionName].draftComments = [maybeDraft];
             }
             else if (!maybeDraft) {
-                newInitialValues[sectionName][questionName].draftComments = [];
+                newCurrentValues[sectionName][questionName].draftComments = [];
             }
-            const commentsArr = newInitialValues[sectionName][questionName].comments || [];
-            const draftsArr = newInitialValues[sectionName][questionName].draftComments || [];
+            const commentsArr = newCurrentValues[sectionName][questionName].comments || [];
+            const draftsArr = newCurrentValues[sectionName][questionName].draftComments || [];
             switch (type) {
                 case 'add': {
                     const newDraft = {
@@ -634,7 +516,7 @@ export class UdpFormsRenderer {
                         timestamp: null,
                     };
                     // put new draft first so activeDraft === draftComments[0] matches UX
-                    newInitialValues[sectionName][questionName].draftComments = [newDraft, ...draftsArr];
+                    newCurrentValues[sectionName][questionName].draftComments = [newDraft, ...draftsArr];
                     break;
                 }
                 case 'save': {
@@ -650,13 +532,13 @@ export class UdpFormsRenderer {
                     if (existingIdx !== -1) {
                         const newComments = [...commentsArr];
                         newComments[existingIdx] = Object.assign({}, savedComment);
-                        newInitialValues[sectionName][questionName].comments = newComments;
+                        newCurrentValues[sectionName][questionName].comments = newComments;
                     }
                     else {
-                        newInitialValues[sectionName][questionName].comments = [...commentsArr, savedComment];
+                        newCurrentValues[sectionName][questionName].comments = [...commentsArr, savedComment];
                     }
                     // remove that draft
-                    newInitialValues[sectionName][questionName].draftComments = draftsArr.filter(d => d.commentId !== commentId);
+                    newCurrentValues[sectionName][questionName].draftComments = draftsArr.filter(d => d.commentId !== commentId);
                     break;
                 }
                 case 'edit': {
@@ -666,13 +548,13 @@ export class UdpFormsRenderer {
                         return;
                     const draftFromSaved = Object.assign(Object.assign({}, saved), { isDraftComment: true, timestamp: null });
                     // Add this draft at the front; keep saved comment intact so content doesn't disappear.
-                    newInitialValues[sectionName][questionName].draftComments = [draftFromSaved, ...draftsArr];
-                    newInitialValues[sectionName][questionName].comments = commentsArr;
+                    newCurrentValues[sectionName][questionName].draftComments = [draftFromSaved, ...draftsArr];
+                    newCurrentValues[sectionName][questionName].comments = commentsArr;
                     break;
                 }
                 case 'delete': {
                     // mark the comment as deleted and clear its value, then persist.
-                    newInitialValues[sectionName][questionName].comments = commentsArr.map(c => {
+                    newCurrentValues[sectionName][questionName].comments = commentsArr.map(c => {
                         if (c.commentId === commentId) {
                             return Object.assign(Object.assign({}, c), { isDeleted: true, value: '', editedTimestamp: new Date().toISOString() });
                         }
@@ -682,18 +564,18 @@ export class UdpFormsRenderer {
                 }
                 case 'editClose': {
                     // Cancel edit: remove the draft only, do NOT restore/alter saved comments.
-                    newInitialValues[sectionName][questionName].draftComments = draftsArr.filter(d => d.commentId !== commentId);
+                    newCurrentValues[sectionName][questionName].draftComments = draftsArr.filter(d => d.commentId !== commentId);
                     break;
                 }
             }
             // if it's a save or delete action, persist immediately
             if (type === 'save' || type === 'delete') {
-                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newInitialValues);
-                await this.handleCommmentUpdate(newInitialValues);
+                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newCurrentValues);
+                await this.handleCommmentUpdate(newCurrentValues);
             }
             else {
-                this.initialValues = Object.assign({}, newInitialValues);
-                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newInitialValues);
+                this.currentValues = Object.assign({}, newCurrentValues);
+                this.udpFormSubmission.data.submissionResponseData = Object.assign({}, newCurrentValues);
             }
         }
         catch (error) {
@@ -748,7 +630,7 @@ export class UdpFormsRenderer {
         return this.isSubmitted || this.udpFormSubmission.unityUserId !== this.clientUserInfo.id;
     }
     render() {
-        return (h("div", { key: 'c0adb1a4f78f6ff15ce946b44677820f716e8a86', class: "forms-renderer-container", style: this.isLoading ? { minHeight: '100vh' } : {} }, this.renderFollowUpSideSheet(), h("udp-forms-ui", { udpForm: this.udpForm, initialValues: this.initialValues, udpFormSubmission: this.udpFormSubmission, submitSuccessful: this.submitSuccessful, isSaving: this.isSaving, saveErrorMessage: this.saveErrorMessage,
+        return (h("div", { key: 'd073bfa6145e449c59dc722723ac82d09730d885', class: "forms-renderer-container", style: this.isLoading ? { minHeight: '100vh' } : {} }, this.renderFollowUpSideSheet(), h("udp-forms-ui", { udpForm: this.udpForm, currentValues: this.currentValues, udpFormSubmission: this.udpFormSubmission, submitSuccessful: this.submitSuccessful, isSaving: this.isSaving, saveErrorMessage: this.saveErrorMessage,
             // showAutoSaveStatus={this.formSubmissionHandler.supportsAutoSave() && !!this.userId}
             readonly: this.isReadOnlyMode, handleSubmit: this.handleSubmit.bind(this), handleSave: values => Promise.resolve(this.debouncedManualSave(values)), handleChange: this.handleFormChange, handleAction: this.triggerAction, handleFinish: this.handleFinish, clientUserInfo: this.clientUserInfo, isSubmitted: this.isSubmitted, dynamicSections: this.dynamicSections, duplicateRepeatableSection: this.duplicateRepeatableSection, deleteRepeatableSection: this.deleteRepeatableSection, key: `form-rerender-key-${this.reRenderKey}`, isShowManualSaveIcon: this.isShowManualSaveIcon(), isLoading: this.isLoading, performBackgroundSaveAndUpdateLocalSubmissionState: this.performBackgroundSaveAndUpdateLocalSubmissionState })));
     }
@@ -996,51 +878,18 @@ export class UdpFormsRenderer {
                 "reflect": false,
                 "attribute": "history"
             },
-            "generic1": {
-                "type": "any",
-                "mutable": false,
-                "complexType": {
-                    "original": "any",
-                    "resolved": "any",
-                    "references": {}
-                },
-                "required": false,
-                "optional": false,
-                "docs": {
-                    "tags": [],
-                    "text": ""
-                },
-                "getter": false,
-                "setter": false,
-                "reflect": false,
-                "attribute": "generic-1"
-            },
-            "generic2": {
-                "type": "any",
-                "mutable": false,
-                "complexType": {
-                    "original": "any",
-                    "resolved": "any",
-                    "references": {}
-                },
-                "required": false,
-                "optional": false,
-                "docs": {
-                    "tags": [],
-                    "text": ""
-                },
-                "getter": false,
-                "setter": false,
-                "reflect": false,
-                "attribute": "generic-2"
-            },
-            "generic3": {
-                "type": "any",
+            "urlContext": {
+                "type": "unknown",
                 "mutable": false,
                 "complexType": {
-                    "original": "any",
-                    "resolved": "any",
-                    "references": {}
+                    "original": "Record<string, any>",
+                    "resolved": "{ [x: string]: any; }",
+                    "references": {
+                        "Record": {
+                            "location": "global",
+                            "id": "global::Record"
+                        }
+                    }
                 },
                 "required": false,
                 "optional": false,
@@ -1050,16 +899,15 @@ export class UdpFormsRenderer {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "generic-3"
+                "defaultValue": "{}"
             }
         };
     }
     static get states() {
         return {
-            "initialValues": {},
+            "currentValues": {},
+            "formInputSeedValues": {},
             "submitSuccessful": {},
-            "currentFormData": {},
             "isLoading": {},
             "isSaving": {},
             "isSubmitted": {},