cat-qw-lib 2.6.33 → 2.6.34

package/fesm2022/cat-qw-lib.mjs

@@ -4089,6 +4089,9 @@ class WidgetAdminFormComponent extends BaseFormComponent {
                 });
             }
             const itemsForDictionary = (dictionaryId) => this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId);
+            // Edit payload can miss dictionaryID/dataDictionaryId while providing dictionaryItemID.
+            // Infer dictionary ids first so dictionary dropdowns can preselect correctly.
+            this.hydrateMissingDictionaryIdsFromItemSelection(allDictionaryItemRecords);
             const r = this.record;
             this.headerDictionaryItems = itemsForDictionary(r.headerDictionaryID);
             this.subHeaderDictionaryItems = itemsForDictionary(r.subHeaderDictionaryID);
@@ -4096,6 +4099,35 @@ class WidgetAdminFormComponent extends BaseFormComponent {
             this.badgeDictionaryItemArray = (r.badges || []).map((badge) => itemsForDictionary(badge.dataDictionaryId || badge.dictionaryID));
         });
     }
+    hydrateMissingDictionaryIdsFromItemSelection(allDictionaryItemRecords) {
+        const inferDictionaryId = (dictionaryItemId) => {
+            if (!dictionaryItemId) {
+                return '';
+            }
+            const matched = allDictionaryItemRecords.find((item) => String(item?._id) === String(dictionaryItemId));
+            return (matched?.dataDictionaryId || matched?.dictionaryID || '');
+        };
+        this.record.dataItems = (this.record.dataItems || []).map((item) => {
+            const currentDictionaryId = item?.dataDictionaryId || item?.dictionaryID || '';
+            const dictionaryItemId = item?.dictionaryItemId || item?.dictionaryItemID || '';
+            const inferredDictionaryId = inferDictionaryId(dictionaryItemId);
+            return {
+                ...item,
+                dataDictionaryId: currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '',
+                dictionaryItemId: dictionaryItemId,
+            };
+        });
+        this.record.badges = (this.record.badges || []).map((badge) => {
+            const currentDictionaryId = badge?.dataDictionaryId || badge?.dictionaryID || '';
+            const dictionaryItemId = badge?.dictionaryItemId || badge?.dictionaryItemID || '';
+            const inferredDictionaryId = inferDictionaryId(dictionaryItemId);
+            return {
+                ...badge,
+                dataDictionaryId: currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '',
+                dictionaryItemId: dictionaryItemId,
+            };
+        });
+    }
     getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId) {
         if (!dictionaryId) {
             return [];