Same Tweaks at space level

- Show edit quota on space level quota details page - Ensure we return from edit stepper from org's space quota list, org level quota page and space level quota page - Apply permissions to edit quota
cloudfoundry · Aug 1, 2019 · 3c2ca17 · 3c2ca17
1 parent 8e3f176
commit 3c2ca17
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 17 deletions.
diff --git a/...d/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts b/...d/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
@@ -1,8 +1,10 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
+import { QUOTA_FROM_LIST } from '../../../shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
+import { QUOTA_SPACE_GUID } from '../space-quota-definition/space-quota-definition.component';
 
 @Component({
   selector: 'app-edit-space-quota',
@@ -21,6 +23,15 @@ export class EditSpaceQuotaComponent {
     const cfId = activeRouteCfOrgSpace.cfGuid;
     const orgId = activeRouteCfOrgSpace.orgGuid;
     const spaceQuotaId = activatedRoute.snapshot.params.quotaId;
-    this.cfSpaceQuotaUrl = `/cloud-foundry/${cfId}/organizations/${orgId}/space-quota-definitions/${spaceQuotaId}`;
+    const spaceGuid = activatedRoute.snapshot.queryParams[QUOTA_SPACE_GUID];
+    const fromList = activatedRoute.snapshot.queryParams[QUOTA_FROM_LIST];
+
+    if (spaceGuid) {
+      this.cfSpaceQuotaUrl = `/cloud-foundry/${cfId}/organizations/${orgId}/spaces/${spaceGuid}/space-quota`;
+    } else if (fromList) {
+      this.cfSpaceQuotaUrl = `/cloud-foundry/${cfId}/organizations/${orgId}/space-quota-definitions`;
+    } else {
+      this.cfSpaceQuotaUrl = `/cloud-foundry/${cfId}/organizations/${orgId}/space-quota-definitions/${spaceQuotaId}`;
+    }
   }
 }
diff --git a/...e/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html b/...e/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
@@ -1,12 +1,22 @@
-<app-page-header [breadcrumbs]="breadcrumbs$ | async" *ngIf="quotaGuid">
+<app-page-header [breadcrumbs]="breadcrumbs$ | async" *ngIf="isOrg">
   <h1>{{ (quotaDefinition$ | async)?.entity?.name }}</h1>
   <div class="page-header-right" *ngIf="canEditQuota$ | async">
-    <button mat-icon-button name="edit" [routerLink]="editLink" matTooltip="Edit">
+    <!-- Show edit button in top blue bar -->
+    <button mat-icon-button name="edit" [routerLink]="editLink$ | async" [queryParams]="editParams" matTooltip="Edit">
       <mat-icon>edit</mat-icon>
     </button>
   </div>
 </app-page-header>
 
+<app-page-sub-nav *ngIf="!isOrg">
+  <!-- Show edit button inline with header-->
+  <ng-container *ngIf="canEditQuota$ | async">
+    <button mat-icon-button name="edit" [routerLink]="editLink$ | async" [queryParams]="editParams" matTooltip="Edit">
+      <mat-icon>edit</mat-icon>
+    </button>
+  </ng-container>
+</app-page-sub-nav>
+
 <div class="quota-definition-base space-quota-definition-page" *ngIf="quotaDefinition$ | async as quotaDefinition">
   <app-loading-page [isLoading]="detailsLoading$" text="Retrieving details">
     <div class="quota-definition-base__name-sub-text">Name</div>

diff --git a/...ore/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts b/...ore/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
-import { filter, first, map, switchMap, tap } from 'rxjs/operators';
+import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { GetSpaceQuotaDefinition } from '../../../../../store/src/actions/quota-definitions.actions';
 import { AppState } from '../../../../../store/src/app-state';
@@ -18,6 +18,8 @@ import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
 
+export const QUOTA_SPACE_GUID = 'space';
+
 @Component({
   selector: 'app-space-quota-definition',
   styleUrls: ['../quota-definition-base/quota-definition-base.component.scss', './space-quota-definition.component.scss'],
@@ -33,10 +35,12 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
   orgGuid: string;
   spaceGuid: string;
   quotaGuid: string;
-  editLink: string[];
+  editLink$: Observable<string[]>;
+  editParams: object;
   detailsLoading$: Observable<boolean>;
   spaceSubscriber: Subscription;
   public canEditQuota$: Observable<boolean>;
+  public isOrg = false;
 
   constructor(
     protected entityServiceFactory: EntityServiceFactory,
@@ -47,17 +51,10 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
   ) {
     super(entityServiceFactory, store, activeRouteCfOrgSpace, activatedRoute);
     this.setupQuotaDefinitionObservable();
-    this.editLink = [
-      '/cloud-foundry',
-      this.cfGuid,
-      'organizations',
-      this.orgGuid,
-      'space-quota-definitions',
-      this.quotaGuid,
-      'edit-space-quota'
-    ];
-    const { cfGuid, orgGuid } = activeRouteCfOrgSpace;
-    this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid).pipe(tap(console.log));
+    const { cfGuid, orgGuid, spaceGuid } = activeRouteCfOrgSpace;
+    this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
+    this.isOrg = !spaceGuid;
+    this.editParams = { [QUOTA_SPACE_GUID]: spaceGuid };
   }
 
   setupQuotaDefinitionObservable() {
@@ -80,6 +77,18 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
       filter(definition => !!definition),
       map(definition => definition.entityRequestInfo.fetching)
     );
+
+    this.editLink$ = quotaGuid$.pipe(
+      map(quotaGuid => [
+        '/cloud-foundry',
+        this.cfGuid,
+        'organizations',
+        this.orgGuid,
+        'space-quota-definitions',
+        quotaGuid,
+        'edit-space-quota'
+      ])
+    );
   }
 
   protected getBreadcrumbs(

diff --git a/.../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts b/.../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
@@ -17,6 +17,7 @@ import { ConfirmationDialogService } from '../../../confirmation-dialog.service'
 import { ITableColumn } from '../../list-table/table.types';
 import { IListAction, ListViewTypes } from '../../list.component.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
+import { QUOTA_FROM_LIST } from '../cf-quotas/cf-quotas-list-config.service';
 import { TableCellQuotaComponent } from '../cf-quotas/table-cell-quota/table-cell-quota.component';
 import { CfOrgSpaceQuotasDataSourceService } from './cf-space-quotas-data-source.service';
 
@@ -111,7 +112,10 @@ export class CfSpaceQuotasListConfigService extends BaseCfListConfig<APIResource
           'space-quota-definitions',
           item.metadata.guid,
           'edit-space-quota'
-        ]
+        ],
+        query: {
+          [QUOTA_FROM_LIST]: true
+        }
       })
     );
   }