Merge branch 'minor-fixes' into entity-pipeline

cloudfoundry · Aug 27, 2019 · 28248d2 · 28248d2
2 parents b0eea9a + 7209bd5
commit 28248d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/...cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts b/...cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts
@@ -1,19 +1,13 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 import { IFeatureFlag } from '../../../../../../../../core/src/core/cf-api.types';
-import { APIResource } from './../../../../../../../../store/src/types/api.types';
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 
 @Component({
   selector: 'app-table-cell-feature-flag-state',
   templateUrl: './table-cell-feature-flag-state.component.html',
   styleUrls: ['./table-cell-feature-flag-state.component.scss']
 })
-export class TableCellFeatureFlagStateComponent implements OnInit {
-
-  @Input() row: APIResource<IFeatureFlag>;
-  constructor() { }
-
-  ngOnInit() {
-  }
-
+export class TableCellFeatureFlagStateComponent extends TableCellCustom<IFeatureFlag> {
+  @Input() row: IFeatureFlag;
 }
diff --git a/...ypes/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts b/...ypes/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts
@@ -10,7 +10,7 @@ import { APIResource } from '../../../../../../../../store/src/types/api.types';
   templateUrl: './table-cell-space-name.component.html',
   styleUrls: ['./table-cell-space-name.component.scss']
 })
-export class TableCellSpaceNameComponent<T> extends TableCellCustom<APIResource<IServiceInstance>> implements OnInit {
+export class TableCellSpaceNameComponent extends TableCellCustom<APIResource<IServiceInstance>> implements OnInit {
 
   breadcrumbs: {};
   spaceUrl: string[];

diff --git a/...rc/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts b/...rc/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts
@@ -20,7 +20,11 @@ export const successEntityHandler: SucceedOrFailEntityRequestHandler = (
     if (action.removeEntityOnDelete) {
       actionDispatcher(new ClearPaginationOfEntity(action, action.guid));
     } else {
-      actionDispatcher(new ClearPaginationOfType(action));
+      if (action.proxyPaginationEntityConfig) {
+        actionDispatcher(new ClearPaginationOfType(action.proxyPaginationEntityConfig));
+      } else {
+        actionDispatcher(new ClearPaginationOfType(action));
+      }
     }
 
     if (Array.isArray(action.clearPaginationEntityKeys)) {