Handle table cell get/setters better (#4799)

- get and set were moved into abstract base class as part of ts bump - we now need to ensure we get/set the correct way - also contains minor cell tidy ups
cloudfoundry · Nov 26, 2020 · cbd6cf5 · cbd6cf5
1 parent 9a3ef32
commit cbd6cf5
Show file tree

Hide file tree

Showing 41 changed files with 97 additions and 106 deletions.
diff --git a/...tric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/...tric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts
@@ -62,6 +62,7 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell<APIResource<
 
   @Input('row')
   set row(row: APIResource<AppScalingTrigger>) {
+    super.row = row;
     if (row) {
       if (row.entity.query && row.entity.query.params) {
         this.paramsMetricsStart = row.entity.query.params.start * 1000;

diff --git a/...omponents/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts b/...omponents/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component.ts
@@ -24,6 +24,7 @@ export class TableCellCfCellComponent extends TableCellCustom<ListAppInstance> i
     metricEntityService: EntityService<IMetrics<IMetricMatrixResult<IMetricCell>>>;
     cfGuid: string;
   }) {
+    super.config = config;
     if (!config) {
       return;
     }

diff --git a/...ents/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts b/...ents/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts
@@ -15,6 +15,7 @@ export class TableCellAppCfOrgSpaceComponent extends TableCellAppCfOrgSpaceBase
 
   @Input('row')
   set row(row: APIResource<IApp>) {
+    super.row = row;
     if (row) {
       this.init(row.entity.cfGuid, (row.entity.space as APIResource<ISpace>).entity.organization_guid, row.entity.space_guid);
     }

diff --git a/...d/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts b/...d/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
@@ -18,6 +18,7 @@ export class TableCellAppStatusComponent extends TableCellCustom<APIResource<IAp
   applicationState: ApplicationStateData;
   @Input('config')
   set config(value: { hideIcon: boolean, initialStateOnly: boolean, }) {
+    super.config = value;
     value = value || {
       hideIcon: false,
       initialStateOnly: false

diff --git a/...s/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component.ts b/...s/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component.ts
@@ -13,6 +13,7 @@ export class TableCellConfirmOrgSpaceComponent extends TableCellCustom<CfRoleCha
   chipsConfig: AppChip<CfRoleChangeWithNames>[];
   @Input('row')
   set row(row: CfRoleChangeWithNames) {
+    super.row = row;
     const chipConfig = new AppChip<CfRoleChangeWithNames>();
     chipConfig.key = row;
     chipConfig.value = row.spaceGuid ? `Space: ${row.spaceName}` : `Org: ${row.orgName}`;

diff --git a/...lags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts b/...lags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
@@ -15,6 +15,7 @@ export class TableCellFeatureFlagDescriptionComponent extends TableCellCustom<IF
 
   @Input()
   set row(row: IFeatureFlag) {
+    super.row = row;
     this.description = row ? FeatureFlagDescriptions[row.name] : null;
   }
 

diff --git a/...ypes/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.ts b/...ypes/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.ts
@@ -19,18 +19,16 @@ export class TableCellRouteAppsAttachedComponent extends TableCellCustom<any> im
 
   @Input('config')
   set config(config: any) {
+    super.config = config;
     this.config$.next(config);
   }
 
   @Input('row')
   set row(route: APIResource<CfRoute>) {
+    super.row = route;
     this.row$.next(route);
   }
 
-  constructor() {
-    super();
-  }
-
   ngOnInit(): void {
     this.boundApps$ = combineLatest([
       this.config$.asObservable().pipe(first()),

diff --git a/...hared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts b/...hared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
@@ -41,6 +41,7 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
 
   @Input('row')
   set row(row: APIResource<IService>) {
+    super.row = row;
     if (row) {
       this.serviceEntity = row;
       this.extraInfo = null;

diff --git a/...t/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts b/...t/list-types/cf-services/table-cell-service-broker/table-cell-service-broker.component.ts
@@ -29,7 +29,7 @@ export class TableCellServiceBrokerComponent extends
 
   @Input()
   set row(row: APIResource<IService>) {
-    this.pRow = row;
+    super.row = row;
     if (row && !this.spaceLink$) {
       this.broker$ = cfEntityCatalog.serviceBroker.store.getEntityService(
         this.row.entity.service_broker_guid,
@@ -62,7 +62,7 @@ export class TableCellServiceBrokerComponent extends
     }
   }
   get row(): APIResource<IService> {
-    return this.pRow;
+    return super.row;
   }
 
   public spaceLink$: Observable<{

diff --git a/...services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts b/...services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
@@ -18,6 +18,7 @@ export class TableCellServiceCfBreadcrumbsComponent extends TableCellCustom<APIR
 
   @Input()
   set row(pService: APIResource<IService>) {
+    super.row = pService;
     if (!pService || !!this.cfOrgSpace) {
       return;
     }

diff --git a/...st-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts b/...st-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts
@@ -15,15 +15,12 @@ export class TableCellServiceProviderComponent extends TableCellCustom<APIResour
 
   @Input()
   set row(pService: APIResource<IService>) {
+    super.row = pService;
     if (!!pService && !!pService.entity.extra && !this.extraInfo) {
       try {
         this.extraInfo = JSON.parse(pService.entity.extra);
       } catch { }
     }
   }
 
-  constructor() {
-    super();
-  }
-
 }
diff --git a/...ypes/cf-services/table-cell-service-references/table-cell-service-references.component.ts b/...ypes/cf-services/table-cell-service-references/table-cell-service-references.component.ts
@@ -15,6 +15,7 @@ export class TableCellServiceReferencesComponent extends TableCellCustom<APIReso
 
   @Input()
   set row(pService: APIResource<IService>) {
+    super.row = pService;
     if (!!pService && !!pService.entity.extra && !this.extraInfo) {
       try {
         this.extraInfo = JSON.parse(pService.entity.extra);
@@ -23,10 +24,6 @@ export class TableCellServiceReferencesComponent extends TableCellCustom<APIReso
 
   }
 
-  constructor() {
-    super();
-  }
-
   hasDocumentationUrl() {
     return !!(this.getDocumentationUrl());
   }

diff --git a/.../list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts b/.../list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts
@@ -16,10 +16,9 @@ export class TableCellServiceTagsComponent extends TableCellCustom<APIResource<I
 
   tags: AppChip<ServiceTag>[] = [];
 
-  private service;
   @Input()
   set row(pService: APIResource<IService>) {
-    this.service = pService;
+    super.row = pService;
     if (!pService) {
       return;
     }
@@ -29,10 +28,7 @@ export class TableCellServiceTagsComponent extends TableCellCustom<APIResource<I
     }));
   }
   get row(): APIResource<IService> {
-    return this.service;
+    return super.row;
   }
 
-  constructor() {
-    super();
-  }
 }
diff --git a/...ell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts b/...ell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
@@ -29,11 +29,13 @@ export class TableCellServiceInstanceAppsAttachedComponent
 
   @Input('config')
   set config(config: any) {
+    super.config = config;
     this.config$.next(config);
   }
 
   @Input('row')
   set row(row: APIResource<IServiceInstance>) {
+    super.row = row;
     this.row$.next(row);
   }
 

diff --git a/...-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts b/...-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts
@@ -21,6 +21,7 @@ export class TableCellServiceInstanceTagsComponent
   tags: AppChip<Tag>[] = [];
   @Input('row')
   set row(row) {
+    super.row = row;
     if (row) {
       this.tags.length = 0;
       if (row.entity && row.entity.service_instance && row.entity.service_instance.entity.tags) {
@@ -42,9 +43,4 @@ export class TableCellServiceInstanceTagsComponent
       }
     }
   }
-
-  constructor() {
-    super();
-  }
-
 }
diff --git a/...ckages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts b/...ckages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts
@@ -33,13 +33,15 @@ export abstract class CfPermissionCellDirective<T> extends TableCellCustom<APIRe
 
   @Input('row')
   set row(row: APIResource<CfUser>) {
+    super.row = row;
     this.rowSubject.next(row);
     this.guid = row.metadata.guid;
     this.userEntity.next(row.entity);
   }
 
   @Input()
   set config(config: any) {
+    super.config = config;
     this.configSubject.next(config);
   }
 

diff --git a/...es/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts b/...es/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts
@@ -14,17 +14,16 @@ export class TableCellAServicePlanPriceComponent extends TableCellCustom<APIReso
   isFree: boolean;
   canShowCosts: boolean;
 
-  private pServicePlan;
   @Input()
   set row(servicePlan: APIResource<IServicePlan>) {
-    this.pServicePlan = servicePlan;
+    super.row = servicePlan;
     if (!servicePlan) {
       return;
     }
     this.isFree = servicePlan.entity.free;
     this.canShowCosts = canShowServicePlanCosts(servicePlan);
   }
   get row(): APIResource<IServicePlan> {
-    return this.pServicePlan;
+    return super.row;
   }
 }
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
@@ -39,7 +39,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
 
   @Input('row')
   set row(row: APIResource<IServiceInstance>) {
-
+    super.row = row;
     if (row) {
       this.serviceInstanceEntity = row;
       const schema = cfEntityFactory(serviceInstancesEntityType);

diff --git a/...wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/...wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -38,6 +38,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
 
   @Input('row')
   set row(row: APIResource<IUserProvidedServiceInstance>) {
+    super.row = row;
     if (row) {
       this.setup(row);
     }
@@ -107,14 +108,14 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
       false,
       true
     );
-  }
+  };
 
   private delete = () => this.serviceActionHelperService.deleteServiceInstance(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.name,
     this.serviceInstanceEntity.entity.cfGuid,
     true
-  )
+  );
 
   private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
@@ -123,7 +124,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
       [CSI_CANCEL_URL]: '/services'
     },
     true
-  )
+  );
 
   getSpaceBreadcrumbs = () => ({ breadcrumbs: 'services-wall' });
 

diff --git a/...rontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts b/...rontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
@@ -1,9 +1,9 @@
 import { AfterContentInit, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
+import { JsonPointer } from '@cfstratos/ajsf-core';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { JsonPointer } from '@cfstratos/ajsf-core';
 
 import { safeStringToObj } from '../../../../../core/src/core/utils.service';
 import { isValidJsonValidator } from '../../../../../core/src/shared/form-validators';
@@ -125,7 +125,7 @@ export class SchemaFormComponent implements OnInit, OnDestroy, AfterContentInit
       return obj;
     }, {});
     return Object.keys(filterSchema).length > 0 ? filterSchema : null;
-  }
+  };
 
   onFormChange(formData) {
     this.formData = formData;
@@ -149,6 +149,6 @@ export class SchemaFormComponent implements OnInit, OnDestroy, AfterContentInit
       }, '');
       return `${a} ${arrMessage} ${c.message} <br>`;
     }, '');
-  }
+  };
 
 }
diff --git a/.../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/.../core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
@@ -84,6 +84,7 @@ export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponen
 
   @Input()
   set row(data: EndpointModel) {
+    super.row = data;
     this.guid$.next(data.guid);
   }
 }
diff --git a/...red/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts b/...red/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
@@ -16,9 +16,9 @@ export class TableCellDefaultComponent<T> extends TableCellCustom<T> implements
   public cellDefinition: ICellDefinition<T>;
 
   @Input('row')
-  get row() { return this.pRow; }
+  get row() { return super.row; }
   set row(row: T) {
-    this.pRow = row;
+    super.row = row;
     if (row) {
       this.setValue(row, this.schemaKey);
       this.setSyncLink();

diff --git a/.../src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts b/.../src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts
@@ -20,9 +20,9 @@ export class TableCellActionsComponent<T> extends TableCellCustom<T> implements
   rowState: Observable<RowState>;
 
   @Input('row')
-  get row() { return this.pRow; }
+  get row() { return super.row; }
   set row(row: T) {
-    this.pRow = row;
+    super.row = row;
     if (row) {
       this.initialise(row);
     }

diff --git a/...ts/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component.ts b/...ts/list/list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component.ts
@@ -17,18 +17,18 @@ export interface TableCellBooleanIndicatorComponentConfig<T> {
 export class TableCellBooleanIndicatorComponent<T = any> extends TableCellCustom<T, TableCellBooleanIndicatorComponentConfig<T>> {
 
   @Input('row')
-  get row() { return this.pRow; }
+  get row() { return super.row; }
   set row(row: T) {
-    this.pRow = row;
+    super.row = row;
     if (this.config) {
       this.enabled = this.config.isEnabled(row);
     }
   }
 
   @Input('config')
-  get config() { return this.pConfig; }
+  get config() { return super.config; }
   set config(config: TableCellBooleanIndicatorComponentConfig<T>) {
-    this.pConfig = config;
+    super.config = config;
     if (!config) {
       return;
     }

diff --git a/...s/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts b/...s/core/src/shared/components/list/list-table/table-cell-edit/table-cell-edit.component.ts
@@ -12,21 +12,20 @@ export class TableCellEditComponent<T> extends TableCellCustom<T> {
 
   @Input()
   get row(): T {
-    return this.pRow;
+    return super.row;
   }
   set row(row: T) {
-    this.pRow = row;
+    super.row = row;
   }
 
   @Input()
   set dataSource(dataSource: IListDataSource<T>) {
-    this.pDataSource = dataSource;
+    super.dataSource = dataSource;
   }
   get dataSource(): IListDataSource<T> {
-    return this.pDataSource;
+    return super.dataSource;
   }
 
-
   @Input()
   subtle: boolean;
-Original file line number
+Diff line change
@@ Expand Up @@
       @Input()
       set row(row: IFeatureFlag) {
+        super.row = row;
         this.description = row ? FeatureFlagDescriptions[row.name] : null;
       }
@@ Expand Down @@