[#986] Show zk memebr functionalities to pak user (#997)

- show funcitonalitites in map dropdown to pak user
cyfronet-fid · Dec 4, 2020 · 600608e · 600608e
1 parent 4bf241e
commit 600608e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/s4e-web/src/app/state/session/session.query.ts b/s4e-web/src/app/state/session/session.query.ts
@@ -35,6 +35,11 @@ export class SessionQuery extends Query<Session> {
     return this.getValue().admin;
   }
 
+  selectPakMember() {
+    return this.select('authorities')
+      .pipe(map(authorities => authorities.some(authority => authority === 'ROLE_MEMBER_PAK')));
+  }
+
   canDeleteInstitution() {
     return this.getValue().authorities.includes('OP_INSTITUTION_DELETE') || this.getValue().admin;
   }

diff --git a/s4e-web/src/app/views/map-view/map-view.component.html b/s4e-web/src/app/views/map-view/map-view.component.html
@@ -71,7 +71,7 @@
   </button>
   <ng-container *ngIf="showLoginOptions$ | async">
     <s4e-user-dropdown
-      [showAdvanced]="userIsZK$ | async"
+      [showAdvanced]="userIsAuthorizedForAdditionalFunctionalities$ | async"
       [userLoggedIn]="userLoggedIn$ | async"
       [hasHeightContrast]="hasHeightContrast$ | async"
       [hasLargeFont]="hasLargeFont$ | async"

diff --git a/s4e-web/src/app/views/map-view/map-view.component.ts b/s4e-web/src/app/views/map-view/map-view.component.ts
@@ -40,7 +40,7 @@ import {REPORT_TEMPLATES_MODAL_ID} from './zk/report-templates-modal/report-temp
 import {ReportTemplateQuery} from './zk/state/report-templates/report-template.query';
 import {ReportTemplateStore} from './zk/state/report-templates/report-template.store';
 import {ViewConfigurationService} from './state/view-configuration/view-configuration.service';
-import {filterFalse, filterNotNull} from '../../utils/rxjs/observable';
+import {filterFalse, filterNotNull, mapAnyTrue} from '../../utils/rxjs/observable';
 
 
 @Component({
@@ -83,7 +83,10 @@ export class MapViewComponent implements OnInit, OnDestroy {
   public showProductDescription$: Observable<boolean> = this.mapQuery.selectShowProductDescription();
   public selectedLocation$: Observable<LocationSearchResult | null>;
   public overlays$: Observable<UIOverlay[]> = this.overlayQuery.selectVisibleAsUIOverlays();
-  public userIsZK$: Observable<boolean> = this.sessionQuery.selectMemberZK();
+  public userIsAuthorizedForAdditionalFunctionalities$: Observable<boolean> = combineLatest([
+    this.sessionQuery.selectPakMember(),
+    this.sessionQuery.selectMemberZK()
+  ]).pipe(mapAnyTrue());
   public timelineResolution$: Observable<number> = this.productQuery.selectTimelineResolution();
   public legend$ = this.legendQuery.selectLegend();
   public hasHeightContrast$ = this.viewConfigurationQuery.select('highContrast');