cat-qw-lib 2.6.34 → 2.6.36

package/cat-qw-lib.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cat-qw-lib.d.ts","sourceRoot":"","sources":["../../projects/cat-qw-lib/src/cat-qw-lib.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,cAAc,cAAc,CAAC"}

package/fesm2022/cat-qw-lib.mjs

@@ -3710,6 +3710,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [] });
 
+/** Widget root `record.style` — user may pass JSON objects; API expects JSON strings. */
+const WIDGET_ROOT_STYLE_JSON_KEYS = [
+    'headerStyle',
+    'subHeaderStyle',
+    'headerIconStyle',
+    'styleExpression',
+    'widgetStyle',
+    'widgetCardStyle',
+    'widgetCardStyleExpression',
+];
+/** `dataItems[].style` */
+const WIDGET_DATA_ITEM_STYLE_JSON_KEYS = [
+    'value',
+    'keyIconStyle',
+    'valueIconStyleExpression',
+    'valueIconStyle',
+    'itemStyle',
+    'styleExpression',
+];
+/** `badges[].style` */
+const WIDGET_BADGE_STYLE_JSON_KEYS = [
+    'value',
+    'valueIconStyleExpression',
+    'valueIconStyle',
+    'itemStyle',
+    'styleExpression',
+];
+function uniqueSortedKeys(...groups) {
+    return [...new Set(groups.flat())];
+}
+/** Union for repairing malformed style text (e.g. `"styleExpression": "{"a":1}"`). */
+const ALL_STYLE_JSON_REPAIR_KEYS = uniqueSortedKeys([...WIDGET_ROOT_STYLE_JSON_KEYS], [...WIDGET_DATA_ITEM_STYLE_JSON_KEYS], [...WIDGET_BADGE_STYLE_JSON_KEYS]);
 /**
  * Service for managing widget configurations.
  */
@@ -3767,13 +3799,27 @@ class WidgetAdminService extends BaseService {
             return null;
         }
     }
+    styleJsonKeysForKind(kind) {
+        switch (kind) {
+            case 'widget':
+                return WIDGET_ROOT_STYLE_JSON_KEYS;
+            case 'item':
+                return WIDGET_DATA_ITEM_STYLE_JSON_KEYS;
+            case 'badge':
+                return WIDGET_BADGE_STYLE_JSON_KEYS;
+            default:
+                return WIDGET_ROOT_STYLE_JSON_KEYS;
+        }
+    }
     /**
-     * Plain-object values (e.g. key/value/itemStyle saved as subdocuments) become JSON strings
-     * so the payload matches API expectations and form text fields stay readable.
+     * For the listed keys only: plain objects → JSON string so the payload matches the API.
+     * Other keys (width, hasSeparator, plain strings, etc.) are unchanged.
      */
-    normalizeNestedStyleObjects(style) {
+    stringifyStyleJsonKeys(style, keys) {
         const out = { ...style };
-        for (const key of Object.keys(out)) {
+        for (const key of keys) {
+            if (!Object.prototype.hasOwnProperty.call(out, key))
+                continue;
             const v = out[key];
             if (v !== null && typeof v === 'object' && !Array.isArray(v)) {
                 out[key] = JSON.stringify(v);
@@ -3781,10 +3827,117 @@ class WidgetAdminService extends BaseService {
         }
         return out;
     }
+    /**
+     * Minify JSON blob strings for known keys (parseable object/array → stable JSON string).
+     */
+    canonicalizeJsonBlobStrings(style, keys) {
+        const out = { ...style };
+        for (const key of keys) {
+            if (!Object.prototype.hasOwnProperty.call(out, key))
+                continue;
+            const v = out[key];
+            if (typeof v !== 'string')
+                continue;
+            const t = v.trim();
+            if (!t || (t[0] !== '{' && t[0] !== '['))
+                continue;
+            try {
+                const parsed = JSON.parse(t);
+                if (typeof parsed === 'object' && parsed !== null) {
+                    out[key] = JSON.stringify(parsed);
+                }
+            }
+            catch {
+                /* keep original string */
+            }
+        }
+        return out;
+    }
+    /** Final pass before PUT/POST for this style level. */
+    finalizeStylePayloadForApi(style, keys) {
+        const normalized = this.stringifyStyleJsonKeys(style, keys);
+        return this.canonicalizeJsonBlobStrings(normalized, keys);
+    }
+    /**
+     * Fixes `"styleExpression": "{"a":1}"` (invalid JSON) by re-encoding the inner object as a proper JSON string value.
+     */
+    repairBrokenQuotedJsonObjectValues(raw, keys) {
+        let s = raw;
+        for (const key of keys) {
+            const label = `"${key}"`;
+            let searchFrom = 0;
+            while (searchFrom < s.length) {
+                const keyPos = s.indexOf(label, searchFrom);
+                if (keyPos === -1)
+                    break;
+                const afterKey = keyPos + label.length;
+                let p = afterKey;
+                while (p < s.length && /\s/.test(s[p]))
+                    p++;
+                if (p >= s.length || s[p] !== ':') {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                p++;
+                while (p < s.length && /\s/.test(s[p]))
+                    p++;
+                if (p >= s.length || s[p] !== '"') {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                const openQuote = p;
+                p++;
+                if (p >= s.length || s[p] !== '{') {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                const braceStart = p;
+                let depth = 0;
+                let q = p;
+                for (; q < s.length; q++) {
+                    const ch = s[q];
+                    if (ch === '{')
+                        depth++;
+                    else if (ch === '}') {
+                        depth--;
+                        if (depth === 0) {
+                            q++;
+                            break;
+                        }
+                    }
+                }
+                if (depth !== 0) {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                const innerJson = s.slice(braceStart, q);
+                try {
+                    JSON.parse(innerJson);
+                }
+                catch {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                let r = q;
+                while (r < s.length && /\s/.test(s[r]))
+                    r++;
+                if (r >= s.length || s[r] !== '"') {
+                    searchFrom = afterKey;
+                    continue;
+                }
+                const closeQuote = r;
+                const encoded = JSON.stringify(innerJson);
+                s = s.slice(0, openQuote) + encoded + s.slice(closeQuote + 1);
+                searchFrom = openQuote + encoded.length;
+            }
+        }
+        return s;
+    }
     /**
      * Converts widget / item / badge style for text-box binding (avoids "[object Object]").
      */
-    coerceStyleToJsonText(value) {
+    coerceStyleToJsonText(value, kind = 'widget') {
+        const keys = this.styleJsonKeysForKind(kind);
         if (value === null || value === undefined) {
             return '';
         }
@@ -3796,7 +3949,7 @@ class WidgetAdminService extends BaseService {
             try {
                 const parsed = JSON.parse(trimmed);
                 if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
-                    const normalized = this.normalizeNestedStyleObjects(parsed);
+                    const normalized = this.stringifyStyleJsonKeys(parsed, keys);
                     return JSON.stringify(normalized, null, 2);
                 }
             }
@@ -3806,7 +3959,7 @@ class WidgetAdminService extends BaseService {
             return value;
         }
         if (typeof value === 'object' && !Array.isArray(value)) {
-            const normalized = this.normalizeNestedStyleObjects(value);
+            const normalized = this.stringifyStyleJsonKeys(value, keys);
             return JSON.stringify(normalized, null, 2);
         }
         return String(value);
@@ -3814,12 +3967,13 @@ class WidgetAdminService extends BaseService {
     /**
      * Parses style from form (string or object) and returns an object payload for API submit.
      */
-    parseStylePayload(input) {
+    parseStylePayload(input, kind = 'widget') {
+        const keys = this.styleJsonKeysForKind(kind);
         if (input === null || input === undefined) {
             return {};
         }
         if (typeof input === 'object' && !Array.isArray(input)) {
-            return input;
+            return this.finalizeStylePayloadForApi({ ...input }, keys);
         }
         if (typeof input !== 'string') {
             return {};
@@ -3828,16 +3982,32 @@ class WidgetAdminService extends BaseService {
         if (!trimmed) {
             return {};
         }
-        try {
-            const parsed = JSON.parse(trimmed);
-            return typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)
-                ? parsed
-                : {};
+        const tryParse = (s) => {
+            try {
+                const parsed = JSON.parse(s);
+                if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+                    return parsed;
+                }
+            }
+            catch {
+                /* continue */
+            }
+            return null;
+        };
+        let parsedObj = tryParse(trimmed);
+        if (!parsedObj) {
+            const repaired = this.repairBrokenQuotedJsonObjectValues(trimmed, ALL_STYLE_JSON_REPAIR_KEYS);
+            parsedObj = tryParse(repaired);
         }
-        catch {
+        if (!parsedObj) {
             const fallback = this.sanitizeStyleString(trimmed);
-            return fallback ?? {};
+            if (fallback) {
+                return this.finalizeStylePayloadForApi(fallback, keys);
+            }
+            const fallback2 = this.sanitizeStyleString(this.repairBrokenQuotedJsonObjectValues(trimmed, ALL_STYLE_JSON_REPAIR_KEYS));
+            return fallback2 ? this.finalizeStylePayloadForApi(fallback2, keys) : {};
         }
+        return this.finalizeStylePayloadForApi(parsedObj, keys);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WidgetAdminService, deps: [{ token: i1$1.HttpClient }, { token: WidgetAdminStore }, { token: AppConfigService }, { token: ListService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WidgetAdminService, providedIn: 'root' });
@@ -3986,6 +4156,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 +4178,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() {
@@ -4111,21 +4288,27 @@ class WidgetAdminFormComponent extends BaseFormComponent {
             const currentDictionaryId = item?.dataDictionaryId || item?.dictionaryID || '';
             const dictionaryItemId = item?.dictionaryItemId || item?.dictionaryItemID || '';
             const inferredDictionaryId = inferDictionaryId(dictionaryItemId);
-            return {
+            const resolvedDictId = currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '';
+            return this.syncRowDictionaryKeys({
                 ...item,
-                dataDictionaryId: currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '',
+                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);
-            return {
+            const resolvedDictId = currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '';
+            return this.syncRowDictionaryKeys({
                 ...badge,
-                dataDictionaryId: currentDictionaryId || inferredDictionaryId || this.record.headerDictionaryID || '',
+                dataDictionaryId: resolvedDictId,
+                dictionaryID: resolvedDictId,
                 dictionaryItemId: dictionaryItemId,
-            };
+                dictionaryItemID: dictionaryItemId,
+            });
         });
     }
     getDictionaryItemsByDictionaryId(allDictionaryItemRecords, dictionaryId) {
@@ -4227,46 +4410,90 @@ class WidgetAdminFormComponent extends BaseFormComponent {
     normalizeLoadedRecordStyles(record) {
         return {
             ...record,
-            style: this.service.coerceStyleToJsonText(record.style),
+            style: this.service.coerceStyleToJsonText(record.style, 'widget'),
             dataItems: (record.dataItems || []).map((item) => ({
                 ...item,
-                style: this.service.coerceStyleToJsonText(item.style),
+                style: this.service.coerceStyleToJsonText(item.style, 'item'),
             })),
             badges: (record.badges || []).map((badge) => ({
                 ...badge,
-                style: this.service.coerceStyleToJsonText(badge.style),
+                style: this.service.coerceStyleToJsonText(badge.style, 'badge'),
             })),
         };
     }
-    handleSubmit() {
-        this.record.style = this.service.parseStylePayload(this.record.style);
-        this.record.dataItems = this.record.dataItems.map((item) => {
+    /**
+     * Parsed styles + API dictionary fields for PUT/POST only.
+     * Keeps `this.record` unchanged so style stays JSON text in inputs if the request fails (avoids "[object Object]").
+     */
+    buildWidgetRecordForApi() {
+        const 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 || '',
-                style: this.service.parseStylePayload(raw.style),
+                dictionaryID,
+                dictionaryItemID,
+                style: this.service.parseStylePayload(raw.style, 'item'),
             };
         });
-        if (this.record.badges && Array.isArray(this.record.badges)) {
-            this.record.badges = this.record.badges.map((badge) => {
+        const badges = this.record.badges && Array.isArray(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 || '',
-                    style: this.service.parseStylePayload(raw.style),
+                    dictionaryID,
+                    dictionaryItemID,
+                    style: this.service.parseStylePayload(raw.style, 'badge'),
                 };
-            });
-        }
-        else {
-            this.record.badges = [];
-        }
+            })
+            : [];
+        return {
+            ...this.record,
+            style: this.service.parseStylePayload(this.record.style, 'widget'),
+            dataItems,
+            badges,
+        };
+    }
+    handleSubmit() {
         super.handleSubmit();
     }
+    handleUpdateRecord() {
+        if (!this.record._id || Object.keys(this.record).length === 0)
+            return;
+        const payload = this.buildWidgetRecordForApi();
+        this.service.update(this.record._id, payload).subscribe({
+            next: (response) => {
+                console.log('Record updated:', response);
+                this.record = {};
+                this.baseStore?.setIsApiValidated(null);
+                this.onFormNavigate.emit(response);
+            },
+            error: (error) => {
+                console.error('Error updating record:', error);
+            },
+        });
+    }
+    handleAddRecord() {
+        if (!this.record || Object.keys(this.record).length === 0)
+            return;
+        const payload = this.buildWidgetRecordForApi();
+        this.service.create(payload).subscribe({
+            next: (response) => {
+                console.log('Record created:', response);
+                this.record = {};
+                this.baseStore?.setIsApiValidated(null);
+                this.onFormNavigate.emit(response);
+            },
+            error: (error) => {
+                console.error('Error creating record:', error);
+            },
+        });
+    }
     ngOnDestroy() {
         this.record = {};
         super.ngOnDestroy();