Add cf/org/space links to service instance table using common components

src/frontend/packages/core/src/shared/components/cf-org-space-links/cf-org-space-links.component.html

@@ -0,0 +1,5 @@
+<ng-container *ngIf="service?.multipleConnectedEndpoints$ | async">
+  <a [routerLink]="service?.getCfURL()">{{ service?.getCfName() | async }}</a> /
+</ng-container>
+<a [routerLink]="service?.getOrgURL()">{{ service?.getOrgName() | async}}</a> /
+<a [routerLink]="service?.getSpaceURL()" [queryParams]="spaceBreadCrumbs">{{ service?.getSpaceName()  | async}}</a>

src/frontend/packages/core/src/shared/components/cf-org-space-links/cf-org-space-links.component.spec.ts

@@ -0,0 +1,32 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { CfOrgSpaceLinksComponent } from './cf-org-space-links.component';
+
+
+describe('CfOrgSpaceLinksComponent', () => {
+  let component: CfOrgSpaceLinksComponent;
+  let fixture: ComponentFixture<CfOrgSpaceLinksComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CfOrgSpaceLinksComponent],
+      imports: [
+        RouterTestingModule,
+        createBasicStoreModule()
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CfOrgSpaceLinksComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/frontend/packages/core/src/shared/components/cf-org-space-links/cf-org-space-links.component.ts

@@ -0,0 +1,14 @@
+import { Component, Input } from '@angular/core';
+
+import { CfOrgSpaceLabelService } from '../../services/cf-org-space-label.service';
+
+@Component({
+  selector: 'app-cf-org-space-links',
+  templateUrl: './cf-org-space-links.component.html',
+  styleUrls: ['./cf-org-space-links.component.scss']
+})
+export class CfOrgSpaceLinksComponent {
+
+  @Input() service: CfOrgSpaceLabelService;
+  @Input() spaceBreadCrumbs: string;
+}

src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts

@@ -12,15 +12,16 @@ import { ApplicationStateIconPipe } from '../../../application-state/application
 import { ApplicationStateComponent } from '../../../application-state/application-state.component';
 import { ApplicationStateService } from '../../../application-state/application-state.service';
 import { BooleanIndicatorComponent } from '../../../boolean-indicator/boolean-indicator.component';
+import { CfOrgSpaceLinksComponent } from '../../../cf-org-space-links/cf-org-space-links.component';
 import { CfRoleCheckboxComponent } from '../../../cf-role-checkbox/cf-role-checkbox.component';
 import { AppChipsComponent } from '../../../chips/chips.component';
 import { GithubCommitAuthorComponent } from '../../../github-commit-author/github-commit-author.component';
 import { RunningInstancesComponent } from '../../../running-instances/running-instances.component';
+import { ServicePlanPriceComponent } from '../../../service-plan-price/service-plan-price.component';
+import { ServicePlanPublicComponent } from '../../../service-plan-public/service-plan-public.component';
 import { UsageGaugeComponent } from '../../../usage-gauge/usage-gauge.component';
 import { EventTabActorIconPipe } from '../../list-types/app-event/table-cell-event-action/event-tab-actor-icon.pipe';
 import { listTableCells, TableCellComponent } from './table-cell.component';
-import { ServicePlanPublicComponent } from '../../../service-plan-public/service-plan-public.component';
-import { ServicePlanPriceComponent } from '../../../service-plan-price/service-plan-price.component';
 
 describe('TableCellComponent', () => {
   let component: TableCellComponent<any>;
@@ -45,7 +46,8 @@ describe('TableCellComponent', () => {
         CfRoleCheckboxComponent,
         GithubCommitAuthorComponent,
         ServicePlanPriceComponent,
-        ServicePlanPublicComponent
+        ServicePlanPublicComponent,
+        CfOrgSpaceLinksComponent
       ],
       imports: [
         CoreModule

src/frontend/packages/core/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts

@@ -1,21 +1,29 @@
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
 
+import { AppState } from '../../../../../../../store/src/app-state';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IApp } from '../../../../../core/cf-api.types';
-import { haveMultiConnectedCfs } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CfOrgSpaceLabelService } from '../../../../services/cf-org-space-label.service';
 import { TableCellCustom } from '../../list.types';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { AppState } from '../../../../../../../store/src/app-state';
 
 
 export class TableCellAppCfOrgSpaceBase extends TableCellCustom<APIResource<IApp>> {
 
-  multipleConnectedEndpoints$: Observable<boolean>;
+  public cfOrgSpace: CfOrgSpaceLabelService;
 
-  constructor(store: Store<AppState>) {
+  constructor(private store: Store<AppState>) {
     super();
-    this.multipleConnectedEndpoints$ = haveMultiConnectedCfs(store);
   }
 
+  protected init(cfGuid?: string, orgGuid?: string, spaceGuid?: string) {
+    if (!this.cfOrgSpace) {
+      this.cfOrgSpace = new CfOrgSpaceLabelService(
+        this.store,
+        cfGuid,
+        orgGuid,
+        spaceGuid
+      );
+    }
+  }
 
 }

src/frontend/packages/core/src/shared/components/list/list-types/app/card/card-app.component.html

@@ -1,4 +1,5 @@
-<app-meta-card class="app-card" [routerLink]="['/applications', row.entity.cfGuid , row.metadata.guid]" [status$]="appStatus$" [entityConfig]="entityConfig" [favorite]="favorite" [statusIcon]="false">
+<app-meta-card class="app-card" [routerLink]="['/applications', row.entity.cfGuid , row.metadata.guid]"
+  [status$]="appStatus$" [entityConfig]="entityConfig" [favorite]="favorite" [statusIcon]="false">
   <app-meta-card-title>
     <app-multiline-title>{{ row.entity.name }}</app-multiline-title>
   </app-meta-card-title>
@@ -11,25 +12,17 @@
   <app-meta-card-item>
     <app-meta-card-key>Instances</app-meta-card-key>
     <app-meta-card-value>
-      <app-running-instances [instances]="row.entity.instances" [cfGuid]="row.entity.cfGuid" [appGuid]="row.entity.guid">
+      <app-running-instances [instances]="row.entity.instances" [cfGuid]="row.entity.cfGuid"
+        [appGuid]="row.entity.guid">
       </app-running-instances>
     </app-meta-card-value>
   </app-meta-card-item>
-  <app-meta-card-item *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
-    <app-meta-card-key>CF/Org/Space</app-meta-card-key>
+  <app-meta-card-item>
+    <app-meta-card-key>{{cfOrgSpace.getLabel() | async}}</app-meta-card-key>
     <app-meta-card-value>
-      {{endpointName$ | async }}/{{ row.entity.space.entity.organization.entity.name }}/{{ row.entity.space.entity.name
-      }}
+      <app-cf-org-space-links [service]="cfOrgSpace"></app-cf-org-space-links>
     </app-meta-card-value>
   </app-meta-card-item>
-  <ng-template #singleEndpoint>
-    <app-meta-card-item>
-      <app-meta-card-key>Org/Space</app-meta-card-key>
-      <app-meta-card-value>
-        {{ row.entity.space.entity.organization.entity.name }}/{{ row.entity.space.entity.name }}
-      </app-meta-card-value>
-    </app-meta-card-item>
-  </ng-template>
   <app-meta-card-item>
     <app-meta-card-key>Created</app-meta-card-key>
     <app-meta-card-value>

src/frontend/packages/core/src/shared/components/list/list-types/app/card/card-app.component.ts

@@ -4,20 +4,14 @@ import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../../../store/src/app-state';
-import {
-  applicationSchemaKey,
-  endpointSchemaKey,
-  entityFactory,
-} from '../../../../../../../../store/src/helpers/entity-factory';
-import { selectEntity } from '../../../../../../../../store/src/selectors/api.selectors';
+import { applicationSchemaKey, entityFactory } from '../../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { IAppFavMetadata } from '../../../../../../cf-favourite-types';
-import { IApp } from '../../../../../../core/cf-api.types';
+import { IApp, ISpace } from '../../../../../../core/cf-api.types';
 import { getFavoriteFromCfEntity } from '../../../../../../core/user-favorite-helpers';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
-import { haveMultiConnectedCfs } from '../../../../../../features/cloud-foundry/cf.helpers';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 import { CardStatus, ComponentEntityMonitorConfig } from '../../../../../shared.types';
 import { ApplicationStateData, ApplicationStateService } from '../../../../application-state/application-state.service';
 import { CardCell } from '../../../list.types';
@@ -33,9 +27,8 @@ export class CardAppComponent extends CardCell<APIResource<IApp>> implements OnI
   applicationState$: Observable<ApplicationStateData>;
 
   appStatus$: Observable<CardStatus>;
-  endpointName$: Observable<string>;
-  multipleConnectedEndpoints$: Observable<boolean>;
   entityConfig: ComponentEntityMonitorConfig;
+  cfOrgSpace: CfOrgSpaceLabelService;
 
   public favorite: UserFavorite<IAppFavMetadata>;
 
@@ -48,10 +41,11 @@ export class CardAppComponent extends CardCell<APIResource<IApp>> implements OnI
 
   ngOnInit() {
     this.entityConfig = new ComponentEntityMonitorConfig(this.row.metadata.guid, entityFactory(applicationSchemaKey));
-    this.multipleConnectedEndpoints$ = haveMultiConnectedCfs(this.store);
-
-    this.endpointName$ = this.store.select<EndpointModel>(selectEntity(endpointSchemaKey, this.row.entity.cfGuid)).pipe(
-      map(endpoint => endpoint ? endpoint.name : '')
+    this.cfOrgSpace = new CfOrgSpaceLabelService(
+      this.store,
+      this.row.entity.cfGuid,
+      (this.row.entity.space as APIResource<ISpace>).entity.organization_guid,
+      this.row.entity.space_guid
     );
 
     this.favorite = getFavoriteFromCfEntity(this.row, applicationSchemaKey);

src/frontend/packages/core/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.html

@@ -1,6 +1 @@
-<span *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
-  CF/Org/Space
-</span>
-<ng-template #singleEndpoint>
-  Org/Space
-</ng-template>
+{{ cfOrgSpace?.getLabel() | async}}

src/frontend/packages/core/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.ts

@@ -1,8 +1,8 @@
-import { AppState } from './../../../../../../../../store/src/app-state';
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { TableCellAppCfOrgSpaceBase } from '../TableCellAppCfOrgSpaceBase';
+import { AppState } from './../../../../../../../../store/src/app-state';
 
 @Component({
   selector: 'app-table-cell-app-cforgspace-header',
@@ -13,6 +13,7 @@ export class TableCellAppCfOrgSpaceHeaderComponent extends TableCellAppCfOrgSpac
 
   constructor(store: Store<AppState>) {
     super(store);
+    this.init();
   }
 
 }

src/frontend/packages/core/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.html

@@ -1,6 +1 @@
-<span *ngIf="multipleConnectedEndpoints$ | async; else singleEndpoint">
-  {{endpointName$ | async }}/{{ row.entity.space.entity.organization.entity.name }}/{{ row.entity.space.entity.name }}
-</span>
-<ng-template #singleEndpoint>
-  {{ row.entity.space.entity.organization.entity.name }}/{{ row.entity.space.entity.name }}
-</ng-template>
+<app-cf-org-space-links [service]="cfOrgSpace"></app-cf-org-space-links>

src/frontend/packages/core/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts

@@ -1,30 +1,27 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
 
-import { TableCellAppCfOrgSpaceBase } from '../TableCellAppCfOrgSpaceBase';
 import { AppState } from '../../../../../../../../store/src/app-state';
-import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
-import { selectEntity } from '../../../../../../../../store/src/selectors/api.selectors';
-import { endpointSchemaKey } from '../../../../../../../../store/src/helpers/entity-factory';
+import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IApp, ISpace } from '../../../../../../core/cf-api.types';
+import { TableCellAppCfOrgSpaceBase } from '../TableCellAppCfOrgSpaceBase';
 
 @Component({
   selector: 'app-table-cell-app-cforgspace',
   templateUrl: './table-cell-app-cforgspace.component.html',
   styleUrls: ['./table-cell-app-cforgspace.component.scss'],
 })
-export class TableCellAppCfOrgSpaceComponent extends TableCellAppCfOrgSpaceBase implements OnInit {
+export class TableCellAppCfOrgSpaceComponent extends TableCellAppCfOrgSpaceBase {
 
-  endpointName$: Observable<string>;
+  @Input('row')
+  set row(row: APIResource<IApp>) {
+    if (row) {
+      this.init(row.entity.cfGuid, (row.entity.space as APIResource<ISpace>).entity.organization_guid, row.entity.space_guid);
+    }
+  }
 
-  constructor(private store: Store<AppState>) {
+  constructor(store: Store<AppState>) {
     super(store);
   }
 
-  ngOnInit() {
-    this.endpointName$ = this.store.select<EndpointModel>(selectEntity(endpointSchemaKey, this.row.entity.cfGuid)).pipe(
-      map(endpoint => endpoint ? endpoint.name : '')
-    );
-  }
 }

src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts

@@ -15,6 +15,10 @@ import { ServiceActionHelperService } from '../../../../data-services/service-ac
 import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM } from '../../../add-service-instance/csi-mode.service';
 import { ITableColumn } from '../../list-table/table.types';
 import { defaultPaginationPageSizeOptionsTable, IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
+import {
+  TableCellAppCfOrgSpaceHeaderComponent,
+} from '../app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
+import { TableCellAppCfOrgSpaceComponent } from '../app/table-cell-app-cforgspace/table-cell-app-cforgspace.component';
 import {
   TableCellServiceInstanceAppsAttachedComponent,
 } from '../cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component';
@@ -27,9 +31,6 @@ import {
 import {
   TableCellServicePlanComponent,
 } from '../cf-spaces-service-instances/table-cell-service-plan/table-cell-service-plan.component';
-import {
-  TableCellSpaceNameComponent,
-} from '../cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component';
 
 interface CanCache {
   [spaceGuid: string]: Observable<boolean>;
@@ -61,9 +62,9 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
     },
     {
       columnId: 'space',
-      headerCell: () => 'Space',
-      cellComponent: TableCellSpaceNameComponent,
-      cellFlex: '1'
+      headerCellComponent: TableCellAppCfOrgSpaceHeaderComponent,
+      cellComponent: TableCellAppCfOrgSpaceComponent,
+      cellFlex: '2'
     },
     {
       columnId: 'service',

src/frontend/packages/core/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.html

@@ -5,9 +5,10 @@
     </app-multiline-title>
   </app-meta-card-title>
   <app-meta-card-item>
-    <app-meta-card-key>Space</app-meta-card-key>
+    <app-meta-card-key>{{cfOrgSpace.getLabel() | async}}</app-meta-card-key>
     <app-meta-card-value>
-      <a [routerLink]="getSpaceURL()" [queryParams]="getSpaceBreadcrumbs()">{{ getSpaceName() }}</a>
+      <app-cf-org-space-links [service]="cfOrgSpace" [spaceBreadCrumbs]="getSpaceBreadcrumbs()">
+      </app-cf-org-space-links>
     </app-meta-card-value>
   </app-meta-card-item>
   <app-meta-card-item>

src/frontend/packages/core/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts

@@ -1,12 +1,15 @@
 import { Component, Input } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 
+import { AppState } from '../../../../../../../../store/src/app-state';
 import { entityFactory, serviceInstancesSchemaKey } from '../../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IServiceExtra, IServiceInstance } from '../../../../../../core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../core/current-user-permissions.service';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig } from '../../../../../shared.types';
 import { AppChip } from '../../../../chips/chips.component';
 import { MetaCardMenuItem } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
@@ -26,6 +29,8 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   hasMultipleBindings = new BehaviorSubject(true);
   entityConfig: ComponentEntityMonitorConfig;
 
+  cfOrgSpace: CfOrgSpaceLabelService;
+
   @Input('row')
   set row(row: APIResource<IServiceInstance>) {
 
@@ -68,10 +73,18 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
           )
         }
       ];
+      if (!this.cfOrgSpace) {
+        this.cfOrgSpace = new CfOrgSpaceLabelService(
+          this.store,
+          this.cfGuid,
+          row.entity.space.entity.organization_guid,
+          row.entity.space_guid);
+      }
     }
   }
 
   constructor(
+    private store: Store<AppState>,
     private serviceActionHelperService: ServiceActionHelperService,
     private currentUserPermissionsService: CurrentUserPermissionsService
   ) {
@@ -112,16 +125,6 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
     return displayName;
   }
 
-  getSpaceName = () => this.serviceInstanceEntity.entity.space.entity.name;
-  getSpaceURL = () => [
-    '/cloud-foundry',
-    this.serviceInstanceEntity.entity.cfGuid,
-    'organizations',
-    this.serviceInstanceEntity.entity.space.entity.organization_guid,
-    'spaces',
-    this.serviceInstanceEntity.entity.space_guid,
-    'summary'
-  ]
   getSpaceBreadcrumbs = () => ({ breadcrumbs: 'services-wall' });
 
 }