cat-qw-lib 2.6.30 → 2.6.31

package/fesm2022/cat-qw-lib.mjs

@@ -3730,14 +3730,14 @@ class WidgetAdminService extends BaseService {
             listLabelProperty: "name",
         },
         {
-            name: "dictionaryID",
+            name: "dataDictionaryId",
             dataSource: DATASOURCES.DICTIONARY,
             listValueProperty: "_id",
             listLabelProperty: "name",
         },
         {
-            name: "dictionaryItemID",
-            dataSource: "DataDictionaries/dictionaryItems",
+            name: "dictionaryItemId",
+            dataSource: DATASOURCES.DELETEDICTIONARYITEM,
             listValueProperty: "_id",
             listLabelProperty: "key",
         },
@@ -3812,7 +3812,7 @@ class WidgetAdminService extends BaseService {
         return String(value);
     }
     /**
-     * Parses style from form (string or already-object) for API submit.
+     * Parses style from form (string or object) and returns an object payload for API submit.
      */
     parseStylePayload(input) {
         if (input === null || input === undefined) {
@@ -3893,8 +3893,8 @@ class WidgetModel extends BaseModel {
  */
 class WidgetItemModel extends BaseModel {
     name;
-    dictionaryItemID;
-    dictionaryID;
+    dictionaryItemId;
+    dataDictionaryId;
     style;
     isActive = true;
 }
@@ -3902,8 +3902,8 @@ class WidgetItemModel extends BaseModel {
  * BadgeModel class represents the model of a badge.
  */
 class BadgeModel {
-    dictionaryItemID;
-    dictionaryID;
+    dictionaryItemId;
+    dataDictionaryId;
     style;
 }
 
@@ -3981,8 +3981,10 @@ class WidgetAdminFormComponent extends BaseFormComponent {
         if (Array.isArray(this.record.dataItems)) {
             const hasEmptyItem = this.record.dataItems.some((item) => {
                 const isItemNameEmpty = !item.name || item.name.trim() === SHARED.EMPTY;
-                const isDictionaryEmpty = !item.dictionaryID || item.dictionaryID.trim() === SHARED.EMPTY;
-                const isDictionaryItemEmpty = !item.dictionaryItemID || item.dictionaryItemID.trim() === SHARED.EMPTY;
+                const dictionaryId = item.dataDictionaryId || item.dictionaryID;
+                const dictionaryItemId = item.dictionaryItemId || item.dictionaryItemID;
+                const isDictionaryEmpty = !dictionaryId || dictionaryId.trim() === SHARED.EMPTY;
+                const isDictionaryItemEmpty = !dictionaryItemId || dictionaryItemId.trim() === SHARED.EMPTY;
                 return isItemNameEmpty && isDictionaryItemEmpty && isDictionaryEmpty;
             });
             if (hasEmptyItem) {
@@ -3997,9 +3999,9 @@ class WidgetAdminFormComponent extends BaseFormComponent {
     }
     handleAPIChange(apiConfigId) {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryRecords = allLists.find((list) => list.forProperty === 'dictionaryID')?.records;
+            const allDictionaryRecords = allLists.find((list) => list.forProperty === 'dataDictionaryId')?.records;
             this.dictionaries =
-                allDictionaryRecords?.filter((item) => String(item.apiConfigId ?? '') === String(apiConfigId ?? '')) || [];
+                allDictionaryRecords?.filter((item) => String(item.apiConfigId ?? item.apiConfigID ?? '') === String(apiConfigId ?? '')) || [];
             this.refreshDictionaryItemListsForRecord();
         });
     }
@@ -4009,33 +4011,47 @@ class WidgetAdminFormComponent extends BaseFormComponent {
      */
     refreshDictionaryItemListsForRecord() {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemID')?.records || [];
-            const itemsForDictionary = (dictionaryId) => dictionaryId
-                ? allDictionaryItemRecords.filter((item) => item.dictionaryID === dictionaryId)
-                : [];
+            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemId')?.records || [];
+            const itemsForDictionary = (dictionaryId) => this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId);
             const r = this.record;
             this.headerDictionaryItems = itemsForDictionary(r.headerDictionaryID);
             this.subHeaderDictionaryItems = itemsForDictionary(r.subHeaderDictionaryID);
-            this.dictionaryItemArray = (r.dataItems || []).map((item) => itemsForDictionary(item.dictionaryID));
-            this.badgeDictionaryItemArray = (r.badges || []).map((badge) => itemsForDictionary(badge.dictionaryID));
+            this.dictionaryItemArray = (r.dataItems || []).map((item) => itemsForDictionary(item.dataDictionaryId || item.dictionaryID));
+            this.badgeDictionaryItemArray = (r.badges || []).map((badge) => itemsForDictionary(badge.dataDictionaryId || badge.dictionaryID));
         });
     }
+    getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId) {
+        if (!dictionaryId) {
+            return [];
+        }
+        const byLegacyDictionaryId = allDictionaryItemRecords.filter((item) => item.dataDictionaryId === dictionaryId);
+        if (byLegacyDictionaryId.length > 0) {
+            return byLegacyDictionaryId;
+        }
+        const selectedDictionary = this.dictionaries.find((d) => d._id === dictionaryId);
+        const dictionaryItemsIds = selectedDictionary?.dictionaryItemsIds || [];
+        if (!Array.isArray(dictionaryItemsIds) || dictionaryItemsIds.length === 0) {
+            return [];
+        }
+        const dictionaryItemsIdSet = new Set(dictionaryItemsIds.map((id) => String(id)));
+        return allDictionaryItemRecords.filter((item) => dictionaryItemsIdSet.has(String(item._id)));
+    }
     handleHeaderDictionarySelect(dictionaryId) {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemID')?.records;
-            this.headerDictionaryItems = allDictionaryItemRecords?.filter((item) => item.dictionaryID === dictionaryId) || [];
+            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemId')?.records;
+            this.headerDictionaryItems = this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords || [], dictionaryId);
         });
     }
     handleSubHeaderDictionarySelect(dictionaryId) {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemID')?.records;
-            this.subHeaderDictionaryItems = allDictionaryItemRecords?.filter((item) => item.dictionaryID === dictionaryId) || [];
+            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemId')?.records;
+            this.subHeaderDictionaryItems = this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords || [], dictionaryId);
         });
     }
     handleWidgetItemDictionarySelect(dictionaryId, index) {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemID')?.records;
-            this.dictionaryItemArray[index] = allDictionaryItemRecords?.filter((item) => item.dictionaryID === dictionaryId) || [];
+            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemId')?.records;
+            this.dictionaryItemArray[index] = this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords || [], dictionaryId);
         });
     }
     handleBadgeAddBtnClick() {
@@ -4043,8 +4059,10 @@ class WidgetAdminFormComponent extends BaseFormComponent {
             return;
         if (Array.isArray(this.record.badges)) {
             const hasEmptyBadge = this.record.badges.some((badge) => {
-                const isDictionaryEmpty = !badge.dictionaryID || badge.dictionaryID.trim() === SHARED.EMPTY;
-                const isDictionaryItemEmpty = !badge.dictionaryItemID || badge.dictionaryItemID.trim() === SHARED.EMPTY;
+                const dictionaryId = badge.dataDictionaryId || badge.dictionaryID;
+                const dictionaryItemId = badge.dictionaryItemId || badge.dictionaryItemID;
+                const isDictionaryEmpty = !dictionaryId || dictionaryId.trim() === SHARED.EMPTY;
+                const isDictionaryItemEmpty = !dictionaryItemId || dictionaryItemId.trim() === SHARED.EMPTY;
                 return isDictionaryItemEmpty && isDictionaryEmpty;
             });
             if (hasEmptyBadge) {
@@ -4059,8 +4077,8 @@ class WidgetAdminFormComponent extends BaseFormComponent {
     }
     handleBadgeDictionarySelect(dictionaryId, index) {
         this.query.getLists().subscribe((allLists) => {
-            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemID')?.records;
-            this.badgeDictionaryItemArray[index] = allDictionaryItemRecords?.filter((item) => item.dictionaryID === dictionaryId) || [];
+            const allDictionaryItemRecords = allLists.find((list) => list.forProperty === 'dictionaryItemId')?.records;
+            this.badgeDictionaryItemArray[index] = this.getDictionaryItemsByDictionaryId(allDictionaryItemRecords || [], dictionaryId);
         });
     }
     handleDeleteBadge(index) {
@@ -4085,31 +4103,38 @@ class WidgetAdminFormComponent extends BaseFormComponent {
      * Text-box controls expect stringified JSON; API returns nested objects → "[object Object]" without this.
      */
     normalizeLoadedRecordStyles(record) {
-        if (record.style !== undefined && record.style !== null && record.style !== '') {
-            record.style = this.service.coerceStyleToJsonText(record.style);
-        }
+        // Always normalize top-level style for text-box binding.
+        record.style = this.service.coerceStyleToJsonText(record.style);
         record.dataItems?.forEach((item) => {
-            if (item.style !== undefined && item.style !== null && item.style !== '') {
-                item.style = this.service.coerceStyleToJsonText(item.style);
-            }
+            item.style = this.service.coerceStyleToJsonText(item.style);
         });
         record.badges?.forEach((badge) => {
-            if (badge.style !== undefined && badge.style !== null && badge.style !== '') {
-                badge.style = this.service.coerceStyleToJsonText(badge.style);
-            }
+            badge.style = this.service.coerceStyleToJsonText(badge.style);
         });
     }
     handleSubmit() {
         this.record.style = this.service.parseStylePayload(this.record.style);
-        this.record.dataItems = this.record.dataItems.map((item) => ({
-            ...item,
-            style: this.service.parseStylePayload(item.style),
-        }));
+        this.record.dataItems = this.record.dataItems.map((item) => {
+            const raw = item;
+            const { dataDictionaryId, dictionaryItemId, ...rest } = raw;
+            return {
+                ...rest,
+                dictionaryID: dataDictionaryId || raw.dictionaryID || '',
+                dictionaryItemID: dictionaryItemId || raw.dictionaryItemID || '',
+                style: this.service.parseStylePayload(raw.style),
+            };
+        });
         if (this.record.badges && Array.isArray(this.record.badges)) {
-            this.record.badges = this.record.badges.map((badge) => ({
-                ...badge,
-                style: this.service.parseStylePayload(badge.style),
-            }));
+            this.record.badges = this.record.badges.map((badge) => {
+                const raw = badge;
+                const { dataDictionaryId, dictionaryItemId, ...rest } = raw;
+                return {
+                    ...rest,
+                    dictionaryID: dataDictionaryId || raw.dictionaryID || '',
+                    dictionaryItemID: dictionaryItemId || raw.dictionaryItemID || '',
+                    style: this.service.parseStylePayload(raw.style),
+                };
+            });
         }
         else {
             this.record.badges = [];