@praxisui/list 8.0.0-beta.5 → 8.0.0-beta.7

package/fesm2022/praxisui-list.mjs

@@ -469,10 +469,9 @@ class ListDataService {
                         }
                         this.loading$.next(true);
                         const obs = this.crud.filter(query || {}, req).pipe(map((page) => {
-                            const content = (page?.content ?? page ?? []);
-                            const total = typeof page?.totalElements === 'number'
-                                ? page.totalElements
-                                : content.length;
+                            const resolvedPage = unwrapApiEnvelope(page);
+                            const content = extractPageContent(resolvedPage);
+                            const total = extractPageTotal(resolvedPage, content.length);
                             this.total$.next(total);
                             return content;
                         }), 
@@ -480,7 +479,7 @@ class ListDataService {
                         catchError((err) => {
                             this.warnFilterFallbackOnce(resourcePath, err);
                             return this.crud.getAll().pipe(map((arr) => {
-                                const content = arr || [];
+                                const content = extractPageContent(unwrapApiEnvelope(arr));
                                 this.total$.next(content.length);
                                 return content;
                             }));
@@ -601,6 +600,16 @@ class ListDataService {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.17", ngImport: i0, type: ListDataService, decorators: [{
             type: Injectable
         }] });
+function unwrapApiEnvelope(page) {
+    return page?.data ?? page;
+}
+function extractPageContent(page) {
+    const content = page?.content ?? page ?? [];
+    return Array.isArray(content) ? content : [];
+}
+function extractPageTotal(page, fallback) {
+    return typeof page?.totalElements === 'number' ? page.totalElements : fallback;
+}
 function stableSerialize$1(value) {
     if (value === null || value === undefined)
         return String(value);
@@ -9013,19 +9022,27 @@ class PraxisList {
             return this.resolveTemplate(raw, ctx);
         return raw;
     }
-    resolveTemplate(raw, ctx) {
+    resolveTemplate(raw, ctx, key) {
+        if (this.isDeferredTemplateExpressionKey(key) && typeof raw === 'string') {
+            return raw;
+        }
         if (typeof raw === 'string')
             return this.resolveStringTemplate(raw, ctx);
         if (Array.isArray(raw))
-            return raw.map((v) => this.resolveTemplate(v, ctx));
+            return raw.map((v) => this.resolveTemplate(v, ctx, key));
         if (raw && typeof raw === 'object') {
             const out = {};
             for (const [k, v] of Object.entries(raw))
-                out[k] = this.resolveTemplate(v, ctx);
+                out[k] = this.resolveTemplate(v, ctx, k);
             return out;
         }
         return raw;
     }
+    isDeferredTemplateExpressionKey(key) {
+        if (!key)
+            return false;
+        return key === 'expr' || key.endsWith('Expr');
+    }
     resolveStringTemplate(raw, ctx) {
         const single = raw.match(/^\$\{([^}]+)\}$/);
         if (single)

package/index.d.ts

@@ -585,6 +585,7 @@ declare class PraxisList implements OnInit, OnChanges, OnDestroy {
     private isGlobalCommand;
     private resolveActionPayload;
     private resolveTemplate;
+    private isDeferredTemplateExpressionKey;
     private resolveStringTemplate;
     private lookup;
     onSelectionChange(_change: MatSelectionListChange): void;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@praxisui/list",
-  "version": "8.0.0-beta.5",
+  "version": "8.0.0-beta.7",
   "description": "List components and helpers for Praxis UI.",
   "peerDependencies": {
     "@angular/common": ">=16 <21",
     "@angular/core": ">=16 <21",
     "@angular/material": ">=16 <21",
-    "@praxisui/dynamic-fields": "^8.0.0-beta.5",
+    "@praxisui/dynamic-fields": "^8.0.0-beta.7",
     "rxjs": ">=7 <9"
   },
   "dependencies": {