issue-1622: Minor bug fixes.

Author: steve-todorov

src/app/pages/console/components/console-query-result/components/console-query-result-json-view/console-query-result-json-view.component.ts

@@ -18,7 +18,7 @@ export class ConsoleQueryResultJsonViewComponent implements OnInit, OnDestroy, A
     result: QueryResponse = null;
 
     @ViewChild('jsonViewer', {static: false, read: NgxJsonViewerComponent})
-    jsonView: NgxJsonViewerComponent;
+    jsonView: NgxJsonViewerComponent = null;
 
     prettyView: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
@@ -54,12 +54,14 @@ export class ConsoleQueryResultJsonViewComponent implements OnInit, OnDestroy, A
     }
 
     toggleJsonPaths() {
-        this.jsonView.segments.filter(segment => {
-            if (segment.key === 'result' || segment.key === 'status') {
-                this.jsonView.toggle(segment);
-            }
-        });
-        this.cdr.markForCheck();
+        if (this.jsonView !== null) {
+            this.jsonView.segments.filter(segment => {
+                if (segment.key === 'result' || segment.key === 'status') {
+                    this.jsonView.toggle(segment);
+                }
+            });
+            this.cdr.markForCheck();
+        }
     }
 
 }

src/app/pages/schema/schema.component.html

@@ -18,11 +18,17 @@
                     <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
 
-                <ng-container *ngIf="dataSource.data.length === 0">
+                <ng-container *ngIf="dataSource.data.length === 0 && !(loading$ | async)">
                     <div style="padding: 20px;">
                         No results found.
                     </div>
                 </ng-container>
+
+                <ng-container *ngIf="dataSource.data.length === 0 && (loading$ | async)">
+                    <div style="padding: 20px;">
+                        Waiting for database response...
+                    </div>
+                </ng-container>
             </ng-template>
 
             <ng-template #connectToDB>