fix: 'No Data' label don't shows in process to load data

metrico · Sep 9, 2022 · 111ac27 · 111ac27
1 parent 8005c92
commit 111ac27
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/app/pages/home.page/home.page.component.ts b/src/app/pages/home.page/home.page.component.ts
@@ -57,7 +57,7 @@ export class HomePageComponent implements OnInit {
     dictionary: Dictionary[] = [];
 
     dataForFile: any = null;
-    isLoadingDetails = false;
+    isLoadingDetails = true;
     details: any = [];
     columns: any[] = [];
     errorMessage: string = '';
@@ -69,6 +69,7 @@ export class HomePageComponent implements OnInit {
     ];
     _SqlArchive: any = [];
 
+
     set SqlArchive(value: any) {
         this._SqlArchive[this.checkSqlHistory()] = value;
 
@@ -309,8 +310,9 @@ export class HomePageComponent implements OnInit {
         }
         if (!isAuthenticated) {
             this.sqlRequest = sqlStr;
+            this.isLoadingDetails = true;
         }
-        this.isLoadingDetails = true;
+
         this.cdr.detectChanges();
 
         this.details = [];
@@ -329,7 +331,9 @@ export class HomePageComponent implements OnInit {
             this.dataForFile = response;
             this.formatData(response);
             this.errorMessage = '';
-            this.isLoadingDetails = false;
+            if (!isAuthenticated) {
+                this.isLoadingDetails = false;
+            }
             this.cdr.detectChanges();
             return true;
 
@@ -346,7 +350,9 @@ export class HomePageComponent implements OnInit {
                     this.cdr.detectChanges();
                 })
             }
-            this.isLoadingDetails = false;
+            if (!isAuthenticated) {
+                this.isLoadingDetails = false;
+            }
             this.cdr.detectChanges();
 
             return false;
@@ -360,6 +366,7 @@ export class HomePageComponent implements OnInit {
         this.SQL(this.sqlRequest);
     }
     async connectToDB(event?: any, isTestConnection = false) {
+        this.isLoadingDetails = true;
         if (event) {
             this.dbLink = event.dbLink;
             this.dbLogin = event.dbLogin;
@@ -382,7 +389,7 @@ export class HomePageComponent implements OnInit {
                 this.isAccess = true;
                 this.getHash();
 
-                this.isLoadingDetails = true;
+
                 this.cdr.detectChanges();
 
                 await promiseWait(100);
@@ -391,7 +398,7 @@ export class HomePageComponent implements OnInit {
                 await this.initDbTree();
                 this.cdr.detectChanges();
 
-                this.isLoadingDetails = false;
+                // this.isLoadingDetails = false;
             } else {
                 this.authSuccessMessage = 'Connection is successfully established.';
                 setTimeout(() => {