@nettyapps/ntybase 21.1.9 → 21.1.12

package/fesm2022/nettyapps-ntybase.mjs

@@ -1607,28 +1607,37 @@ class NettyAgGridBase extends NettyAppsBase {
     // ---------------------------------------------
     onShowHideColumns() {
         this.gridColumnsVisible.update((a) => !a);
-        this.showHideColumnsAsync();
-    }
-    showHideColumnsAsync() {
-        setTimeout(() => this.showHideColumns(), 400);
-    }
-    showHideColumns() {
-        var fields = this.columnDefs()
-            .filter((columnDef) => columnDef.ntyHide === 'x')
-            .map((columnDef) => columnDef.field);
-        this.gridApi?.setColumnsVisible(fields, this.gridColumnsVisible());
-    }
-    showHideEmbeddedColumnsAsync() {
-        setTimeout(() => this.showHideEmbeddedColumns(), 100);
+        this.initAgGrid();
     }
-    showHideEmbeddedColumns() {
-        if (this.columnDefs() == undefined || this.columnDefs() == null) {
-            return;
-        }
-        var fields = this.columnDefs()
-            .filter((columnDef) => columnDef.ntyEmbeddedHide == 'x')
-            .map((columnDef) => columnDef.field);
-        this.gridApi?.setColumnsVisible(fields, !this._isEmbedded());
+    // showHideColumnsAsync() {
+    //     setTimeout(() => this.showHideColumns(), 400);
+    // }
+    // showHideColumns() {
+    //     var fields = this.columnDefs()
+    //         .filter((columnDef: any) => columnDef.ntyHide === 'x')
+    //         .map((columnDef: any) => columnDef.field);
+    //     this.gridApi?.setColumnsVisible(fields, this.gridColumnsVisible());
+    // }
+    // showHideEmbeddedColumnsAsync() {
+    //     setTimeout(() => this.showHideEmbeddedColumns(), 100);
+    // }
+    // showHideEmbeddedColumns() {
+    //     if (this.columnDefs() == undefined || this.columnDefs() == null) {
+    //         return;
+    //     }
+    //     var fields = this.columnDefs()
+    //         .filter((columnDef: any) => columnDef.ntyEmbeddedHide == 'x')
+    //         .map((columnDef: any) => columnDef.field);
+    //     this.gridApi?.setColumnsVisible(fields, !this._isEmbedded());
+    // }
+    isHidden(isEmbeddedHide, isVisibleHide) {
+        const isEmbedded = this._isEmbedded();
+        const isVisibleSwitchOn = this.gridColumnsVisible();
+        if (isVisibleHide && !isVisibleSwitchOn)
+            return true;
+        if (isEmbeddedHide && isEmbedded)
+            return true;
+        return false;
     }
     // *****************************************
     // *** Logging Functions                 ***
@@ -1999,15 +2008,13 @@ class NettyAgGridListBase extends NettyAgGridBase {
             }
             if (this.hasValidValue(this.parameterGUID())) {
                 this.setFilter();
-                if (this._isEmbedded()) {
-                    this.loadData();
-                }
-                //this.loadData();
+                this.loadData();
             }
             else if (!this._isPopupValid()) {
                 // Clear right side nav if parameterGUID is not provided
                 this.commonService.clearOutlet();
             }
+            console.log("effect.", this.parameterGUID());
         });
         effect(() => {
             const update = this.commonService.updates();
@@ -2026,7 +2033,7 @@ class NettyAgGridListBase extends NettyAgGridBase {
         // Manage filter expanded state
         effect(() => {
             this._isEmbedded();
-            this.showHideEmbeddedColumnsAsync();
+            this.initAgGrid();
         });
         effect(() => {
             const name = this.pageName();
@@ -2041,6 +2048,27 @@ class NettyAgGridListBase extends NettyAgGridBase {
                 });
             }
         });
+        effect(() => {
+            const isEmbedded = this._isEmbedded();
+            const currentPref = this.preferenceType();
+            const currentSearch = this.searchValueName();
+            if (isEmbedded) {
+                if (currentPref && !currentPref.endsWith('_isEmbedded')) {
+                    this.preferenceType.set(`${currentPref}_isEmbedded`);
+                }
+                if (currentSearch && !currentSearch.endsWith('_isEmbedded')) {
+                    this.searchValueName.set(`${currentSearch}_isEmbedded`);
+                }
+            }
+            else {
+                if (currentPref?.endsWith('_isEmbedded')) {
+                    this.preferenceType.set(currentPref.replace('_isEmbedded', ''));
+                }
+                if (currentSearch?.endsWith('_isEmbedded')) {
+                    this.searchValueName.set(currentSearch.replace('_isEmbedded', ''));
+                }
+            }
+        });
     }
     /**
      * Validates if the given value is equal to null,undefined or ''
@@ -4570,5 +4598,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.2", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AlertService, AuthenticationGuard, AuthenticationInterceptor, AuthenticationService, ButtonRenderer, CanDeactivateGuard, CheckboxRenderer, CommonService, ConfirmDialog, CredentialsService, CurrentUserPreference, ENVIRONMENT_CONFIG, EnvironmentInfo, EnvironmentInfoService, ExcelImportBase, ForgotPassword, Login, LoginDto, MFACodeDto, MfaLogin, NettyAgGridBase, NettyAgGridListBase, NettyAgGridListFilterBase, NettyAgGridLogBase, NettyAgGridSaveBase, NettyAgGridService, NettyAppsBase, NettyAppsFilterBase, NettyBaseApp, NettyHelper, NettyImageService, NettyMenuService, NtyLoadingComponent, NtyLoadingInterceptor, Ntybase, NtybaseModule, PageTitle, RangeDateTimeFilter, RangeNumberFilter, RangeStringFilter, UrlHelperService, ntyAuthenticationInterceptor };
+export { AlertService, AuthenticationGuard, AuthenticationInterceptor, AuthenticationService, ButtonRenderer, CanDeactivateGuard, CheckboxRenderer, CommonService, ConfirmDialog, CredentialsService, CurrentUserPreference, ENVIRONMENT_CONFIG, EnvironmentInfo, EnvironmentInfoService, ExcelImportBase, ForgotPassword, Login, LoginDto, MFACodeDto, MfaLogin, NettyAgGridBase, NettyAgGridListBase, NettyAgGridListFilterBase, NettyAgGridLogBase, NettyAgGridSaveBase, NettyAgGridService, NettyAppsBase, NettyAppsFilterBase, NettyBaseApp, NettyHelper, NettyImageService, NettyMenuService, NtyLoadingComponent, NtyLoadingInterceptor, NtyLoadingService, Ntybase, NtybaseModule, PageTitle, RangeDateTimeFilter, RangeNumberFilter, RangeStringFilter, UrlHelperService, ntyAuthenticationInterceptor };
 //# sourceMappingURL=nettyapps-ntybase.mjs.map