@c8y/ngx-components 1022.26.1 → 1022.28.2

package/fesm2022/c8y-ngx-components-device-grid.mjs

@@ -953,7 +953,7 @@ class IconDeviceGridColumn extends BaseColumn {
 }
 
 class DeviceGridService extends DataGridService {
-    constructor(inventoryService, userService, translateService, alertService, modal, columnUtilService, userPreferencesService) {
+    constructor(inventoryService, userService, translateService, alertService, modal, columnUtilService, userPreferencesService, searchService) {
         super(userPreferencesService);
         this.inventoryService = inventoryService;
         this.userService = userService;
@@ -962,6 +962,7 @@ class DeviceGridService extends DataGridService {
         this.modal = modal;
         this.columnUtilService = columnUtilService;
         this.userPreferencesService = userPreferencesService;
+        this.searchService = searchService;
         this.GRID_CONFIG_DEFAULT_STORAGE_KEY = 'device-grid-config';
     }
     getDefaultColumns() {
@@ -1067,7 +1068,7 @@ class DeviceGridService extends DataGridService {
     }
     async getData(columns, pagination, query = {}, withChildren = false, text = null) {
         const filters = {
-            ...this.getDevicesFilters(columns, pagination, query, false, text),
+            ...(await this.getDevicesFilters(columns, pagination, query, false, text)),
             withGroups: true,
             withChildren,
             withTotalElements: true
@@ -1077,7 +1078,7 @@ class DeviceGridService extends DataGridService {
     async getChildDeviceData(columns, pagination, query = {}, withChildren = false, id) {
         const childDeviceFilters = true;
         const filters = {
-            ...this.getDevicesFilters(columns, pagination, query, childDeviceFilters),
+            ...(await this.getDevicesFilters(columns, pagination, query, childDeviceFilters)),
             withGroups: true,
             withChildren
         };
@@ -1085,7 +1086,7 @@ class DeviceGridService extends DataGridService {
     }
     async getCount(columns, pagination, query = {}, text = null) {
         const filters = {
-            ...this.getDevicesFilters(columns, pagination, query, false, text),
+            ...(await this.getDevicesFilters(columns, pagination, query, false, text)),
             withTotalElements: true
         };
         return (await this.inventoryService.list(filters)).paging.totalElements;
@@ -1093,7 +1094,7 @@ class DeviceGridService extends DataGridService {
     async getCountChildDevices(columns, pagination, query = {}, id) {
         const childDeviceFilters = true;
         const filters = {
-            ...this.getDevicesFilters(columns, pagination, query, childDeviceFilters),
+            ...(await this.getDevicesFilters(columns, pagination, query, childDeviceFilters)),
             withTotalElements: true
         };
         return (await this.inventoryService.childDevicesList(id, filters)).paging.totalElements;
@@ -1112,8 +1113,13 @@ class DeviceGridService extends DataGridService {
         };
         return (await this.inventoryService.list(filters)).paging.totalElements;
     }
-    getDeviceQueryString(columns, query) {
+    getDeviceQueryString(columns, query, text, isWildcardSearchEnabled) {
         let fullQuery = this.getQueryObj(columns);
+        if (text && isWildcardSearchEnabled) {
+            fullQuery = this.queriesUtil.addAndFilter(fullQuery, {
+                name: `*${text.trim().replace(/\s+/g, '*')}*`
+            });
+        }
         fullQuery = this.queriesUtil.addAndFilter(fullQuery, query);
         return this.queriesUtil.buildQuery(fullQuery);
     }
@@ -1126,19 +1132,20 @@ class DeviceGridService extends DataGridService {
     saveConfig$(config, key = this.GRID_CONFIG_DEFAULT_STORAGE_KEY) {
         return super.saveConfig$(config, key);
     }
-    getDevicesFilters(columns, pagination, query, childDeviceFilters, text) {
+    async getDevicesFilters(columns, pagination, query, childDeviceFilters, text) {
+        const isWildcardSearchEnabled = await this.searchService.isWildcardSearchEnabled();
         return {
             ...(childDeviceFilters
-                ? { query: this.getDeviceQueryString(columns, query) }
-                : { q: this.getDeviceQueryString(columns, query) }),
-            ...(text && { text }),
+                ? { query: this.getDeviceQueryString(columns, query, text, isWildcardSearchEnabled) }
+                : { q: this.getDeviceQueryString(columns, query, text, isWildcardSearchEnabled) }),
+            ...(text && !isWildcardSearchEnabled && { text }),
             pageSize: pagination.pageSize,
             currentPage: pagination.currentPage,
             withChildren: false,
             withTotalPages: true
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: DeviceGridService, deps: [{ token: i1$2.InventoryService }, { token: i1$2.UserService }, { token: i1.TranslateService }, { token: i1$1.AlertService }, { token: i1$1.ModalService }, { token: ColumnUtilService }, { token: i1$1.UserPreferencesService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: DeviceGridService, deps: [{ token: i1$2.InventoryService }, { token: i1$2.UserService }, { token: i1.TranslateService }, { token: i1$1.AlertService }, { token: i1$1.ModalService }, { token: ColumnUtilService }, { token: i1$1.UserPreferencesService }, { token: i1$1.InventorySearchService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: DeviceGridService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImport: i0, type: DeviceGridService, decorators: [{
@@ -1146,7 +1153,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.14", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$2.InventoryService }, { type: i1$2.UserService }, { type: i1.TranslateService }, { type: i1$1.AlertService }, { type: i1$1.ModalService }, { type: ColumnUtilService }, { type: i1$1.UserPreferencesService }] });
+        }], ctorParameters: () => [{ type: i1$2.InventoryService }, { type: i1$2.UserService }, { type: i1.TranslateService }, { type: i1$1.AlertService }, { type: i1$1.ModalService }, { type: ColumnUtilService }, { type: i1$1.UserPreferencesService }, { type: i1$1.InventorySearchService }] });
 
 class DeviceGridComponent {
     /** Pagination settings, e.g. allows for setting current page or page size. If not given, defaults to standard settings. */
@@ -1268,7 +1275,8 @@ class DeviceGridComponent {
             };
         }
         this.onColumnsChange.emit(dataSourceModifier.columns);
-        this.onDeviceQueryStringChange.emit(this.deviceGridService.getDeviceQueryString(dataSourceModifier.columns, this.baseQuery));
+        this.onDeviceQueryStringChange.emit(this.deviceGridService.getDeviceQueryString(dataSourceModifier.columns, this.baseQuery, dataSourceModifier.searchText, false // Search is not applied for smart groups
+        ));
         if (this.dataCallback) {
             serverSideDataResult = this.dataCallback(serverSideDataResult);
         }