@qbs-origin/origin-form 0.8.2 → 0.8.3

package/fesm2022/qbs-origin-origin-form.mjs

@@ -16,7 +16,7 @@ import * as i4$1 from '@angular/material/checkbox';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import * as i6 from '@angular/material/autocomplete';
 import { MatAutocompleteTrigger, MatAutocompleteModule } from '@angular/material/autocomplete';
-import { catchError, throwError, BehaviorSubject, firstValueFrom, of, switchMap as switchMap$1, shareReplay, finalize, map, forkJoin, take, Subject, Subscription, interval, startWith, pairwise, debounceTime, takeUntil, timer, Observable, merge } from 'rxjs';
+import { catchError, throwError, BehaviorSubject, firstValueFrom, of, switchMap as switchMap$1, shareReplay, finalize, map, forkJoin, take, Subject, Subscription, interval, startWith, pairwise, takeUntil, from, timer, Observable, merge } from 'rxjs';
 import * as i1$1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, provideHttpClient, HTTP_INTERCEPTORS, withInterceptorsFromDi } from '@angular/common/http';
 import { tap, switchMap, catchError as catchError$1, map as map$1, takeWhile, finalize as finalize$1 } from 'rxjs/operators';
@@ -2718,14 +2718,14 @@ class AppDataFill {
             language: language || '',
             offerId: offerId || '',
             isSubmitted: isSubmitted || false,
-            parentAppDataUuid: parentAppDataUuid || '',
+            parentAppDataUuid: parentAppDataUuid || ''
         };
         this.flux = flux || [];
     }
 }
 class AppData {
     constructor(data) {
-        (this.id = data.id ?? undefined), (this.appDataId = data.appDataId || '');
+        ((this.id = data.id ?? undefined), (this.appDataId = data.appDataId || ''));
         this.appConfigurationId = data.appConfigurationId || 0;
         this.fillData = data.fillData;
         this.initFlowValues = data.initFlowValues;
@@ -2745,7 +2745,8 @@ class FormModelExtenxions {
         this.formModel = model;
     }
     addInitFlowValuesItems(items) {
-        const initFlowValuesRaw = this.formModel?.generalData?.initFlowValues;
+        const initFlowValuesRaw = this.formModel?.generalData
+            ?.initFlowValues;
         if (initFlowValuesRaw === null || initFlowValuesRaw === undefined) {
             return;
         }
@@ -2798,7 +2799,7 @@ class FormModelExtenxions {
         return {
             fieldName: `initFlowValues_${underscorePath}`,
             fieldType: StepControlType.Metadata,
-            id: `initFlowValues_${underscorePath}`,
+            id: `initFlowValues_${underscorePath}`
         };
     }
     fluxItems(untilStepIdentifier = undefined) {
@@ -2808,7 +2809,7 @@ class FormModelExtenxions {
                 items.push({
                     fieldName: fieldValue,
                     fieldType: StepControlType.Metadata,
-                    id: `metadata.${fieldValue}`,
+                    id: `metadata.${fieldValue}`
                 });
             });
         }
@@ -2836,13 +2837,13 @@ class FormModelExtenxions {
                                 StepControlType.Buttons,
                                 StepControlType.NewRow,
                                 StepControlType.FluxInfo,
-                                StepControlType.Paragraph,
+                                StepControlType.Paragraph
                             ].includes(control.type) == false) {
                                 items.push({
                                     fieldName: `${step.name} -> ${section.title} -> ${control.title}`,
                                     fieldType: control.type,
                                     manulInputControlType: control.specificControlData?.type,
-                                    id: control.identifier,
+                                    id: control.identifier
                                 });
                             }
                         });
@@ -2862,7 +2863,7 @@ class FormModelExtenxions {
                         fieldType: step.type,
                         id: document?.documentId
                             ? `upload.${document.documentId}`
-                            : `${step.type}.${step.name}`,
+                            : `${step.type}.${step.name}`
                     });
                 });
             }
@@ -2874,7 +2875,7 @@ class FormModelExtenxions {
                         fieldType: step.type,
                         id: document?.id
                             ? `generate.${document.id}`
-                            : `${step.type}.${step.name}`,
+                            : `${step.type}.${step.name}`
                     });
                 });
             }
@@ -2886,7 +2887,7 @@ class FormModelExtenxions {
                             fieldType: step.type,
                             id: document?.id
                                 ? `sign.${document.id}`
-                                : `${step.type}.${step.name}`,
+                                : `${step.type}.${step.name}`
                         });
                     });
                 }
@@ -2897,7 +2898,7 @@ class FormModelExtenxions {
                             fieldType: step.type,
                             id: document?.id
                                 ? `system.${document.id}`
-                                : `${step.type}.${step.name}`,
+                                : `${step.type}.${step.name}`
                         });
                     });
                 }
@@ -2913,7 +2914,7 @@ class FormModelExtenxions {
                     items.push({
                         fieldName: `${apiMethod.method} -> ${f.fieldName}`,
                         fieldType: StepControlType.ApiMethodField,
-                        id: f.id,
+                        id: f.id
                     });
                 });
             }
@@ -2932,7 +2933,7 @@ class FormModelExtenxions {
         const allApiItems = [
             ...this.formModel.api.getItems,
             ...this.formModel.api.validationItems,
-            ...this.formModel.api.sendItems,
+            ...this.formModel.api.sendItems
         ];
         offerMethodsIds.forEach((methodId) => {
             const apiMethod = allApiItems.find((item) => item.id === methodId);
@@ -2941,7 +2942,7 @@ class FormModelExtenxions {
                     items.push({
                         fieldName: `${apiMethod.method} -> ${f.fieldName}`,
                         fieldType: FluxType.ViewOffer,
-                        id: `api_${apiMethod.id} -> ${f.id}`,
+                        id: `api_${apiMethod.id} -> ${f.id}`
                     });
                 });
             }
@@ -3098,7 +3099,7 @@ const initialFormulareState = {
             showNameStep: false,
             showAllSteps: false,
             showProgressBar: false,
-            initFlowValues: '',
+            initFlowValues: ''
         },
         design: {
             fonts: [],
@@ -3114,7 +3115,7 @@ const initialFormulareState = {
             marginLeft: '',
             marginRight: '',
             marginTop: '',
-            marginBottom: '',
+            marginBottom: ''
         },
         flux: [],
         api: { getItems: [], validationItems: [], sendItems: [] },
@@ -3122,16 +3123,16 @@ const initialFormulareState = {
         documents: [],
         statuses: [],
         display: {
-            sections: [],
+            sections: []
         },
         generatedCss: {},
         metadataFields: [],
         errors: {},
         applicationMappings: {
             applicationTypeId: 0,
-            columnMappings: [],
+            columnMappings: []
         },
-        parentChildConfig: undefined,
+        parentChildConfig: undefined
     },
     selectedTab: 'Date generale',
     canGetFromProd: false,
@@ -3139,7 +3140,7 @@ const initialFormulareState = {
     canPublishInProd: false,
     canPublishInTest: false,
     applicationUuid: '',
-    version: '',
+    version: ''
 };
 class PartnerDictionaryMapping {
 }
@@ -3174,6 +3175,8 @@ class FieldsMapping {
 class MethodField {
     constructor() {
         this.manulInputControlType = undefined;
+        this.fieldValue = undefined;
+        this.expectedValue = undefined;
     }
 }
 class GetMethodField {
@@ -5169,7 +5172,7 @@ class ApplicationDataService {
         const payload = {
             ...appData,
             initFlowValues: appData.initFlowValues,
-            fillData: appData.fillData ? JSON.stringify(appData.fillData) : undefined,
+            fillData: appData.fillData ? JSON.stringify(appData.fillData) : undefined
         };
         return this.http.post(saveUrl, payload);
     }
@@ -5180,7 +5183,7 @@ class ApplicationDataService {
             appDataId: appDataId,
             stepData: JSON.stringify(currentStep),
             withNextStep: true,
-            selectedOfferId: selectedOfferId,
+            selectedOfferId: selectedOfferId
         };
         return this.http.post(saveUrl, payload);
     }
@@ -5190,9 +5193,16 @@ class ApplicationDataService {
             appDataId;
         return this.http.get(getUrl);
     }
-    validateApi(apiValidateRequest) {
+    async validateApi(apiValidateRequest) {
         const url = this.configService.readConfig().baseUrlBusiness + '/ApiRequest/dorequest';
-        return this.http.post(url, apiValidateRequest);
+        try {
+            const response = await firstValueFrom(this.http.post(url, apiValidateRequest));
+            return response === true;
+        }
+        catch (error) {
+            console.warn('API validation request failed', error);
+            return false;
+        }
     }
     doDocumentRequest(apiValidateRequest) {
         const url = this.configService.readConfig().baseUrlBusiness +
@@ -5211,7 +5221,7 @@ class ApplicationDataService {
     makeProcessApiCall(appDataID) {
         const url = this.configService.readConfig().baseUrlInfrastructure + '/Process';
         return this.http.post(url, { appId: appDataID }).pipe(map((response) => {
-            console.log('response from makeProcessApiCall', response), response;
+            (console.log('response from makeProcessApiCall', response), response);
         }), catchError((error) => of({ ...error, body: false })));
     }
     getProcessStatus(appDataID) {
@@ -5231,7 +5241,7 @@ class ApplicationDataService {
         return this.http.post(url, {
             appDataId: appDataId,
             stepId: stepId,
-            setNextStep: setNextStep,
+            setNextStep: setNextStep
         });
     }
     async setCurrentStep(appDataId, stepId) {
@@ -5259,7 +5269,7 @@ class ApplicationDataService {
             '/appdata/changeLanguage';
         const payload = {
             appDataId: appDataUuid,
-            languageIso: languageISOCode,
+            languageIso: languageISOCode
         };
         return this.http.post(url, payload);
     }
@@ -5476,7 +5486,31 @@ class ModelPopulationHelper {
                                 if (controlDefinition.type === StepControlType.Dictionary) {
                                     const specificData = controlDefinition.specificControlData;
                                     const isRadio = specificData.showAsRadioButtonsList === true;
-                                    if (filledValueId !== null) {
+                                    // Check for multi-select values first
+                                    const fillValueIds = filledControlData.fillValueIds;
+                                    if (specificData.allowMultipleSelection &&
+                                        fillValueIds &&
+                                        Array.isArray(fillValueIds) &&
+                                        fillValueIds.length > 0) {
+                                        const dictionary = dictionaryMap.get(specificData.dictionaryUUID);
+                                        const mappedValues = [];
+                                        for (const valueId of fillValueIds) {
+                                            const numericId = typeof valueId === 'string'
+                                                ? parseInt(valueId, 10)
+                                                : valueId;
+                                            const valueDto = dictionary?.values?.find((v) => v.id === numericId);
+                                            if (valueDto) {
+                                                const mapped = ModelPopulationHelper.mapDictionaryValueDto(valueDto, availableLanguages);
+                                                if (mapped) {
+                                                    mappedValues.push(mapped);
+                                                }
+                                            }
+                                        }
+                                        if (mappedValues.length > 0) {
+                                            valueFromFillData = mappedValues;
+                                        }
+                                    }
+                                    else if (filledValueId !== null) {
                                         if (isRadio) {
                                             valueFromFillData = filledValueId;
                                         }
@@ -5511,8 +5545,9 @@ class ModelPopulationHelper {
                                             }
                                         }
                                     }
-                                    // Handle reference values
+                                    // Handle reference values (only for single-select)
                                     if (valueFromFillData &&
+                                        !Array.isArray(valueFromFillData) &&
                                         dictionaryMap.has(specificData.dictionaryUUID)) {
                                         const mainDictionary = dictionaryMap.get(specificData.dictionaryUUID);
                                         if (mainDictionary?.id) {
@@ -5596,6 +5631,93 @@ class ModelPopulationHelper {
                 }
             }
         }
+        // Fallback: apply inherited fields for controls not populated from flux
+        if (fillData.inheritedFields) {
+            for (const step of flux) {
+                if (!step.sections)
+                    continue;
+                for (const section of step.sections) {
+                    if (!section.controls)
+                        continue;
+                    for (const controlDef of section.controls) {
+                        const controlId = controlDef.identifier;
+                        if (!controlId || model[controlId] !== undefined)
+                            continue;
+                        const inheritedValue = fillData.inheritedFields[controlId];
+                        if (inheritedValue === undefined || inheritedValue === null)
+                            continue;
+                        if (controlDef.type === StepControlType.Dictionary) {
+                            const specificData = controlDef.specificControlData;
+                            const isRadio = specificData.showAsRadioButtonsList === true;
+                            // Enriched format: { fillValue, fillValueId, fillValueIds, dictionaryUUID }
+                            if (typeof inheritedValue === 'object' &&
+                                !Array.isArray(inheritedValue) &&
+                                inheritedValue.dictionaryUUID) {
+                                const dictionary = dictionaryMap.get(specificData.dictionaryUUID);
+                                // Multi-select
+                                if (specificData.allowMultipleSelection &&
+                                    inheritedValue.fillValueIds &&
+                                    Array.isArray(inheritedValue.fillValueIds) &&
+                                    inheritedValue.fillValueIds.length > 0) {
+                                    const mappedValues = [];
+                                    for (const valueId of inheritedValue.fillValueIds) {
+                                        const numericId = typeof valueId === 'string'
+                                            ? parseInt(valueId, 10)
+                                            : valueId;
+                                        const valueDto = dictionary?.values?.find((v) => v.id === numericId);
+                                        if (valueDto) {
+                                            const mapped = ModelPopulationHelper.mapDictionaryValueDto(valueDto, availableLanguages);
+                                            if (mapped) {
+                                                mappedValues.push(mapped);
+                                            }
+                                        }
+                                    }
+                                    if (mappedValues.length > 0) {
+                                        model[controlId] = mappedValues;
+                                    }
+                                }
+                                else if (inheritedValue.fillValueId !== undefined && inheritedValue.fillValueId !== null) {
+                                    // Single-select
+                                    const parsedId = parseInt(String(inheritedValue.fillValueId), 10);
+                                    if (!isNaN(parsedId)) {
+                                        if (isRadio) {
+                                            model[controlId] = parsedId;
+                                        }
+                                        else {
+                                            const valueDto = dictionary?.values?.find((v) => v.id === parsedId);
+                                            if (valueDto) {
+                                                model[controlId] =
+                                                    ModelPopulationHelper.mapDictionaryValueDto(valueDto, availableLanguages);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            else {
+                                // Backward compatible: simple value (old format)
+                                const parsedId = parseInt(String(inheritedValue), 10);
+                                if (!isNaN(parsedId)) {
+                                    if (isRadio) {
+                                        model[controlId] = parsedId;
+                                    }
+                                    else {
+                                        const dictionary = dictionaryMap.get(specificData.dictionaryUUID);
+                                        const valueDto = dictionary?.values?.find((v) => v.id === parsedId);
+                                        if (valueDto) {
+                                            model[controlId] =
+                                                ModelPopulationHelper.mapDictionaryValueDto(valueDto, availableLanguages);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else {
+                            model[controlId] = inheritedValue;
+                        }
+                    }
+                }
+            }
+        }
         // Apply precompletion for ManualInput controls
         ModelPopulationHelper.applyPrecompletionToModel(model, flux);
         return model;
@@ -7072,33 +7194,33 @@ class CollectorFormComponent {
                 language: 'English',
                 code: 'en',
                 type: 'US',
-                icon: FLAG_ICONS.en,
+                icon: FLAG_ICONS.en
             },
             {
                 language: 'Romana',
                 code: 'ro',
-                icon: FLAG_ICONS.ro,
+                icon: FLAG_ICONS.ro
             },
             {
                 language: 'Deutsch',
                 code: 'de',
-                icon: FLAG_ICONS.de,
+                icon: FLAG_ICONS.de
             },
             {
                 language: 'Français',
                 code: 'fr',
-                icon: FLAG_ICONS.fr,
+                icon: FLAG_ICONS.fr
             },
             {
                 language: 'Italiano',
                 code: 'it',
-                icon: FLAG_ICONS.it,
+                icon: FLAG_ICONS.it
             },
             {
                 language: 'Español',
                 code: 'es',
-                icon: FLAG_ICONS.es,
-            },
+                icon: FLAG_ICONS.es
+            }
         ];
         this._self = this;
         this.loadingMessage = null;
@@ -7371,7 +7493,7 @@ class CollectorFormComponent {
                 .map((control) => ({
                 controlId: control.controlId,
                 fillValue: control.fillValue,
-                fillValueId: control.fillValueId,
+                fillValueId: control.fillValueId
             }))))
                 .reduce((dictionary, { controlId, fillValue, fillValueId }) => {
                 if (fillValueId) {
@@ -7429,6 +7551,51 @@ class CollectorFormComponent {
         if (initFlowValues !== null && initFlowValues !== undefined) {
             addInitFlowValues(initFlowValues, []);
         }
+        // Add inherited fields from parent app
+        const inheritedFields = this.fillData?.inheritedFields;
+        if (inheritedFields && typeof inheritedFields === 'object') {
+            for (const [key, value] of Object.entries(inheritedFields)) {
+                let resolvedValue;
+                if (typeof value === 'object' &&
+                    value !== null &&
+                    !Array.isArray(value) &&
+                    value.dictionaryUUID) {
+                    // Enriched format: handle multi-select and single-select
+                    const enriched = value;
+                    const fillValueIds = enriched.fillValueIds;
+                    if (Array.isArray(fillValueIds) && fillValueIds.length > 0) {
+                        // Multi-select: look up each ID in dictionaryMap for translated display
+                        const currentLanguageId = this.getCurrentLanguageId();
+                        const displayValues = [];
+                        for (const valueId of fillValueIds) {
+                            const numericId = typeof valueId === 'string' ? parseInt(valueId, 10) : valueId;
+                            for (const [, dict] of this.dictionaryMap.entries()) {
+                                const dv = dict.values?.find((v) => v.id === numericId);
+                                if (dv) {
+                                    const translation = dv.valueTranslations?.find((t) => t.languageId == currentLanguageId);
+                                    displayValues.push(translation?.value || dv.name);
+                                    break;
+                                }
+                            }
+                        }
+                        resolvedValue = displayValues.length > 0
+                            ? displayValues.join(', ')
+                            : (enriched.fillValue ?? String(value));
+                    }
+                    else {
+                        // Single-select
+                        resolvedValue = enriched.fillValue ?? String(value);
+                    }
+                }
+                else {
+                    resolvedValue = value;
+                }
+                controlIdsWithValues[`inherited_${key}`] = resolvedValue;
+                if (controlIdsWithValues[key] === undefined) {
+                    controlIdsWithValues[key] = resolvedValue;
+                }
+            }
+        }
         this.controlIdsWithValues = controlIdsWithValues;
     }
     getCurrentLanguageId() {
@@ -7447,7 +7614,7 @@ class CollectorFormComponent {
             showProgressBar: this.generalData.showProgressBar &&
                 this.generalData.showAllSteps == false
                 ? true
-                : false,
+                : false
         };
         this.formlyAllSteps = await this.buildFormlyFieldGroupAsync();
         var hasDictionaryDependentSteps = this.formlyAllSteps.some((f) => f.props?.['dependentDictionary']?.isDictionaryDependent);
@@ -7474,7 +7641,7 @@ class CollectorFormComponent {
                     display: this.display,
                     designConfig: {
                         buttonsVerticalPosition: this.appModel.design.buttonsVerticalPosition,
-                        buttonsHorizontalPosition: this.appModel.design.buttonsHorizontalPosition,
+                        buttonsHorizontalPosition: this.appModel.design.buttonsHorizontalPosition
                     },
                     stepsSettings: this.stepsSettings,
                     metaData: this.fillData?.metadata,
@@ -7487,10 +7654,10 @@ class CollectorFormComponent {
                     hasActionSteps: this.flux.some((step) => this.actionStepHandler.isActionStep(step)), // Indicate if there are action steps
                     completionEvent: () => this.onCompletion(),
                     onSelectedPageChanging: (index) => this.onSelectedPageChanging(index),
-                    onSelectedPageChanged: (index) => this.onSelectedPageChanged(index),
+                    onSelectedPageChanged: (index) => this.onSelectedPageChanged(index)
                 },
-                fieldGroup: formlyFilteredSteps,
-            },
+                fieldGroup: formlyFilteredSteps
+            }
         ];
         // For display mode, populate values immediately after config is built
         if (this.showDisplayMode && this.formlyConfig[0]?.fieldGroup) {
@@ -7515,7 +7682,8 @@ class CollectorFormComponent {
         let actionsExecuted = false;
         if (toIndex > fromIndex) {
             console.log('➡️ Moving forward - executing action steps after current step');
-            actionsExecuted = await this.executeActionStepsAfterCurrentStep(fromIndex);
+            actionsExecuted =
+                await this.executeActionStepsAfterCurrentStep(fromIndex);
         }
         else if (toIndex < fromIndex) {
             console.log('⬅️ Moving backward - no action execution needed');
@@ -7637,11 +7805,15 @@ class CollectorFormComponent {
                             // Multiple selection - show values with comma
                             const valueIdsArray = found.fillValueIds || found.fillvalueids || found.FillValueIds;
                             const valuesArray = found.fillValues || found.fillvalues || found.FillValues;
-                            if (valueIdsArray && Array.isArray(valueIdsArray) && valueIdsArray.length > 0) {
+                            if (valueIdsArray &&
+                                Array.isArray(valueIdsArray) &&
+                                valueIdsArray.length > 0) {
                                 const currentLanguageId = this.getCurrentLanguageId();
                                 const displayValues = [];
                                 for (const valueId of valueIdsArray) {
-                                    const numericValueId = typeof valueId === 'string' ? parseInt(valueId, 10) : valueId;
+                                    const numericValueId = typeof valueId === 'string'
+                                        ? parseInt(valueId, 10)
+                                        : valueId;
                                     for (const [key, dict] of this.dictionaryMap.entries()) {
                                         const value = dict.values?.find((v) => v.id === numericValueId);
                                         if (value) {
@@ -7655,7 +7827,9 @@ class CollectorFormComponent {
                                     fg.defaultValue = displayValues.join(', ');
                                 }
                             }
-                            else if (valuesArray && Array.isArray(valuesArray) && valuesArray.length > 0) {
+                            else if (valuesArray &&
+                                Array.isArray(valuesArray) &&
+                                valuesArray.length > 0) {
                                 // Fallback: use fillValues array directly
                                 fg.defaultValue = valuesArray.join(', ');
                             }
@@ -7678,8 +7852,13 @@ class CollectorFormComponent {
                         }
                         else {
                             // Check controlIdsWithValues for initFlowValues
-                            const initFlowValue = this.controlIdsWithValues?.[associatedControlId];
+                            let initFlowValue = this.controlIdsWithValues?.[associatedControlId];
                             if (initFlowValue !== undefined) {
+                                if (typeof initFlowValue === 'object' &&
+                                    initFlowValue !== null &&
+                                    initFlowValue.fillValue !== undefined) {
+                                    initFlowValue = initFlowValue.fillValue;
+                                }
                                 fg.defaultValue = initFlowValue;
                             }
                             else {
@@ -7782,9 +7961,9 @@ class CollectorFormComponent {
                     description: step.name,
                     buttons: this.constructButtons(step.buttons),
                     dependentDictionary: step.dependentDictionary,
-                    stepId: step.identifier,
+                    stepId: step.identifier
                 },
-                fieldGroup: await this.buildSectionsFieldGroupAsync(step, step.sections),
+                fieldGroup: await this.buildSectionsFieldGroupAsync(step, step.sections)
             };
             if (step.translations) {
                 stepFormlyConfig.props['label'] = Utils.findTranslationInfo('name', step.translations, this.currentLanguageIso);
@@ -7825,9 +8004,9 @@ class CollectorFormComponent {
             props: {
                 label: step.name,
                 buttons: this.constructButtons(step.buttons),
-                fluxType: step.type,
+                fluxType: step.type
             },
-            fieldGroup: [],
+            fieldGroup: []
         };
         this.setStepBaseProps(step, formlyConfig);
         var fieldConfig = this.createFormlySystemFieldConfig(step);
@@ -7872,8 +8051,8 @@ class CollectorFormComponent {
                     if (event === 'success') {
                         await this.stepperGoNextAsync();
                     }
-                },
-            },
+                }
+            }
         };
     }
     CreateDownloadDocsFieldConfig(controlData) {
@@ -7885,8 +8064,8 @@ class CollectorFormComponent {
                 controlData: controlData,
                 env: this.env,
                 documentsData: this.appModel.documents,
-                langIso: this.currentLanguageIso,
-            },
+                langIso: this.currentLanguageIso
+            }
         };
     }
     CreateViewDocsFieldConfig(controlData) {
@@ -7898,8 +8077,8 @@ class CollectorFormComponent {
                 controlData: controlData,
                 env: this.env,
                 documentsData: this.appModel.documents,
-                langIso: this.currentLanguageIso,
-            },
+                langIso: this.currentLanguageIso
+            }
         };
     }
     CreateUploadDocsFieldConfig(controlData) {
@@ -7911,8 +8090,8 @@ class CollectorFormComponent {
                 controlData: controlData,
                 env: this.env,
                 documentsData: this.appModel.documents,
-                langIso: this.currentLanguageIso,
-            },
+                langIso: this.currentLanguageIso
+            }
         };
     }
     CreateGenerateDocsFieldConfig(step) {
@@ -7928,8 +8107,8 @@ class CollectorFormComponent {
                     if (event === 'success') {
                         await this.stepperGoNextAsync();
                     }
-                },
-            },
+                }
+            }
         };
     }
     async stepperGoNextAsync() {
@@ -7954,8 +8133,8 @@ class CollectorFormComponent {
                 dataUrlId: this.dataUrlId,
                 stepData: step,
                 labels: labels,
-                langIso: this.currentLanguageIso,
-            },
+                langIso: this.currentLanguageIso
+            }
         };
     }
     CreateIdScanFieldConfig(step) {
@@ -7974,8 +8153,8 @@ class CollectorFormComponent {
                 appDataId: this.appDataUuid || Utils.generateUUID(),
                 appId: this.appModel.applicationUuid,
                 errorMessages: errorMessages,
-                event: (event) => this.onIdScanCompleted(event, step),
-            },
+                event: (event) => this.onIdScanCompleted(event, step)
+            }
         };
     }
     CreateKycFieldConfig(step) {
@@ -7998,8 +8177,8 @@ class CollectorFormComponent {
                 ectCompleted: async () => {
                     this.loadingMessage = translatedLoadingMessage;
                     await this.originFormSignalrHandlerService.initiateKycProcessing(this.appDataUuid);
-                },
-            },
+                }
+            }
         };
     }
     CreatePhoneEmailFieldConfig(step) {
@@ -8013,8 +8192,8 @@ class CollectorFormComponent {
                     if (event === 'success') {
                         await this.stepperGoNextAsync();
                     }
-                },
-            },
+                }
+            }
         };
     }
     CreateViewOfferFieldConfig(step) {
@@ -8026,8 +8205,8 @@ class CollectorFormComponent {
                 env: this.env,
                 appModel: this.appModel,
                 langIso: this.currentLanguageIso,
-                event: (event) => this.onOfferSelected(event, step),
-            },
+                event: (event) => this.onOfferSelected(event, step)
+            }
         };
     }
     CreatePauseFieldConfig(step) {
@@ -8040,8 +8219,8 @@ class CollectorFormComponent {
                 stepData: step,
                 env: this.env,
                 appModel: this.appModel,
-                langIso: this.currentLanguageIso,
-            },
+                langIso: this.currentLanguageIso
+            }
         };
     }
     CreateOpenBankingFieldConfig(step) {
@@ -8062,10 +8241,10 @@ class CollectorFormComponent {
                     waitingMessage: Utils.findTranslation(step.config?.waitingMessageTranslations || [], this.currentLanguageIso),
                     consentErrorMessage: Utils.findTranslation(step.config?.consentErrorMessageTranslations || [], this.currentLanguageIso),
                     completionMessage: Utils.findTranslation(step.config?.completionMessageTranslations || [], this.currentLanguageIso),
-                    retryButtonLabel: Utils.findTranslation(step.config?.retryButtonLabelTranslations || [], this.currentLanguageIso),
+                    retryButtonLabel: Utils.findTranslation(step.config?.retryButtonLabelTranslations || [], this.currentLanguageIso)
                 },
-                event: (event) => this.onOpenBankingEvent(event, step),
-            },
+                event: (event) => this.onOpenBankingEvent(event, step)
+            }
         };
     }
     CreateStatusFieldConfig(step) {
@@ -8075,8 +8254,8 @@ class CollectorFormComponent {
                 config: step.config,
                 stepData: step,
                 appDataId: this.appDataUuid,
-                appId: this.appModel.applicationUuid,
-            },
+                appId: this.appModel.applicationUuid
+            }
         };
     }
     createFormlySystemFieldConfig(step) {
@@ -8150,8 +8329,8 @@ class CollectorFormComponent {
                 if (c.controlId) {
                     const value = {
                         [c.controlId]: {
-                            value: c.fillValue,
-                        },
+                            value: c.fillValue
+                        }
                     };
                     if (this.form.contains(c.controlId)) {
                         this.form.patchValue(value);
@@ -8172,7 +8351,7 @@ class CollectorFormComponent {
         if (formlyStepField) {
             formlyStepField.props = {
                 ...formlyStepField.props,
-                buttonsDisabled: false,
+                buttonsDisabled: false
             };
             this.updateFormlyConfig();
             this.formlyConfigUpdated.emit();
@@ -8199,8 +8378,8 @@ class CollectorFormComponent {
                     type: 'separator',
                     props: {
                         title: section.translations?.find((t) => t.languageIso === this.currentLanguageIso)?.value ?? '',
-                        design: this.design,
-                    },
+                        design: this.design
+                    }
                 };
             }
             if (section.showSectionSeparator) {
@@ -8209,8 +8388,8 @@ class CollectorFormComponent {
                     type: 'separator',
                     props: {
                         ...separatorFormlyConfig.props,
-                        showSeparator: section.showSectionSeparator,
-                    },
+                        showSeparator: section.showSectionSeparator
+                    }
                 };
             }
             if (section.dependentDictionary) {
@@ -8222,10 +8401,10 @@ class CollectorFormComponent {
                 props: {
                     label: section.title,
                     description: section.translations?.find((t) => t.languageIso === this.currentLanguageIso)?.value ?? '',
-                    design: this.design,
+                    design: this.design
                 },
                 fieldGroup: await this.buildControlsFieldGroupAsync(step, section.controls || [], section.presentationControls || []),
-                fieldGroupClassName: 'display-flex',
+                fieldGroupClassName: 'display-flex'
             };
             if (section.dependentDictionary) {
                 this.attachToDependentDictionaryIfNecessary(section.dependentDictionary, sectionFormlyConfig);
@@ -8243,7 +8422,7 @@ class CollectorFormComponent {
                 // buttons: this.constructButtons(step.buttons),
                 //  dependentDictionary: step.dependentDictionary,
                 },
-                fieldGroup: await this.buildSectionsFieldGroupAsync(undefined, this.display.sections),
+                fieldGroup: await this.buildSectionsFieldGroupAsync(undefined, this.display.sections)
             };
         }
         return stepFormlyConfig;
@@ -8284,8 +8463,8 @@ class CollectorFormComponent {
             props: {
                 label: '',
                 disabled: true,
-                hide: true,
-            },
+                hide: true
+            }
         };
     }
     async buildControlsFieldGroupAsync(step, controls, presentationControls) {
@@ -8409,7 +8588,7 @@ class CollectorFormComponent {
             '.component-checkbox',
             '.component-radio',
             '.component-date',
-            '.component-data',
+            '.component-data'
         ];
         let formlyConfig = this.getDefaultFormlyFieldConfig(control, initialType, pattern, componentStyleKey, componentsToExcludeFromStyle);
         //control.specificControlData.type === 3  is email
@@ -8440,7 +8619,7 @@ class CollectorFormComponent {
                     case ManualInputControlType.DateTime:
                         formlyConfig.type = 'datepicker';
                         formlyConfig.props = {
-                            readonly: true,
+                            readonly: true
                         };
                         componentStyleKey = '.component-date';
                         break;
@@ -8535,40 +8714,40 @@ class CollectorFormComponent {
                     }
                     return true;
                 },
-                message: emailErrorLabelValue,
-            },
+                message: emailErrorLabelValue
+            }
         };
     }
     addApiValidators(formlyConfig, control) {
-        formlyConfig.asyncValidators = {
+        const throughApiValidation = Utils.findErrorTranslationValueOrDefault(control.errorsTranslations, this.currentLanguageIso, 'throughApiValidation');
+        formlyConfig.validators = {
             validateThroughApi: {
-                expression: (cont) => {
-                    return (cont.valueChanges.pipe(debounceTime(500), switchMap$1(() => {
-                        const apiValidationMethod = control.specificControlData.apiValidationMethod;
-                        const bodyValue = this.appModel.partners
-                            .flatMap((p) => p.partnerSettings.partnerMethodsApi)
-                            .find((p) => p.methodId === apiValidationMethod)
-                            ?.bodyConfiguration.bodyMapFields;
-                        const fieldMap = bodyValue?.reduce((acc, f) => {
-                            if (f.fluxFieldId === control.identifier) {
-                                acc[f.partnerField] = cont.value || '';
-                            }
-                            else {
-                                acc[f.partnerField] = '';
-                            }
-                            return acc;
-                        }, {}) || {};
-                        const dataRequest = {
-                            appId: this.appModel.applicationId,
-                            apiId: apiValidationMethod,
-                            data: JSON.stringify(fieldMap),
-                        };
-                        return this.validateMethodApi(dataRequest).pipe(catchError(() => of(false)));
-                    })) || 'ssssssssssssssss');
+                expression: async (cont) => {
+                    if (!cont.value) {
+                        return of(null);
+                    }
+                    const apiValidationMethod = control.specificControlData.apiValidationMethod;
+                    const dataRequest = {
+                        appDataId: this.appDataUuid,
+                        apiMethodId: apiValidationMethod,
+                        controlIdentifier: control.identifier
+                    };
+                    var response = await this.validateMethodApi(dataRequest);
+                    if (response === false) {
+                        cont.setErrors({ validateThroughApi: true });
+                        return false;
+                    }
+                    return true;
                 },
-                message: 'Validation failed.',
-            },
+                message: throughApiValidation
+            }
         };
+        if (formlyConfig.validation) {
+            formlyConfig.validation.messages = {
+                ...formlyConfig.validation.messages,
+                validateThroughApi: throughApiValidation
+            };
+        }
     }
     getDefaultFormlyFieldConfig(control, type, pattern, componentStyleKey, componentsToExcludeFromStyle) {
         const currentLanguageId = Utils.findLanguageIdByIso(this.availableLanguages, this.currentLanguageIso);
@@ -8585,16 +8764,16 @@ class CollectorFormComponent {
                 attributes: {
                     style: componentsToExcludeFromStyle.find((c) => c === componentStyleKey)
                         ? ''
-                        : componentStyleKey,
+                        : componentStyleKey
                 },
                 autosize: true,
                 options: [{}],
                 fieldGroup: [],
-                autoDimension: control.autoDimension,
+                autoDimension: control.autoDimension
             },
             expressions: {},
             hooks: {},
-            validators: {},
+            validators: {}
         };
         formlyConfig.validation = {};
         if (control.specificControlData?.isMandatory && formlyConfig.props) {
@@ -8602,7 +8781,7 @@ class CollectorFormComponent {
             formlyConfig.props.required = control.specificControlData?.isMandatory;
             formlyConfig.validation.messages = {
                 ...formlyConfig.validation?.messages,
-                required: requiredMessage,
+                required: requiredMessage
             };
         }
         if (control.type === StepControlType.Dictionary &&
@@ -8613,7 +8792,7 @@ class CollectorFormComponent {
             formlyConfig.props.required = control.specificControlData?.isMandatory;
             formlyConfig.validation.messages = {
                 ...formlyConfig.validation?.messages,
-                required: requiredMessage,
+                required: requiredMessage
             };
         }
         let simpleValidationMessage = '';
@@ -8625,14 +8804,14 @@ class CollectorFormComponent {
                     formlyConfig.props.min = control.specificControlData.minValue;
                     formlyConfig.validation.messages = {
                         ...formlyConfig.validation?.messages,
-                        min: simpleValidationMessage,
+                        min: simpleValidationMessage
                     };
                 }
                 if (control.specificControlData?.maxValue?.toString()) {
                     formlyConfig.props.max = control.specificControlData.maxValue;
                     formlyConfig.validation.messages = {
                         ...formlyConfig.validation?.messages,
-                        max: simpleValidationMessage,
+                        max: simpleValidationMessage
                     };
                 }
             }
@@ -8655,12 +8834,12 @@ class CollectorFormComponent {
                             }
                         },
                         message: simpleValidationMessage ||
-                            'Value does not match the required pattern',
-                    },
+                            'Value does not match the required pattern'
+                    }
                 };
                 formlyConfig.validation.messages = {
                     ...formlyConfig.validation?.messages,
-                    pattern: simpleValidationMessage,
+                    pattern: simpleValidationMessage
                 };
             }
             // Apply maxLength validation if maxCharacters is defined
@@ -8669,7 +8848,7 @@ class CollectorFormComponent {
                     control.specificControlData?.maxCharacters;
                 formlyConfig.validation.messages = {
                     ...formlyConfig.validation?.messages,
-                    maxLength: simpleValidationMessage,
+                    maxLength: simpleValidationMessage
                 };
             }
             if (control.specificControlData?.allowOnlyFuture ||
@@ -8696,12 +8875,12 @@ class CollectorFormComponent {
                         },
                         message: (error, field) => {
                             return simpleValidationMessage;
-                        },
-                    },
+                        }
+                    }
                 };
                 formlyConfig.validators = {
                     ...formlyConfig.validators,
-                    ...checkDateValidation,
+                    ...checkDateValidation
                 };
             }
         }
@@ -8724,8 +8903,8 @@ class CollectorFormComponent {
                         }
                         return true;
                     },
-                    message: phoneErrorLabelValue,
-                },
+                    message: phoneErrorLabelValue
+                }
             };
         }
         if (control.specificControlData?.type === 2) {
@@ -8747,12 +8926,12 @@ class CollectorFormComponent {
                         if (simpleValidationMessage === '')
                             return 'Please enter a valid date';
                         return simpleValidationMessage;
-                    },
-                },
+                    }
+                }
             };
             formlyConfig.validators = {
                 ...formlyConfig.validators,
-                ...checkDate2Validation,
+                ...checkDate2Validation
             };
         }
         return formlyConfig;
@@ -8799,14 +8978,21 @@ class CollectorFormComponent {
                         case 'boolean':
                             formlyConfig.defaultValue = fillValue ? '&check;' : '&cross;';
                             break;
-                        default:
-                            if (fillValue?.name) {
+                        case 'object':
+                            // Enriched inherited dictionary format: extract fillValue for display
+                            if (fillValue.fillValue !== undefined) {
+                                formlyConfig.defaultValue = fillValue.fillValue;
+                            }
+                            else if (fillValue.name) {
                                 formlyConfig.defaultValue = fillValue.name;
                             }
                             else {
-                                formlyConfig.defaultValue = fillValue;
+                                formlyConfig.defaultValue = JSON.stringify(fillValue);
                             }
                             break;
+                        default:
+                            formlyConfig.defaultValue = fillValue;
+                            break;
                     }
                 }
             }
@@ -8856,7 +9042,7 @@ class CollectorFormComponent {
                 hide: (field) => {
                     const shouldShow = this.shouldShowDependentField(parentKey, dependentValueIds, this.model);
                     return !shouldShow;
-                },
+                }
             };
         }
     }
@@ -8883,7 +9069,7 @@ class CollectorFormComponent {
             if (filteredValues.length > 0) {
                 const newDictionary = {
                     ...dictionary,
-                    values: filteredValues,
+                    values: filteredValues
                 };
                 newDictionaries.push(newDictionary);
             }
@@ -9063,7 +9249,7 @@ class CollectorFormComponent {
                 value: value,
                 label: Utils.findValueTranslation(value.valueTranslations, currentLanguageId) || value.name,
                 currentLanguageIso: this.currentLanguageIso,
-                relatedDictionariesTranslations: dictionaryControlData.relatedDictionariesTranslations,
+                relatedDictionariesTranslations: dictionaryControlData.relatedDictionariesTranslations
             }));
             options.props['selectedRelatedDictionaries'] =
                 dictionaryControlData.selectedRelatedDictionaries || [];
@@ -9134,14 +9320,14 @@ class CollectorFormComponent {
                         currentLanguageId: currentLanguageId,
                         required: true,
                         attributes: {
-                            style: this.styleObjectToStringExceptBackground(this.design[`.font-list`] || {}),
+                            style: this.styleObjectToStringExceptBackground(this.design[`.font-list`] || {})
                         },
                         options: referenceDictionary.values?.map((value) => ({
                             value: value,
                             label: Utils.findValueTranslation(value.valueTranslations, currentLanguageId) || value.name,
-                            currentLanguageIso: this.currentLanguageIso,
-                        })),
-                    },
+                            currentLanguageIso: this.currentLanguageIso
+                        }))
+                    }
                 };
                 if (referenceDictionary.defaultValueId) {
                     const defaultVal = this.findAndMapDefaultValue(referenceDictionary, referenceDictionary.defaultValueId);
@@ -9157,9 +9343,10 @@ class CollectorFormComponent {
                     if (parentIndex !== -1) {
                         const endIndex = this.findLastChildIndex(parentFieldGroup, parentIndex);
                         const percentageToAdd = this.getExistingPercentage(parentFieldGroup, parentIndex);
-                        newField.className = percentageToAdd === 0
-                            ? parentDictionaryField.className
-                            : this.getPercentageClassName(percentageToAdd);
+                        newField.className =
+                            percentageToAdd === 0
+                                ? parentDictionaryField.className
+                                : this.getPercentageClassName(percentageToAdd);
                         parentFieldGroup.splice(endIndex + 1, 0, newField);
                         const classNameToAdd = type === 'radio' ? ` component-radio` : ` component-data`;
                         newField.className += classNameToAdd;
@@ -9240,12 +9427,12 @@ class CollectorFormComponent {
                         preloadedDictionaries: this.dictionaryMap,
                         options: childDictionary.values?.map((value) => ({
                             value: value.id,
-                            label: value.name,
+                            label: value.name
                         })),
                         required: true,
                         attributes: {
-                            style: this.styleObjectToStringExceptBackground(this.design[`.font-list`] || {}),
-                        },
+                            style: this.styleObjectToStringExceptBackground(this.design[`.font-list`] || {})
+                        }
                     },
                     hooks: {
                         onInit: (field) => {
@@ -9267,8 +9454,8 @@ class CollectorFormComponent {
                                 unsubscribe$.next();
                                 unsubscribe$.complete();
                             };
-                        },
-                    },
+                        }
+                    }
                 };
                 const parentFieldGroup = parentDictionaryField.parent
                     ? parentDictionaryField.parent.fieldGroup
@@ -9440,7 +9627,7 @@ class CollectorFormComponent {
         return buttonsConfig.map((button) => ({
             type: button.value.toLowerCase(),
             label: button.translations?.[this.currentLanguageIso] || button.value,
-            styleKey: `.button-${button.value.toLowerCase()}`,
+            styleKey: `.button-${button.value.toLowerCase()}`
         }));
     }
     styleObjectToStringExceptBackground(styleObj) {
@@ -9449,17 +9636,16 @@ class CollectorFormComponent {
             .map(([key, value]) => `${key}: ${value}`)
             .join('; ');
     }
-    validateMethodApi(data) {
-        if (data.apiId === undefined || data.appId === undefined) {
-            return of(false);
+    async validateMethodApi(data) {
+        if (data.apiMethodId === undefined) {
+            return false;
         }
-        return this.applicationDataService.validateApi(data).pipe(map((response) => {
-            console.log('API validation response:', response);
-            return !!response;
+        var apiResponse = from(this.applicationDataService.validateApi(data)).pipe(map((obs) => {
+            return !!obs;
         }), catchError((error) => {
-            console.error('Error validating ' + data.data, error);
             return of(false);
         }));
+        return firstValueFrom(apiResponse);
     }
     /**
      * Public method to clear the saving after actions state
@@ -10418,7 +10604,21 @@ class FormlyParagraphComponent extends BaseFormlyStepComponent {
         };
     }
     get formattedLabel() {
-        return this.formatDateIfNeeded(this.field.defaultValue).toString();
+        return this.normalizeValue(this.field.defaultValue);
+    }
+    normalizeValue(value) {
+        if (value == null)
+            return '';
+        if (Array.isArray(value)) {
+            return value
+                .map(v => this.normalizeValue(v))
+                .filter(Boolean)
+                .join(', ');
+        }
+        if (typeof value === 'object') {
+            return String(value.fillValue ?? value.value ?? value.name ?? value.label ?? '');
+        }
+        return this.formatDateIfNeeded(value);
     }
     formatDateIfNeeded(value) {
         if (!value)