Merge pull request #2584 from cloudfoundry-incubator/fix-services-wal…

…l-exceptiohn Clear service instances pagination after disconnecting an endpoint
cloudfoundry · Jun 29, 2018 · d604302 · d604302
2 parents 6fbc52a + 31221f6
commit d604302
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...ntend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts b/...ntend/app/features/service-catalog/service-catalog-page/service-catalog-page.component.ts
@@ -2,13 +2,11 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source';
 import {
   CfServicesListConfigService,
 } from '../../../shared/components/list/list-types/cf-services/cf-services-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
-import { APIResource } from '../../../store/types/api.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cloud-foundry/cf.helpers';
 
 @Component({
@@ -29,7 +27,10 @@ export class ServiceCatalogPageComponent {
 
   constructor(public cloudFoundryService: CloudFoundryService) {
     this.cfIds$ = cloudFoundryService.cFEndpoints$.pipe(
-      map(endpoints => endpoints.map(endpoint => endpoint.guid))
+      map(endpoints => endpoints
+        .filter(endpoint => endpoint.connectionStatus === 'connected')
+        .map(endpoint => endpoint.guid)
+      )
     );
   }
 }
diff --git a/src/frontend/app/features/services/services-wall/services-wall.component.ts b/src/frontend/app/features/services/services-wall/services-wall.component.ts
@@ -36,7 +36,10 @@ export class ServicesWallComponent implements OnDestroy {
 
     this.canCreateServiceInstance = CurrentUserPermissions.SERVICE_INSTANCE_CREATE;
     this.cfIds$ = cloudFoundryService.cFEndpoints$.pipe(
-      map(endpoints => endpoints.map(endpoint => endpoint.guid))
+      map(endpoints => endpoints
+        .filter(endpoint => endpoint.connectionStatus === 'connected')
+        .map(endpoint => endpoint.guid)
+      )
     );
 
     this.initCfOrgSpaceService = initCfOrgSpaceService(this.store,

diff --git a/...rontend/app/store/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts b/...rontend/app/store/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
@@ -5,6 +5,7 @@ import {
   organizationSchemaKey,
   serviceSchemaKey,
   spaceSchemaKey,
+  serviceInstancesSchemaKey,
 } from '../../helpers/entity-factory';
 import { PaginationState } from '../../types/pagination.types';
 
@@ -29,6 +30,7 @@ export function clearEndpointEntities(state: PaginationState, action: EndpointAc
     newState = paginationClearType(newState, organizationSchemaKey, defaultPaginationEntityState);
     newState = paginationClearType(newState, serviceSchemaKey, defaultPaginationEntityState);
     newState = paginationClearType(newState, cfUserSchemaKey, defaultPaginationEntityState);
+    newState = paginationClearType(newState, serviceInstancesSchemaKey, defaultPaginationEntityState);
     return newState;
   }
   return state;