From a6d3b208b01a18f42fbef394607d7edaf4b3769d Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 12 Apr 2021 15:10:29 +0200
Subject: [PATCH 1/4] Hide buttons when no routing to sink

---
 .../components/app-menu/app-menu.component.html |  2 +-
 .../components/app-menu/app-menu.component.ts   | 16 +++++++++++++---
 .../help-menu/help-menu.component.html          |  2 +-
 .../components/help-menu/help-menu.component.ts | 16 +++++++++++++---
 .../notification-menu.component.html            |  2 +-
 .../notification-menu.component.ts              | 17 +++++++++++++----
 6 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/projects/common/src/fm/components/app-menu/app-menu.component.html b/projects/common/src/fm/components/app-menu/app-menu.component.html
index 950d683..5a9b54d 100644
--- a/projects/common/src/fm/components/app-menu/app-menu.component.html
+++ b/projects/common/src/fm/components/app-menu/app-menu.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user}">
+    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Apps"><i class="fas fa-th" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
             <router-outlet name="app-menu"></router-outlet>            
diff --git a/projects/common/src/fm/components/app-menu/app-menu.component.ts b/projects/common/src/fm/components/app-menu/app-menu.component.ts
index 4df1e62..d9f405a 100644
--- a/projects/common/src/fm/components/app-menu/app-menu.component.ts
+++ b/projects/common/src/fm/components/app-menu/app-menu.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 
 import { IUser } from '../../models/user';
@@ -11,16 +12,25 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './app-menu.component.html',
   styleUrls: ['./app-menu.component.scss']
 })
-export class AppMenuComponent implements OnInit {
+export class AppMenuComponent implements OnInit,AfterViewInit {
 
   @Input() user:IUser;
   @Input() showMenu:boolean;
+  public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>) { }
+  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
 
   ngOnInit(): void {
   }
 
+  ngAfterViewInit() {
+    this.route.children.forEach((entry) => {
+      if(entry.outlet=="app-menu") {
+        this.noContent=false;
+      }
+    });
+  }
+
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleAppMenu());
diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.html b/projects/common/src/fm/components/help-menu/help-menu.component.html
index c679e87..e6f42ad 100644
--- a/projects/common/src/fm/components/help-menu/help-menu.component.html
+++ b/projects/common/src/fm/components/help-menu/help-menu.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user}">
+    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Help"><i class="fas fa-question" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
             <router-outlet name="help-menu"></router-outlet>            
diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.ts b/projects/common/src/fm/components/help-menu/help-menu.component.ts
index f3ca928..ad2995e 100644
--- a/projects/common/src/fm/components/help-menu/help-menu.component.ts
+++ b/projects/common/src/fm/components/help-menu/help-menu.component.ts
@@ -1,5 +1,6 @@
 import { Input } from '@angular/core';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit,AfterViewInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 import { IUser } from '../../models/user';
 import {Store} from '@ngrx/store';
@@ -11,16 +12,25 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './help-menu.component.html',
   styleUrls: ['./help-menu.component.scss']
 })
-export class HelpMenuComponent implements OnInit {
+export class HelpMenuComponent implements OnInit, AfterViewInit {
   
   @Input() user:IUser;
   @Input() showMenu:boolean;
+  public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>) { }
+  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
 
   ngOnInit(): void {
   }
 
+  ngAfterViewInit() {
+    this.route.children.forEach((entry) => {
+      if(entry.outlet=="help-menu") {
+        this.noContent=false;
+      }
+    });
+  }
+
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleHelpMenu());
diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.html b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
index fab5e66..5d25964 100644
--- a/projects/common/src/fm/components/notification-menu/notification-menu.component.html
+++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user}">
+    <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span class="unread badge bg-info notification rounded-pill hidden" [ngClass]="{'hidden':unread==0}">{{unread}}</span>
         <span i18n-title title="Notifications"><i class="fas fa-bell" [ngClass]="{'fa-bell-on':unread!=0}" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
index c1b2ace..349e214 100644
--- a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
+++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, Input } from '@angular/core';
-
+import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 import { IUser } from '../../models/user';
 import {Store} from '@ngrx/store';
@@ -11,17 +11,26 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './notification-menu.component.html',
   styleUrls: ['./notification-menu.component.scss']
 })
-export class NotificationMenuComponent implements OnInit {
+export class NotificationMenuComponent implements OnInit,AfterViewInit {
 
   @Input() unread:number;
   @Input() user:IUser;
   @Input() showMenu:boolean;
+  public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>) { }
+  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
 
   ngOnInit(): void {
   }
 
+  ngAfterViewInit() {
+    this.route.children.forEach((entry) => {
+      if(entry.outlet=="notification-menu") {
+        this.noContent=false;
+      }
+    });
+  }
+
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleNotificationMenu());

From 1380d7169aa5cfbb2e2a04b432560ae6bfd287a7 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 12 Apr 2021 15:52:42 +0200
Subject: [PATCH 2/4] Fix trigger

---
 .../app-menu/app-menu.component.html          |  2 +-
 .../components/app-menu/app-menu.component.ts | 24 +++++++++----------
 .../help-menu/help-menu.component.html        |  2 +-
 .../help-menu/help-menu.component.ts          | 23 +++++++++---------
 .../notification-menu.component.html          |  2 +-
 .../notification-menu.component.ts            | 23 +++++++++---------
 6 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/projects/common/src/fm/components/app-menu/app-menu.component.html b/projects/common/src/fm/components/app-menu/app-menu.component.html
index 5a9b54d..be37a1f 100644
--- a/projects/common/src/fm/components/app-menu/app-menu.component.html
+++ b/projects/common/src/fm/components/app-menu/app-menu.component.html
@@ -2,7 +2,7 @@
     <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Apps"><i class="fas fa-th" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="app-menu"></router-outlet>            
+            <router-outlet name="app-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
        </div>
     </div>
 </div>
diff --git a/projects/common/src/fm/components/app-menu/app-menu.component.ts b/projects/common/src/fm/components/app-menu/app-menu.component.ts
index d9f405a..9c9a93a 100644
--- a/projects/common/src/fm/components/app-menu/app-menu.component.ts
+++ b/projects/common/src/fm/components/app-menu/app-menu.component.ts
@@ -1,6 +1,4 @@
-import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-
+import { Component, OnInit, Input } from '@angular/core';
 
 import { IUser } from '../../models/user';
 import {Store} from '@ngrx/store';
@@ -12,28 +10,28 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './app-menu.component.html',
   styleUrls: ['./app-menu.component.scss']
 })
-export class AppMenuComponent implements OnInit,AfterViewInit {
+export class AppMenuComponent implements OnInit {
 
   @Input() user:IUser;
   @Input() showMenu:boolean;
   public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
+  constructor(private store: Store<appReducers.State>) { }
 
   ngOnInit(): void {
   }
 
-  ngAfterViewInit() {
-    this.route.children.forEach((entry) => {
-      if(entry.outlet=="app-menu") {
-        this.noContent=false;
-      }
-    });
-  }
-
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleAppMenu());
   } 
 
+  activateRoute() {
+    this.noContent=false;
+  }
+
+  deActivateRoute() {
+    this.noContent=true;
+  }
+
 }
diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.html b/projects/common/src/fm/components/help-menu/help-menu.component.html
index e6f42ad..5cd1a1f 100644
--- a/projects/common/src/fm/components/help-menu/help-menu.component.html
+++ b/projects/common/src/fm/components/help-menu/help-menu.component.html
@@ -2,7 +2,7 @@
     <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Help"><i class="fas fa-question" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="help-menu"></router-outlet>            
+            <router-outlet name="help-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()></router-outlet>            
        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.ts b/projects/common/src/fm/components/help-menu/help-menu.component.ts
index ad2995e..aababd0 100644
--- a/projects/common/src/fm/components/help-menu/help-menu.component.ts
+++ b/projects/common/src/fm/components/help-menu/help-menu.component.ts
@@ -1,6 +1,5 @@
 import { Input } from '@angular/core';
-import { Component, OnInit,AfterViewInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit } from '@angular/core';
 
 import { IUser } from '../../models/user';
 import {Store} from '@ngrx/store';
@@ -12,27 +11,27 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './help-menu.component.html',
   styleUrls: ['./help-menu.component.scss']
 })
-export class HelpMenuComponent implements OnInit, AfterViewInit {
+export class HelpMenuComponent implements OnInit {
   
   @Input() user:IUser;
   @Input() showMenu:boolean;
   public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
+  constructor(private store: Store<appReducers.State>) { }
 
   ngOnInit(): void {
   }
 
-  ngAfterViewInit() {
-    this.route.children.forEach((entry) => {
-      if(entry.outlet=="help-menu") {
-        this.noContent=false;
-      }
-    });
-  }
-
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleHelpMenu());
   } 
+
+  activateRoute() {
+    this.noContent=false;
+  }
+
+  deActivateRoute() {
+    this.noContent=true;
+  }
 }
diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.html b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
index 5d25964..6b3b526 100644
--- a/projects/common/src/fm/components/notification-menu/notification-menu.component.html
+++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
@@ -3,7 +3,7 @@
         <span class="unread badge bg-info notification rounded-pill hidden" [ngClass]="{'hidden':unread==0}">{{unread}}</span>
         <span i18n-title title="Notifications"><i class="fas fa-bell" [ngClass]="{'fa-bell-on':unread!=0}" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="notification-menu"></router-outlet>            
+            <router-outlet name="notification-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()></router-outlet>            
        </div>
     </div>
 </div>
diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
index 349e214..aa9a518 100644
--- a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
+++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts
@@ -1,5 +1,4 @@
-import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, OnInit, Input } from '@angular/core';
 
 import { IUser } from '../../models/user';
 import {Store} from '@ngrx/store';
@@ -11,29 +10,29 @@ import * as appActions from '../../actions/app-common.actions';
   templateUrl: './notification-menu.component.html',
   styleUrls: ['./notification-menu.component.scss']
 })
-export class NotificationMenuComponent implements OnInit,AfterViewInit {
+export class NotificationMenuComponent implements OnInit {
 
   @Input() unread:number;
   @Input() user:IUser;
   @Input() showMenu:boolean;
   public noContent: boolean = true;
 
-  constructor(private store: Store<appReducers.State>, private route: ActivatedRoute) { }
+  constructor(private store: Store<appReducers.State>) { }
 
   ngOnInit(): void {
   }
 
-  ngAfterViewInit() {
-    this.route.children.forEach((entry) => {
-      if(entry.outlet=="notification-menu") {
-        this.noContent=false;
-      }
-    });
-  }
-
   toggle(event:MouseEvent) {
     event.stopPropagation();
     this.store.dispatch(new appActions.ToggleNotificationMenu());
   } 
 
+  activateRoute() {
+    this.noContent=false;
+  }
+
+  deActivateRoute() {
+    this.noContent=true;
+  }
+
 }

From 0485c163ad5ef27b1932bf7100e8cb29a8eb5652 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 12 Apr 2021 15:55:38 +0200
Subject: [PATCH 3/4] Fix build

---
 .../common/src/fm/components/help-menu/help-menu.component.html | 2 +-
 .../notification-menu/notification-menu.component.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.html b/projects/common/src/fm/components/help-menu/help-menu.component.html
index 5cd1a1f..c485960 100644
--- a/projects/common/src/fm/components/help-menu/help-menu.component.html
+++ b/projects/common/src/fm/components/help-menu/help-menu.component.html
@@ -2,7 +2,7 @@
     <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Help"><i class="fas fa-question" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="help-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()></router-outlet>            
+            <router-outlet name="help-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.html b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
index 6b3b526..915c2cb 100644
--- a/projects/common/src/fm/components/notification-menu/notification-menu.component.html
+++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.html
@@ -3,7 +3,7 @@
         <span class="unread badge bg-info notification rounded-pill hidden" [ngClass]="{'hidden':unread==0}">{{unread}}</span>
         <span i18n-title title="Notifications"><i class="fas fa-bell" [ngClass]="{'fa-bell-on':unread!=0}" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="notification-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()></router-outlet>            
+            <router-outlet name="notification-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
        </div>
     </div>
 </div>

From dcc24aa1493671b3cd88f43dff2d8dff1c601e27 Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Mon, 19 Apr 2021 08:43:20 +0200
Subject: [PATCH 4/4] Fix setExtent

---
 .../common-map/src/fm-map/effects/map.effects.ts  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts
index 01ca2bd..edf501e 100644
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/projects/common-map/src/fm-map/effects/map.effects.ts
@@ -154,14 +154,15 @@ export class MapEffects {
     @Effect()
     zoomToExtent2$: Observable<Action> = this.actions$.pipe(
       ofType(mapActions.SETFEATURES),
-      map((action: mapActions.SetFeatures) => {
+      switchMap((action: mapActions.SetFeatures) => {
         let extent = createEmpty();
-           if (extent) {
-            for (let f of action.features) {
-              extend(extent, (f as Feature).getGeometry().getExtent());
-            }
-          }        
-        return new mapActions.SetExtent(extent);
+        if (extent) {
+          for (let f of action.features) {
+            extend(extent, (f as Feature).getGeometry().getExtent());
+          }
+          if(action.features.length>0) return of(new mapActions.SetExtent(extent));
+        }        
+        return EMPTY;
       }));
 
   @Effect()