Update v3 master with v2

examples/custom-src/frontend/app/custom/acme-login/acme-login.component.ts

@@ -1,10 +1,10 @@
-import { Component, Inject, ViewEncapsulation } from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { Customizations, CustomizationsMetadata } from '../../core/customizations.types';
+import { AppState } from '../../../../store/src/app-state';
+import { CustomizationService, CustomizationsMetadata } from '../../core/customizations.types';
 import { StratosLoginComponent } from '../../core/extension/extension-service';
 import { LoginPageComponent } from '../../features/login/login-page/login-page.component';
-import { AppState } from '../../../../store/src/app-state';
 
 @StratosLoginComponent()
 @Component({
@@ -15,10 +15,13 @@ import { AppState } from '../../../../store/src/app-state';
 })
 export class AcmeLoginComponent extends LoginPageComponent {
 
+  config: CustomizationsMetadata;
+
   constructor(
     store: Store<AppState>,
-    @Inject(Customizations) public config: CustomizationsMetadata
+    cs: CustomizationService,
   ) {
     super(store);
+    this.config = cs.get();
   }
 }

examples/custom-src/frontend/app/custom/app-tab-extension/app-tab-extension.component.ts

@@ -1,7 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { StratosTab, StratosTabType, StratosAction, StratosActionType } from '../../core/extension/extension-service';
+
+import { StratosTab, StratosTabType } from '../../core/extension/extension-service';
 
 @StratosTab({
+  icon: 'extension',
   type: StratosTabType.Application,
   label: 'Example App Tab',
   link: 'example'

examples/custom-src/frontend/app/custom/custom.module.ts

@@ -1,12 +1,13 @@
 import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../core/core.module';
-import { Customizations, CustomizationsMetadata } from '../core/customizations.types';
+import { CustomizationService, CustomizationsMetadata } from '../core/customizations.types';
 import { MDAppModule } from '../core/md.module';
 import { SharedModule } from '../shared/shared.module';
 import { AcmeLoginComponent } from './acme-login/acme-login.component';
-import { AppTabExtensionComponent } from './app-tab-extension/app-tab-extension.component';
-import { AppActionExtensionComponent } from './app-action-extension/app-action-extension.component';
 import { AcmeSupportInfoComponent } from './acme-support-info/acme-support-info.component';
+import { AppActionExtensionComponent } from './app-action-extension/app-action-extension.component';
+import { AppTabExtensionComponent } from './app-tab-extension/app-tab-extension.component';
 
 const AcmeCustomizations: CustomizationsMetadata = {
   copyright: '© 2018 ACME Corp',
@@ -32,9 +33,11 @@ const AcmeCustomizations: CustomizationsMetadata = {
     AppTabExtensionComponent,
     AppActionExtensionComponent,
     AcmeSupportInfoComponent
-  ],
-  providers: [
-    { provide: Customizations, useValue: AcmeCustomizations }
-  ],
+  ]
 })
-export class CustomModule {}
+export class CustomModule {
+
+  constructor(cs: CustomizationService) {
+    cs.set(AcmeCustomizations);
+  }
+}

src/frontend/packages/core/src/app.module.ts

@@ -6,6 +6,7 @@ import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router
 import { Store } from '@ngrx/store';
 import { debounceTime, withLatestFrom } from 'rxjs/operators';
 
+import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
 import { CloudFoundryModule } from '../../cloud-foundry/src/cloud-foundry.module';
 import { SetRecentlyVisitedEntityAction } from '../../store/src/actions/recently-visited.actions';
 import { RouterNav } from '../../store/src/actions/router.actions';
@@ -34,6 +35,7 @@ import { IApp, IOrganization, ISpace } from './core/cf-api.types';
 import { CoreModule } from './core/core.module';
 import { CurrentUserPermissions } from './core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from './core/current-user-permissions.service';
+import { CustomizationService } from './core/customizations.types';
 import { DynamicExtensionRoutes } from './core/extension/dynamic-extension-routes';
 import { ExtensionService } from './core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from './core/github.helpers';
@@ -55,7 +57,6 @@ import { FavoriteConfig, favoritesConfigMapper } from './shared/components/favor
 import { GlobalEventData, GlobalEventService } from './shared/global-events.service';
 import { SharedModule } from './shared/shared.module';
 import { XSRFModule } from './xsrf.module';
-import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
 
 // Create action for router navigation. See
 // - https://github.com/ngrx/platform/issues/68
@@ -116,6 +117,7 @@ export class CustomRouterStateSerializer
     CfAutoscalerModule
   ],
   providers: [
+    CustomizationService,
     TabNavService,
     LoggedInService,
     ExtensionService,

src/frontend/packages/core/src/core/core.module.ts

@@ -7,12 +7,10 @@ import { MomentModule } from 'ngx-moment';
 import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component';
 import { RecentEntitiesComponent } from '../shared/components/recent-entities/recent-entities.component';
 import { AuthGuardService } from './auth-guard.service';
-import { NotSetupGuardService } from './not-setup-guard.service';
 import { ButtonBlurOnClickDirective } from './button-blur-on-click.directive';
 import { BytesToHumanSize, MegaBytesToHumanSize } from './byte-formatters.pipe';
 import { ClickStopPropagationDirective } from './click-stop-propagation.directive';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
-import { Customizations } from './customizations.types';
 import { DisableRouterLinkDirective } from './disable-router-link.directive';
 import { DotContentComponent } from './dot-content/dot-content.component';
 import { EndpointsService } from './endpoints.service';
@@ -23,6 +21,7 @@ import { InfinityPipe } from './infinity.pipe';
 import { LogOutDialogComponent } from './log-out-dialog/log-out-dialog.component';
 import { LoggerService } from './logger.service';
 import { MDAppModule } from './md.module';
+import { NotSetupGuardService } from './not-setup-guard.service';
 import { PageHeaderService } from './page-header-service/page-header.service';
 import { PageNotFoundComponentComponent } from './page-not-found-component/page-not-found-component.component';
 import { SafeImgPipe } from './safe-img.pipe';
@@ -73,7 +72,6 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
-    { provide: Customizations, useValue: {} },
     CurrentUserPermissionsService
   ],
   declarations: [

src/frontend/packages/core/src/core/customizations.types.ts

@@ -1,4 +1,4 @@
-import { InjectionToken } from '@angular/core';
+import { Injectable } from '@angular/core';
 
 /**
  * Optional customizations
@@ -13,4 +13,13 @@ export interface CustomizationsMetadata {
   alwaysShowNavForEndpointTypes?: (epType) => boolean;
 }
 
-export const Customizations = new InjectionToken<CustomizationsMetadata>('Stratos customizations');
+@Injectable({
+  providedIn: 'root',
+})
+export class CustomizationService {
+
+  private customizationMetadata: CustomizationsMetadata = {};
+
+  set = (cm: CustomizationsMetadata) => this.customizationMetadata = cm;
+  get = () => this.customizationMetadata;
+}

src/frontend/packages/core/src/features/about/about-page/about-page.component.ts

@@ -3,19 +3,19 @@ import {
   ComponentFactory,
   ComponentFactoryResolver,
   ComponentRef,
-  Inject,
   OnDestroy,
   OnInit,
   ViewChild,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
-import { SessionData } from '../../../../../store/src/types/auth.types';
+
 import { AppState } from '../../../../../store/src/app-state';
 import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
+import { SessionData } from '../../../../../store/src/types/auth.types';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 
 @Component({
   selector: 'app-about-page',
@@ -34,11 +34,15 @@ export class AboutPageComponent implements OnInit, OnDestroy {
   aboutInfoComponentRef: ComponentRef<any>;
   componentRef: ComponentRef<any>;
 
+  customizations: CustomizationsMetadata;
+
   constructor(
     private store: Store<AppState>,
     private resolver: ComponentFactoryResolver,
-    @Inject(Customizations) public customizations: CustomizationsMetadata
-  ) { }
+    cs: CustomizationService
+  ) {
+    this.customizations = cs.get();
+  }
 
   ngOnInit() {
     this.sessionData$ = this.store.select(s => s.auth).pipe(

src/frontend/packages/core/src/features/about/about.module.ts

@@ -1,11 +1,11 @@
 import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../../core/core.module';
-import { CustomImportModule } from '../../custom-import.module';
 import { SharedModule } from '../../shared/shared.module';
 import { AboutPageComponent } from './about-page/about-page.component';
 import { AboutRoutingModule } from './about.routing';
-import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-page.component';
 import { DiagnosticsPageComponent } from './diagnostics-page/diagnostics-page.component';
+import { EulaPageComponent, EulaPageContentComponent } from './eula-page/eula-page.component';
 
 
 
@@ -14,7 +14,6 @@ import { DiagnosticsPageComponent } from './diagnostics-page/diagnostics-page.co
     CoreModule,
     SharedModule,
     AboutRoutingModule,
-    CustomImportModule
   ],
   declarations: [
     AboutPageComponent,

src/frontend/packages/core/src/features/about/diagnostics-page/diagnostics-page.component.ts

@@ -1,13 +1,12 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Meta } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
-import { SessionData } from '../../../../../store/src/types/auth.types';
 import { AppState } from '../../../../../store/src/app-state';
 import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
+import { SessionData } from '../../../../../store/src/types/auth.types';
 
 @Component({
   selector: 'app-diagnostics-page',
@@ -36,7 +35,7 @@ export class DiagnosticsPageComponent implements OnInit {
   public gitBranchLink: string;
   public gitCommitLink: string;
 
-  constructor(private meta: Meta, private store: Store<AppState>, @Inject(Customizations) public customizations: CustomizationsMetadata) { }
+  constructor(private meta: Meta, private store: Store<AppState>) { }
 
   ngOnInit() {
 

src/frontend/packages/core/src/features/applications/application-delete/application-delete.component.spec.ts

@@ -7,7 +7,6 @@ import { generateTestApplicationServiceProvider } from '../../../../test-framewo
 import { BaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { generateTestEntityServiceProvider } from '../../../../test-framework/entity-service.helper';
 import { ApplicationsModule } from '../applications.module';
-import { CustomImportModule } from './../../../custom-import.module';
 import { ApplicationDeleteComponent } from './application-delete.component';
 
 describe('ApplicationDeleteComponent', () => {
@@ -30,10 +29,6 @@ describe('ApplicationDeleteComponent', () => {
         generateTestApplicationServiceProvider(cfId, appId),
         TabNavService
       ]
-    }).overrideModule(ApplicationsModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     }).compileComponents();
   }));
 

src/frontend/packages/core/src/features/applications/applications.module.ts

@@ -2,7 +2,6 @@ import { DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../core/core.module';
-import { CustomImportModule } from '../../custom-import.module';
 import { SharedModule } from '../../shared/shared.module';
 import { ApplicationDeleteComponent } from './application-delete/application-delete.component';
 import {
@@ -42,7 +41,6 @@ import { SshApplicationComponent } from './ssh-application/ssh-application.compo
     CoreModule,
     SharedModule,
     ApplicationsRoutingModule,
-    CustomImportModule
   ],
   declarations: [
     ApplicationWallComponent,

src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry.module.ts

@@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../core/core.module';
-import { CustomImportModule } from '../../custom-import.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
@@ -125,14 +124,14 @@ import { UsersRolesSelectComponent } from './users/manage-users/manage-users-sel
 import { UsersRolesComponent } from './users/manage-users/manage-users.component';
 import { RemoveUserComponent } from './users/remove-user/remove-user.component';
 
+
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     CloudFoundryRoutingModule,
     RouterModule,
     NgxChartsModule,
-    CustomImportModule
   ],
   declarations: [
     CloudFoundryBaseComponent,

src/frontend/packages/core/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts

@@ -2,12 +2,11 @@ import { inject, TestBed } from '@angular/core/testing';
 import { HttpModule } from '@angular/http';
 import { RouterTestingModule } from '@angular/router/testing';
 
+import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { SharedModule } from '../../../../shared/shared.module';
-import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
 import { CloudFoundryModule } from '../../cloud-foundry.module';
 import { CfRolesService } from './cf-roles.service';
-import { CustomImportModule } from '../../../../custom-import.module';
 
 
 describe('CfRolesService', () => {
@@ -24,10 +23,6 @@ describe('CfRolesService', () => {
         CfRolesService,
         CfUserService,
       ]
-    }).overrideModule(CloudFoundryModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     });
   });
 

src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts

@@ -1,10 +1,10 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Portal } from '@angular/cdk/portal';
-import { Component, NgZone, OnDestroy, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { MatDrawer } from '@angular/material';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { combineLatest, Observable, Subscription, of } from 'rxjs';
+import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map, startWith, withLatestFrom } from 'rxjs/operators';
 
 import { GetCFInfo } from '../../../../../store/src/actions/cloud-foundry.actions';
@@ -18,13 +18,13 @@ import { GetCurrentUsersRelations } from '../../../../../store/src/actions/permi
 import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { AppState } from '../../../../../store/src/app-state';
 import { DashboardState } from '../../../../../store/src/reducers/dashboard-reducer';
+import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
 import { EndpointHealthCheck } from '../../../../endpoints-health-checks';
 import { TabNavService } from '../../../../tab-nav.service';
+import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { PageHeaderService } from './../../../core/page-header-service/page-header.service';
 import { SideNavItem } from './../side-nav/side-nav.component';
-import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
 
 
 @Component({
@@ -53,7 +53,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
     private endpointsService: EndpointsService,
     public tabNavService: TabNavService,
     private ngZone: NgZone,
-    @Inject(Customizations) private customizations: CustomizationsMetadata
+    private cs: CustomizationService
   ) {
     this.noMargin$ = this.router.events.pipe(
       filter(event => event instanceof NavigationEnd),
@@ -195,8 +195,8 @@ export class DashboardBaseComponent implements OnInit, OnDestroy {
         };
         if (item.requiresEndpointType) {
           // Upstream always likes to show Cloud Foundry related endpoints - other distributions can chane this behaviour
-          const alwaysShow = this.customizations.alwaysShowNavForEndpointTypes ?
-            this.customizations.alwaysShowNavForEndpointTypes(item.requiresEndpointType) : (item.requiresEndpointType === 'cf');
+          const alwaysShow = this.cs.get().alwaysShowNavForEndpointTypes ?
+            this.cs.get().alwaysShowNavForEndpointTypes(item.requiresEndpointType) : (item.requiresEndpointType === 'cf');
           item.hidden = alwaysShow ? of(false) : this.endpointsService.doesNotHaveConnectedEndpointType(item.requiresEndpointType);
         } else if (item.requiresPersistence) {
           item.hidden = this.endpointsService.disablePersistenceFeatures$.pipe(startWith(true));

src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.spec.ts

@@ -1,8 +1,9 @@
-import { ComponentFixture, TestBed, async } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Customizations } from '../../../core/customizations.types';
-import { MDAppModule } from '../../../core/md.module';
+
 import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { CustomizationService } from '../../../core/customizations.types';
+import { MDAppModule } from '../../../core/md.module';
 import { SideNavComponent } from './side-nav.component';
 
 
@@ -19,7 +20,7 @@ describe('SideNavComponent', () => {
         createBasicStoreModule()
       ],
       providers: [
-        { provide: Customizations, useValue: {} }
+        CustomizationService
       ]
     })
       .compileComponents();

src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.ts

@@ -1,12 +1,12 @@
-import { Component, EventEmitter, Inject, InjectionToken, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, InjectionToken, Input, OnInit, Output } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { buffer, debounceTime, filter, map } from 'rxjs/operators';
 
 import { ActionHistoryDump } from '../../../../../store/src/actions/action-history.actions';
 import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 import { ISubHeaderTabs } from '../../../shared/components/page-subheader/page-subheader.types';
 
 
@@ -35,10 +35,14 @@ export interface SideNavItem extends ISubHeaderTabs {
 
 export class SideNavComponent implements OnInit {
 
+  public customizations: CustomizationsMetadata;
+
   constructor(
     private store: Store<AppState>,
-    @Inject(Customizations) public customizations: CustomizationsMetadata
-  ) { }
+    cs: CustomizationService
+  ) {
+    this.customizations = cs.get();
+  }
   @Input() set iconMode(isIconMode: boolean) {
     if (isIconMode !== this.isIconMode) {
       this.isIconMode = isIconMode;

src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.ts

@@ -4,7 +4,6 @@ import {
   ComponentFactory,
   ComponentFactoryResolver,
   ComponentRef,
-  Inject,
   NgZone,
   OnDestroy,
   OnInit,
@@ -20,7 +19,7 @@ import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
 import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
-import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types';
+import { CustomizationService, CustomizationsMetadata } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
 import {
   getActionsFromExtensions,
@@ -56,14 +55,18 @@ export class EndpointsPageComponent implements AfterViewInit, OnDestroy, OnInit
     action: 'Got it'
   };
 
+  public customizations: CustomizationsMetadata;
+
   constructor(
     public endpointsService: EndpointsService,
     public store: Store<AppState>,
     private ngZone: NgZone,
     private resolver: ComponentFactoryResolver,
     private snackBar: MatSnackBar,
-    @Inject(Customizations) public customizations: CustomizationsMetadata
+    cs: CustomizationService
   ) {
+    this.customizations = cs.get();
+
     // Redirect to /applications if not enabled.
     endpointsService.disablePersistenceFeatures$.pipe(
       map(off => {

src/frontend/packages/core/src/features/endpoints/endpoints.module.ts

@@ -9,15 +9,13 @@ import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog/connec
 import { CreateEndpointModule } from './create-endpoint/create-endpoint.module';
 import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
 import { EndpointsRoutingModule } from './endpoints.routing';
-import { CustomImportModule } from '../../custom-import.module';
 
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
     EndpointsRoutingModule,
     CreateEndpointModule,
-    CustomImportModule
   ],
   declarations: [
     EndpointsPageComponent,

src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.spec.ts

@@ -2,18 +2,17 @@ import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../../core/core.module';
-import { EntityServiceFactory } from '../../../../../core/entity-service-factory.service';
-import { ApplicationsModule } from '../../../../../features/applications/applications.module';
+import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
+import { applicationSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../test-framework/entity-service.helper';
 import { createBasicStoreModule, getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../../../core/core.module';
+import { EntityServiceFactory } from '../../../../../core/entity-service-factory.service';
+import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { SharedModule } from '../../../../shared.module';
 import { CfAppEventsConfigService } from './cf-app-events-config.service';
-import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
-import { entityFactory, applicationSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
-import { CustomImportModule } from '../../../../../custom-import.module';
 
 
 describe('CfAppEventsConfigService', () => {
@@ -41,10 +40,6 @@ describe('CfAppEventsConfigService', () => {
         createBasicStoreModule(),
         RouterTestingModule
       ]
-    }).overrideModule(ApplicationsModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     });
   });
 

src/frontend/packages/core/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts

@@ -2,17 +2,16 @@ import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../../core/core.module';
-import { ApplicationsModule } from '../../../../../features/applications/applications.module';
+import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
+import { applicationSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../test-framework/entity-service.helper';
 import { createBasicStoreModule, getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../../../core/core.module';
+import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { SharedModule } from '../../../../shared.module';
 import { CfAppInstancesConfigService } from './cf-app-instances-config.service';
-import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
-import { entityFactory, applicationSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
-import { CustomImportModule } from '../../../../../custom-import.module';
 
 describe('CfAppInstancesConfigService', () => {
 
@@ -39,10 +38,6 @@ describe('CfAppInstancesConfigService', () => {
         createBasicStoreModule(),
         RouterTestingModule,
       ]
-    }).overrideModule(ApplicationsModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     });
   });
 

src/frontend/packages/core/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts

@@ -2,18 +2,16 @@ import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../../core/core.module';
-
+import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
+import { applicationSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
 import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../test-framework/entity-service.helper';
 import { createBasicStoreModule, getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../../../core/core.module';
+import { ApplicationsModule } from '../../../../../features/applications/applications.module';
 import { SharedModule } from '../../../../shared.module';
 import { CfAppVariablesListConfigService } from './cf-app-variables-list-config.service';
-import { endpointStoreNames } from '../../../../../../../store/src/types/endpoint.types';
-import { entityFactory, applicationSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { GetApplication } from '../../../../../../../store/src/actions/application.actions';
-import { ApplicationsModule } from '../../../../../features/applications/applications.module';
-import { CustomImportModule } from '../../../../../custom-import.module';
 
 describe('CfAppVariablesListConfigService', () => {
 
@@ -40,10 +38,6 @@ describe('CfAppVariablesListConfigService', () => {
         ApplicationsModule,
         RouterTestingModule
       ]
-    }).overrideModule(ApplicationsModule, {
-      remove: {
-        imports: [CustomImportModule]
-      }
     });
   });