Fix delete for multi action lists

cloudfoundry · richard-cox · Mar 22, 2019 · Feb 15, 2019 · Feb 19, 2019 · Feb 20, 2019
commit 52c4c7b26be37b39fd8ce2059bfe808034683c9d
diff --git a/...ts/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/...ts/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -1,13 +1,17 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { BehaviorSubject, of as observableOf, Observable } from 'rxjs';
 
 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 { entityFactory, serviceInstancesSchemaKey } from '../../../../../../store/helpers/entity-factory';
+import {
+  entityFactory,
+  serviceInstancesSchemaKey,
+  userProvidedServiceInstanceSchemaKey
+} from '../../../../../../store/helpers/entity-factory';
 import { APIResource } from '../../../../../../store/types/api.types';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
-import { ComponentEntityMonitorConfig } from '../../../../../shared.types';
+import { ComponentEntityMonitorConfig, CardStatus } from '../../../../../shared.types';
 import { AppChip } from '../../../../chips/chips.component';
 import { MetaCardMenuItem } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
@@ -27,13 +31,16 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   entityConfig: ComponentEntityMonitorConfig;
   userProvided: boolean;
 
+  status$: Observable<CardStatus>;
+
   @Input('row')
   set row(row: APIResource<IServiceInstance>) {
 
     if (row) {
-      this.entityConfig = new ComponentEntityMonitorConfig(row.metadata.guid, entityFactory(serviceInstancesSchemaKey));
       this.serviceInstanceEntity = row;
       this.userProvided = !this.serviceInstanceEntity.entity.service;
+      const schema = this.userProvided ? entityFactory(userProvidedServiceInstanceSchemaKey) : entityFactory(serviceInstancesSchemaKey);
+      this.entityConfig = new ComponentEntityMonitorConfig(row.metadata.guid, schema);
       this.serviceInstanceTags = row.entity.tags.map(t => ({
         value: t
       }));

diff --git a/src/frontend/app/shared/data-services/service-action-helper.service.ts b/src/frontend/app/shared/data-services/service-action-helper.service.ts
@@ -11,6 +11,7 @@ import { APIResource } from '../../store/types/api.types';
 import { RouterNav, RouterQueryParams } from '../../store/actions/router.actions';
 import { SERVICE_INSTANCE_TYPES } from '../components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
 import { DeleteUserProvidedInstance } from '../../store/actions/user-provided-service.actions';
+import { serviceInstancesSchemaKey } from '../../store/helpers/entity-factory';
 
 @Injectable()
 export class ServiceActionHelperService {
@@ -35,7 +36,7 @@ export class ServiceActionHelperService {
       }));
       return;
     }
-    const action = userProvided ? new DeleteUserProvidedInstance(endpointGuid, serviceInstanceGuid) :
+    const action = userProvided ? new DeleteUserProvidedInstance(endpointGuid, serviceInstanceGuid, serviceInstancesSchemaKey) :
       new DeleteServiceInstance(endpointGuid, serviceInstanceGuid);
     if (!noConfirm) {
 
@@ -59,7 +60,7 @@ export class ServiceActionHelperService {
     endpointGuid: string,
     userProvided = false
   ) => {
-    const action = userProvided ? new DeleteUserProvidedInstance(endpointGuid, serviceInstanceGuid) :
+    const action = userProvided ? new DeleteUserProvidedInstance(endpointGuid, serviceInstanceGuid, serviceInstancesSchemaKey) :
       new DeleteServiceInstance(endpointGuid, serviceInstanceGuid);
     const confirmation = new ConfirmationDialogConfig(
       'Delete Service Instance',

diff --git a/src/frontend/app/shared/monitors/pagination-monitor.ts b/src/frontend/app/shared/monitors/pagination-monitor.ts
@@ -175,7 +175,6 @@ export class PaginationMonitor<T = any> {
       map(([[pagination], allEntities]) => {
         return Object.keys(pagination.ids).reduce((allPageEntities, pageNumber) => {
           const { page, pageSchema } = this.getPageInfo(pagination, pageNumber, schema);
-          console.log(allPageEntities)
           return [
             ...allPageEntities,
             ...this.denormalizePage(page, pageSchema, allEntities)

diff --git a/src/frontend/app/store/actions/user-provided-service.actions.ts b/src/frontend/app/store/actions/user-provided-service.actions.ts
@@ -154,7 +154,7 @@ export class UpdateUserProvidedServiceInstance extends CFStartAction implements
 }
 
 export class DeleteUserProvidedInstance extends CFStartAction implements ICFAction {
-  constructor(public endpointGuid: string, public guid: string) {
+  constructor(public endpointGuid: string, public guid: string, public proxyPaginationEntityKey?: string) {
     super();
     this.options = new RequestOptions();
     this.options.url = `user_provided_service_instances/${guid}`;

diff --git a/src/frontend/app/store/effects/api.effects.ts b/src/frontend/app/store/effects/api.effects.ts
@@ -441,7 +441,6 @@ export class APIEffect {
     const flatEntities = [].concat(...allEntities).filter(e => !!e);
 
     let entityArray;
-    console.log('hrer')
     const pagAction = apiAction as PaginatedAction;
     if (pagAction.__forcedPageNumberEntityKey__) {
       entityArray = [entityFactory(pagAction.__forcedPageNumberEntityKey__)];

diff --git a/src/frontend/app/store/effects/request.effects.ts b/src/frontend/app/store/effects/request.effects.ts
@@ -154,10 +154,11 @@ export class RequestEffect {
           (apiAction.options.method === 'post' || apiAction.options.method === RequestMethod.Post ||
             apiAction.options.method === 'delete' || apiAction.options.method === RequestMethod.Delete)
         ) {
+          const entityKey = apiAction.proxyPaginationEntityKey || apiAction.entityKey;
           if (apiAction.removeEntityOnDelete) {
-            actions.unshift(new ClearPaginationOfEntity(apiAction.entityKey, apiAction.guid));
+            actions.unshift(new ClearPaginationOfEntity(entityKey, apiAction.guid));
           } else {
-            actions.unshift(new ClearPaginationOfType(apiAction.entityKey));
+            actions.unshift(new ClearPaginationOfType(entityKey));
           }
         }
       }

diff --git a/src/frontend/app/store/types/request.types.ts b/src/frontend/app/store/types/request.types.ts
@@ -33,6 +33,9 @@ export type IRequestActionEntity = EntitySchema | EntitySchema[];
 export interface IRequestAction extends RequestAction {
   entity?: IRequestActionEntity;
   entityKey: string;
+  // This is used for multiaction lists where the deleted entity
+  // is going to be part of another entities pagination section
+  proxyPaginationEntityKey?: string;
   endpointGuid?: string;
   updatingKey?: string;
   // For single entity requests