Added backward compatility to old action types

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

@@ -1,7 +1,6 @@
 import { RequestMethod, RequestOptions, URLSearchParams } from '@angular/http';
 
 import { IQuotaDefinition } from '../../../core/src/core/cf-api.types';
-
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
 import { CFEntityConfig } from '../../cf-types';

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

@@ -10,12 +10,12 @@ import {
   routeEntityType,
   spaceEntityType,
 } from '../cf-entity-factory';
-import { CFStartAction } from './cf-action.types';
 import {
-  EntityInlineParentAction,
   createEntityRelationKey,
-  createEntityRelationPaginationKey
+  createEntityRelationPaginationKey,
+  EntityInlineParentAction,
 } from '../entity-relations/entity-relations.types';
+import { CFStartAction } from './cf-action.types';
 
 export const CREATE_ROUTE = '[Route] Create start';
 export const CREATE_ROUTE_SUCCESS = '[Route] Create success';
@@ -112,7 +112,7 @@ export class UnmapRoute extends BaseRouteAction {
     this.options.method = 'delete';
     this.options.params = new URLSearchParams();
   }
-  endpointTYpe = 'cf';
+  endpointType = 'cf';
   actions = [
     RouteEvents.UNMAP_ROUTE,
     RouteEvents.UNMAP_ROUTE_SUCCESS,

src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.ts

@@ -1,5 +1,5 @@
-import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
+import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
 
 /**
  * A structure which represents the tree like layout of entity dependencies. For example organization --> space --> routes

src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts

@@ -1,28 +1,22 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import { first } from 'rxjs/operators';
-
-import { ISpace } from '../../../core/src/core/cf-api.types';
-import { EffectsFeatureTestModule, TEST_CATALOGUE_ENTITIES } from '../../../core/src/core/entity-catalogue-test.module';
 import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
-import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
-import {
-  createBasicStoreModule,
-  createEntityStoreState,
-  TestStoreEntity,
-} from '../../../core/test-framework/store-test-helper';
-import { RequestTypes } from '../../../store/src/actions/request.actions';
-import { AppState } from '../../../store/src/app-state';
-import { APIResource } from '../../../store/src/types/api.types';
-import { WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { GetAllOrganizationSpaces } from '../actions/organization.actions';
-import { CFAppState } from '../cf-app-state';
-import { cfEntityFactory, organizationEntityType, spaceEntityType } from '../cf-entity-factory';
+import { spaceEntityType, cfEntityFactory, organizationEntityType } from '../cf-entity-factory';
+import { EntityRelationSpecHelper } from '../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
+import { EffectsFeatureTestModule, TEST_CATALOGUE_ENTITIES } from '../../../core/src/core/entity-catalogue-test.module';
 import { generateCFEntities } from '../cf-entity-generator';
+import { createBasicStoreModule, TestStoreEntity, createEntityStoreState } from '../../../core/test-framework/store-test-helper';
+import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
+import { CFAppState } from '../cf-app-state';
+import { GetAllOrganizationSpaces } from '../actions/organization.actions';
 import { populatePaginationFromParent } from './entity-relations';
-import { EntityRelationSpecHelper } from './entity-relations.spec';
-
+import { APIResource } from '../../../store/src/types/api.types';
+import { ISpace } from '../../../core/src/core/cf-api.types';
+import { AppState } from '../../../store/src/app-state';
+import { WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
+import { RequestTypes } from '../../../store/src/actions/request.actions';
 
 
 describe('Entity Relations - populate from parent', () => {

src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-list.spec.ts

@@ -1,7 +1,6 @@
-import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { listEntityRelations } from './entity-relations';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
-
+import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 const endpointType = 'endpointtype1';
 
 describe('Entity Relations - List relations', () => {

src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts

@@ -1,45 +1,32 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-
 import { EffectsFeatureTestModule, TEST_CATALOGUE_ENTITIES } from '../../../core/src/core/entity-catalogue-test.module';
 import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityCatalogueEntityConfig } from '../../../core/src/core/entity-catalogue/entity-catalogue.types';
-import {
-  createBasicStoreModule,
-  createEntityStoreState,
-  TestStoreEntity,
-} from '../../../core/test-framework/store-test-helper';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '../../../core/test-framework/store-test-helper';
 import { SetInitialParams } from '../../../store/src/actions/pagination.actions';
 import { APIResponse } from '../../../store/src/actions/request.actions';
 import { InternalAppState, IRequestTypeState } from '../../../store/src/app-state';
 import {
-  EntityRequestAction,
-  RequestEntityLocation,
-  WrapperRequestActionSuccess,
-} from '../../../store/src/types/request.types';
+  entityRelationMissingQuotaGuid,
+  entityRelationMissingQuotaUrl,
+  entityRelationMissingSpacesUrl,
+  EntityRelationSpecHelper
+} from '../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
+import { EntityRequestAction, RequestEntityLocation, WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { GetOrganization } from '../actions/organization.actions';
 import { FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions';
 import { CFAppState } from '../cf-app-state';
-import {
-  cfEntityFactory,
-  organizationEntityType,
-  quotaDefinitionEntityType,
-  routeEntityType,
-  spaceEntityType,
-} from '../cf-entity-factory';
+import { cfEntityFactory, organizationEntityType, quotaDefinitionEntityType, routeEntityType, spaceEntityType } from '../cf-entity-factory';
 import { generateCFEntities } from '../cf-entity-generator';
 import { CFRequestDataState } from '../cf-entity-types';
 import { EntityTreeRelation } from './entity-relation-tree';
 import { validateEntityRelations } from './entity-relations';
-import {
-  entityRelationMissingQuotaGuid,
-  entityRelationMissingQuotaUrl,
-  entityRelationMissingSpacesUrl,
-  EntityRelationSpecHelper,
-} from './entity-relations.spec';
 import { createEntityRelationKey, createEntityRelationPaginationKey } from './entity-relations.types';
 
+
+
 describe('Entity Relations - validate -', () => {
 
   const helper = new EntityRelationSpecHelper();

src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.tree.spec.ts

@@ -1,7 +1,7 @@
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { CFEntitySchema } from '../cf-entity-factory';
 import { fetchEntityTree } from './entity-relations.tree';
 import { createEntityRelationKey, EntityInlineParentAction } from './entity-relations.types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { CFEntitySchema } from '../cf-entity-factory';
 
 describe('Entity Relations - Tree', () => {
 
@@ -110,3 +110,4 @@ describe('Entity Relations - Tree', () => {
   });
 
 });
+

src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts

@@ -28,6 +28,7 @@ import {
   spaceEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-factory';
+import { AppStat } from '../../../../cloud-foundry/src/store/types/app-metadata.types';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { EntityService } from '../../../../core/src/core/entity-service';
 import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
@@ -50,13 +51,12 @@ import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../store/src/types/pagination.types';
 
 import { getRoute, isTCPRoute } from './routes/routes.helper';
-import { createEntityRelationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import {
   ApplicationEnvVarsHelper,
   EnvVarStratosProject
 } from './application/application-tabs-base/tabs/build-tab/application-env-vars.service';
-import { AppStat } from '../../store/types/app-metadata.types';
-import { selectCfEntity } from '../../store/selectors/api.selectors';
+import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
+import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { rootUpdatingKey, ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 

src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts

@@ -10,7 +10,6 @@ import { IAppFavMetadata } from '../../../../../../cloud-foundry/src/cf-metadata
 import { IApp, IOrganization, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
-import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
 import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { EntityService } from '../../../../../../core/src/core/entity-service';
 import {
@@ -40,6 +39,7 @@ import { APIResource } from '../../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { ApplicationService } from '../../application.service';
 import { ApplicationPollingService } from './application-polling.service';
+import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
 
 @Component({

src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts

@@ -2,38 +2,36 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, share, switchMap } from 'rxjs/operators';
-
-import { GetServiceBroker } from '../../../../cloud-foundry/src/actions/service-broker.actions';
-import { GetServiceInstances } from '../../../../cloud-foundry/src/actions/service-instances.actions';
-import { GetService, GetServicePlansForService } from '../../../../cloud-foundry/src/actions/service.actions';
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import {
-  cfEntityFactory,
-  organizationEntityType,
-  serviceInstancesEntityType,
-  servicePlanEntityType,
-  spaceEntityType,
-} from '../../../../cloud-foundry/src/cf-entity-factory';
+import { APIResource } from '../../../../store/src/types/api.types';
 import {
-  IService,
-  IServiceBroker,
-  IServiceInstance,
   IServicePlan,
-  IServicePlanExtra,
+  IServiceBroker,
   IServicePlanVisibility,
+  IServiceInstance,
+  IService,
+  IServicePlanExtra
 } from '../../../../core/src/core/cf-api-svc.types';
-import { EntityService } from '../../../../core/src/core/entity-service';
-import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
-import { safeStringToObj } from '../../../../core/src/core/utils.service';
+import { getIdFromRoute, fetchTotalResults } from '../cloud-foundry/cf.helpers';
+import { CFAppState } from '../../cf-app-state';
 import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory';
-import { StratosStatus } from '../../../../core/src/shared/shared.types';
+import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
+import {
+  serviceInstancesEntityType,
+  spaceEntityType,
+  organizationEntityType,
+  servicePlanEntityType,
+  cfEntityFactory
+} from '../../cf-entity-factory';
+import { GetServiceInstances } from '../../actions/service-instances.actions';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../store/src/types/api.types';
-import { fetchTotalResults, getIdFromRoute } from '../cloud-foundry/cf.helpers';
-import { ServicePlanAccessibility } from './services.service';
 import { QParam, QParamJoiners } from '../../../../store/src/q-param';
-import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-
+import { GetServicePlansForService, GetService } from '../../actions/service.actions';
+import { ServicePlanAccessibility } from './services.service';
+import { StratosStatus } from '../../../../core/src/shared/shared.types';
+import { safeStringToObj } from '../../../../core/src/core/utils.service';
+import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
+import { EntityService } from '../../../../core/src/core/entity-service';
+import { GetServiceBroker } from '../../actions/service-broker.actions';
 
 export const getSvcAvailability = (
   servicePlan: APIResource<IServicePlan>,

src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts

@@ -9,9 +9,6 @@ import {
   serviceBrokerEntityType,
   servicePlanVisibilityEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-factory';
-import { GetServiceBrokers } from '../../../../cloud-foundry/src/actions/service-broker.actions';
-import { GetServicePlanVisibilities } from '../../../../cloud-foundry/src/actions/service-plan-visibility.actions';
-import { GetSpace } from '../../../../cloud-foundry/src/actions/space.actions';
 import {
   IService,
   IServiceBroker,
@@ -29,6 +26,9 @@ import { APIResource } from '../../../../store/src/types/api.types';
 import { getIdFromRoute } from '../cloud-foundry/cf.helpers';
 import { getCfService, getServiceInstancesInCf, getServicePlans } from './services-helper';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
+import { GetServicePlanVisibilities } from '../../actions/service-plan-visibility.actions';
+import { GetServiceBrokers } from '../../actions/service-broker.actions';
+import { GetSpace } from '../../actions/space.actions';
 import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
 
 export interface ServicePlanAccessibility {

src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts

@@ -5,13 +5,13 @@ import { filter, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { GetAllServices } from '../../../../../cloud-foundry/src/actions/service.actions';
 import { GetAllServicesForSpace } from '../../../../../cloud-foundry/src/actions/space.actions';
-import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../../store/src/types/api.types';
-import { serviceEntityType, cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { cfEntityFactory, serviceEntityType } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { IService } from '../../../../../core/src/core/cf-api-svc.types';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
+import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { APIResource } from '../../../../../store/src/types/api.types';
+import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
 
 @Injectable()
 export class ServicesWallService {

src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts

@@ -8,30 +8,24 @@ import {
   serviceInstancesEntityType,
   servicePlanVisibilityEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-factory';
+import { GetServiceInstances } from '../../../../../cloud-foundry/src/actions/service-instances.actions';
+import { GetServicePlanVisibilities } from '../../../../../cloud-foundry/src/actions/service-plan-visibility.actions';
+import { GetServicePlanServiceInstances } from '../../../../../cloud-foundry/src/actions/service-plan.actions';
+import { GetServiceInstancesForSpace } from '../../../../../cloud-foundry/src/actions/space.actions';
+import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { APIResource } from '../../../../../store/src/types/api.types';
+
+import { getCfService, getServiceBroker, getServicePlans } from '../../../features/service-catalog/services-helper';
+import { QParam, QParamJoiners } from '../../../../../store/src/q-param';
+import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
-  getCfService,
-  getServiceBroker,
-  getServicePlans,
-} from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
-import {
-  IService,
-  IServiceBroker,
-  IServiceInstance,
-  IServicePlan,
   IServicePlanVisibility,
+  IService, IServiceBroker, IServicePlan, IServiceInstance
 } from '../../../../../core/src/core/cf-api-svc.types';
-import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { CF_GUID } from '../../../../../core/src/shared/entity.tokens';
+import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../core/src/shared/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../../store/src/types/api.types';
-import { CFAppState } from '../../../cf-app-state';
-import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
-import { GetServicePlanVisibilities } from '../../../actions/service-plan-visibility.actions';
-import { QParam, QParamJoiners } from '../../../../../store/src/q-param';
-import { GetServiceInstancesForSpace } from '../../../actions/space.actions';
-import { GetServicePlanServiceInstances } from '../../../actions/service-plan.actions';
-import { GetServiceInstances } from '../../../actions/service-instances.actions';
 
 export class CreateServiceInstanceHelper {
   servicePlanVisibilities$: Observable<APIResource<IServicePlanVisibility>[]>;