cat-qw-lib 2.6.33 → 2.6.35

package/fesm2022/cat-qw-lib.mjs

@@ -3986,6 +3986,21 @@ class WidgetAdminFormComponent extends BaseFormComponent {
             this.handleAPIChange(this.record.apiConfigId);
         });
     }
+    /**
+     * Widget Items / Badges dropdowns bind to dictionaryID + dictionaryItemID (template).
+     * API may send dataDictionaryId + dictionaryItemID (or any mix). Keep both in sync.
+     */
+    syncRowDictionaryKeys(row) {
+        const dictionaryId = row?.dataDictionaryId || row?.dictionaryID || '';
+        const dictionaryItemId = row?.dictionaryItemId || row?.dictionaryItemID || '';
+        return {
+            ...row,
+            dataDictionaryId: dictionaryId,
+            dictionaryID: dictionaryId,
+            dictionaryItemId: dictionaryItemId,
+            dictionaryItemID: dictionaryItemId,
+        };
+    }
     /**
      * Normalize backend dictionary keys into UI form keys on edit load.
      * This lets dropdowns preselect values immediately without user re-selection.
@@ -3993,16 +4008,8 @@ class WidgetAdminFormComponent extends BaseFormComponent {
     normalizeIncomingDictionaryAliases(record) {
         return {
             ...record,
-            dataItems: (record.dataItems || []).map((item) => ({
-                ...item,
-                dataDictionaryId: item.dataDictionaryId || item.dictionaryID || '',
-                dictionaryItemId: item.dictionaryItemId || item.dictionaryItemID || '',
-            })),
-            badges: (record.badges || []).map((badge) => ({
-                ...badge,
-                dataDictionaryId: badge.dataDictionaryId || badge.dictionaryID || '',
-                dictionaryItemId: badge.dictionaryItemId || badge.dictionaryItemID || '',
-            })),
+            dataItems: (record.dataItems || []).map((item) => this.syncRowDictionaryKeys(item)),
+            badges: (record.badges || []).map((badge) => this.syncRowDictionaryKeys(badge)),
         };
     }
     handleWidgetItemAddBtnClick() {
@@ -4089,6 +4096,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 +4106,41 @@ 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);
+            const resolvedDictId = currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '';
+            return this.syncRowDictionaryKeys({
+                ...item,
+                dataDictionaryId: resolvedDictId,
+                dictionaryID: resolvedDictId,
+                dictionaryItemId: dictionaryItemId,
+                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);
+            const resolvedDictId = currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '';
+            return this.syncRowDictionaryKeys({
+                ...badge,
+                dataDictionaryId: resolvedDictId,
+                dictionaryID: resolvedDictId,
+                dictionaryItemId: dictionaryItemId,
+                dictionaryItemID: dictionaryItemId,
+            });
+        });
+    }
     getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId) {
         if (!dictionaryId) {
             return [];
@@ -4210,22 +4255,26 @@ class WidgetAdminFormComponent extends BaseFormComponent {
         this.record.style = this.service.parseStylePayload(this.record.style);
         this.record.dataItems = this.record.dataItems.map((item) => {
             const raw = item;
-            const { dataDictionaryId, dictionaryItemId, ...rest } = raw;
+            const dictionaryID = raw.dataDictionaryId || raw.dictionaryID || '';
+            const dictionaryItemID = raw.dictionaryItemId || raw.dictionaryItemID || '';
+            const { dataDictionaryId: _dd, dictionaryItemId: _di, ...rest } = raw;
             return {
                 ...rest,
-                dictionaryID: dataDictionaryId || raw.dictionaryID || '',
-                dictionaryItemID: dictionaryItemId || raw.dictionaryItemID || '',
+                dictionaryID,
+                dictionaryItemID,
                 style: this.service.parseStylePayload(raw.style),
             };
         });
         if (this.record.badges && Array.isArray(this.record.badges)) {
             this.record.badges = this.record.badges.map((badge) => {
                 const raw = badge;
-                const { dataDictionaryId, dictionaryItemId, ...rest } = raw;
+                const dictionaryID = raw.dataDictionaryId || raw.dictionaryID || '';
+                const dictionaryItemID = raw.dictionaryItemId || raw.dictionaryItemID || '';
+                const { dataDictionaryId: _dd, dictionaryItemId: _di, ...rest } = raw;
                 return {
                     ...rest,
-                    dictionaryID: dataDictionaryId || raw.dictionaryID || '',
-                    dictionaryItemID: dictionaryItemId || raw.dictionaryItemID || '',
+                    dictionaryID,
+                    dictionaryItemID,
                     style: this.service.parseStylePayload(raw.style),
                 };
             });