From 8663054506615f4718ef5eb1d5b5db19b2e869df Mon Sep 17 00:00:00 2001
From: Vincent Fazio <vjf@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:50:23 +1100
Subject: [PATCH] AUS-3693 Enable 'Analytics' tab only when there are MSCL
 observations available

---
 .../common/filterpanel/filterpanel.component.ts   | 15 ---------------
 .../dynamic.layer.analytic.component.ts           |  4 ++--
 .../querier/dynamic.analytic.component.ts         |  8 +++++---
 .../querier/querier.modal.component.html          | 15 ++++++++-------
 .../querier/querier.modal.component.ts            | 10 ++++++----
 src/environments/ref.ts                           |  3 +--
 6 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/app/menupanel/common/filterpanel/filterpanel.component.ts b/src/app/menupanel/common/filterpanel/filterpanel.component.ts
index ceb921b93..127883440 100644
--- a/src/app/menupanel/common/filterpanel/filterpanel.component.ts
+++ b/src/app/menupanel/common/filterpanel/filterpanel.component.ts
@@ -178,21 +178,6 @@ export class FilterPanelComponent implements OnInit {
       optionalFilters: _.cloneDeep(this.optionalFilters)
     };
 
-    // VT: append advance filter to mandatory filter.
-    /*
-    // deprecated, use AdvanceFilterDirective
-    for (const idx in this.advancedParam) {
-      if (!this.layer.filterCollection.mandatoryFilters) {
-        this.layer.filterCollection.mandatoryFilters = [];
-      }
-      this.layer.filterCollection.mandatoryFilters.push({
-        parameter: idx,
-        value: this.advancedParam[idx]
-      });
-    }
-    */
-    // VT: End append
-
     // TODO: Store time period with state
     // WMS layers may have a time set
     if (this.layerTimes.currentTime) {
diff --git a/src/app/modalwindow/layeranalytic/dynamic.layer.analytic.component.ts b/src/app/modalwindow/layeranalytic/dynamic.layer.analytic.component.ts
index 4a37ed2dd..4fd54d77e 100644
--- a/src/app/modalwindow/layeranalytic/dynamic.layer.analytic.component.ts
+++ b/src/app/modalwindow/layeranalytic/dynamic.layer.analytic.component.ts
@@ -12,7 +12,7 @@ import { LayerAnalyticInterface } from './layer.analytic.interface';
 export class DynamicLayerAnalyticComponent {
   private _layer: LayerModel;
   @ViewChild('dynamicLayerContentAnalyticPlaceholder', { read: ViewContainerRef, static: true })
-  dyanmicAnalyticHost: ViewContainerRef;
+  dynamicAnalyticHost: ViewContainerRef;
 
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver, private changeDetectorRef: ChangeDetectorRef ) { }
@@ -34,7 +34,7 @@ export class DynamicLayerAnalyticComponent {
 
     const componentFactory = this.componentFactoryResolver.resolveComponentFactory(ref.layeranalytic[this._layer.id]);
 
-    const viewContainerRef = this.dyanmicAnalyticHost
+    const viewContainerRef = this.dynamicAnalyticHost
     viewContainerRef.clear();
     const componentRef = viewContainerRef.createComponent(componentFactory);
 
diff --git a/src/app/modalwindow/querier/dynamic.analytic.component.ts b/src/app/modalwindow/querier/dynamic.analytic.component.ts
index 9edb91dc4..f37d2f596 100644
--- a/src/app/modalwindow/querier/dynamic.analytic.component.ts
+++ b/src/app/modalwindow/querier/dynamic.analytic.component.ts
@@ -21,7 +21,7 @@ export class DynamicAnalyticComponent {
   @Input() doc: QuerierInfoModel;
   private _load: boolean;
   @ViewChild('dynamicContentAnalyticPlaceholder', { read: ViewContainerRef, static: true })
-  dyanmicAnalyticHost: ViewContainerRef;
+  dynamicAnalyticHost: ViewContainerRef;
 
 
   constructor(private changeDetectorRef: ChangeDetectorRef) { }
@@ -36,9 +36,11 @@ export class DynamicAnalyticComponent {
 
   loadComponent() {
 
-    const viewContainerRef = this.dyanmicAnalyticHost
+    const viewContainerRef = this.dynamicAnalyticHost
     viewContainerRef.clear();
-    const componentRef = viewContainerRef.createComponent(ref.analytic[this.layer.id]);
+    // Default to MSCLComponent
+    const component = this.layer.id in ref.analytic? ref.analytic[this.layer.id]: MSCLComponent;
+    const componentRef = viewContainerRef.createComponent(component);
 
     (<NVCLDatasetListComponent>componentRef.instance).layer = this.layer;
     (<NVCLDatasetListComponent>componentRef.instance).onlineResource = this.onlineResource;
diff --git a/src/app/modalwindow/querier/querier.modal.component.html b/src/app/modalwindow/querier/querier.modal.component.html
index 8e686bf5f..af0e8f270 100644
--- a/src/app/modalwindow/querier/querier.modal.component.html
+++ b/src/app/modalwindow/querier/querier.modal.component.html
@@ -43,7 +43,7 @@ <h4 class="card-title">
 							<div class="card-header">
 								<ul id="querier-card-tab" class="nav nav-tabs float-right">
 									<li (click)="doc.home=true;doc.analytic=false;onDataChange()" [ngClass]="{'active':doc.home}"><a href="#{{doc.key}}-card-tab-home" data-toggle="tab"><i class="fa fa-list"></i><span class="d-none d-md-inline"> WFS</span></a></li>
-									<li (click)="doc.home=false;doc.analytic=true;onDataChange()" [ngClass]="{'active':doc.analytic}" title="Show analytic" *ngIf="(isNVCL(doc.layer.id) && flagAnalytic || !isNVCL(doc.layer.id)) && analyticMap[doc.layer.id] || hasMsclAnalytics" ><a href="#{{doc.key}}-card-tab-profile" data-toggle="tab"><i class="fa fa-line-chart"></i><span class="d-none d-md-inline">&nbsp;Analytic</span></a></li>
+									<li (click)="doc.home=false;doc.analytic=true;onDataChange()" [ngClass]="{'active':doc.analytic}" title="Show analytic" *ngIf="(isNVCL(doc.layer.id) && flagNVCLAnalytic || !isNVCL(doc.layer.id)) && analyticMap[doc.layer.id] || hasMsclAnalytics" ><a href="#{{doc.key}}-card-tab-profile" data-toggle="tab"><i class="fa fa-line-chart"></i><span class="d-none d-md-inline">&nbsp;Analytic</span></a></li>
 								</ul>
 								<h4 *ngIf="doc.home" class="card-title">Feature Detail</h4>
 								<h4 *ngIf="doc.analytic" class="card-title">Analytic</h4>
@@ -53,6 +53,7 @@ <h4 *ngIf="doc.analytic" class="card-title">Analytic</h4>
 							<!-- BEGIN tab-content -->
 							<div id="card-tab-content" class="tab-content" style="max-height:calc(75vh)">
 								<!-- BEGIN tab-pane -->
+								<!-- Content of WFS Tab -->
 								<div *ngIf="doc.key !== 'Server Error'" class="tab-pane fade" [ngClass]="{'active show':doc.home}" id="{{doc.key}}-card-tab-home">
 									<div *ngIf="bToClipboard || supportOpenInNewWindow(doc)" style="position: inherit;padding-top: unset;margin-bottom: 20px;">
 										<div class="float-left d-none d-md-inline mt-0 w-100">
@@ -64,11 +65,10 @@ <h4 *ngIf="doc.analytic" class="card-title">Analytic</h4>
 									<!-- Show HTML if XML is transformed -->
 									<div *ngIf="doc.transformed" [innerHtml]="doc.transformed"></div>
 									<!-- Show default XML Tree if there is no HTML transformation -->
-									<mat-tree *ngIf="flatTreeDataSource[doc.key]" [dataSource]="flatTreeDataSource[doc.key]" [treeControl]="flatTreeControl[doc.key]"
-										class="example-tree">
+									<mat-tree *ngIf="flatTreeDataSource[doc.key]" [dataSource]="flatTreeDataSource[doc.key]" [treeControl]="flatTreeControl[doc.key]">
 										<dl>
 											<!-- Node without children -->
-											<mat-tree-node *matTreeNodeDef="let node" style="font-size: 12px !important; min-height: 0px"  [matTreeNodePaddingIndent]="15" matTreeNodePadding>
+											<mat-tree-node *matTreeNodeDef="let node" style="font-size: 12px !important; min-height: 0px"  [matTreeNodePaddingIndent]="10" matTreeNodePadding>
 												<dt style="flex: auto;">{{node.filename}}</dt>
 												<dd>{{node.type}}
 													<a *ngIf="node.type && node.type.toString().startsWith('http')" target="_blank" href="{{node.type}}">
@@ -77,7 +77,7 @@ <h4 *ngIf="doc.analytic" class="card-title">Analytic</h4>
 												</dd>
 											</mat-tree-node>
 											<!-- Node with children -->
-											<mat-tree-node *matTreeNodeDef="let node; when: hasChild"  [matTreeNodePaddingIndent]="15" matTreeNodePadding>
+											<mat-tree-node *matTreeNodeDef="let node; when: hasChild" [matTreeNodePaddingIndent]="10" matTreeNodePadding>
 												<dt style="flex: auto; font-size: 12px !important">
 													<button mat-icon-button matTreeNodeToggle [matTreeNodeToggleRecursive]="true" [attr.aria-label]="'toggle ' + node.filename">
 														<mat-icon class="mat-icon-rtl-mirror">
@@ -98,10 +98,11 @@ <h4 *ngIf="doc.analytic" class="card-title">Analytic</h4>
 								<div *ngIf="doc.key === 'Server Error'" class="tab-pane fade" [ngClass]="{'active show':doc.home}" id="{{doc.key}}-card-tab-home">
 									<p>Sorry - {{doc.onlineResource.url}} server has returned an error message. See browser console for more information</p>
 								</div>
-
 								<!-- END tab-pane -->
+
 								<!-- BEGIN tab-pane -->
-								<div *ngIf="analyticMap[doc.layer.id]" class="tab-pane fade" [ngClass]="{'active show':doc.analytic}" id="{{doc.key}}-card-tab-profile">
+								<!-- Content of Analytics Tab -->
+								<div *ngIf="analyticMap[doc.layer.id] || hasMsclAnalytics" class="tab-pane fade" [ngClass]="{'active show':doc.analytic}" id="{{doc.key}}-card-tab-profile">
 									<app-custom-analytic [layer]="doc.layer" [load]="doc.loadSubComponent" [onlineResource] = "doc.onlineResource" [featureId]="doc.key" [doc] = "doc"></app-custom-analytic>
 								</div>
 								<!-- END tab-pane -->
diff --git a/src/app/modalwindow/querier/querier.modal.component.ts b/src/app/modalwindow/querier/querier.modal.component.ts
index 77c97063c..6a62dea15 100644
--- a/src/app/modalwindow/querier/querier.modal.component.ts
+++ b/src/app/modalwindow/querier/querier.modal.component.ts
@@ -81,7 +81,7 @@ export class QuerierModalComponent  implements OnInit {
    * 
    * If this was not done the two components would not see the same state of the service variable "isAnalytic"
   */
-  public flagAnalytic: boolean;
+  public flagNVCLAnalytic: boolean;
 
   constructor(public nvclService: NVCLService, public bsModalRef: BsModalRef, public csClipboardService: CsClipboardService,
         private manageStateService: ManageStateService, private gmlParserService: GMLParserService,
@@ -89,18 +89,18 @@ export class QuerierModalComponent  implements OnInit {
         private changeDetectorRef: ChangeDetectorRef, private appRef: ApplicationRef,
         private msclService: MSCLService) {
     this.analyticMap = ref.analytic;
-    this.flagAnalytic = false;
+    this.flagNVCLAnalytic = false;
   }
 
   ngOnInit() {
 
   /**
    * Checks the state of "isAnalytic" variable in the nvclService - observable
-   * and updates the local variable "flagAnalytic" - which updates the Analytic TAB in the html
+   * and updates the local variable "flagNVCLAnalytic" - which updates the Analytic TAB in the html
    */
     this.nvclService.getAnalytic().subscribe((result) => {
       // console.log("[querier]ngOnInit().getAnalytic() = "+result);
-      this.flagAnalytic = result;
+      this.flagNVCLAnalytic = result;
 
       // Calling this to update the UI
       this.onDataChange();
@@ -289,6 +289,8 @@ export class QuerierModalComponent  implements OnInit {
     this.flatTreeControl[name] = new FlatTreeControl<FlatNode>(node => node.level, node => node.expandable); 
     this.flatTreeDataSource[name] = new MatTreeFlatDataSource(this.flatTreeControl[name], this.treeFlattener);
     this.flatTreeDataSource[name].data = data;
+    this.flatTreeControl[name].expandAll();
+    this.changeDetectorRef.detectChanges();
   }
 
   /**
diff --git a/src/environments/ref.ts b/src/environments/ref.ts
index 3de650083..e4d646d6e 100644
--- a/src/environments/ref.ts
+++ b/src/environments/ref.ts
@@ -17,8 +17,7 @@ export const ref = {
     'tima-geosample': TIMAComponent,
     'remanent-anomalies': RemanentAnomaliesComponent,
     'remanent-anomalies-EMAG': RemanentAnomaliesComponent,
-    'mscl-borehole': MSCLComponent,
-    'mscl-gssa-borehole': MSCLComponent
+    'mscl-borehole': MSCLComponent
   },
   layeranalytic: {
     'nvcl-v2-borehole': NVCLBoreholeAnalyticComponent