Merge remote-tracking branch 'origin/v3-master' into fix-error-messages

cloudfoundry · Sep 26, 2019 · 1a2e6df · 1a2e6df
2 parents 797c598 + ffc9e1d
commit 1a2e6df
Show file tree

Hide file tree

Showing 174 changed files with 880 additions and 803 deletions.
diff --git a/...cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/...cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -5,7 +5,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
 
-import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-factory';
+import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationMonitorService } from '../../../../cloud-foundry/src/features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';

diff --git a/...rc/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/...rc/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
@@ -5,7 +5,7 @@ import { MockBackend } from '@angular/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { applicationEntityType, cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
+import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { ApplicationsModule } from '../../../../../cloud-foundry/src/features/applications/applications.module';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
@@ -16,6 +16,7 @@ import { createEmptyStoreModule } from '../../../../../core/test-framework/store
 import { AppStoreExtensionsModule } from '../../../../../store/src/store.extensions.module';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service';
+import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 
 describe('CfAppAutoscalerEventsConfigService', () => {
 

diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
@@ -1,6 +1,6 @@
 import { RequestOptions } from '@angular/http';
 
-import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-factory';
+import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';

diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -1,4 +1,5 @@
-import { cfEntityFactory, metricEntityType } from '../../../cloud-foundry/src/cf-entity-factory';
+import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
+import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
 import { IOrganization } from '../../../core/src/core/cf-api.types';
 import {

diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts
@@ -0,0 +1,56 @@
+// import { NgModule } from '@angular/core';
+
+// import { CoreModule } from '../../../core/src/core/core.module';
+// import { StratosExtension } from '../../../core/src/core/extension/extension-service';
+// import { ExtensionEntitySchema } from '../../../core/src/core/extension/extension-types';
+// import { getAPIResourceGuid } from '../../../store/src/selectors/api.selectors';
+
+// export const appAutoscalerHealthSchemaKey = 'autoscalerHealth';
+// export const appAutoscalerInfoSchemaKey = 'autoscalerInfo';
+// export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy';
+// export const appAutoscalerPolicyTriggerSchemaKey = 'autoscalerPolicyTrigger';
+// export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory';
+// export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric';
+
+// export const autoscalerEntities: ExtensionEntitySchema[] = [
+//   {
+//     entityKey: appAutoscalerInfoSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: appAutoscalerPolicySchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: appAutoscalerPolicyTriggerSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: appAutoscalerHealthSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: appAutoscalerScalingHistorySchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+//   {
+//     entityKey: appAutoscalerAppMetricSchemaKey,
+//     definition: {},
+//     options: { idAttribute: getAPIResourceGuid }
+//   },
+// ];
+
+// @StratosExtension({
+//   entities: autoscalerEntities,
+// })
+// @NgModule({
+//   imports: [
+//     CoreModule
+//   ]
+// })
+// export class AutoscalerStoreModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/actions/app-event.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/app-event.actions.ts
@@ -1,9 +1,10 @@
 import { RequestOptions, URLSearchParams } from '@angular/http';
 
+import { QParam, QParamJoiners } from '../../../store/src/q-param';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { appEventEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
-import { QParam, QParamJoiners } from '../../../store/src/q-param';
 
 export const AppGetAllEvents = {
   GET_ALL: '[Application Event] Get all',

diff --git a/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts
@@ -2,15 +2,15 @@ import { RequestOptions } from '@angular/http';
 
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction, RequestEntityLocation } from '../../../store/src/types/request.types';
+import { cfEntityFactory } from '../cf-entity-factory';
 import {
   appEnvVarsEntityType,
   applicationEntityType,
   appStatsEntityType,
   appSummaryEntityType,
-  cfEntityFactory,
-} from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
+} from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 export enum AppMetadataTypes {
   STATS,

diff --git a/src/frontend/packages/cloud-foundry/src/actions/application-service-routes.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/application-service-routes.actions.ts
@@ -1,24 +1,23 @@
 import { RequestOptions, URLSearchParams } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-
 import { ICFAction } from '../../../store/src/types/request.types';
 import { CFEntityConfig } from '../../cf-types';
+import { cfEntityFactory } from '../cf-entity-factory';
 import {
   applicationEntityType,
-  cfEntityFactory,
   domainEntityType,
   routeEntityType,
   serviceBindingEntityType,
   serviceInstancesEntityType,
-} from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
+} from '../cf-entity-types';
 import {
   createEntityRelationKey,
-  EntityInlineParentAction,
+  createEntityRelationPaginationKey,
   EntityInlineChildAction,
-  createEntityRelationPaginationKey
+  EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 export const ASSIGN_ROUTE = '[Application] Assign route';
 export const ASSIGN_ROUTE_SUCCESS = '[Application] Assign route success';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -6,7 +6,8 @@ import { ActionMergeFunction } from '../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { applicationEntityType, appStatsEntityType, cfEntityFactory } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { applicationEntityType, appStatsEntityType } from '../cf-entity-types';
 import { EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { AppMetadataTypes } from './app-metadata.actions';
 import { CFStartAction } from './cf-action.types';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts
@@ -2,7 +2,8 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { buildpackEntityType, cfEntityFactory } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { buildpackEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
 
 export class FetchAllBuildpacks extends CFStartAction implements PaginatedAction {

diff --git a/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts
@@ -1,5 +1,5 @@
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { cfInfoEntityType } from '../cf-entity-factory';
+import { cfInfoEntityType } from '../cf-entity-types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 
 export const GET_CF_INFO = '[CF Endpoint] Get Info';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
@@ -4,7 +4,7 @@ import { GitSCM } from '../../../core/src/shared/data-services/scm/scm';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { gitBranchesEntityType, gitCommitEntityType } from '../cf-entity-factory';
+import { gitBranchesEntityType, gitCommitEntityType } from '../cf-entity-types';
 import { GitAppDetails, OverrideAppDetails, SourceType } from '../store/types/deploy-application.types';
 import { GitBranch, GitCommit } from '../store/types/git.types';
 

diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts
@@ -1,10 +1,11 @@
 import { RequestOptions, URLSearchParams } from '@angular/http';
 
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
-import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { cfEntityFactory, domainEntityType } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { domainEntityType } from '../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
 
 export const GET_DOMAIN = '[domain] Get domain ';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
@@ -3,7 +3,8 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { RequestEntityLocation } from '../../../store/src/types/request.types';
-import { cfEntityFactory, featureFlagEntityType } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { featureFlagEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
 
 export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {

diff --git a/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts
@@ -1,5 +1,5 @@
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { gitRepoEntityType } from '../cf-entity-factory';
+import { gitRepoEntityType } from '../cf-entity-types';
 import {
   EnvVarStratosProject,
 } from '../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
@@ -2,25 +2,24 @@ import { RequestMethod, RequestOptions, URLSearchParams } from '@angular/http';
 
 import { IUpdateOrganization } from '../../../core/src/core/cf-api.types';
 import { getActions } from '../../../store/src/actions/action.helper';
-
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { CFEntityConfig } from '../../cf-types';
+import { cfEntityFactory } from '../cf-entity-factory';
 import {
-  cfEntityFactory,
   cfUserEntityType,
   domainEntityType,
   organizationEntityType,
   spaceEntityType,
   spaceWithOrgEntityType,
-} from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
-import { createDefaultUserRelations } from './user.actions.helpers';
+} from '../cf-entity-types';
 import {
-  EntityInlineParentAction,
+  createEntityRelationPaginationKey,
   EntityInlineChildAction,
-  createEntityRelationPaginationKey
+  EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
+import { createDefaultUserRelations } from './user.actions.helpers';
 
 export const GET_ORGANIZATION = '[Organization] Get one';
 export const GET_ORGANIZATION_SUCCESS = '[Organization] Get one success';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/permissions.actions.ts
@@ -2,7 +2,7 @@ import { RequestOptions } from '@angular/http';
 import { Action } from '@ngrx/store';
 
 import { APIResource } from '../../../store/src/types/api.types';
-import { organizationEntityType, spaceEntityType } from '../cf-entity-factory';
+import { organizationEntityType, spaceEntityType } from '../cf-entity-types';
 
 export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS = '[Current User] Get audited org Relations';
 export const GET_AUDITED_ORG_CURRENT_USER_RELATIONS_SUCCESS = '[Current User] Get audited org Relations success';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts
@@ -7,12 +7,8 @@ import {
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { CFEntityConfig } from '../../cf-types';
-import {
-  cfEntityFactory,
-  organizationEntityType,
-  quotaDefinitionEntityType,
-  spaceQuotaEntityType,
-} from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { organizationEntityType, quotaDefinitionEntityType, spaceQuotaEntityType } from '../cf-entity-types';
 import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
 

diff --git a/src/frontend/packages/cloud-foundry/src/actions/route.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/route.actions.ts
@@ -3,13 +3,8 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import {
-  applicationEntityType,
-  cfEntityFactory,
-  domainEntityType,
-  routeEntityType,
-  spaceEntityType,
-} from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { applicationEntityType, domainEntityType, routeEntityType, spaceEntityType } from '../cf-entity-types';
 import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,

diff --git a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts
@@ -1,11 +1,11 @@
 import { RequestOptions } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { cfEntityFactory, securityGroupEntityType, spaceEntityType } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { securityGroupEntityType, spaceEntityType } from '../cf-entity-types';
+import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { EntityInlineParentAction, createEntityRelationKey } from '../entity-relations/entity-relations.types';
 
 export class GetAllSecurityGroups extends CFStartAction implements PaginatedAction, EntityInlineParentAction {
   constructor(

diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts
@@ -3,7 +3,8 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { cfEntityFactory, serviceBindingEntityType } from '../cf-entity-factory';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { serviceBindingEntityType } from '../cf-entity-types';
 import { CFStartAction } from './cf-action.types';
 
 export const DELETE_SERVICE_BINDING_ACTION = '[ Service Instances ] Delete Service Binding';

diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts
@@ -2,9 +2,10 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { cfEntityFactory, serviceBrokerEntityType } from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
+import { cfEntityFactory } from '../cf-entity-factory';
+import { serviceBrokerEntityType } from '../cf-entity-types';
+import { CFStartAction } from './cf-action.types';
 
 export class GetServiceBrokers extends CFStartAction implements PaginatedAction {
   constructor(

diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts
@@ -1,12 +1,11 @@
 import { Headers, RequestOptions, URLSearchParams } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
+import { cfEntityFactory } from '../cf-entity-factory';
 import {
   applicationEntityType,
-  cfEntityFactory,
   organizationEntityType,
   serviceBindingEntityType,
   serviceBindingNoBindingsEntityType,
@@ -15,9 +14,9 @@ import {
   serviceInstancesWithSpaceEntityType,
   servicePlanEntityType,
   spaceEntityType,
-} from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
+} from '../cf-entity-types';
 import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 export const DELETE_SERVICE_BINDING = '[Service Instances] Delete service binding';
 export const UPDATE_SERVICE_INSTANCE_SUCCESS = getActions('Service Instances', 'Update Service Instance')[1];

diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts
@@ -2,15 +2,15 @@ import { RequestOptions, URLSearchParams } from '@angular/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
+import { cfEntityFactory } from '../cf-entity-factory';
 import {
-  cfEntityFactory,
   organizationEntityType,
   servicePlanEntityType,
   servicePlanVisibilityEntityType,
   spaceEntityType,
-} from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
+} from '../cf-entity-types';
 import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 export class GetServicePlanVisibilities extends CFStartAction implements PaginatedAction {
   constructor(