Skip to content

Commit 04c65e4

Browse files
author
Nathan Jones
committed
Merge branch 'entity-catalogue-store' into entity-pipeline
* entity-catalogue-store: Minor todos Minor fixes Changes following review proxyPaginationEntityKey --> proxyPaginationEntityConfig Changes following review Fix schema key issues - Ensure we pick up a schema other than default when needed - Action, which is an EntityCatalogueEntityConfig, now have correct schema key Fix user favourites sync of cf endpoints - looking for cfEndpoints in store instad of stratosEndpoints Fix user profile page Minor todo's, fix selectCurrentUserStratosRoles Fixed the following subscription leaks discovered when disconnecting a cf - CfOrgSpaceDataService - ngOnDestroy in a service will run when the service is provided by a component, fix is to ensure always provided by a component - cf-org-card & cf-space-card - `ngOnDestroy = () =>` won't run, so use `ngOnDestroy()` - cf endpoint service had a sub that was never `first`ed or unsub'ed Fix clearing of pagination and entity sections on disconnect and minor todos Tidy up cf-entity-generator Move CFAppState and CFEntityValues into cf module Fix dupe name of BaseRequestDataState type and interface, add some typing #1 Move CFStartAction + StartCFAction to cf module Creare Cf info action builder, fix builder typing - Makes use of .dispatchGet(endpoint.guid) which differs from standard dispatchGet with multiple args Minor permissions changes Ensure schemeKey is populated, so when we fetch schema via a config object we get the correct one Minor codeclimate fixes and imports
2 parents 414956e + 7d46fd5 commit 04c65e4

File tree

323 files changed

+1204
-1318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+1204
-1318
lines changed

‎src/frontend/packages/cloud-foundry/cf-types.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ export const CF_ENDPOINT_TYPE = 'cf';
55
export class CFEntityConfig implements EntityCatalogueEntityConfig {
66
public endpointType = CF_ENDPOINT_TYPE;
77

8-
constructor(public entityType: string) {
9-
10-
}
8+
constructor(public entityType: string) { }
119
}

‎src/frontend/packages/cloud-foundry/src/actions/app-event.actions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
43
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5-
import { CFStartAction } from '../../../store/src/types/request.types';
4+
import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
5+
import { CFStartAction } from './cf-action.types';
66
import { QParam } from '../../../store/src/q-param';
77

88
export const AppGetAllEvents = {

‎src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { RequestOptions } from '@angular/http';
22

3+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
4+
import { ICFAction, RequestEntityLocation } from '../../../store/src/types/request.types';
35
import {
46
appEnvVarsEntityType,
57
applicationEntityType,
68
appStatsEntityType,
79
appSummaryEntityType,
810
cfEntityFactory,
911
} from '../cf-entity-factory';
10-
import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
11-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
12-
import { CFStartAction, ICFAction, RequestEntityLocation } from '../../../store/src/types/request.types';
12+
import { CFStartAction } from './cf-action.types';
1313

1414
export enum AppMetadataTypes {
1515
STATS,

‎src/frontend/packages/cloud-foundry/src/actions/application-service-routes.actions.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3+
import { getActions } from '../../../store/src/actions/action.helper';
4+
5+
import { ICFAction } from '../../../store/src/types/request.types';
36
import { CFEntityConfig } from '../../cf-types';
47
import {
58
applicationEntityType,
@@ -9,14 +12,13 @@ import {
912
serviceBindingEntityType,
1013
serviceInstancesEntityType,
1114
} from '../cf-entity-factory';
15+
import { CFStartAction } from './cf-action.types';
1216
import {
1317
createEntityRelationKey,
14-
createEntityRelationPaginationKey,
15-
EntityInlineChildAction,
1618
EntityInlineParentAction,
19+
EntityInlineChildAction,
20+
createEntityRelationPaginationKey
1721
} from '../entity-relations/entity-relations.types';
18-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
19-
import { getActions } from '../../../store/src/actions/action.helper';
2022

2123
export const ASSIGN_ROUTE = '[Application] Assign route';
2224
export const ASSIGN_ROUTE_SUCCESS = '[Application] Assign route success';

‎src/frontend/packages/cloud-foundry/src/actions/application.actions.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { Headers, RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { CF_ENDPOINT_TYPE } from '../../cf-types';
4-
import { applicationEntityType, appStatsEntityType, cfEntityFactory } from '../cf-entity-factory';
53
import { IApp } from '../../../core/src/core/cf-api.types';
64
import { EntityInlineParentAction } from '../entity-relations/entity-relations.types';
75
import { pick } from '../../../store/src/helpers/reducer.helper';
86
import { ActionMergeFunction } from '../../../store/src/types/api.types';
97
import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
10-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
8+
import { ICFAction } from '../../../store/src/types/request.types';
9+
import { CF_ENDPOINT_TYPE } from '../../cf-types';
10+
import { applicationEntityType, appStatsEntityType, cfEntityFactory } from '../cf-entity-factory';
1111
import { AppMetadataTypes } from './app-metadata.actions';
12+
import { CFStartAction } from './cf-action.types';
1213

1314
export const GET_ALL = '[Application] Get all';
1415
export const GET_ALL_SUCCESS = '[Application] Get all success';

‎src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { buildpackEntityType, cfEntityFactory } from '../cf-entity-factory';
4-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5-
import { CFStartAction } from '../../../store/src/types/request.types';
63
import { getActions } from '../../../store/src/actions/action.helper';
4+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5+
import { buildpackEntityType, cfEntityFactory } from '../cf-entity-factory';
6+
import { CFStartAction } from './cf-action.types';
77

88
export class FetchAllBuildpacks extends CFStartAction implements PaginatedAction {
99
constructor(public endpointGuid: string, public paginationKey: string) {

‎src/frontend/packages/cloud-foundry/src/actions/cf-action.types.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { Action } from '@ngrx/store';
2+
3+
import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
4+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5+
import { ICFAction, IStartRequestAction, StartAction } from '../../../store/src/types/request.types';
6+
import { CF_ENDPOINT_TYPE } from '../../cf-types';
7+
8+
export abstract class CFStartAction extends StartAction implements Action {
9+
public endpointType = CF_ENDPOINT_TYPE;
10+
}
11+
12+
export class StartCFAction extends CFStartAction implements IStartRequestAction {
13+
constructor(
14+
public apiAction: ICFAction | PaginatedAction,
15+
public requestType: ApiRequestTypes = 'fetch'
16+
) {
17+
super();
18+
}
19+
}

‎src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { CF_ENDPOINT_TYPE } from '../../cf-types';
22
import { cfInfoEntityType } from '../cf-entity-factory';
33
import { EntityRequestAction } from '../../../store/src/types/request.types';
44

5-
export const GET_INFO = '[CF Endpoint] Get Info';
6-
// TODO Where do these go?
5+
export const GET_CF_INFO = '[CF Endpoint] Get Info';
6+
77
export class GetCFInfo implements EntityRequestAction {
88
constructor(public cfGuid: string) { }
9-
type = GET_INFO;
9+
type = GET_CF_INFO;
1010
endpointType = CF_ENDPOINT_TYPE;
1111
entityType = cfInfoEntityType;
1212
}

‎src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { cfEntityFactory, domainEntityType } from '../cf-entity-factory';
43
import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
54
import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
65
import { PaginatedAction } from '../../../store/src/types/pagination.types';
7-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
6+
import { ICFAction } from '../../../store/src/types/request.types';
7+
import { cfEntityFactory, domainEntityType } from '../cf-entity-factory';
8+
import { CFStartAction } from './cf-action.types';
89

910
export const GET_DOMAIN = '[domain] Get domain ';
1011
export const GET_DOMAIN_SUCCESS = '[domain] Get domain success';
@@ -28,19 +29,18 @@ export class FetchDomain extends CFStartAction implements ICFAction {
2829
options: RequestOptions;
2930
}
3031
export class FetchAllDomains extends CFStartAction implements PaginatedAction {
31-
constructor(public endpointGuid: string, public flattenPagination = true) {
32+
constructor(public endpointGuid: string, public paginationKey: string = null, public flattenPagination = true) {
3233
super();
3334
this.options = new RequestOptions();
3435
this.options.url = 'shared_domains';
3536
this.options.method = 'get';
3637
this.options.params = new URLSearchParams();
37-
this.paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
38+
this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, endpointGuid);
3839
}
3940
actions = [GET_ALL_DOMAIN, GET_ALL_DOMAIN_SUCCESS, GET_ALL_DOMAIN_FAILED];
4041
entity = [cfEntityFactory(domainEntityType)];
4142
entityType = domainEntityType;
4243
options: RequestOptions;
43-
paginationKey = 'all-domains';
4444
initialParams = {
4545
'results-per-page': 100,
4646
};

‎src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { cfEntityFactory, featureFlagEntityType } from '../cf-entity-factory';
4-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5-
import { CFStartAction, RequestEntityLocation } from '../../../store/src/types/request.types';
63
import { getActions } from '../../../store/src/actions/action.helper';
4+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5+
import { RequestEntityLocation } from '../../../store/src/types/request.types';
6+
import { cfEntityFactory, featureFlagEntityType } from '../cf-entity-factory';
7+
import { CFStartAction } from './cf-action.types';
78

89
export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {
910
constructor(public endpointGuid: string, public paginationKey: string) {

‎src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
import { RequestOptions, URLSearchParams, RequestMethod } from '@angular/http';
1+
import { RequestMethod, RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { CFEntityConfig } from '../../cf-types';
4-
import {
5-
cfEntityFactory,
6-
cfUserEntityType,
7-
organizationEntityType,
8-
spaceEntityType,
9-
} from '../cf-entity-factory';
103
import { IUpdateOrganization } from '../../../core/src/core/cf-api.types';
11-
import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
12-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
13-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
144
import { getActions } from '../../../store/src/actions/action.helper';
5+
6+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
7+
import { ICFAction } from '../../../store/src/types/request.types';
8+
import { CFEntityConfig } from '../../cf-types';
9+
import { CFStartAction } from './cf-action.types';
10+
import { cfEntityFactory, cfUserEntityType, organizationEntityType, spaceEntityType, spaceWithOrgEntityType } from '../cf-entity-factory';
1511
import { createDefaultUserRelations } from './user.actions.helpers';
12+
import { EntityInlineParentAction, EntityInlineChildAction } from '../entity-relations/entity-relations.types';
1613

1714
export const GET_ORGANIZATION = '[Organization] Get one';
1815
export const GET_ORGANIZATION_SUCCESS = '[Organization] Get one success';
@@ -57,6 +54,7 @@ export class GetOrganization extends CFStartAction implements ICFAction, EntityI
5754
}
5855

5956
export class GetAllOrganizationSpaces extends CFStartAction implements PaginatedAction, EntityInlineParentAction, EntityInlineChildAction {
57+
public schemaKey: string;
6058
constructor(
6159
public paginationKey: string,
6260
public orgGuid: string,
@@ -84,6 +82,12 @@ export class GetAllOrganizationSpaces extends CFStartAction implements Paginated
8482
parentEntityConfig = new CFEntityConfig(organizationEntityType);
8583
}
8684

85+
export class GetAllOrganizationSpacesWithOrgs extends GetAllOrganizationSpaces {
86+
entity = cfEntityFactory(spaceWithOrgEntityType);
87+
entityType = spaceEntityType;
88+
schemaKey = spaceWithOrgEntityType;
89+
}
90+
8791
export class GetAllOrganizations extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
8892
constructor(
8993
public paginationKey: string,

‎src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { RequestOptions } from '@angular/http';
22
import { Action } from '@ngrx/store';
33

4-
import { organizationEntityType, spaceEntityType } from '../cf-entity-factory';
54
import { APIResource } from '../../../store/src/types/api.types';
5+
import { organizationEntityType, spaceEntityType } from '../cf-entity-factory';
66

77
export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS = '[Current User] Get audited org Relations';
88
export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get audited org Relations success';
@@ -72,7 +72,10 @@ export interface IUserRelationTypes {
7272
export class GetUserCfRelations implements Action {
7373
constructor(public cfGuid: string, public type: string) { }
7474
}
75-
// TODO what do we do with these actions?
75+
76+
/**
77+
* Used in conjunction with `permissions.effects.ts` to fetch roles of a user connected to a cf that power the permissions model
78+
*/
7679
export class GetUserRelations implements Action {
7780
public type = GET_CURRENT_USER_RELATION;
7881
public actions: string[];

‎src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import { RequestMethod, RequestOptions, URLSearchParams } from '@angular/http';
22

3+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
4+
import { ICFAction } from '../../../store/src/types/request.types';
35
import { CFEntityConfig } from '../../cf-types';
46
import {
57
cfEntityFactory,
68
organizationEntityType,
79
quotaDefinitionEntityType,
810
spaceQuotaEntityType,
911
} from '../cf-entity-factory';
12+
import { CFStartAction } from './cf-action.types';
1013
import { EntityInlineChildAction } from '../entity-relations/entity-relations.types';
11-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
12-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
1314

1415
export const GET_QUOTA_DEFINITIONS = '[QuotaDefinitions] Get all';
1516
export const GET_QUOTA_DEFINITIONS_SUCCESS = '[QuotaDefinitions] Get all success';

‎src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3+
import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
34
import {
45
EntityInlineChildAction,
56
EntityInlineParentAction,
67
} from '../entity-relations/entity-relations.types';
78
import { PaginatedAction } from '../../../store/src/types/pagination.types';
8-
import { CFStartAction, RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
9-
import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
9+
import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types';
10+
import { CFStartAction } from './cf-action.types';
1011
import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
1112

1213
const relationActionId = 'FetchRelationAction';

‎src/frontend/packages/cloud-foundry/src/actions/route.actions.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3+
import { getActions } from '../../../store/src/actions/action.helper';
4+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5+
import { ICFAction } from '../../../store/src/types/request.types';
36
import {
47
applicationEntityType,
58
cfEntityFactory,
69
domainEntityType,
710
routeEntityType,
811
spaceEntityType,
912
} from '../cf-entity-factory';
10-
import {
11-
createEntityRelationKey,
12-
createEntityRelationPaginationKey,
13-
EntityInlineParentAction,
14-
} from '../entity-relations/entity-relations.types';
15-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
16-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
17-
import { getActions } from '../../../store/src/actions/action.helper';
18-
13+
import { CFStartAction } from './cf-action.types';
14+
import { EntityInlineParentAction, createEntityRelationKey, createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
1915

2016
export const CREATE_ROUTE = '[Route] Create start';
2117
export const CREATE_ROUTE_SUCCESS = '[Route] Create success';

‎src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { RequestOptions } from '@angular/http';
22

3-
import { cfEntityFactory, securityGroupEntityType, spaceEntityType } from '../cf-entity-factory';
4-
import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
5-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
6-
import { CFStartAction } from '../../../store/src/types/request.types';
73
import { getActions } from '../../../store/src/actions/action.helper';
84

5+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
6+
import { cfEntityFactory, securityGroupEntityType, spaceEntityType } from '../cf-entity-factory';
7+
import { CFStartAction } from './cf-action.types';
8+
import { EntityInlineParentAction, createEntityRelationKey } from '../entity-relations/entity-relations.types';
9+
910
export class GetAllSecurityGroups extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
1011
constructor(
1112
public endpointGuid: string,

‎src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { cfEntityFactory, serviceBindingEntityType } from '../cf-entity-factory';
4-
import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
5-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
63
import { getActions } from '../../../store/src/actions/action.helper';
7-
4+
import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
5+
import { ICFAction } from '../../../store/src/types/request.types';
6+
import { cfEntityFactory, serviceBindingEntityType } from '../cf-entity-factory';
7+
import { CFStartAction } from './cf-action.types';
88

99
export const DELETE_SERVICE_BINDING_ACTION = '[ Service Instances ] Delete Service Binding';
1010
export const DELETE_SERVICE_BINDING_ACTION_SUCCESS = '[ Service Instances ] Delete Service Binding success';

‎src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { RequestOptions, URLSearchParams } from '@angular/http';
22

3-
import { cfEntityFactory, serviceBrokerEntityType } from '../cf-entity-factory';
4-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5-
import { CFStartAction, EntityRequestAction } from '../../../store/src/types/request.types';
63
import { getActions } from '../../../store/src/actions/action.helper';
4+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
5+
import { cfEntityFactory, serviceBrokerEntityType } from '../cf-entity-factory';
6+
import { CFStartAction } from './cf-action.types';
7+
import { EntityRequestAction } from '../../../store/src/types/request.types';
78

89
export class GetServiceBrokers extends CFStartAction implements PaginatedAction {
910
constructor(

‎src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import { Headers, RequestOptions, URLSearchParams } from '@angular/http';
22

3+
import { getActions } from '../../../store/src/actions/action.helper';
4+
5+
import { PaginatedAction } from '../../../store/src/types/pagination.types';
6+
import { ICFAction } from '../../../store/src/types/request.types';
37
import {
48
applicationEntityType,
59
cfEntityFactory,
@@ -12,10 +16,8 @@ import {
1216
servicePlanEntityType,
1317
spaceEntityType,
1418
} from '../cf-entity-factory';
19+
import { CFStartAction } from './cf-action.types';
1520
import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
16-
import { PaginatedAction } from '../../../store/src/types/pagination.types';
17-
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
18-
import { getActions } from '../../../store/src/actions/action.helper';
1921

2022
export const DELETE_SERVICE_BINDING = '[Service Instances] Delete service binding';
2123
export const UPDATE_SERVICE_INSTANCE_SUCCESS = getActions('Service Instances', 'Update Service Instance')[1];
@@ -45,6 +47,7 @@ export class GetServiceInstances
4547
actions = getActions('Service Instances', 'Get all');
4648
entity = [cfEntityFactory(serviceInstancesWithSpaceEntityType)];
4749
entityType = serviceInstancesEntityType;
50+
schemaKey = serviceInstancesWithSpaceEntityType;
4851
options: RequestOptions;
4952
initialParams = {
5053
page: 1,
@@ -71,6 +74,7 @@ export class GetServiceInstance
7174
}
7275
actions = getActions('Service Instances', 'Get particular instance');
7376
entity = [cfEntityFactory(serviceInstancesWithSpaceEntityType)];
77+
schemaKey = serviceInstancesWithSpaceEntityType;
7478
entityType = serviceInstancesEntityType;
7579
options: RequestOptions;
7680
}

0 commit comments

Comments
 (0)