ng-prime-tools 1.1.4 → 1.1.6

package/fesm2022/ng-prime-tools.mjs

@@ -253,9 +253,7 @@ class PTAdvancedPrimeTableComponent {
     }
     ngOnInit() {
         this.hasGroupedColumns = this.columns.some((col) => col.children && col.children.length > 0);
-        this.globalFilterFields = this.columns
-            .filter((col) => col.code !== undefined && col.isFilter !== false)
-            .map((col) => col.code);
+        this.globalFilterFields = this.buildGlobalFilterFields();
         this.initializePagination();
         this.initializeActions();
         this.columns.forEach((col) => {
@@ -275,10 +273,11 @@ class PTAdvancedPrimeTableComponent {
                 col.isSortable = true;
             if (col.isEditable === undefined)
                 col.isEditable = true;
-            if (col.isFilter !== false && col.code !== undefined) {
-                if (!this.globalFilterFields.includes(col.code)) {
-                    this.globalFilterFields.push(col.code);
-                }
+            if (col.isFilter !== false &&
+                col.code !== undefined &&
+                col.type !== TableTypeEnum.COMPOSED &&
+                !this.globalFilterFields.includes(col.code)) {
+                this.globalFilterFields.push(col.code);
             }
             if (!col.width)
                 col.width = this.calculateColumnWidth(col);
@@ -303,6 +302,29 @@ class PTAdvancedPrimeTableComponent {
     ngOnDestroy() {
         this.cleanupPointerDrag();
     }
+    buildGlobalFilterFields() {
+        const fields = [];
+        this.columns.forEach((column) => {
+            if (!column.code || column.isFilter === false) {
+                return;
+            }
+            if (column.type !== TableTypeEnum.COMPOSED) {
+                fields.push(column.code);
+                return;
+            }
+            column.composedNames?.forEach((composedName, index) => {
+                const composedType = column.composedTypes?.[index];
+                /*
+                 * Image URLs, base64 data and other non-text composed values
+                 * must not participate in the global search.
+                 */
+                if (composedType === TableTypeEnum.STRING) {
+                    fields.push(`${column.code}.${composedName}`);
+                }
+            });
+        });
+        return fields;
+    }
     emitLazyLoad() {
         const payload = {
             page: this.currentPage,
@@ -677,16 +699,24 @@ class PTAdvancedPrimeTableComponent {
         }
     }
     initializeComposedFilters(col) {
-        col.composedNames?.forEach((composedName) => {
-            const code = col.code || '';
-            const composedCode = code + '.' + composedName;
+        col.composedNames?.forEach((composedName, index) => {
+            const composedType = col.composedTypes?.[index];
+            /*
+             * Only textual composed properties are searchable/filterable.
+             * Do not add IMAGE properties such as devise.icon.
+             */
+            if (composedType !== TableTypeEnum.STRING) {
+                return;
+            }
+            const code = col.code;
+            const composedCode = `${code}.${composedName}`;
             if (!this.globalFilterFields.includes(composedCode)) {
                 this.globalFilterFields.push(composedCode);
             }
             this.filters[composedName] = {
                 options: col.filterOptions,
                 value: [],
-                label: 'Filter by ' + composedName,
+                label: `Filter by ${composedName}`,
                 placeholder: 'Select option',
             };
         });
@@ -1033,27 +1063,30 @@ class PTAdvancedPrimeTableComponent {
     }
     filterGlobal(event) {
         const target = event.target;
-        const value = (target.value || '').toLowerCase();
+        const value = target.value ?? '';
         this.searchValue = value;
+        this.resetToFirstPage();
         if (this.isLazy) {
-            this.resetToFirstPage();
-            this.search.emit(value);
+            this.search.emit(value.trim());
             this.emitLazyLoad();
             return;
         }
-        this.resetToFirstPage();
-        this.refreshTableData();
-        this.filteredData.emit([...this.tableData]);
+        this.dt?.filterGlobal(value.trim(), 'contains');
     }
-    filterComposedColumn(composedData, value) {
-        if (!composedData)
+    filterComposedColumn(composedData, column, value) {
+        if (!composedData) {
             return false;
-        return Object.keys(composedData).some((key) => {
-            const cellValue = composedData[key];
-            return typeof cellValue === 'string'
-                ? cellValue.toLowerCase().includes(value)
-                : false;
-        });
+        }
+        return (column.composedNames?.some((composedName, index) => {
+            const composedType = column.composedTypes?.[index];
+            if (composedType !== TableTypeEnum.STRING) {
+                return false;
+            }
+            const cellValue = composedData?.[composedName];
+            return String(cellValue ?? '')
+                .toLowerCase()
+                .includes(value);
+        }) ?? false);
     }
     parseAnyDate(input) {
         if (input === null || input === undefined || input === '')
@@ -1189,7 +1222,7 @@ class PTAdvancedPrimeTableComponent {
                     .includes(normalizedValue);
             }
             if (column.type === TableTypeEnum.COMPOSED) {
-                return this.filterComposedColumn(cell, normalizedValue);
+                return this.filterComposedColumn(cell, column, normalizedValue);
             }
             return String(cell ?? '')
                 .toLowerCase()