Merge pull request #990 from FZJ-INM1-BDA/dev_connectivity_canvas

Dev connectivity canvas

package.json

@@ -81,7 +81,7 @@
     "@ngrx/store": "^9.1.1",
     "@types/node": "12.12.39",
     "export-nehuba": "0.0.12",
-    "hbp-connectivity-component": "^0.4.4",
+    "hbp-connectivity-component": "^0.4.9",
     "jszip": "^3.6.0",
     "zone.js": "^0.10.2"
   }

src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts

@@ -277,10 +277,6 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
       )
 
       this.subscriptions.push(
-        fromEvent(this.connectivityComponentElement?.nativeElement, 'collapsedMenuChanged', {capture: true})
-          .subscribe((e: CustomEvent) => {
-            this.expandMenuIndex = e.detail
-          }),
         fromEvent(this.connectivityComponentElement?.nativeElement, 'customToolEvent', {capture: true})
           .subscribe((e: CustomEvent) => {
             if (e.detail.name === 'export csv') {
@@ -289,6 +285,10 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
               a.downloadCSV()
             }
           }),
+        fromEvent(this.connectivityComponentElement?.nativeElement, 'connectedRegionClicked', {capture: true})
+          .subscribe((e: CustomEvent) => {
+            this.navigateToRegion(e.detail.name)
+          }),
       )
     }
 

src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.spec.ts

@@ -14,7 +14,7 @@ import { viewerStateSetSelectedRegions } from "src/services/state/viewerState.st
 import { viewerStateCustomLandmarkSelector, viewerStateNavigationStateSelector, viewerStateSelectedRegionsSelector } from "src/services/state/viewerState/selectors"
 import { Landmark2DModule } from "src/ui/nehubaContainer/2dLandmarks/module"
 import { QuickTourModule } from "src/ui/quickTour"
-import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.module"
+import { AngularMaterialModule } from "src/sharedModules/angularMaterial.module"
 import { ClickInterceptor, CLICK_INTERCEPTOR_INJECTOR, UtilModule } from "src/util"
 import { WindowResizeModule } from "src/util/windowResize"
 import { NehubaLayerControlService } from "../layerCtrl.service"
@@ -250,10 +250,10 @@ describe('> nehubaViewerGlue.component.ts', () => {
       fixture.detectChanges()
 
       addNgLayerSpy = spyOn(fixture.componentInstance['layerCtrlService'], 'addNgLayer').and.callFake(() => {
-        
+
       })
       removeNgLayersSpy = spyOn(fixture.componentInstance['layerCtrlService'], 'removeNgLayers').and.callFake(() => {
-        
+
       })
     })
     afterEach(() => {
@@ -266,7 +266,7 @@ describe('> nehubaViewerGlue.component.ts', () => {
         desc: 'too few files',
         inp: []
       }, {
-        desc: 'too many files', 
+        desc: 'too many files',
         inp: [dummyFile1, dummyFile2]
       }]
 
@@ -274,20 +274,20 @@ describe('> nehubaViewerGlue.component.ts', () => {
         describe(`> ${desc}`, () => {
           beforeEach(() => {
             input = inp
-  
+
             const cmp = fixture.componentInstance
             cmp.handleFileDrop(input)
           })
-  
+
           it('> should not call addnglayer', () => {
             expect(removeNgLayersSpy).not.toHaveBeenCalled()
             expect(addNgLayerSpy).not.toHaveBeenCalled()
           })
-  
+
           // TODO having a difficult time getting snackbar harness
           // it('> snackbar should show error message', async () => {
           //   console.log('get harness')
-            
+
           //   rootLoader = TestbedHarnessEnvironment.documentRootLoader(fixture)
           //   const loader = TestbedHarnessEnvironment.loader(fixture)
           //   fixture.detectChanges()