From 164930ab4e8c3e6723ebd27af89760e2f5fe79cb Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 29 Jun 2020 17:39:41 +0100 Subject: [PATCH 1/4] Move out cf themese from _all-theme & remove custom cf table sort/filter field widths --- .../packages/cloud-foundry/sass/_all-theme.scss | 12 +++++++++++- .../src/cloud-foundry-package.module.ts | 5 ----- .../application-wall.component.theme.scss | 9 --------- .../application-base.component.theme.scss | 5 ----- .../service-catalog-page.component.theme.scss | 9 --------- .../services-wall.component.theme.scss | 9 --------- src/frontend/packages/core/sass/_all-theme.scss | 15 +-------------- 7 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss delete mode 100644 src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss delete mode 100644 src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss delete mode 100644 src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss diff --git a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss index fd92ae1354..da3d8fd817 100644 --- a/src/frontend/packages/cloud-foundry/sass/_all-theme.scss +++ b/src/frontend/packages/cloud-foundry/sass/_all-theme.scss @@ -1,7 +1,11 @@ // Theming for the copmponents in the Cloud Foundry package -@import '../src/features/applications/application-wall/application-wall.component.theme'; @import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme'; +@import '../src/shared/components/schema-form/schema-form.component.theme'; +@import '../src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme'; +@import '../src/features/applications/deploy-application/deploy-application.component.theme'; +@import '../src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme'; +@import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme'; @mixin apply-theme-stratos-cloud-foundry($stratos-theme) { @@ -9,4 +13,10 @@ $app-theme: map-get($stratos-theme, app-theme); @include cf-security-group-theme($theme); + @include app-schema-form-theme($theme, $app-theme); + @include cf-admin-add-user-warning($theme, $app-theme); + @include app-deploy-app-theme($theme, $app-theme); + @include app-deploy-app-fs-component-theme($theme, $app-theme); + @include app-cloud-foundry-firehose-theme($theme, $app-theme); + } diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts index 6e088679f4..d6277fee8c 100644 --- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts +++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts @@ -31,11 +31,6 @@ import { cfCurrentUserPermissionsService } from './user-permissions/cf-user-perm CloudFoundryStoreModule, // FIXME: Ensure that anything lazy loaded is not included here - #3675 CloudFoundrySharedModule, - // FIXME: Move cf effects into cf module - #3675 - // EffectsModule.for Root([ - // PermissionsEffects, - // PermissionEffects - // ]) ], providers: [ ...cfCurrentUserPermissionsService, diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss deleted file mode 100644 index 81840ebdad..0000000000 --- a/src/frontend/packages/cloud-foundry/src/features/applications/application-wall/application-wall.component.theme.scss +++ /dev/null @@ -1,9 +0,0 @@ -// For the App Wall, reduce the size of the filter and sort -.app-wall { - .list-component__header__right-filter { - width: 140px; - } - .list-component__header__right-sort { - width: 120px; - } -} diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss deleted file mode 100644 index 8d1f7fa03d..0000000000 --- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.theme.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin app-base-page-theme($theme, $app-theme) { - .summary__nav { - //background-color: map-get($app-theme, app-background-color); - } -} diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss deleted file mode 100644 index d2b75ca4fd..0000000000 --- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme.scss +++ /dev/null @@ -1,9 +0,0 @@ -// For the Services Catalog, reduce the size of the filter and sort -.marketplace { - .list-component__header__right-filter { - width: 140px; - } - .list-component__header__right-sort { - width: 120px; - } -} diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss b/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss deleted file mode 100644 index 73f218c996..0000000000 --- a/src/frontend/packages/cloud-foundry/src/features/services/services-wall/services-wall.component.theme.scss +++ /dev/null @@ -1,9 +0,0 @@ -// For the Services Wall, reduce the size of the filter and sort -.services-wall { - .list-component__header__right-filter { - width: 140px; - } - .list-component__header__right-sort { - width: 120px; - } -} diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss index 67ae92ae8b..2a75bc332a 100644 --- a/src/frontend/packages/core/sass/_all-theme.scss +++ b/src/frontend/packages/core/sass/_all-theme.scss @@ -54,14 +54,7 @@ @import '../src/shared/components/favorites-global-list/favorites-global-list.component.theme'; @import '../src/shared/components/favorites-meta-card/favorites-meta-card.component.theme'; -@import '../../cloud-foundry/src/shared/components/schema-form/schema-form.component.theme'; -@import '../../cloud-foundry/src/features/services/services-wall/services-wall.component.theme'; -@import '../../cloud-foundry/src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme'; -@import '../../cloud-foundry/src/features/applications/application/application-base.component.theme'; -@import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application.component.theme'; -@import '../../cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme'; -@import '../../cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme'; -@import '../../cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme'; + @import '../../core/src/features/error-page/error-page/error-page.component.theme'; @import '../../core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme'; @import '../../core/src/features/metrics/metrics/metrics.component.theme'; @@ -85,7 +78,6 @@ @include display-value-theme($theme, $app-theme); @include steppers-theme($theme, $app-theme); @include list-theme($theme, $app-theme); - @include app-base-page-theme($theme, $app-theme); @include app-mat-snack-bar-theme($theme, $app-theme); @include ngx-charts-gauge($theme, $app-theme); @include app-text-status-theme($theme, $app-theme); @@ -98,8 +90,6 @@ @include app-boolean-indicator-theme($theme, $app-theme); @include loading-page-theme($theme, $app-theme); @include app-log-viewer-theme($theme, $app-theme); - @include app-deploy-app-theme($theme, $app-theme); - @include app-cloud-foundry-firehose-theme($theme, $app-theme); @include app-card-number-metric-theme($theme, $app-theme); @include app-card-boolean-metric-theme($theme, $app-theme); @include app-dot-content($theme, $app-theme); @@ -108,12 +98,10 @@ @include app-page-header-events($theme, $app-theme); @include app-user-profile-banner-component-theme($theme, $app-theme); @include action-monitor-icon-theme($theme, $app-theme); - @include app-deploy-app-fs-component-theme($theme, $app-theme); @include app-upload-progress-indicator-component-theme($theme, $app-theme); @include page-404($theme, $app-theme); @include about-page-theme($theme, $app-theme); @include meta-card-component($theme, $app-theme); - @include app-schema-form-theme($theme, $app-theme); @include start-end-theme($theme, $app-theme); @include metrics-chart-theme($theme, $app-theme); @include metrics-range-selector-theme($theme, $app-theme); @@ -127,7 +115,6 @@ @include favorites-global-list-theme($theme, $app-theme); @include favorites-meta-card-theme($theme, $app-theme); @include page-side-nav-theme($theme, $app-theme); - @include cf-admin-add-user-warning($theme, $app-theme); @include entity-summary-title-theme($theme, $app-theme); @include app-meta-card-item-theme($theme, $app-theme); @include error-page-theme($theme, $app-theme); From 6d946964f68f567fdc29e24fa6a8f45d4c299c4a Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 29 Jun 2020 17:58:46 +0100 Subject: [PATCH 2/4] Move cf routes out of app.routing & move out cf route modules from cf package module (fixes code splitting) --- .../src/cloud-foundry-package.module.ts | 10 +-- .../src/cloud-foundry-routing.module.ts | 64 +++++++++++++++++++ ...ule.ts => cloud-foundry-section.module.ts} | 8 ++- ...ng.ts => cloud-foundry-section.routing.ts} | 2 +- .../manage-users/cf-roles.service.spec.ts | 6 +- .../service-catalog/service-catalog.module.ts | 5 +- .../src/features/services/services.module.ts | 5 +- .../src/shared/cf-shared.module.ts | 5 -- .../src/store/cloud-foundry.store.module.ts | 7 ++ src/frontend/packages/core/src/app.routing.ts | 57 +---------------- 10 files changed, 93 insertions(+), 76 deletions(-) create mode 100644 src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts rename src/frontend/packages/cloud-foundry/src/features/cloud-foundry/{cloud-foundry.module.ts => cloud-foundry-section.module.ts} (98%) rename src/frontend/packages/cloud-foundry/src/features/cloud-foundry/{cloud-foundry.routing.ts => cloud-foundry-section.routing.ts} (99%) diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts index d6277fee8c..9490c66e9c 100644 --- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts +++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-package.module.ts @@ -5,10 +5,7 @@ import { MDAppModule } from '../../core/src/core/md.module'; import { SharedModule } from '../../core/src/shared/shared.module'; import { EntityCatalogModule } from '../../store/src/entity-catalog.module'; import { generateCFEntities } from './cf-entity-generator'; -import { ApplicationsModule } from './features/applications/applications.module'; -import { CloudFoundryModule } from './features/cloud-foundry/cloud-foundry.module'; -import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module'; -import { ServicesModule } from './features/services/services.module'; +import { CloudFoundryRoutingModule } from './cloud-foundry-routing.module'; import { CloudFoundrySharedModule } from './shared/cf-shared.module'; import { CfUserService } from './shared/data-services/cf-user.service'; import { CloudFoundryService } from './shared/data-services/cloud-foundry.service'; @@ -24,13 +21,10 @@ import { cfCurrentUserPermissionsService } from './user-permissions/cf-user-perm CommonModule, SharedModule, MDAppModule, - ApplicationsModule, - CloudFoundryModule, - ServiceCatalogModule, - ServicesModule, CloudFoundryStoreModule, // FIXME: Ensure that anything lazy loaded is not included here - #3675 CloudFoundrySharedModule, + CloudFoundryRoutingModule ], providers: [ ...cfCurrentUserPermissionsService, diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts new file mode 100644 index 0000000000..0266310650 --- /dev/null +++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-routing.module.ts @@ -0,0 +1,64 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; + +const customRoutes: Routes = [ + { + path: 'applications', + loadChildren: () => import('./features/applications/applications.module').then(m => m.ApplicationsModule), + data: { + stratosNavigation: { + label: 'Applications', + matIcon: 'apps', + requiresEndpointType: 'cf', + position: 20 + } + }, + }, + { + path: 'marketplace', + loadChildren: () => import('./features/service-catalog/service-catalog.module') + .then(m => m.ServiceCatalogModule), + data: { + stratosNavigation: { + label: 'Marketplace', + matIcon: 'store', + requiresEndpointType: 'cf', + position: 30 + } + }, + }, + { + path: 'services', + loadChildren: () => import('./features/services/services.module').then(m => m.ServicesModule), + data: { + stratosNavigation: { + label: 'Services', + matIcon: 'service', + matIconFont: 'stratos-icons', + requiresEndpointType: 'cf', + position: 40 + } + }, + }, + { + path: 'cloud-foundry', + loadChildren: () => import('./features/cloud-foundry/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule), + data: { + stratosNavigation: { + label: 'Cloud Foundry', + matIcon: 'cloud_foundry', + matIconFont: 'stratos-icons', + requiresEndpointType: 'cf', + position: 50 + } + }, + }, +] + +@NgModule({ + imports: [ + RouterModule.forRoot(customRoutes), + ], + declarations: [] +}) +export class CloudFoundryRoutingModule { } \ No newline at end of file diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts similarity index 98% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts index 76e9e15ff3..c9e0f23122 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.module.ts @@ -1,3 +1,4 @@ +import { DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -21,8 +22,8 @@ import { CreateSpaceStepComponent } from './add-space/create-space-step/create-s import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types'; import { CliInfoCloudFoundryComponent } from './cli-info-cloud-foundry/cli-info-cloud-foundry.component'; import { CloudFoundryBaseComponent } from './cloud-foundry-base/cloud-foundry-base.component'; +import { CloudFoundrySectionRoutingModule } from './cloud-foundry-section.routing'; import { CloudFoundryTabsBaseComponent } from './cloud-foundry-tabs-base/cloud-foundry-tabs-base.component'; -import { CloudFoundryRoutingModule } from './cloud-foundry.routing'; import { CloudFoundryComponent } from './cloud-foundry/cloud-foundry.component'; import { EditOrganizationStepComponent } from './edit-organization/edit-organization-step/edit-organization-step.component'; import { EditOrganizationComponent } from './edit-organization/edit-organization.component'; @@ -137,7 +138,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component'; imports: [ CoreModule, SharedModule, - CloudFoundryRoutingModule, + CloudFoundrySectionRoutingModule, RouterModule, NgxChartsModule, CloudFoundrySharedModule @@ -228,9 +229,10 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component'; CloudFoundryCellService, UserInviteService, UserInviteConfigureService, + DatePipe ], entryComponents: [ UserInviteConfigurationDialogComponent ] }) -export class CloudFoundryModule { } +export class CloudFoundrySectionModule { } diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts similarity index 99% rename from src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts index cdfcacbe8b..258d2b2163 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-section.routing.ts @@ -427,4 +427,4 @@ const cloudFoundry: Routes = [{ @NgModule({ imports: [RouterModule.forChild(cloudFoundry)] }) -export class CloudFoundryRoutingModule { } +export class CloudFoundrySectionRoutingModule { } diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts index 14e0a46dd7..90e369eeec 100644 --- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.spec.ts @@ -1,12 +1,12 @@ +import { HttpClientModule } from '@angular/common/http'; import { inject, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { SharedModule } from '../../../../../../core/src/shared/shared.module'; import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { CfUserService } from '../../../../shared/data-services/cf-user.service'; -import { CloudFoundryModule } from '../../cloud-foundry.module'; +import { CloudFoundrySectionModule } from '../../cloud-foundry-section.module'; import { CfRolesService } from './cf-roles.service'; -import { HttpClientModule } from '@angular/common/http'; describe('CfRolesService', () => { beforeEach(() => { @@ -14,7 +14,7 @@ describe('CfRolesService', () => { imports: [ ...generateCfStoreModules(), SharedModule, - CloudFoundryModule, + CloudFoundrySectionModule, HttpClientModule, RouterTestingModule ], diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts index a959216d92..f2d5dec61b 100644 --- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts +++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts @@ -1,4 +1,4 @@ -import { CommonModule } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { CoreModule } from '../../../../core/src/core/core.module'; @@ -33,6 +33,9 @@ import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base. ], exports: [ ServiceTabsBaseComponent, + ], + providers: [ + DatePipe ] }) export class ServiceCatalogModule { } diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts b/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts index 628dced999..0680c4e2ff 100644 --- a/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts +++ b/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts @@ -1,4 +1,4 @@ -import { CommonModule } from '@angular/common'; +import { CommonModule, DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { @@ -27,6 +27,9 @@ import { ServicesRoutingModule } from './services.routing'; ServicesWallComponent, DetachServiceInstanceComponent, DetachAppsComponent + ], + providers: [ + DatePipe ] }) export class ServicesModule { } diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts index aeef92fd78..9d766f68c9 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts @@ -208,9 +208,6 @@ import { CfUserPermissionDirective } from './directives/cf-user-permission/cf-us import { ApplicationStateService } from './services/application-state.service'; import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service'; -// tslint:disable:max-line-length -// tslint:enable:max-line-length - const cfListTableCells: Type>[] = [ TableCellServiceInstanceAppsAttachedComponent, TableCellServiceComponent, @@ -267,8 +264,6 @@ const cfListCards: Type>[] = [ UserProvidedServiceInstanceCardComponent, ]; -// listTableCells.push(); - @NgModule({ imports: [ CommonModule, diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts index f2c9b707bd..700bf7c0a7 100644 --- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts +++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { EffectsModule } from '@ngrx/effects'; +import { ActiveRouteCfOrgSpace } from '../features/cloud-foundry/cf-page.types'; import { CloudFoundryReducersModule } from './cloud-foundry.reducers.module'; import { AppVariablesEffect } from './effects/app-variables.effects'; import { AppEffects } from './effects/app.effects'; @@ -30,6 +31,12 @@ import { UsersRolesEffects } from './effects/users-roles.effects'; CfValidateEffects, UsersRolesEffects ]) + ], + providers: [ + { + provide: ActiveRouteCfOrgSpace, + useValue: {} + }, ] }) export class CloudFoundryStoreModule { } diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts index 7f85939c8b..4bd4a953da 100644 --- a/src/frontend/packages/core/src/app.routing.ts +++ b/src/frontend/packages/core/src/app.routing.ts @@ -5,18 +5,18 @@ import { RouterModule, Routes } from '@angular/router'; import { AuthGuardService } from './core/auth-guard.service'; import { CoreModule } from './core/core.module'; import { EndpointsService } from './core/endpoints.service'; +import { NotSetupGuardService } from './core/not-setup-guard.service'; import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component'; import { CustomRoutingImportModule } from './custom-import.module'; import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component'; import { HomePageComponent } from './features/home/home/home-page.component'; import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component'; import { DomainMismatchComponent } from './features/setup/domain-mismatch/domain-mismatch.component'; +import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component'; +import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component'; import { ConsoleUaaWizardComponent } from './features/setup/uaa-wizard/console-uaa-wizard.component'; import { UpgradePageComponent } from './features/setup/upgrade-page/upgrade-page.component'; import { SharedModule } from './shared/shared.module'; -import { NotSetupGuardService } from './core/not-setup-guard.service'; -import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component'; -import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component'; const appRoutes: Routes = [ { path: '', redirectTo: 'home', pathMatch: 'full' }, @@ -59,18 +59,6 @@ const appRoutes: Routes = [ } }, { path: 'entity-list', loadChildren: () => import('./api-driven-views/api-driven-views.module').then(m => m.ApiDrivenViewsModule) }, - { - path: 'applications', - loadChildren: () => import('../../cloud-foundry/src/features/applications/applications.module').then(m => m.ApplicationsModule), - data: { - stratosNavigation: { - label: 'Applications', - matIcon: 'apps', - requiresEndpointType: 'cf', - position: 20 - } - }, - }, { path: 'endpoints', data: { @@ -89,45 +77,6 @@ const appRoutes: Routes = [ path: '', loadChildren: () => import('./features/endpoints/endpoints.module').then(m => m.EndpointsModule), }] - }, - { - path: 'marketplace', - loadChildren: () => import('../../cloud-foundry/src/features/service-catalog/service-catalog.module') - .then(m => m.ServiceCatalogModule), - data: { - stratosNavigation: { - label: 'Marketplace', - matIcon: 'store', - requiresEndpointType: 'cf', - position: 30 - } - }, - }, - { - path: 'services', - loadChildren: () => import('../../cloud-foundry/src/features/services/services.module').then(m => m.ServicesModule), - data: { - stratosNavigation: { - label: 'Services', - matIcon: 'service', - matIconFont: 'stratos-icons', - requiresEndpointType: 'cf', - position: 40 - } - }, - }, - { - path: 'cloud-foundry', - loadChildren: () => import('../../cloud-foundry/src/features/cloud-foundry/cloud-foundry.module').then(m => m.CloudFoundryModule), - data: { - stratosNavigation: { - label: 'Cloud Foundry', - matIcon: 'cloud_foundry', - matIconFont: 'stratos-icons', - requiresEndpointType: 'cf', - position: 50 - } - }, }, { path: 'about', loadChildren: () => import('./features/about/about.module').then(m => m.AboutModule) }, { path: 'user-profile', loadChildren: () => import('./features/user-profile/user-profile.module').then(m => m.UserProfileModule) }, From 30f305ef3333f0e89e39c698bf312fc8176573cc Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 30 Jun 2020 13:23:03 +0100 Subject: [PATCH 3/4] Fix autoscaler e2e test --- .../packages/cf-autoscaler/src/core/autoscaler.module.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts index cb76b829f2..a57337186b 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts @@ -2,6 +2,9 @@ import { NgModule } from '@angular/core'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service'; +import { + ApplicationEnvVarsHelper, +} from '../../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; import { CloudFoundrySharedModule } from '../../../cloud-foundry/src/shared/cf-shared.module'; import { CoreModule } from '../../../core/src/core/core.module'; import { SharedModule } from '../../../core/src/shared/shared.module'; @@ -82,7 +85,8 @@ import { AutoscalerRoutingModule } from './autoscaler.routing'; CardAutoscalerDefaultComponent ], providers: [ - ApplicationService + ApplicationService, + ApplicationEnvVarsHelper ] }) export class AutoscalerModule { } From 4e83acc4ab3215eb15570a80022a62385f83701c Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 30 Jun 2020 15:59:52 +0100 Subject: [PATCH 4/4] Fix autoscaler e2e test #2 --- .../packages/cf-autoscaler/src/core/autoscaler.module.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts index a57337186b..3f41ef2f3e 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts @@ -1,3 +1,4 @@ +import { DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -86,7 +87,8 @@ import { AutoscalerRoutingModule } from './autoscaler.routing'; ], providers: [ ApplicationService, - ApplicationEnvVarsHelper + ApplicationEnvVarsHelper, + DatePipe ] }) export class AutoscalerModule { }