fix access permissions

Author: sei-tspencer

src/app/components/scenario-templates/scenario-template-memberships/scenario-template-memberships/scenario-template-memberships.component.html

@@ -11,10 +11,10 @@ <h1>{{ scenarioTemplate.name }}</h1>
 </div>
 <div class="d-flex gap-5 justify-content-center">
   <app-scenario-template-membership-list [users]="nonMembers$ | async" [groups]="groupNonMembers$ | async"
-    [canEdit]="canEdit" (createMembership)="createMembership($event)"></app-scenario-template-membership-list>
+    [canEdit]="canEdit$ | async" (createMembership)="createMembership($event)"></app-scenario-template-membership-list>
 
   <app-scenario-template-member-list [memberships]="memberships$ | async" [users]="members$ | async"
-    [groups]="groupMembers$ | async" [roles]="roles$ | async" [canEdit]="canEdit"
+    [groups]="groupMembers$ | async" [roles]="roles$ | async" [canEdit]="canEdit$ | async"
     (deleteMembership)="deleteMembership($event)"
     (editMembership)="editMembership($event)"></app-scenario-template-member-list>
 </div>

src/app/components/scenario-templates/scenario-template-memberships/scenario-template-memberships/scenario-template-memberships.component.ts

@@ -8,12 +8,11 @@ import {
   EventEmitter,
   Input,
   OnChanges,
-  OnDestroy,
   OnInit,
   Output,
   SimpleChanges,
 } from '@angular/core';
-import { combineLatest, forkJoin, Observable } from 'rxjs';
+import { combineLatest, forkJoin, Observable, of } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 import { ScenarioTemplateQuery } from 'src/app/data/scenario-template/scenario-template.query';
 import { ScenarioTemplateMembershipDataService } from 'src/app/data/scenario-template/scenario-template-membership-data.service';
@@ -26,6 +25,7 @@ import {
 } from 'src/app/generated/steamfitter.api';
 import { GroupDataService } from 'src/app/data/group/group-data.service';
 import { PermissionDataService } from 'src/app/data/permission/permission-data.service';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-scenario-template-memberships',
@@ -50,7 +50,7 @@ export class ScenarioTemplateMembershipsComponent implements OnInit, OnChanges {
   groupNonMembers$ = this.selectGroups(false);
   groupMembers$ = this.selectGroups(true);
 
-  canEdit: boolean;
+  canEdit$: Observable<boolean>;
 
   constructor(
     private scenarioTemplateQuery: ScenarioTemplateQuery,
@@ -59,7 +59,8 @@ export class ScenarioTemplateMembershipsComponent implements OnInit, OnChanges {
     private userDataService: UserDataService,
     private userQuery: UserQuery,
     private groupDataService: GroupDataService,
-    private permissionDataService: PermissionDataService
+    private permissionDataService: PermissionDataService,
+    private activatedRoute: ActivatedRoute
   ) {}
 
   ngOnInit(): void {
@@ -71,6 +72,10 @@ export class ScenarioTemplateMembershipsComponent implements OnInit, OnChanges {
       this.scenarioTemplateRolesDataService.loadRoles(),
       this.groupDataService.load(),
     ]).subscribe();
+    this.permissionDataService
+      .loadScenarioTemplatePermissions(this.scenarioTemplateId)
+      .subscribe((x) =>
+        this.canEdit$ = of(this.permissionDataService.canEditScenarioTemplate(this.scenarioTemplateId)));
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -79,11 +84,9 @@ export class ScenarioTemplateMembershipsComponent implements OnInit, OnChanges {
       .pipe(
         filter((x) => x != null),
         tap(
-          (x) =>
-            (this.canEdit = this.permissionDataService.canEditScenarioTemplate(
-              x.id
-            ))
-        )
+          (x) => {
+            this.canEdit$ = of(this.permissionDataService.canEditScenarioTemplate(this.scenarioTemplateId));
+          })
       );
   }
 

src/app/data/permission/permission-data.service.ts

@@ -81,24 +81,33 @@ export class PermissionDataService {
       .getMyScenarioTemplatePermissions(scenarioTemplateId)
       .pipe(
         take(1),
-        tap((x) => (this._scenarioTemplatePermissions = x))
+        tap((x) => {
+          this._scenarioTemplatePermissions = x;
+        })
       );
   }
 
   canEditScenario(scenarioId: string): boolean {
     return this.canScenario(
-      SystemPermission.EditScenarios,
-      scenarioId,
-      ScenarioPermission.EditScenario
-    );
+        SystemPermission.EditScenarios,
+        scenarioId,
+        ScenarioPermission.EditScenario) ||
+      this.canScenario(
+        SystemPermission.ManageScenarios,
+        scenarioId,
+        ScenarioPermission.ManageScenario);
   }
 
   canEditScenarioTemplate(scenarioTemplateId: string): boolean {
     return this.canScenarioTemplate(
-      SystemPermission.EditScenarioTemplates,
-      scenarioTemplateId,
-      ScenarioTemplatePermission.EditScenarioTemplate
-    );
+        SystemPermission.EditScenarioTemplates,
+        scenarioTemplateId,
+        ScenarioTemplatePermission.EditScenarioTemplate) ||
+      this.canScenarioTemplate(
+        SystemPermission.ManageScenarioTemplates,
+        scenarioTemplateId,
+        ScenarioTemplatePermission.ManageScenarioTemplate
+      );
   }
 
   canManageScenario(scenarioId: string): boolean {