@nettyapps/ntybase 21.0.35-beta.22 → 21.0.35-beta.24

package/fesm2022/nettyapps-ntybase.mjs

@@ -1326,26 +1326,19 @@ class NettyAgGridBase extends NettyAppsBase {
     backClicked() {
         this.commonService.goBack();
     }
-    async refreshData() {
-        try {
-            this.loadData();
-            await this.alertService.showAlert('@dataRefreshedSuccessfully');
-        }
-        catch (err) {
-            this.alertService.showError(err);
-        }
-    }
     /** Set data into the grid */
-    setData(data) {
+    setData(data, initialize = false) {
         this.recordList.set(data);
         if (this.columnDefs() == null || this.columnDefs().length == 0) {
             this.initAgGrid();
         }
         if (this.searchValue() && this.gridApi) {
             this.gridApi.setGridOption('quickFilterText', this.searchValue());
-            if (this.recordList == undefined || this.recordList.length == 0) {
-                if (this._isEmbedded()) {
-                    this.alertService.showWarning('@recordNotFoundSearch');
+            if (!initialize) {
+                if (this.recordList == undefined || this.recordList.length == 0) {
+                    if (!this._isEmbedded()) {
+                        this.alertService.showWarning('@recordNotFoundSearch');
+                    }
                 }
             }
         }
@@ -1789,7 +1782,7 @@ class NettyAgGridListBase extends NettyAgGridBase {
     // ********************************************
     // Filter section
     hasFilter = input(true, ...(ngDevMode ? [{ debugName: "hasFilter" }] : [])); // Does the component have a filter
-    _hasFilter = computed(() => this.hasFilter() ?? false, ...(ngDevMode ? [{ debugName: "_hasFilter" }] : []));
+    _hasFilter = computed(() => this.hasFilter() ?? true, ...(ngDevMode ? [{ debugName: "_hasFilter" }] : []));
     isFilterValid = signal(true, ...(ngDevMode ? [{ debugName: "isFilterValid" }] : [])); // Can the filter be used
     isFilterExpanded = linkedSignal({ ...(ngDevMode ? { debugName: "isFilterExpanded" } : {}), source: () => ({
             embedded: this._isEmbedded(),
@@ -1840,9 +1833,7 @@ class NettyAgGridListBase extends NettyAgGridBase {
         if (savedSearchValue) {
             this.searchValue.set(savedSearchValue);
         }
-        if (!this._hasFilter()) {
-            this.loadData();
-        }
+        this.loadData();
         // Load user grid preferences
         await this.nettyAgGridService.copyGridUserPereferenceToLocal(this.preferenceType());
         await this.AfterOnInit();
@@ -2023,16 +2014,30 @@ class NettyAgGridListBase extends NettyAgGridBase {
     // ********************************************************* 
     loadData() {
         if (this._hasFilter()) {
-            this.setData([]);
+            this.setData([], true);
             return;
         }
         this.nettyAppsProxy.select(this.record).subscribe({
             next: (data) => {
-                this.setData(data);
+                this.setData(data, false);
             },
             error: (err) => this.alertService.showError('@dataLoadFailed', err),
         });
     }
+    async refreshData() {
+        try {
+            if (this._hasFilter()) {
+                this.refreshFilterData();
+            }
+            else {
+                this.loadData();
+            }
+            // await this.alertService.showAlert('@dataRefreshedSuccessfully');
+        }
+        catch (err) {
+            this.alertService.showError(err);
+        }
+    }
     async deleteSelected() {
         if (!this.gridApi)
             return;
@@ -2110,7 +2115,7 @@ class NettyAgGridLogBase extends NettyAgGridBase {
     loadData() {
         this.nettyAppsProxy.selectLog(this.record).subscribe({
             next: (data) => {
-                this.setData(data);
+                this.setData(data, false);
             },
             error: (err) => this.alertService.showError('@dataLoadFailed', err),
         });