From e24f838d81ac9d847c9ccc221b099d9b620925a2 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 14 Nov 2018 20:12:25 +0800 Subject: [PATCH 01/98] [autoscaler] add autoscaler tab --- .../auto-scaler-tab.component.html | 3 + .../auto-scaler-tab.component.scss | 6 ++ .../auto-scaler-tab.component.spec.ts | 69 +++++++++++++++++++ .../auto-scaler-tab.component.ts | 24 +++++++ .../applications/applications.module.ts | 2 + .../applications/applications.routing.ts | 2 + 6 files changed, 106 insertions(+) create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html new file mode 100644 index 0000000000..f2e5e67904 --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss new file mode 100644 index 0000000000..94ca044473 --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss @@ -0,0 +1,6 @@ +.app-auto-scaler { + display: flex; + height: 100%; + position: relative; + width: 100%; +} diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts new file mode 100644 index 0000000000..9fd903bb52 --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts @@ -0,0 +1,69 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { StoreModule } from '@ngrx/store'; + +import { CoreModule } from '../../../../../../core/core.module'; +import { MDAppModule } from '../../../../../../core/md.module'; +import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; +import { LogViewerComponent } from '../../../../../../shared/components/log-viewer/log-viewer.component'; +import { EntityMonitorFactory } from '../../../../../../shared/monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { GetApplication } from '../../../../../../store/actions/application.actions'; +import { applicationSchemaKey, entityFactory } from '../../../../../../store/helpers/entity-factory'; +import { AppStoreModule } from '../../../../../../store/store.module'; +import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper'; +import { generateTestEntityServiceProvider } from '../../../../../../test-framework/entity-service.helper'; +import { createBasicStoreModule } from '../../../../../../test-framework/store-test-helper'; +import { ApplicationEnvVarsService } from '../build-tab/application-env-vars.service'; +import { LogStreamTabComponent } from './auto-scaler-tab.component'; + + +describe('LogStreamTabComponent', () => { + let component: LogStreamTabComponent; + let fixture: ComponentFixture; + + const appId = ''; + const cfId = '2'; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + StoreModule, + CoreModule, + NoopAnimationsModule, + RouterTestingModule, + MDAppModule, + createBasicStoreModule() + ], + declarations: [ + LogViewerComponent, + LogStreamTabComponent + ], + providers: [ + generateTestEntityServiceProvider( + appId, + entityFactory(applicationSchemaKey), + new GetApplication(appId, cfId) + ), + generateTestApplicationServiceProvider(cfId, appId), + AppStoreModule, + ApplicationStateService, + ApplicationEnvVarsService, + EntityMonitorFactory, + PaginationMonitorFactory + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LogStreamTabComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts new file mode 100644 index 0000000000..0ba16870ce --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ApplicationService } from '../../../../application.service'; + +@Component({ + selector: 'app-auto-scaler-tab', + templateUrl: './auto-scaler-tab.component.html', + styleUrls: ['./auto-scaler-tab.component.scss'] +}) +export class AutoScalerTabComponent implements OnInit { + + srcUrl: any; + + constructor(private sanitizer: DomSanitizer, private applicationService: ApplicationService) { + this.srcUrl = this.sanitizer.bypassSecurityTrustResourceUrl('https://scalingconsole.stage1.eu-gb.bluemix.net/apps/' + this.applicationService.appGuid); + console.log("url", this.srcUrl) + } + + ngOnInit() { + console.log('cfGuid', this.applicationService.cfGuid) + console.log('appGuid', this.applicationService.appGuid) + } + +} diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index 75db658c1f..d03deb8285 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -17,6 +17,7 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; +import { AutoScalerTabComponent } from './application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; @@ -46,6 +47,7 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new ApplicationBaseComponent, EventsTabComponent, LogStreamTabComponent, + AutoScalerTabComponent, ServicesTabComponent, BuildTabComponent, VariablesTabComponent, diff --git a/src/frontend/packages/core/src/features/applications/applications.routing.ts b/src/frontend/packages/core/src/features/applications/applications.routing.ts index ea3522160a..526de56cfb 100644 --- a/src/frontend/packages/core/src/features/applications/applications.routing.ts +++ b/src/frontend/packages/core/src/features/applications/applications.routing.ts @@ -19,6 +19,7 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; +import { AutoScalerTabComponent } from './application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; @@ -106,6 +107,7 @@ const applicationsRoutes: Routes = [ { path: 'events', component: EventsTabComponent }, { path: 'gitscm', component: GitSCMTabComponent }, { path: 'metrics', component: MetricsTabComponent }, + { path: 'auto-scaler', component: AutoScalerTabComponent }, { path: '**', component: PageNotFoundComponentComponent, From 49ffa85ee28d3196823d7374c7a852e21e00364a Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 20 Nov 2018 11:36:00 +0800 Subject: [PATCH 02/98] [autoscaler] show basic info in autoscaler tab --- .../auto-scaler-tab.component.html | 42 +++++++++++++++++-- .../auto-scaler-tab.component.ts | 42 ++++++++++++++----- .../application-service-helper.ts | 3 ++ .../store/src/helpers/entity-factory.ts | 8 ++++ .../api-request-reducers.generator.ts | 6 ++- .../packages/store/src/types/entity.types.ts | 6 ++- src/jetstream/passthrough.go | 6 +++ 7 files changed, 98 insertions(+), 15 deletions(-) diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html index f2e5e67904..776c3b2c0b 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html @@ -1,3 +1,39 @@ -
- -
+
+ + + + + + Status + + +
+
+ Enabled +
+
+ + + + + + + Limits + + +
+
+ {{ policy.instance_min_count }} + {{ policy.instance_max_count }} +
+
+ + + + + + + +
\ No newline at end of file diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts index 0ba16870ce..2ca83499f5 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts @@ -1,24 +1,46 @@ -import { Component, OnInit } from '@angular/core'; -import { DomSanitizer } from '@angular/platform-browser'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; +import { EntityService } from '../../../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, +} from '../../../../../../store/helpers/entity-factory'; import { ApplicationService } from '../../../../application.service'; +import { GetAppAutoscalerPolicyAction } from '../../../../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../../store/types/app-autoscaler.types'; +import { map } from 'rxjs/operators'; @Component({ selector: 'app-auto-scaler-tab', templateUrl: './auto-scaler-tab.component.html', - styleUrls: ['./auto-scaler-tab.component.scss'] + styleUrls: ['./auto-scaler-tab.component.scss'], }) export class AutoScalerTabComponent implements OnInit { - srcUrl: any; + appAutoscalerPolicyService: EntityService; + appAutoscalerPolicy$: Observable; - constructor(private sanitizer: DomSanitizer, private applicationService: ApplicationService) { - this.srcUrl = this.sanitizer.bypassSecurityTrustResourceUrl('https://scalingconsole.stage1.eu-gb.bluemix.net/apps/' + this.applicationService.appGuid); - console.log("url", this.srcUrl) - } + constructor( + private applicationService: ApplicationService, + private entityServiceFactory: EntityServiceFactory, + ) { } ngOnInit() { - console.log('cfGuid', this.applicationService.cfGuid) - console.log('appGuid', this.applicationService.appGuid) + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => entity), + map(policyEntity => { + console.log("appAutoscalerPolicy", policyEntity) + return policyEntity && policyEntity.entity + }) + ); } } diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts index afb06d55a5..b665e3b421 100644 --- a/src/frontend/packages/core/test-framework/application-service-helper.ts +++ b/src/frontend/packages/core/test-framework/application-service-helper.ts @@ -13,6 +13,7 @@ import { AppState } from '../../store/src/app-state'; import { EntityServiceFactory } from '../src/core/entity-service-factory.service'; import { PaginationMonitorFactory } from '../src/shared/monitors/pagination-monitor.factory'; import { Observable, of as observableOf } from 'rxjs'; +import { AppAutoscalerPolicy, AppAutoscalerHealth } from '../store/types/app-autoscaler.types'; function createEntity(entity: T): APIResource { return { @@ -51,6 +52,8 @@ export class ApplicationServiceMock { appSummary$: Observable>> = observableOf({ entityRequestInfo: { fetching: false } } as EntityInfo>); + appAutoscalerPolicy$: Observable> = observableOf(({ entityRequestInfo: { fetching: false } } as EntityInfo)); + appAutoscalerHealth$: Observable> = observableOf(({ entityRequestInfo: { fetching: false } } as EntityInfo)); appStats$: Observable[]> = observableOf(new Array>()); applicationStratProject$: Observable = observableOf({ deploySource: { type: '', timestamp: 0, commit: '' }, deployOverrides: null }); diff --git a/src/frontend/packages/store/src/helpers/entity-factory.ts b/src/frontend/packages/store/src/helpers/entity-factory.ts index cdc5c69e1d..d31655d78a 100644 --- a/src/frontend/packages/store/src/helpers/entity-factory.ts +++ b/src/frontend/packages/store/src/helpers/entity-factory.ts @@ -36,6 +36,8 @@ export const servicePlanVisibilitySchemaKey = 'servicePlanVisibility'; export const serviceBrokerSchemaKey = 'serviceBroker'; export const userFavoritesSchemaKey = 'userFavorites'; export const userProvidedServiceInstanceSchemaKey = 'userProvidedServiceInstance'; +export const appAutoscalerHealthSchemaKey = 'autoscalerHealth'; +export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; export const spaceWithOrgKey = 'spaceWithOrg'; export const serviceInstancesWithSpaceSchemaKey = 'serviceInstancesWithSpace'; @@ -313,6 +315,12 @@ entityCache[servicePlanVisibilitySchemaKey] = ServicePlanVisibilitySchema; const UserFavoritesSchemaKey = new EntitySchema(userFavoritesSchemaKey, {}, { idAttribute: getAPIResourceGuid }); entityCache[userFavoritesSchemaKey] = UserFavoritesSchemaKey; +const AppAutoscalerPolicySchema = new EntitySchema(appAutoscalerPolicySchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerPolicySchemaKey] = AppAutoscalerPolicySchema; + +const AppAutoscalerHealthSchema = new EntitySchema(appAutoscalerHealthSchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerHealthSchemaKey] = AppAutoscalerHealthSchema; + const ApplicationEntitySchema = new EntitySchema( applicationSchemaKey, { diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts index f8f1293e89..949d2ed7bf 100644 --- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts +++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts @@ -29,6 +29,8 @@ import { userFavoritesSchemaKey, userProfileSchemaKey, userProvidedServiceInstanceSchemaKey, + appAutoscalerPolicySchemaKey, + appAutoscalerHealthSchemaKey, } from '../helpers/entity-factory'; import { endpointStoreNames } from '../types/endpoint.types'; import { IRequestDataState, IRequestState } from '../types/entity.types'; @@ -116,7 +118,9 @@ const entities = [ servicePlanVisibilitySchemaKey, serviceBrokerSchemaKey, userFavoritesSchemaKey, - userProvidedServiceInstanceSchemaKey + userProvidedServiceInstanceSchemaKey, + appAutoscalerPolicySchemaKey, + appAutoscalerHealthSchemaKey, ]; export function registerAPIRequestEntity(schemaKey: string) { diff --git a/src/frontend/packages/store/src/types/entity.types.ts b/src/frontend/packages/store/src/types/entity.types.ts index 25858b43f3..d5fd999804 100644 --- a/src/frontend/packages/store/src/types/entity.types.ts +++ b/src/frontend/packages/store/src/types/entity.types.ts @@ -46,6 +46,8 @@ import { stackSchemaKey, userFavoritesSchemaKey, userProvidedServiceInstanceSchemaKey, + appAutoscalerHealthSchemaKey, + appAutoscalerPolicySchemaKey, } from '../helpers/entity-factory'; import { RequestInfoState } from '../reducers/api-request-reducer/types'; import { APIResource } from './api.types'; @@ -138,5 +140,7 @@ export const defaultCfEntitiesState = { [servicePlanVisibilitySchemaKey]: {}, [serviceBrokerSchemaKey]: {}, [userFavoritesSchemaKey]: {}, - [userProvidedServiceInstanceSchemaKey]: [] + [userProvidedServiceInstanceSchemaKey]: [], + [appAutoscalerHealthSchemaKey]: {}, + [appAutoscalerPolicySchemaKey]: {}, }; diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go index 604817f08d..37fb8c0cf5 100644 --- a/src/jetstream/passthrough.go +++ b/src/jetstream/passthrough.go @@ -254,6 +254,12 @@ func (p *portalProxy) ProxyRequest(c echo.Context, uri *url.URL) (map[string]*in if strings.HasPrefix(cnsiRequest.URL.Host, apiPrefix) { // Replace 'api.' prefix with supplied prefix cnsiRequest.URL.Host = strings.Replace(cnsiRequest.URL.Host, apiPrefix, apiHost, 1) + if apiHost == "autoscaler." { + cnsiRequest.URL.Path = strings.Replace(cnsiRequest.URL.Path, "v2", "v1", 1) + } + if apiHost == "scalingconsole." { + cnsiRequest.URL.Path = strings.Replace(cnsiRequest.URL.Path, "v2", "v1", 1) + } } else { // Add supplied prefix to the domain cnsiRequest.URL.Host = apiHost + cnsiRequest.URL.Host From 689037571b873610255c653f8715cf3e47531387 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 20 Nov 2018 18:06:22 +0800 Subject: [PATCH 03/98] [autoscaler] add metric hostory request (fail) --- .../auto-scaler-tab.component.html | 26 ++++- .../auto-scaler-tab.component.scss | 11 ++ .../auto-scaler-tab.component.spec.ts | 69 ------------ .../auto-scaler-tab.component.ts | 61 ++++++++++- .../store/actions/app-autoscaler.actions.ts | 103 ++++++++++++++++++ .../app/store/types/app-autoscaler.types.ts | 14 +++ .../store/src/helpers/entity-factory.ts | 12 ++ .../api-request-reducers.generator.ts | 6 + .../packages/store/src/types/entity.types.ts | 6 + 9 files changed, 231 insertions(+), 77 deletions(-) delete mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts create mode 100644 src/frontend/app/store/actions/app-autoscaler.actions.ts create mode 100644 src/frontend/app/store/types/app-autoscaler.types.ts diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html index 776c3b2c0b..7687ef46a8 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html @@ -15,7 +15,7 @@ - + Limits @@ -31,9 +31,29 @@ + + + + + + Scaling Rules + + +
+
+ {{policy.scaling_rules.length}} +
+
+ + + + - + \ No newline at end of file diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss index 94ca044473..1685de240a 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss @@ -4,3 +4,14 @@ position: relative; width: 100%; } + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + app-metadata-item:first-child { + margin-top: 0; + } + } +} diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts deleted file mode 100644 index 9fd903bb52..0000000000 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.spec.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule } from '@ngrx/store'; - -import { CoreModule } from '../../../../../../core/core.module'; -import { MDAppModule } from '../../../../../../core/md.module'; -import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; -import { LogViewerComponent } from '../../../../../../shared/components/log-viewer/log-viewer.component'; -import { EntityMonitorFactory } from '../../../../../../shared/monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { GetApplication } from '../../../../../../store/actions/application.actions'; -import { applicationSchemaKey, entityFactory } from '../../../../../../store/helpers/entity-factory'; -import { AppStoreModule } from '../../../../../../store/store.module'; -import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper'; -import { generateTestEntityServiceProvider } from '../../../../../../test-framework/entity-service.helper'; -import { createBasicStoreModule } from '../../../../../../test-framework/store-test-helper'; -import { ApplicationEnvVarsService } from '../build-tab/application-env-vars.service'; -import { LogStreamTabComponent } from './auto-scaler-tab.component'; - - -describe('LogStreamTabComponent', () => { - let component: LogStreamTabComponent; - let fixture: ComponentFixture; - - const appId = ''; - const cfId = '2'; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - StoreModule, - CoreModule, - NoopAnimationsModule, - RouterTestingModule, - MDAppModule, - createBasicStoreModule() - ], - declarations: [ - LogViewerComponent, - LogStreamTabComponent - ], - providers: [ - generateTestEntityServiceProvider( - appId, - entityFactory(applicationSchemaKey), - new GetApplication(appId, cfId) - ), - generateTestApplicationServiceProvider(cfId, appId), - AppStoreModule, - ApplicationStateService, - ApplicationEnvVarsService, - EntityMonitorFactory, - PaginationMonitorFactory - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LogStreamTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts index 2ca83499f5..c12dc35545 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts @@ -5,11 +5,19 @@ import { EntityServiceFactory } from '../../../../../../core/entity-service-fact import { entityFactory, appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricHistorySchemaKey, + appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerHealthSchemaKey } from '../../../../../../store/helpers/entity-factory'; import { ApplicationService } from '../../../../application.service'; -import { GetAppAutoscalerPolicyAction } from '../../../../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../../store/types/app-autoscaler.types'; +import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerHealthAction } from '../../../../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, AppAutoscalerHealth } from '../../../../../../store/types/app-autoscaler.types'; import { map } from 'rxjs/operators'; +import { + CfAppInstancesConfigService, +} from '../../../../../../shared/components/list/list-types/app-instance/cf-app-instances-config.service'; +import { ListConfig } from '../../../../../../shared/components/list/list.component.types'; @Component({ selector: 'app-auto-scaler-tab', @@ -18,8 +26,13 @@ import { map } from 'rxjs/operators'; }) export class AutoScalerTabComponent implements OnInit { + appAutoscalerHealthService: EntityService; appAutoscalerPolicyService: EntityService; + appAutoscalerScalingHistoryService: EntityService; + + appAutoscalerHealth$: Observable; appAutoscalerPolicy$: Observable; + appAutoscalerScalingHistory$: Observable; constructor( private applicationService: ApplicationService, @@ -27,6 +40,13 @@ export class AutoScalerTabComponent implements OnInit { ) { } ngOnInit() { + this.appAutoscalerHealthService = this.entityServiceFactory.create( + appAutoscalerHealthSchemaKey, + entityFactory(appAutoscalerHealthSchemaKey), + "public", + new GetAppAutoscalerHealthAction(), + false + ); this.appAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerPolicySchemaKey, entityFactory(appAutoscalerPolicySchemaKey), @@ -34,13 +54,44 @@ export class AutoScalerTabComponent implements OnInit { new GetAppAutoscalerPolicyAction(this.applicationService.appGuid), false ); + this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( + appAutoscalerScalingHistorySchemaKey, + entityFactory(appAutoscalerScalingHistorySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerScalingHistoryAction(this.applicationService.appGuid), + false + ); + + this.appAutoscalerHealth$ = this.appAutoscalerHealthService.entityObs$.pipe( + map(({ entity }) => { + console.log(entity) + return entity + }), + map((healthEntity, ddd) => { + console.log("appAutoscalerHealth", healthEntity, ddd) + return healthEntity && healthEntity.entity + }) + ); this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => entity), - map(policyEntity => { - console.log("appAutoscalerPolicy", policyEntity) + map(({ entity }) => { + console.log(entity) + return entity + }), + map((policyEntity, ddd) => { + console.log("appAutoscalerPolicy", policyEntity, ddd) return policyEntity && policyEntity.entity }) ); + this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( + map(({ entity }) => { + console.log(entity) + return entity + }), + map((historyEntity,ddd) => { + console.log("appAutoscalerScalingHistory", historyEntity, ddd) + return historyEntity && historyEntity.entity + }) + ); } } diff --git a/src/frontend/app/store/actions/app-autoscaler.actions.ts b/src/frontend/app/store/actions/app-autoscaler.actions.ts new file mode 100644 index 0000000000..af38a3026c --- /dev/null +++ b/src/frontend/app/store/actions/app-autoscaler.actions.ts @@ -0,0 +1,103 @@ +import { RequestOptions, Headers, URLSearchParams } from '@angular/http'; + +import { + appAutoscalerHealthSchemaKey, + appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricHistorySchemaKey, + appAutoscalerInsMetricHistorySchemaKey, + entityFactory, +} from '../helpers/entity-factory'; +import { CFStartAction, ICFAction } from '../types/request.types'; + +const endpointApiHostHeader = 'x-cap-api-host'; + +export const AppAutoscalerPolicyEvents = { + GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', + GET_APP_AUTOSCALER_POLICY_SUCCESS: '[App Autoscaler] Get autoscaler policy success', + GET_APP_AUTOSCALER_POLICY_FAILED: '[App Autoscaler] Get autoscaler policy failed' +}; + +export const AppAutoscalerScalingHistoryEvents = { + GET_APP_AUTOSCALER_SCALING_HISTORY: '[App Autoscaler] Get autoscaler scaling history', + GET_APP_AUTOSCALER_SCALING_HISTORY_SUCCESS: '[App Autoscaler] Get autoscaler scaling history success', + GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED: '[App Autoscaler] Get autoscaler scaling history failed' +}; + +export const AppAutoscalerHealthEvents = { + GET_APP_AUTOSCALER_HEALTH: '[App Autoscaler] Get autoscaler health', + GET_APP_AUTOSCALER_HEALTH_SUCCESS: '[App Autoscaler] Get autoscaler health success', + GET_APP_AUTOSCALER_HEALTH_FAILED: '[App Autoscaler] Get autoscaler health failed' +}; + +export class GetAppAutoscalerHealthAction extends CFStartAction implements ICFAction { + options: RequestOptions; + constructor( + ) { + super(); + this.options = new RequestOptions(); + this.options.url = `public/health_check` + this.options.method = 'get' + this.options.headers = new Headers(); + this.options.headers.set(endpointApiHostHeader, 'scalingconsole'); + } + entity = [entityFactory(appAutoscalerHealthSchemaKey)]; + entityKey = appAutoscalerHealthSchemaKey; + paginationKey: string; + actions = [ + AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH, + AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH_SUCCESS, + AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH_FAILED + ]; +} + +export class GetAppAutoscalerPolicyAction extends CFStartAction implements ICFAction { + options: RequestOptions; + constructor( + public guid: string, + ) { + super(); + this.options = new RequestOptions(); + this.options.url = `apps/${guid}/policy` + this.options.method = 'get' + this.options.headers = new Headers(); + this.options.headers.set(endpointApiHostHeader, 'autoscaler'); + } + entity = [entityFactory(appAutoscalerPolicySchemaKey)]; + entityKey = appAutoscalerPolicySchemaKey; + paginationKey: string; + actions = [ + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY, + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_SUCCESS, + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_FAILED + ]; +} + +export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements ICFAction { + options: RequestOptions; + constructor( + public guid: string, + ) { + super(); + this.options = new RequestOptions(); + this.options.url = `apps/${guid}/scaling_histories` + this.options.method = 'get' + this.options.headers = new Headers(); + this.options.headers.set(endpointApiHostHeader, 'autoscaler'); + this.options.params = new URLSearchParams(); + this.options.params.append('start-time', '1542124800000000000'); + this.options.params.append('end-time', '1542729600000000000'); + this.options.params.append('page', '1'); + this.options.params.append('results-per-page', '10'); + this.options.params.append('order', 'desc'); + } + entity = [entityFactory(appAutoscalerScalingHistorySchemaKey)]; + entityKey = appAutoscalerScalingHistorySchemaKey; + paginationKey: string; + flattenPagination: false; + actions = [ + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_SUCCESS, + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED + ]; +} \ No newline at end of file diff --git a/src/frontend/app/store/types/app-autoscaler.types.ts b/src/frontend/app/store/types/app-autoscaler.types.ts new file mode 100644 index 0000000000..e8cc648c91 --- /dev/null +++ b/src/frontend/app/store/types/app-autoscaler.types.ts @@ -0,0 +1,14 @@ +export interface AppAutoscalerPolicy { + guid: string; +} + +export interface AppAutoscalerHealth { + status: boolean; + error: { + cloudfoundry_autoscaler: string; + cloudfoundry_autoscaler_timestamp: string; + } +} + +export interface AppAutoscalerScalingHistory { +} diff --git a/src/frontend/packages/store/src/helpers/entity-factory.ts b/src/frontend/packages/store/src/helpers/entity-factory.ts index d31655d78a..5ba99f77ae 100644 --- a/src/frontend/packages/store/src/helpers/entity-factory.ts +++ b/src/frontend/packages/store/src/helpers/entity-factory.ts @@ -38,6 +38,9 @@ export const userFavoritesSchemaKey = 'userFavorites'; export const userProvidedServiceInstanceSchemaKey = 'userProvidedServiceInstance'; export const appAutoscalerHealthSchemaKey = 'autoscalerHealth'; export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; +export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory'; +export const appAutoscalerAppMetricHistorySchemaKey = 'autoscalerAppMetricHistory'; +export const appAutoscalerInsMetricHistorySchemaKey = 'autoscalerInsMetricHistory'; export const spaceWithOrgKey = 'spaceWithOrg'; export const serviceInstancesWithSpaceSchemaKey = 'serviceInstancesWithSpace'; @@ -321,6 +324,15 @@ entityCache[appAutoscalerPolicySchemaKey] = AppAutoscalerPolicySchema; const AppAutoscalerHealthSchema = new EntitySchema(appAutoscalerHealthSchemaKey, {}, { idAttribute: getAPIResourceGuid }); entityCache[appAutoscalerHealthSchemaKey] = AppAutoscalerHealthSchema; +const AppAutoscalerScalingHistorySchema = new EntitySchema(appAutoscalerScalingHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerScalingHistorySchemaKey] = AppAutoscalerScalingHistorySchema; + +const AppAutoscalerAppMetricSchema = new EntitySchema(appAutoscalerAppMetricHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerAppMetricHistorySchemaKey] = AppAutoscalerAppMetricSchema; + +const AppAutoscalerInsMetricSchema = new EntitySchema(appAutoscalerInsMetricHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerInsMetricHistorySchemaKey] = AppAutoscalerInsMetricSchema; + const ApplicationEntitySchema = new EntitySchema( applicationSchemaKey, { diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts index 949d2ed7bf..f01f867bea 100644 --- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts +++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts @@ -31,6 +31,9 @@ import { userProvidedServiceInstanceSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerHealthSchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricHistorySchemaKey, + appAutoscalerInsMetricHistorySchemaKey, } from '../helpers/entity-factory'; import { endpointStoreNames } from '../types/endpoint.types'; import { IRequestDataState, IRequestState } from '../types/entity.types'; @@ -121,6 +124,9 @@ const entities = [ userProvidedServiceInstanceSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerHealthSchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricHistorySchemaKey, + appAutoscalerInsMetricHistorySchemaKey, ]; export function registerAPIRequestEntity(schemaKey: string) { diff --git a/src/frontend/packages/store/src/types/entity.types.ts b/src/frontend/packages/store/src/types/entity.types.ts index d5fd999804..6cc4f1e8fa 100644 --- a/src/frontend/packages/store/src/types/entity.types.ts +++ b/src/frontend/packages/store/src/types/entity.types.ts @@ -48,6 +48,9 @@ import { userProvidedServiceInstanceSchemaKey, appAutoscalerHealthSchemaKey, appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricHistorySchemaKey, + appAutoscalerInsMetricHistorySchemaKey, } from '../helpers/entity-factory'; import { RequestInfoState } from '../reducers/api-request-reducer/types'; import { APIResource } from './api.types'; @@ -143,4 +146,7 @@ export const defaultCfEntitiesState = { [userProvidedServiceInstanceSchemaKey]: [], [appAutoscalerHealthSchemaKey]: {}, [appAutoscalerPolicySchemaKey]: {}, + [appAutoscalerScalingHistorySchemaKey]: {}, + [appAutoscalerAppMetricHistorySchemaKey]: {}, + [appAutoscalerInsMetricHistorySchemaKey]: {}, }; From 02a5bbbf43063e2faff047aa00dcd8c434286fa7 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 28 Nov 2018 15:52:34 +0800 Subject: [PATCH 04/98] [autoscaler] add autoscaler tables --- .../auto-scaler-tab.component.html | 141 +++++++++++++++++- .../auto-scaler-tab.component.scss | 28 +++- .../auto-scaler-tab.component.ts | 4 + 3 files changed, 165 insertions(+), 8 deletions(-) diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html index 7687ef46a8..571a40617e 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html @@ -9,13 +9,27 @@
- Enabled + Enabled
- + + + + Instances + + +
+
+ 2 +
+
+ + + + Limits @@ -24,32 +38,145 @@
{{ policy.instance_min_count }} +
+
{{ policy.instance_max_count }}
+ + + + Latest Metrics + + +
+
+ 58 MB +
+
+ 45 % +
+
+ NaN +
+
+ 0 rps +
+
+ + + - + Scaling Rules
-
- {{policy.scaling_rules.length}} -
+ + + + + + + + + + + + + + + +
Metric {{element.entity.metric_type}} Condition {{element.entity.operator}} {{element.entity.threshold}} for + {{element.entity.breach_duration_secs}} secs. Action {{element.entity.adjustment}} instances
+
+ + + + + + + Scheduled Limit Rules + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
From {{element.start_date_time}} To {{element.end_date_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + + element.end_date : 'Aways'}} Repeats On {{element.days_of_month}} {{element.days_of_week}} of the + {{element.days_of_week? 'week': 'month'}} From {{element.start_time}} To {{element.end_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
- +
{{ scalingHistory.total_results}}
diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss index 1685de240a..b8ec9fa55c 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss @@ -1,6 +1,5 @@ .app-auto-scaler { display: flex; - height: 100%; position: relative; width: 100%; } @@ -15,3 +14,30 @@ } } } + +app-tile-grid { + width: 100% +} + +table { + width: 100% +} + +.app-auto-scaler-policy-left { + flex: 0 0 40%; +} + +.app-auto-scaler-tile-1of2 { + flex: 0 0 50%; +} + +.app-auto-scaler-tile-1of6 { + flex: 0 0 16.78%; +} + +.app-auto-scaler-limit { + display: inherit; + mat-card { + width: 50% + } +} \ No newline at end of file diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts index c12dc35545..d6cae060f6 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts @@ -34,6 +34,10 @@ export class AutoScalerTabComponent implements OnInit { appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; + scalingRuleColumns: string[] = ['metric', 'condition', 'action'] + specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max'] + recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max'] + constructor( private applicationService: ApplicationService, private entityServiceFactory: EntityServiceFactory, From 4d66acb48846e79a86b979cf3a331b4c24e0d8e7 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 29 Nov 2018 14:08:02 +0800 Subject: [PATCH 05/98] [autoscaler] request app metrics --- .../auto-scaler-tab.component.html | 16 ++--- .../auto-scaler-tab.component.ts | 66 ++++++++++++++----- .../store/actions/app-autoscaler.actions.ts | 38 ++++++++++- .../app/store/types/app-autoscaler.types.ts | 3 + .../packages/store/src/effects/api.effects.ts | 21 ++++++ .../store/src/helpers/entity-factory.ts | 12 ++-- .../api-request-reducers.generator.ts | 8 +-- .../packages/store/src/types/entity.types.ts | 8 +-- .../packages/store/src/types/request.types.ts | 1 + 9 files changed, 134 insertions(+), 39 deletions(-) diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html index 571a40617e..16d549499a 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html @@ -53,17 +53,17 @@
-
- 58 MB +
+ {{appAutoscalerAppMetricMemoryused[0].entity.value}} MB
-
- 45 % +
+ {{appAutoscalerAppMetricMemoryutil[0].entity.value}} %
-
- NaN +
+ {{appAutoscalerAppMetricResponsetime[0].entity.value}} ms
-
- 0 rps +
+ {{appAutoscalerAppMetricThroughput[0].entity.value}} rps
diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts index d6cae060f6..3a362d30a7 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { EntityService } from '../../../../../../core/entity-service'; import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; @@ -6,42 +6,53 @@ import { entityFactory, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricHistorySchemaKey, - appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, appAutoscalerHealthSchemaKey } from '../../../../../../store/helpers/entity-factory'; import { ApplicationService } from '../../../../application.service'; -import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerHealthAction } from '../../../../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, AppAutoscalerHealth } from '../../../../../../store/types/app-autoscaler.types'; +import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerHealthAction, GetAppAutoscalerAppMetricAction } from '../../../../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, AppAutoscalerHealth, AppAutoscalerAppMetric } from '../../../../../../store/types/app-autoscaler.types'; import { map } from 'rxjs/operators'; -import { - CfAppInstancesConfigService, -} from '../../../../../../shared/components/list/list-types/app-instance/cf-app-instances-config.service'; -import { ListConfig } from '../../../../../../shared/components/list/list.component.types'; +import { APIResource } from '../../../../../../store/types/api.types'; +import { getPaginationObservables } from '../../../../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +import { Store } from '@ngrx/store'; +import { AppState } from '../../../../../../store/app-state'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { EntityInfo } from '../../../../../../store/types/api.types'; @Component({ selector: 'app-auto-scaler-tab', templateUrl: './auto-scaler-tab.component.html', styleUrls: ['./auto-scaler-tab.component.scss'], }) + export class AutoScalerTabComponent implements OnInit { + scalingRuleColumns: string[] = ['metric', 'condition', 'action'] + specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max'] + recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max'] + appAutoscalerHealthService: EntityService; appAutoscalerPolicyService: EntityService; appAutoscalerScalingHistoryService: EntityService; appAutoscalerHealth$: Observable; - appAutoscalerPolicy$: Observable; + appAutoscalerPolicy$: Observable>; appAutoscalerScalingHistory$: Observable; - scalingRuleColumns: string[] = ['metric', 'condition', 'action'] - specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max'] - recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max'] + appAutoscalerAppMetricMemoryused$: Observable[]>; + appAutoscalerAppMetricMemoryutil$: Observable[]>; + appAutoscalerAppMetricThroughput$: Observable[]>; + appAutoscalerAppMetricResponsetime$: Observable[]>; constructor( + private store: Store, private applicationService: ApplicationService, private entityServiceFactory: EntityServiceFactory, - ) { } + private paginationMonitorFactory: PaginationMonitorFactory + ) { + } ngOnInit() { this.appAutoscalerHealthService = this.entityServiceFactory.create( @@ -66,6 +77,18 @@ export class AutoScalerTabComponent implements OnInit { false ); + let params = { + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + "000000", + 'page': '1', + 'results-per-page': '1', + 'order': 'desc' + } + this.appAutoscalerAppMetricMemoryused$ = this.getAppMetric('memoryused', params) + this.appAutoscalerAppMetricMemoryutil$ = this.getAppMetric('memoryutil', params) + this.appAutoscalerAppMetricThroughput$ = this.getAppMetric('throughput', params) + this.appAutoscalerAppMetricResponsetime$ = this.getAppMetric('responsetime', params) + this.appAutoscalerHealth$ = this.appAutoscalerHealthService.entityObs$.pipe( map(({ entity }) => { console.log(entity) @@ -83,6 +106,7 @@ export class AutoScalerTabComponent implements OnInit { }), map((policyEntity, ddd) => { console.log("appAutoscalerPolicy", policyEntity, ddd) + return policyEntity && policyEntity.entity }) ); @@ -91,11 +115,23 @@ export class AutoScalerTabComponent implements OnInit { console.log(entity) return entity }), - map((historyEntity,ddd) => { + map((historyEntity, ddd) => { console.log("appAutoscalerScalingHistory", historyEntity, ddd) return historyEntity && historyEntity.entity }) ); } + getAppMetric(metricName: string, params: any) { + let action = new GetAppAutoscalerAppMetricAction("key", this.applicationService.appGuid, this.applicationService.cfGuid, metricName, params) + return getPaginationObservables>({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerAppMetricSchemaKey) + ) + }, false).entities$; + } + } diff --git a/src/frontend/app/store/actions/app-autoscaler.actions.ts b/src/frontend/app/store/actions/app-autoscaler.actions.ts index af38a3026c..fcf9cb2991 100644 --- a/src/frontend/app/store/actions/app-autoscaler.actions.ts +++ b/src/frontend/app/store/actions/app-autoscaler.actions.ts @@ -1,11 +1,14 @@ import { RequestOptions, Headers, URLSearchParams } from '@angular/http'; +import { PaginatedAction } from '../types/pagination.types'; +import { createEntityRelationPaginationKey } from '../../store/helpers/entity-relations/entity-relations.types' +import { RequestEntityLocation } from '../types/request.types'; import { appAutoscalerHealthSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricHistorySchemaKey, - appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, entityFactory, } from '../helpers/entity-factory'; import { CFStartAction, ICFAction } from '../types/request.types'; @@ -24,6 +27,12 @@ export const AppAutoscalerScalingHistoryEvents = { GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED: '[App Autoscaler] Get autoscaler scaling history failed' }; +export const AppAutoscalerAppMetricEvents = { + GET_APP_AUTOSCALER_APP_METRIC: '[App Autoscaler] Get autoscaler app metric', + GET_APP_AUTOSCALER_APP_METRIC_SUCCESS: '[App Autoscaler] Get autoscaler app metric success', + GET_APP_AUTOSCALER_APP_METRIC_FAILED: '[App Autoscaler] Get autoscaler app metric failed' +}; + export const AppAutoscalerHealthEvents = { GET_APP_AUTOSCALER_HEALTH: '[App Autoscaler] Get autoscaler health', GET_APP_AUTOSCALER_HEALTH_SUCCESS: '[App Autoscaler] Get autoscaler health success', @@ -73,6 +82,31 @@ export class GetAppAutoscalerPolicyAction extends CFStartAction implements ICFAc ]; } +export class GetAppAutoscalerAppMetricAction extends CFStartAction implements PaginatedAction { + constructor(public paginationKey: string, public appGuid: string, public cfGuid: string, public metricName: string, public params: any) { + super(); + this.options = new RequestOptions(); + this.options.url = `apps/${appGuid}/aggregated_metric_histories/${metricName}`; + this.options.method = 'get'; + this.options.params = new URLSearchParams(); + this.options.params.append('', ''); + this.options.headers = new Headers(); + this.options.headers.set(endpointApiHostHeader, 'autoscaler'); + } + actions = [ + AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC, + AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC_SUCCESS, + AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC_FAILED + ]; + + entity = [entityFactory(appAutoscalerAppMetricSchemaKey)]; + entityKey = appAutoscalerAppMetricSchemaKey; + options: RequestOptions; + initialParams = this.params; + skipValidation = false + entityLocation = RequestEntityLocation.AUTOSCALER_ARRAY; +} + export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements ICFAction { options: RequestOptions; constructor( diff --git a/src/frontend/app/store/types/app-autoscaler.types.ts b/src/frontend/app/store/types/app-autoscaler.types.ts index e8cc648c91..5fb4f5932d 100644 --- a/src/frontend/app/store/types/app-autoscaler.types.ts +++ b/src/frontend/app/store/types/app-autoscaler.types.ts @@ -12,3 +12,6 @@ export interface AppAutoscalerHealth { export interface AppAutoscalerScalingHistory { } + +export interface AppAutoscalerAppMetric { +} \ No newline at end of file diff --git a/src/frontend/packages/store/src/effects/api.effects.ts b/src/frontend/packages/store/src/effects/api.effects.ts index 7f97fe18a5..3622730597 100644 --- a/src/frontend/packages/store/src/effects/api.effects.ts +++ b/src/frontend/packages/store/src/effects/api.effects.ts @@ -412,6 +412,27 @@ export class APIEffect { }); case RequestEntityLocation.OBJECT: // The response is the entity return this.completeResourceEntity(cfData, cfGuid, apiAction.guid); + case RequestEntityLocation.AUTOSCALER_ARRAY: + if (!cfData.resources) { + // Treat the response as RequestEntityLocation.OBJECT + return this.completeResourceEntity( + cfData, + cfGuid, + apiAction.guid, + ); + } + totalResults += cfData['total_results']; + totalPages += cfData['total_pages']; + if (!cfData.resources.length) { + return null; + } + return cfData.resources.map(resource => { + return this.completeResourceEntity( + resource, + cfGuid, + resource.timestamp, + ); + }); case RequestEntityLocation.RESOURCE: // The response is an object and the entities list is within a 'resource' param default: if (!cfData.resources) { diff --git a/src/frontend/packages/store/src/helpers/entity-factory.ts b/src/frontend/packages/store/src/helpers/entity-factory.ts index 5ba99f77ae..69419f89d2 100644 --- a/src/frontend/packages/store/src/helpers/entity-factory.ts +++ b/src/frontend/packages/store/src/helpers/entity-factory.ts @@ -39,8 +39,8 @@ export const userProvidedServiceInstanceSchemaKey = 'userProvidedServiceInstance export const appAutoscalerHealthSchemaKey = 'autoscalerHealth'; export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory'; -export const appAutoscalerAppMetricHistorySchemaKey = 'autoscalerAppMetricHistory'; -export const appAutoscalerInsMetricHistorySchemaKey = 'autoscalerInsMetricHistory'; +export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric'; +export const appAutoscalerInsMetricSchemaKey = 'autoscalerInsMetric'; export const spaceWithOrgKey = 'spaceWithOrg'; export const serviceInstancesWithSpaceSchemaKey = 'serviceInstancesWithSpace'; @@ -327,11 +327,11 @@ entityCache[appAutoscalerHealthSchemaKey] = AppAutoscalerHealthSchema; const AppAutoscalerScalingHistorySchema = new EntitySchema(appAutoscalerScalingHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); entityCache[appAutoscalerScalingHistorySchemaKey] = AppAutoscalerScalingHistorySchema; -const AppAutoscalerAppMetricSchema = new EntitySchema(appAutoscalerAppMetricHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); -entityCache[appAutoscalerAppMetricHistorySchemaKey] = AppAutoscalerAppMetricSchema; +const AppAutoscalerAppMetricSchema = new EntitySchema(appAutoscalerAppMetricSchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerAppMetricSchemaKey] = AppAutoscalerAppMetricSchema; -const AppAutoscalerInsMetricSchema = new EntitySchema(appAutoscalerInsMetricHistorySchemaKey, {}, { idAttribute: getAPIResourceGuid }); -entityCache[appAutoscalerInsMetricHistorySchemaKey] = AppAutoscalerInsMetricSchema; +const AppAutoscalerInsMetricSchema = new EntitySchema(appAutoscalerInsMetricSchemaKey, {}, { idAttribute: getAPIResourceGuid }); +entityCache[appAutoscalerInsMetricSchemaKey] = AppAutoscalerInsMetricSchema; const ApplicationEntitySchema = new EntitySchema( applicationSchemaKey, diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts index f01f867bea..e16d88238b 100644 --- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts +++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts @@ -32,8 +32,8 @@ import { appAutoscalerPolicySchemaKey, appAutoscalerHealthSchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricHistorySchemaKey, - appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, } from '../helpers/entity-factory'; import { endpointStoreNames } from '../types/endpoint.types'; import { IRequestDataState, IRequestState } from '../types/entity.types'; @@ -125,8 +125,8 @@ const entities = [ appAutoscalerPolicySchemaKey, appAutoscalerHealthSchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricHistorySchemaKey, - appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, ]; export function registerAPIRequestEntity(schemaKey: string) { diff --git a/src/frontend/packages/store/src/types/entity.types.ts b/src/frontend/packages/store/src/types/entity.types.ts index 6cc4f1e8fa..ba27a4982f 100644 --- a/src/frontend/packages/store/src/types/entity.types.ts +++ b/src/frontend/packages/store/src/types/entity.types.ts @@ -49,8 +49,8 @@ import { appAutoscalerHealthSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricHistorySchemaKey, - appAutoscalerInsMetricHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, } from '../helpers/entity-factory'; import { RequestInfoState } from '../reducers/api-request-reducer/types'; import { APIResource } from './api.types'; @@ -147,6 +147,6 @@ export const defaultCfEntitiesState = { [appAutoscalerHealthSchemaKey]: {}, [appAutoscalerPolicySchemaKey]: {}, [appAutoscalerScalingHistorySchemaKey]: {}, - [appAutoscalerAppMetricHistorySchemaKey]: {}, - [appAutoscalerInsMetricHistorySchemaKey]: {}, + [appAutoscalerAppMetricSchemaKey]: {}, + [appAutoscalerInsMetricSchemaKey]: {}, }; diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts index a9a227c82b..e6f1de702c 100644 --- a/src/frontend/packages/store/src/types/request.types.ts +++ b/src/frontend/packages/store/src/types/request.types.ts @@ -26,6 +26,7 @@ export enum RequestEntityLocation { RESOURCE, // The response is an object and the entities list is within a 'resource' param. Falls back to 'OBJECT' if missing. ARRAY, // The response is an array which contains the entities OBJECT, // The response is the entity + AUTOSCALER_ARRAY, // The response is for autoscaler } export type IRequestActionEntity = EntitySchema | EntitySchema[]; From 62e8d801085a55ef8e514f50a46347070f27168c Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 26 Feb 2019 16:00:07 +0800 Subject: [PATCH 06/98] [autoscaler] add policy edit page, event page and metric page --- package.json | 1 + .../auto-scaler-tab.component.ts | 137 ------ .../autoscaler-tab.component.html} | 157 ++++--- .../autoscaler-tab.component.scss} | 29 +- .../autoscaler-tab.component.spec.ts | 73 +++ .../autoscaler-tab.component.ts | 403 +++++++++++++++++ ...utoscaler-metric-chart-page.component.html | 61 +++ ...utoscaler-metric-chart-page.component.scss | 63 +++ .../autoscaler-metric-chart-page.component.ts | 212 +++++++++ ...toscaler-scale-history-page.component.html | 13 + ...toscaler-scale-history-page.component.scss | 25 ++ ...autoscaler-scale-history-page.component.ts | 52 +++ .../edit-autoscaler-policy.component.html | 198 ++++++++ .../edit-autoscaler-policy.component.scss | 42 ++ .../edit-autoscaler-policy.component.ts | 225 ++++++++++ .../card-autoscaler-default.component.html | 67 +++ .../card-autoscaler-default.component.scss | 171 +++++++ .../card-autoscaler-default.component.spec.ts | 46 ++ .../card-autoscaler-default.component.ts | 116 +++++ ...p-autoscaler-events-config.service.spec.ts | 50 +++ ...cf-app-autoscaler-events-config.service.ts | 114 +++++ .../cf-app-autoscaler-events-data-source.ts | 58 +++ ...cell-autoscaler-event-action-label.pipe.ts | 19 + ...ell-autoscaler-event-action.component.html | 2 + ...ell-autoscaler-event-action.component.scss | 0 ...-cell-autoscaler-event-action.component.ts | 10 + ...-cell-autoscaler-event-change-icon.pipe.ts | 31 ++ ...ell-autoscaler-event-change.component.html | 6 + ...ell-autoscaler-event-change.component.scss | 5 + ...-cell-autoscaler-event-change.component.ts | 10 + ...cell-autoscaler-event-error.component.html | 1 + ...cell-autoscaler-event-error.component.scss | 0 ...e-cell-autoscaler-event-error.component.ts | 10 + ...-cell-autoscaler-event-status-icon.pipe.ts | 38 ++ ...ell-autoscaler-event-status.component.html | 5 + ...ell-autoscaler-event-status.component.scss | 12 + ...-autoscaler-event-status.component.spec.ts | 31 ++ ...-cell-autoscaler-event-status.component.ts | 10 + ...-autoscaler-event-timestamp.component.html | 1 + ...-autoscaler-event-timestamp.component.scss | 0 ...toscaler-event-timestamp.component.spec.ts | 29 ++ ...ll-autoscaler-event-timestamp.component.ts | 10 + ...-cell-autoscaler-event-type.component.html | 1 + ...-cell-autoscaler-event-type.component.scss | 0 ...ll-autoscaler-event-type.component.spec.ts | 31 ++ ...le-cell-autoscaler-event-type.component.ts | 10 + .../store/actions/app-autoscaler.actions.ts | 199 ++++---- .../app/store/effects/autoscaler.effects.ts | 364 +++++++++++++++ .../store/helpers/autoscaler-helpers.spec.ts | 407 +++++++++++++++++ .../app/store/helpers/autoscaler-helpers.ts | 425 ++++++++++++++++++ .../app/store/types/app-autoscaler.types.ts | 19 +- .../core/src/environments/environment.prod.ts | 1 + .../core/src/environments/environment.ts | 1 + .../applications/application.service.ts | 17 + .../application-tabs-base.component.ts | 59 ++- .../applications/applications.module.ts | 14 +- .../applications/applications.routing.ts | 19 +- .../table-cell/table-cell.component.ts | 25 ++ .../packages/core/src/shared/shared.module.ts | 15 + src/frontend/packages/core/src/styles.scss | 18 + .../application-service-helper.ts | 8 +- .../packages/store/src/effects/api.effects.ts | 21 - .../packages/store/src/store.module.ts | 4 +- .../packages/store/src/types/request.types.ts | 1 - src/jetstream/passthrough.go | 6 - 65 files changed, 3869 insertions(+), 339 deletions(-) delete mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts rename src/frontend/app/features/applications/application/application-tabs-base/tabs/{auto-scaler-tab/auto-scaler-tab.component.html => autoscaler-tab/autoscaler-tab.component.html} (50%) rename src/frontend/app/features/applications/application/application-tabs-base/tabs/{auto-scaler-tab/auto-scaler-tab.component.scss => autoscaler-tab/autoscaler-tab.component.scss} (55%) create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts create mode 100644 src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts create mode 100644 src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html create mode 100644 src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss create mode 100644 src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts create mode 100644 src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html create mode 100644 src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss create mode 100644 src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts create mode 100644 src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html create mode 100644 src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss create mode 100644 src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts create mode 100644 src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts create mode 100644 src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts create mode 100644 src/frontend/app/store/effects/autoscaler.effects.ts create mode 100644 src/frontend/app/store/helpers/autoscaler-helpers.spec.ts create mode 100644 src/frontend/app/store/helpers/autoscaler-helpers.ts diff --git a/package.json b/package.json index 0a5d3e1921..b850862c3d 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "lodash-es": "^4.17.11", "marked": "^0.6.2", "moment": "^2.24.0", + "moment-timezone": "^0.5.23", "ngx-moment": "^3.3.0", "normalizr": "^3.2.3", "reselect": "^3.0.1", diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts deleted file mode 100644 index 3a362d30a7..0000000000 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.ts +++ /dev/null @@ -1,137 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { EntityService } from '../../../../../../core/entity-service'; -import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; -import { - entityFactory, - appAutoscalerPolicySchemaKey, - appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricSchemaKey, - appAutoscalerInsMetricSchemaKey, - appAutoscalerHealthSchemaKey -} from '../../../../../../store/helpers/entity-factory'; -import { ApplicationService } from '../../../../application.service'; -import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerHealthAction, GetAppAutoscalerAppMetricAction } from '../../../../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, AppAutoscalerHealth, AppAutoscalerAppMetric } from '../../../../../../store/types/app-autoscaler.types'; -import { map } from 'rxjs/operators'; -import { APIResource } from '../../../../../../store/types/api.types'; -import { getPaginationObservables } from '../../../../../../store/reducers/pagination-reducer/pagination-reducer.helper'; -import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../store/app-state'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { EntityInfo } from '../../../../../../store/types/api.types'; - -@Component({ - selector: 'app-auto-scaler-tab', - templateUrl: './auto-scaler-tab.component.html', - styleUrls: ['./auto-scaler-tab.component.scss'], -}) - -export class AutoScalerTabComponent implements OnInit { - - scalingRuleColumns: string[] = ['metric', 'condition', 'action'] - specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max'] - recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max'] - - appAutoscalerHealthService: EntityService; - appAutoscalerPolicyService: EntityService; - appAutoscalerScalingHistoryService: EntityService; - - appAutoscalerHealth$: Observable; - appAutoscalerPolicy$: Observable>; - appAutoscalerScalingHistory$: Observable; - - appAutoscalerAppMetricMemoryused$: Observable[]>; - appAutoscalerAppMetricMemoryutil$: Observable[]>; - appAutoscalerAppMetricThroughput$: Observable[]>; - appAutoscalerAppMetricResponsetime$: Observable[]>; - - constructor( - private store: Store, - private applicationService: ApplicationService, - private entityServiceFactory: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory - ) { - } - - ngOnInit() { - this.appAutoscalerHealthService = this.entityServiceFactory.create( - appAutoscalerHealthSchemaKey, - entityFactory(appAutoscalerHealthSchemaKey), - "public", - new GetAppAutoscalerHealthAction(), - false - ); - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid), - false - ); - this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( - appAutoscalerScalingHistorySchemaKey, - entityFactory(appAutoscalerScalingHistorySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerScalingHistoryAction(this.applicationService.appGuid), - false - ); - - let params = { - 'start-time': 0, - 'end-time': (new Date()).getTime().toString() + "000000", - 'page': '1', - 'results-per-page': '1', - 'order': 'desc' - } - this.appAutoscalerAppMetricMemoryused$ = this.getAppMetric('memoryused', params) - this.appAutoscalerAppMetricMemoryutil$ = this.getAppMetric('memoryutil', params) - this.appAutoscalerAppMetricThroughput$ = this.getAppMetric('throughput', params) - this.appAutoscalerAppMetricResponsetime$ = this.getAppMetric('responsetime', params) - - this.appAutoscalerHealth$ = this.appAutoscalerHealthService.entityObs$.pipe( - map(({ entity }) => { - console.log(entity) - return entity - }), - map((healthEntity, ddd) => { - console.log("appAutoscalerHealth", healthEntity, ddd) - return healthEntity && healthEntity.entity - }) - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - console.log(entity) - return entity - }), - map((policyEntity, ddd) => { - console.log("appAutoscalerPolicy", policyEntity, ddd) - - return policyEntity && policyEntity.entity - }) - ); - this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( - map(({ entity }) => { - console.log(entity) - return entity - }), - map((historyEntity, ddd) => { - console.log("appAutoscalerScalingHistory", historyEntity, ddd) - return historyEntity && historyEntity.entity - }) - ); - } - - getAppMetric(metricName: string, params: any) { - let action = new GetAppAutoscalerAppMetricAction("key", this.applicationService.appGuid, this.applicationService.cfGuid, metricName, params) - return getPaginationObservables>({ - store: this.store, - action, - paginationMonitor: this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(appAutoscalerAppMetricSchemaKey) - ) - }, false).entities$; - } - -} diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html similarity index 50% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html rename to src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html index 16d549499a..d13faabc98 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.html +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html @@ -1,6 +1,6 @@ -
+
- + @@ -9,105 +9,119 @@
- Enabled + Policy + undefined + Policy + undefined
- - - Instances - - -
-
- 2 -
-
- - + + + - Limits + Status
- {{ policy.instance_min_count }} -
-
- {{ policy.instance_max_count }} + Policy defined + Policy defined + Policy undefined + Policy undefined + Policy undefined + Policy defined
- + + + + Latest Metrics
-
- {{appAutoscalerAppMetricMemoryused[0].entity.value}} MB -
-
- {{appAutoscalerAppMetricMemoryutil[0].entity.value}} % -
-
- {{appAutoscalerAppMetricResponsetime[0].entity.value}} ms -
-
- {{appAutoscalerAppMetricThroughput[0].entity.value}} rps +
+ + + + +
+ + + - - - + + - Scaling Rules + Scaling Rules
- +
- + - + - +
Metric {{element.entity.metric_type}} {{element.metric_type}} Condition {{element.entity.operator}} {{element.entity.threshold}} for - {{element.entity.breach_duration_secs}} secs. {{element.operator}} {{element.threshold}} for + {{element.breach_duration_secs}} secs. Action {{element.entity.adjustment}} instances {{element.adjustment}} instances
+ + + - + Scheduled Limit Rules
- +
@@ -135,7 +149,7 @@
-
From {{element.start_date_time}}
+
- @@ -172,15 +187,53 @@
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + @@ -143,7 +157,8 @@ Repeats On {{element.days_of_month}} {{element.days_of_week}} of the + {{element.days_of_month}} {{element.days_of_week}} of + the {{element.days_of_week? 'week': 'month'}}
+ + + + + + + + + + + Latest Events + + +
+ + + + + + + + + + + + + + + + + + + +
Event Instances scaled + {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to + {{element.new_instances}} Trigger {{element.reason}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.message}} {{element.error}}
+
+ + + + - -
- {{ scalingHistory.total_results}} -
-
- {{ health.status}} -
\ No newline at end of file diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss similarity index 55% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss rename to src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss index b8ec9fa55c..ee354edc11 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component.scss +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss @@ -2,6 +2,13 @@ display: flex; position: relative; width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } } .app-metadata { @@ -13,14 +20,24 @@ margin-top: 0; } } + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } + app-metadata-item { + margin-bottom: 0; + } } app-tile-grid { - width: 100% + width: 100%; } table { - width: 100% + width: 100%; } .app-auto-scaler-policy-left { @@ -31,6 +48,10 @@ table { flex: 0 0 50%; } +.app-auto-scaler-tile-1of3 { + flex: 0 0 30%; +} + .app-auto-scaler-tile-1of6 { flex: 0 0 16.78%; } @@ -38,6 +59,6 @@ table { .app-auto-scaler-limit { display: inherit; mat-card { - width: 50% + width: 50%; } -} \ No newline at end of file +} diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts new file mode 100644 index 0000000000..fcee16209b --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts @@ -0,0 +1,73 @@ +import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { StoreModule } from '@ngrx/store'; + +import { CoreModule } from '../../../../../../core/core.module'; +import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; +import { SharedModule } from '../../../../../../shared/shared.module'; +import { appReducers } from '../../../../../../store/reducers.module'; +import { AppStoreModule } from '../../../../../../store/store.module'; +import { endpointStoreNames } from '../../../../../../store/types/endpoint.types'; +import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper'; +import { getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper'; +import { ApplicationService } from '../../../../application.service'; +import { AutoscalerTabComponent } from './autoscaler-tab.component'; +import { HttpModule, Http, ConnectionBackend } from '@angular/http'; +import { MockBackend } from '@angular/http/testing'; +import { GITHUB_API_URL, getGitHubAPIURL } from '../../../../../../core/github.helpers'; + +describe('AutoscalerTabComponent', () => { + let component: AutoscalerTabComponent; + let fixture: ComponentFixture; + const initialState = getInitialTestStoreState(); + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AutoscalerTabComponent, + ], + imports: [ + CoreModule, + SharedModule, + RouterTestingModule, + BrowserAnimationsModule, + StoreModule.forRoot( + appReducers, + { + initialState + } + ), + HttpModule + ], + providers: [ + { provide: ApplicationService, useClass: ApplicationServiceMock }, + AppStoreModule, + ApplicationStateService, + Http, + { + provide: ConnectionBackend, + useClass: MockBackend + }, + { provide: GITHUB_API_URL, useValue: null } + ] + }) + .compileComponents(); + })); + + beforeEach(inject([ApplicationService], (applicationService: ApplicationService) => { + const cfGuid = Object.keys(initialState.requestData[endpointStoreNames.type])[0]; + const appGuid = Object.keys(initialState.requestData.application)[0]; + fixture = TestBed.createComponent(AutoscalerTabComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + afterEach(() => { + fixture.destroy(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts new file mode 100644 index 0000000000..1228ea3bec --- /dev/null +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -0,0 +1,403 @@ +import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Observable, Subscription } from 'rxjs'; +import { EntityService } from '../../../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerInsMetricSchemaKey, +} from '../../../../../../store/helpers/entity-factory'; +import { ApplicationService } from '../../../../application.service'; +import { + GetAppAutoscalerPolicyAction, + GetAppAutoscalerScalingHistoryAction, + GetAppAutoscalerAppMetricAction, + GetAppAutoscalerInsMetricAction, + UpdateAppAutoscalerPolicyAction, + DetachAppAutoscalerPolicyAction, +} from '../../../../../../store/actions/app-autoscaler.actions'; +import { + AppAutoscalerPolicy, + AppAutoscalerScalingHistory, + AppAutoscalerAppMetric, + AppAutoscalerInsMetric +} from '../../../../../../store/types/app-autoscaler.types'; +import { map, filter, distinctUntilChanged, first } from 'rxjs/operators'; +import { getPaginationObservables } from '../../../../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +import { Store } from '@ngrx/store'; +import { AppState } from '../../../../../../store/app-state'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { ActionState } from '../../../../../../store/reducers/api-request-reducer/types'; +import { selectUpdateInfo } from '../../../../../../store/selectors/api.selectors'; +import { ConfirmationDialogConfig } from '../../../../../../shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; +import { ListConfig } from '../../../../../../shared/components/list/list.component.types'; +import { DatePipe } from '@angular/common'; +import { CurrentUserPermissionsService } from '../../../../../../core/current-user-permissions.service'; +import { + CfAppRoutesListConfigService, +} from '../../../../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service'; +import { CfOrgSpaceDataService } from '../../../../../../shared/data-services/cf-org-space-service.service'; +import { RouterNav } from '../../../../../../store/actions/router.actions'; +import { MetricTypes } from '../../../../../../store/helpers/autoscaler-helpers'; + +@Component({ + selector: 'app-autoscaler-tab', + templateUrl: './autoscaler-tab.component.html', + styleUrls: ['./autoscaler-tab.component.scss'], + providers: [ + { + provide: ListConfig, + useFactory: ( + store: Store, + appService: ApplicationService, + confirmDialog: ConfirmationDialogService, + datePipe: DatePipe, + cups: CurrentUserPermissionsService + ) => { + return new CfAppRoutesListConfigService(store, appService, confirmDialog, datePipe, cups); + }, + deps: [Store, ApplicationService, ConfirmationDialogService, DatePipe, CurrentUserPermissionsService] + }, + CfOrgSpaceDataService + ] +}) + + + +export class AutoscalerTabComponent implements OnInit, OnDestroy { + + scalingRuleColumns: string[] = ['metric', 'condition', 'action']; + specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; + recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; + scalingHistoryColumns: string[] = ['event', 'trigger', 'date', 'error']; + metricTypes: string[] = MetricTypes; + + appAutoscalerPolicyService: EntityService; + appAutoscalerScalingHistoryService: EntityService; + + appAutoscalerPolicy$: Observable; + appAutoscalerScalingHistory$: Observable; + + private currentPolicy: any; + public isEditing = false; + public instanceMinCountCurrent: number; + public instanceMinCountEdit: number; + public instanceMaxCountCurrent: any; + public instanceMaxCountEdit: any; + + appAutoscalerPolicyErrorSub: Subscription; + appAutoscalerScalingHistoryErrorSub: Subscription; + + private appAutoscalerPolicySnackBarRef: MatSnackBarRef; + private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef; + + // private confirmDialog: ConfirmationDialogService; + private attachConfirmOk = 0; + private detachConfirmOk = 0; + + appAutoscalerAppMetrics = {}; + appAutoscalerInsMetrics = {}; + appAutoscalerAppMetricNames = []; + + paramsMetrics = { + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + '000000', + 'page': '1', + 'results-per-page': '1', + 'order': 'desc' + }; + paramsHistory = { + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + '000000', + 'page': '1', + 'results-per-page': '5', + 'order': 'desc' + }; + + ngOnDestroy(): void { + if (this.appAutoscalerPolicySnackBarRef) { + this.appAutoscalerPolicySnackBarRef.dismiss(); + } + if (this.appAutoscalerScalingHistorySnackBarRef) { + this.appAutoscalerScalingHistorySnackBarRef.dismiss(); + } + if (this.appAutoscalerPolicyErrorSub) { + this.appAutoscalerPolicyErrorSub.unsubscribe(); + } + if (this.appAutoscalerScalingHistoryErrorSub) { + this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); + } + } + + constructor( + private store: Store, + private applicationService: ApplicationService, + private entityServiceFactory: EntityServiceFactory, + private paginationMonitorFactory: PaginationMonitorFactory, + private appAutoscalerPolicySnackBar: MatSnackBar, + private appAutoscalerScalingHistorySnackBar: MatSnackBar, + private confirmDialog: ConfirmationDialogService, + ) { + } + + ngOnInit() { + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( + appAutoscalerScalingHistorySchemaKey, + entityFactory(appAutoscalerScalingHistorySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, this.applicationService.cfGuid, this.paramsHistory), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); + this.loadLatestMetricsUponPolicy(entity); + } + return entity && entity.entity; + }) + ); + this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( + map(({ entity }) => entity && entity.entity) + ); + this.initErrorSub(); + } + + getAppMetric(metricName: string, trigger: any, params: any) { + const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, + this.applicationService.cfGuid, metricName, true, trigger, params); + return getPaginationObservables({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerAppMetricSchemaKey) + ) + }, false).entities$; + } + + getInsMetric(metricName: string, trigger: any, params: any) { + const action = new GetAppAutoscalerInsMetricAction(this.applicationService.appGuid, + this.applicationService.cfGuid, metricName, true, trigger, params); + return getPaginationObservables({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerInsMetricSchemaKey) + ) + }, false).entities$; + } + + loadLatestMetricsUponPolicy(policyEntity) { + if (policyEntity && policyEntity.entity && policyEntity.entity.scaling_rules_map) { + this.appAutoscalerAppMetrics = {}; + Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { + this.appAutoscalerAppMetrics[metricName] = + this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); + }); + } + } + + initErrorSub() { + this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error), + map(request => request.message), + distinctUntilChanged(), + ).subscribe(errorMessage => { + if (this.appAutoscalerPolicySnackBarRef) { + this.appAutoscalerPolicySnackBarRef.dismiss(); + } + this.appAutoscalerPolicySnackBarRef = this.appAutoscalerPolicySnackBar.open(errorMessage, 'Dismiss'); + }); + + this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error), + map(request => request.message), + distinctUntilChanged(), + ).subscribe(errorMessage => { + if (this.appAutoscalerScalingHistorySnackBarRef) { + this.appAutoscalerScalingHistorySnackBarRef.dismiss(); + } + this.appAutoscalerScalingHistorySnackBarRef = this.appAutoscalerScalingHistorySnackBar.open(errorMessage, 'Dismiss'); + }); + } + + diableAutoscaler() { + const confirmation = new ConfirmationDialogConfig( + 'Detach And Delete Policy', + 'Are you sure you want to detach and delete the policy?.', + 'Detach and Delete', + true + ); + if (this.detachConfirmOk === 1) { + this.detachConfirmOk = 0; + } else { + this.detachConfirmOk = 1; + } + this.confirmDialog.open(confirmation, () => { + this.detachConfirmOk = 2; + this.isEditing = false; + const doUpdate = () => this.detachPolicy(); + doUpdate().pipe( + first(), + ).subscribe(actionState => { + if (actionState.error) { + this.appAutoscalerPolicySnackBarRef = + this.appAutoscalerPolicySnackBar.open(`Failed to detach policy: ${actionState.message}`, 'Dismiss'); + } + }); + }); + this.attachConfirmOk = 0; + } + + createDefaultPolicy() { + const confirmation = new ConfirmationDialogConfig( + 'Attach Default Policy', + 'Confirm to attach a default AutoScaler policy, you can update it later.', + 'Attach', + ); + if (this.attachConfirmOk === 1) { + this.attachConfirmOk = 0; + } else { + this.attachConfirmOk = 1; + } + this.confirmDialog.open(confirmation, () => { + this.attachConfirmOk = 2; + this.isEditing = false; + this.currentPolicy = { + 'instance_min_count': 1, + 'instance_max_count': 10, + 'scaling_rules': [ + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 10, + 'operator': '<=', + 'cool_down_secs': 300, + 'adjustment': '-2' + }, + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 40, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-5' + } + ], + 'schedules': { + 'timezone': 'Asia/Shanghai', + 'recurring_schedule': [ + { + 'start_time': '10:00', + 'end_time': '18:00', + 'days_of_week': [ + 1, + 2, + 3 + ], + 'instance_min_count': 1, + 'instance_max_count': 10, + 'initial_min_instance_count': 5 + } + ], + 'specific_date': [ + { + 'start_date_time': '2099-06-02T10:00', + 'end_date_time': '2099-06-15T13:59', + 'instance_min_count': 1, + 'instance_max_count': 4, + 'initial_min_instance_count': 2 + } + ] + } + }; + const doUpdate = () => this.updatePolicy(); + doUpdate().pipe( + first(), + ).subscribe(actionState => { + if (actionState.error) { + this.appAutoscalerPolicySnackBarRef = + this.appAutoscalerPolicySnackBar.open(`Failed to create policy: ${actionState.message}`, 'Dismiss'); + } + }); + this.detachConfirmOk = 0; + }); + } + + updatePolicy(): Observable { + this.store.dispatch( + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + ); + const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, + this.applicationService.appGuid, + UpdateAppAutoscalerPolicyAction.updateKey); + return this.store.select(actionState).pipe(filter(item => !!item)); + } + + detachPolicy(): Observable { + this.store.dispatch( + new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + ); + const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, + this.applicationService.appGuid, + UpdateAppAutoscalerPolicyAction.updateKey); + return this.store.select(actionState).pipe(filter(item => !!item)); + } + + updatePolicyPage() { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'edit-autoscaler-policy' + ], + query: { + // spaceGuid: app.app.entity.space_guid + } + })); + } + + metricChartPage() { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'app-autoscaler-metric-chart-page' + ], + query: { + // spaceGuid: app.app.entity.space_guid + } + })); + } + + scaleHistoryPage() { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'app-autoscaler-scale-history-page' + ], + query: { + // spaceGuid: app.app.entity.space_guid + } + })); + } +} diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html new file mode 100644 index 0000000000..8f396fd4b0 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html @@ -0,0 +1,61 @@ + +

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.entity.name }}

+
+ +
+ +
+ + + + + + + {{metricName}}
+
+ {{paramsMetrics['start-time'] / 1000000 | date:'medium'}} ~ + {{paramsMetrics['end-time'] / 1000000 | date:'medium'}} +
+ + + +
+ + +
+
+ + + +
+
+ + +
+ + + + + \ No newline at end of file diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss new file mode 100644 index 0000000000..bec9e1cd26 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss @@ -0,0 +1,63 @@ +app-tile-grid { + width: 100%; +} + +.autoscaler-metric-page { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + margin-right: 3em; + app-metadata-item:first-child { + margin-top: 0; + } + } +} + +.autoscaler-chart-gauge { + margin-top: 1em; + width: 30%; + display: inline-block; +} + +.autoscaler-chart-bar { + margin-top: 1em; + width: 70%; + display: inline-block; +} + +.autoscaler-chart-legend { + width: 100%; + svg { + width: 0px; + } + .ngx-charts { + width: 0em; + } + .legend-labels { + width: 15em; + } +} + +.ngx-charts { + width: 0px; +} + +.autoscaler-metric-subtitle { + color: rgba(0, 0, 0, 0.54); + font-size: 0.9em; + margin-top: 0.3em; +} diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts new file mode 100644 index 0000000000..96276176e6 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts @@ -0,0 +1,212 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, Subscription } from 'rxjs'; +import { filter, map, take } from 'rxjs/operators'; +import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; +import { AppState } from '../../../store/app-state'; +import { ApplicationService } from '../application.service'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { EntityService } from '../../../core/entity-service'; +import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, +} from '../../../store/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; +import { + GetAppAutoscalerAppMetricAction, +} from '../../../store/actions/app-autoscaler.actions'; +import { + AppAutoscalerAppMetric, +} from '../../../store/types/app-autoscaler.types'; +import { + appAutoscalerAppMetricSchemaKey, +} from '../../../store/helpers/entity-factory'; +import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; +import { normalColor } from '../../../store/helpers/autoscaler-helpers'; + +const monthName = new Intl.DateTimeFormat('en-us', { month: 'short' }); +const weekdayName = new Intl.DateTimeFormat('en-us', { weekday: 'short' }); +function formatLabel(label: any): string { + if (label instanceof Date) { + label = label.toLocaleDateString(); + } else { + label = label.toLocaleString(); + } + return label; +} + +@Component({ + selector: 'app-autoscaler-metric-chart-page', + templateUrl: './autoscaler-metric-chart-page.component.html', + styleUrls: ['./autoscaler-metric-chart-page.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { + + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + current = (new Date()).getTime(); + paramsMetrics = { + 'start-time': this.current - 30 * 60 * 1000 + '000000', + 'end-time': this.current + '000000', + 'page': '1', + 'results-per-page': '10000000', + 'order': 'asc' + }; + + appAutoscalerAppMetrics = {}; + appAutoscalerAppMetricNames = []; + appAutoscalerAppMetricLegend = {}; + + constructor( + public applicationService: ApplicationService, + private store: Store, + private snackBar: MatSnackBar, + private entityServiceFactory: EntityServiceFactory, + private paginationMonitorFactory: PaginationMonitorFactory, + ) { + } + + private app: any = { + entity: {} + }; + + private sub: Subscription; + + appAutoscalerPolicyService: EntityService; + public appAutoscalerPolicy$: Observable; + private snackBarRef: MatSnackBarRef; + + clearSub() { + if (this.sub) { + this.sub.unsubscribe(); + this.sub = undefined; + } + } + + ngOnInit() { + this.sub = this.applicationService.application$.pipe( + filter(app => !!app.app.entity), + take(1), + map(app => app.app.entity) + ).subscribe(app => { + this.app = app; + this.store.dispatch(new SetCFDetails({ + cloudFoundry: this.applicationService.cfGuid, + org: '', + space: this.app.space_guid, + })); + this.store.dispatch(new SetNewAppName(this.app.name)); + // Don't want the values to change while the user is editing + this.clearSub(); + }); + + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); + this.loadLatestMetricsUponPolicy(entity); + } + return entity && entity.entity; + }) + ); + } + + ngOnDestroy(): void { + if (this.snackBarRef) { + this.snackBarRef.dismiss(); + } + this.clearSub(); + } + + select(data) { + } + + getAppMetric(metricName: string, trigger: any, params: any) { + const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, + this.applicationService.cfGuid, metricName, false, trigger, params); + return getPaginationObservables({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerAppMetricSchemaKey) + ) + }, false).entities$; + } + + loadLatestMetricsUponPolicy(policyEntity) { + if (policyEntity && policyEntity.entity && policyEntity.entity.scaling_rules_map) { + this.appAutoscalerAppMetrics = {}; + Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { + this.appAutoscalerAppMetricLegend[metricName] = this.getLegend(policyEntity.entity.scaling_rules_map[metricName]); + this.appAutoscalerAppMetrics[metricName] = + this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); + }); + } + } + + pieTooltipText({ data }) { + const label = formatLabel(data.name); + const val = formatLabel(data.value); + return ` + ${label} + $${val} + `; + } + + getLegend(trigger) { + const legendValue = []; + const legendColor = []; + for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { + const current = trigger.upper[i]; + const name = `${current.adjustment} if ${current.metric_type} ${current.operator} ${current.threshold}`; + legendValue.push({ + name, + value: 1 + }); + legendColor.push({ + name, + value: current.color + }); + } + legendValue.push({ + name: 'ideal state', + value: 1 + }); + legendColor.push({ + name: 'ideal state', + value: normalColor + }); + + for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { + const current = trigger.lower[i]; + const name = `${current.adjustment} if ${current.metric_type} ${current.operator} ${current.threshold}`; + legendValue.push({ + name, + value: 1 + }); + legendColor.push({ + name, + value: current.color + }); + } + return { + legendValue, + legendColor + }; + } + +} diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html new file mode 100644 index 0000000000..1b9a060740 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html @@ -0,0 +1,13 @@ + +

AutoScaler Scaling Events: {{ (applicationService.application$ | async)?.app.entity.name }}

+
+ +
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss new file mode 100644 index 0000000000..b7248b408e --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss @@ -0,0 +1,25 @@ +[app-table-content] { + mat-header-cell, + mat-cell { + flex-grow: 1; + } + + .cdk-column-actor_name { + align-items: center; + display: flex; + flex-basis: 100px; + flex-direction: row; + } + + .cdk-column-type { + flex-basis: 100px; + } + + .cdk-column-detail { + flex-grow: 3; + + td { + padding-right: 5px; + } + } +} diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts new file mode 100644 index 0000000000..4cdd1ee201 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts @@ -0,0 +1,52 @@ +import { Component, OnDestroy, OnInit, HostBinding } from '@angular/core'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, Subscription } from 'rxjs'; +import { filter, map, take } from 'rxjs/operators'; +import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; +import { AppState } from '../../../store/app-state'; +import { ApplicationService } from '../application.service'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { EntityService } from '../../../core/entity-service'; +import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, +} from '../../../store/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; +import { + GetAppAutoscalerAppMetricAction, +} from '../../../store/actions/app-autoscaler.actions'; +import { + AppAutoscalerAppMetric, +} from '../../../store/types/app-autoscaler.types'; +import { + appAutoscalerAppMetricSchemaKey, +} from '../../../store/helpers/entity-factory'; +import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; +import { normalColor } from '../../../store/helpers/autoscaler-helpers'; +import { + CfAppAutoscalerEventsConfigService, +} from '../../../shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; +import { ListConfig } from '../../../shared/components/list/list.component.types'; + +@Component({ + selector: 'app-autoscaler-scale-history-page', + templateUrl: './autoscaler-scale-history-page.component.html', + styleUrls: ['./autoscaler-scale-history-page.component.scss'], + providers: [{ + provide: ListConfig, + useClass: CfAppAutoscalerEventsConfigService, + }] +}) +export class AutoscalerScaleHistoryPageComponent { + + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + + constructor( + public applicationService: ApplicationService, + ) { + } +} diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html new file mode 100644 index 0000000000..2463b9f05a --- /dev/null +++ b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -0,0 +1,198 @@ + +

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.entity.name }}

+
+ +
+ + + +
+ + + + + + +
+ + + + + + + + + Rule {{index+1}}: + + + + If average + + + + {{ metricType }} + + + + + + + {{ operator }} + + + + + + + for + + + + seconsds, then + + + + instances. Cooldown: + + + + seconds. + + + + + + + + + + + + + + + + + Schedule {{index+1}}: + + + +
+
+
+ + + Always + + + + + + + + + + + + + Week + + Month + + + + + {{day}} + + + +
+
+ + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + Schedule {{index+1}}: + + + +
+
+
+ + + + + + + + +
+
+ + + + + + + + +
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss new file mode 100644 index 0000000000..8b46d8b617 --- /dev/null +++ b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -0,0 +1,42 @@ +.edit-app { + flex: 1; +} + +.mat-radio-outer-circle { + height: 15px; + width: 15px; + top: 2.5px; +} + +app-tile-grid { + width: 100%; +} + +.app-auto-scaler { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + margin-right: 3em; + app-metadata-item:first-child { + margin-top: 0; + } + } +} + +.edit-recurring-schedule { + max-width: 100%; +} \ No newline at end of file diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts new file mode 100644 index 0000000000..7c013dc51c --- /dev/null +++ b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -0,0 +1,225 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Http } from '@angular/http'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, of as observableOf, Subscription } from 'rxjs'; +import { filter, map, take, first } from 'rxjs/operators'; + +import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; +import { AppMetadataTypes } from '../../../store/actions/app-metadata.actions'; +import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; +import { AppState } from '../../../store/app-state'; +import { AppNameUniqueChecking, AppNameUniqueDirective } from '../app-name-unique.directive/app-name-unique.directive'; +import { ApplicationService } from '../application.service'; + +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { EntityService } from '../../../core/entity-service'; +import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, +} from '../../../store/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; +import { selectUpdateInfo } from '../../../store/selectors/api.selectors'; +import { ActionState } from '../../../store/reducers/api-request-reducer/types'; +import { SourceType } from '../../../store/types/deploy-application.types'; +import { MetricTypes, UpperOperators, LowerOperators } from '../../../store/helpers/autoscaler-helpers'; + +@Component({ + selector: 'app-edit-autoscaler-policy', + templateUrl: './edit-autoscaler-policy.component.html', + styleUrls: ['./edit-autoscaler-policy.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { + + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + + scalingRuleColumns: string[] = ['metric', 'condition', 'action']; + specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; + recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; + + weekdayOptions: string[] = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; + + metricTypes = MetricTypes; + operatorTypes = UpperOperators.concat(LowerOperators); + + sourceTypes: SourceType[] = [ + { name: 'Public GitHub', id: 'github', group: 'gitscm' }, + { name: 'Public GitLab', id: 'gitlab', group: 'gitscm' }, + { name: 'Public Git URL', id: 'giturl' }, + { name: 'Application Archive File', id: 'file' }, + { name: 'Application Folder', id: 'folder' }, + ]; + + editAppForm: FormGroup; + + uniqueNameValidator: AppNameUniqueDirective; + + appNameChecking: AppNameUniqueChecking = new AppNameUniqueChecking(); + + constructor( + public applicationService: ApplicationService, + private store: Store, + private fb: FormBuilder, + private http: Http, + private snackBar: MatSnackBar, + private entityServiceFactory: EntityServiceFactory, + ) { + this.uniqueNameValidator = new AppNameUniqueDirective(this.store, this.http); + this.editAppForm = this.fb.group({ + instance_min_count: [0, [ + Validators.required, + Validators.min(1) + ]], + instance_max_count: [0, [ + Validators.required, + Validators.min(1) + ]], + }); + } + + private app: any = { + entity: {} + }; + + private sub: Subscription; + + private error = false; + + appAutoscalerPolicyService: EntityService; + appAutoscalerPolicyUpdateService: EntityService; + public appAutoscalerPolicy$: Observable; + + private currentPolicy: any; + public isEditing = false; + public instanceMinCountCurrent: number; + public instanceMinCountEdit: number; + public instanceMaxCountCurrent: any; + public instanceMaxCountEdit: any; + + private snackBarRef: MatSnackBarRef; + + updateApp: StepOnNextFunction = () => { + const updates = {}; + // We will only send the values that were actually edited + for (const key of Object.keys(this.editAppForm.value)) { + if (!this.editAppForm.controls[key].pristine) { + updates[key] = this.editAppForm.value[key]; + } + } + + let obs$: Observable; + if (Object.keys(updates).length) { + // We had at least one value to change - send update action + obs$ = this.applicationService.updateApplication(updates, [AppMetadataTypes.SUMMARY]).pipe(map(v => ( + { + success: !v.error, + message: `Could not update application: ${v.message}` + }))); + } else { + obs$ = observableOf({ success: true }); + } + + return obs$.pipe(take(1), map(res => { + return { + ...res, + redirect: res.success + }; + })); + } + + clearSub() { + if (this.sub) { + this.sub.unsubscribe(); + this.sub = undefined; + } + } + + ngOnInit() { + this.sub = this.applicationService.application$.pipe( + filter(app => !!app.app.entity), + take(1), + map(app => app.app.entity) + ).subscribe(app => { + this.app = app; + this.store.dispatch(new SetCFDetails({ + cloudFoundry: this.applicationService.cfGuid, + org: '', + space: this.app.space_guid, + })); + this.store.dispatch(new SetNewAppName(this.app.name)); + // Don't want the values to change while the user is editing + this.clearSub(); + }); + + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.instanceMinCountCurrent = entity.entity.instance_min_count; + this.instanceMaxCountCurrent = entity.entity.instance_max_count; + this.currentPolicy = entity.entity; + this.editAppForm.setValue({ + instance_min_count: this.currentPolicy.instance_min_count, + instance_max_count: this.currentPolicy.instance_max_count, + }); + } + return entity && entity.entity; + }) + ); + } + + ngOnDestroy(): void { + if (this.snackBarRef) { + this.snackBarRef.dismiss(); + } + this.clearSub(); + } + + edit() { + this.instanceMinCountEdit = this.instanceMinCountCurrent; + this.instanceMaxCountEdit = this.instanceMaxCountCurrent; + this.isEditing = true; + } + + finishEdit(ok: boolean) { + this.isEditing = false; + this.currentPolicy.instance_min_count = this.instanceMinCountEdit; + this.currentPolicy.instance_max_count = this.instanceMaxCountEdit; + if (ok) { + const doUpdate = () => this.updatePolicy(); + doUpdate().pipe( + first(), + ).subscribe(actionState => { + if (actionState.error) { + this.snackBarRef = this.snackBar.open(`Failed to update instance count: ${actionState.message}`, 'Dismiss'); + } + }); + } + } + + updatePolicy(): Observable { + this.store.dispatch( + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + ); + const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, + this.applicationService.appGuid, + UpdateAppAutoscalerPolicyAction.updateKey); + return this.store.select(actionState).pipe(filter(item => !!item)); + } + + remove() { + // console.log('remove') + } +} diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html new file mode 100644 index 0000000000..9eb3a90edd --- /dev/null +++ b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html @@ -0,0 +1,67 @@ + +
+ + Instances + + +
+
+ + + + +
+
+ +
+
+ + Limits + + +
+
+ +
+
{{ policy.instance_min_count }}
+
+ + + +
+
+
-
+ +
+
+ +
+
{{ policy.instance_max_count }}
+
+ + + +
+
+
-
+ +
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss new file mode 100644 index 0000000000..ca6c89291d --- /dev/null +++ b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss @@ -0,0 +1,171 @@ +.card-autoscaler-default { + &__large { + font-size: 16px; + } + + &__compact { + margin-bottom: 0; + position: absolute; + } + + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } + + mat-form-field { + width: 50px; + .mat-form-field-infix { + border-top: unset; + } + } + + app-metadata-item { + .metadata-item__content { + flex-direction: row; + } + } + + .metadata-item__content { + display: inline; + } + + .metadata-item__value { + display: inline; + margin-right: 10px; + } + + .metadata-item__label { + display: inline; + margin-right: 10px; + } + +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + margin-right: 1em; + app-metadata-item:first-child { + margin-top: 0; + } + } +} + +// .mat-card { +// padding: 24px 10px 24px 24px; + +// .create-policy { +// margin-top: 1rem; +// text-decoration: none; +// } + +// .mat-card-heading { +// font-weight: 600; +// } + +// .mat-card-container { +// display: flex; +// flex-direction: column; +// padding-right: 2rem; + +// a { +// margin-left: auto; +// margin-bottom: 2px; +// } + +// &.instances { +// border-right: 1px solid gray; +// } + +// &.limits-container { +// padding-left: 2rem; +// padding-right: 0; + +// .limits { +// display: flex; +// } +// .min-limit { +// padding-right: 1rem; +// } +// } + +// &.limits-link { +// padding-right: 0; +// margin-top: -15px; +// } + +// } + +// &.status-card { +// width: 160px; + +// &.green { +// border-top: 4px solid #4caf50; +// } +// } + +// &.instances-card { +// width: 348px; +// } + +// &.most-recent-event-card { +// width: 525px; +// } + +// .row-container { +// display: flex; +// justify-content: space-between; +// } + +// .column-container { +// display: flex; +// flex-direction: column; +// } + +// .text-padding { +// padding-left: 5px; +// } + +// table { +// width: 100%; + +// thead th { +// text-align: left; +// font-weight: 200; +// font-size: small; +// border-bottom: 1px solid lightgrey; +// } +// } + +// th, td { +// padding-top: 5px; + +// &.recent-event-when { +// width: 38%; +// } + +// &.recent-event-change { +// width: 15%; +// } +// } + +// p { +// &.configured { +// color: green; +// } +// &.not-configured { +// color: gray; +// font-style: italic; +// } +// &.scale-recur-heading { +// margin-top: 2.0rem; +// } +// } + +// } diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts new file mode 100644 index 0000000000..14702c9648 --- /dev/null +++ b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -0,0 +1,46 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component'; +import { CoreModule } from '../../../../core/core.module'; +import { ApplicationService } from '../../../../features/applications/application.service'; +import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; +import { ApplicationStateService } from '../../application-state/application-state.service'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { CommonModule } from '@angular/common'; +import { MetadataItemComponent } from '../../metadata-item/metadata-item.component'; + +describe('CardAutoscalerDefaultComponent', () => { + let component: CardAutoscalerDefaultComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + CardAutoscalerDefaultComponent, + MetadataItemComponent, + ], + imports: [ + CoreModule, + CommonModule, + BrowserAnimationsModule, + createBasicStoreModule() + ], + providers: [ + { provide: ApplicationService, useClass: ApplicationServiceMock }, + ApplicationStateService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CardAutoscalerDefaultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts new file mode 100644 index 0000000000..0704148589 --- /dev/null +++ b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts @@ -0,0 +1,116 @@ +import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Observable } from 'rxjs'; +import { map, first, filter } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; +import { AppState } from '../../../../store/app-state'; +import { ApplicationService } from '../../../../features/applications/application.service'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { EntityService } from '../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey, +} from '../../../../store/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../store/types/app-autoscaler.types'; +import { selectUpdateInfo } from '../../../../store/selectors/api.selectors'; +import { ActionState } from '../../../../store/reducers/api-request-reducer/types'; +import { CardStatus } from '../../../shared.types'; + +@Component({ + selector: 'app-card-autoscaler-default', + templateUrl: './card-autoscaler-default.component.html', + styleUrls: ['./card-autoscaler-default.component.scss'] +}) +export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { + + @ViewChild('instanceField') instanceField: ElementRef; + + constructor( + public appService: ApplicationService, + private store: Store, + private snackBar: MatSnackBar, + private entityServiceFactory: EntityServiceFactory, + private applicationService: ApplicationService, + ) { + this.status$ = this.appService.applicationState$.pipe( + map(state => state.indicator) + ); + } + + status$: Observable; + appAutoscalerPolicyService: EntityService; + appAutoscalerPolicyUpdateService: EntityService; + public appAutoscalerPolicy$: Observable; + + currentPolicy = { + instance_min_count: 0, + instance_max_count: 0 + }; + public isEditing = false; + public instanceMinCountCurrent: number; + public instanceMinCountEdit: number; + public instanceMaxCountCurrent: any; + public instanceMaxCountEdit: any; + + private snackBarRef: MatSnackBarRef; + + ngOnInit() { + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.instanceMinCountCurrent = entity.entity.instance_min_count; + this.instanceMaxCountCurrent = entity.entity.instance_max_count; + this.currentPolicy = entity.entity; + } + return entity && entity.entity; + }) + ); + } + + ngOnDestroy(): void { + if (this.snackBarRef) { + this.snackBarRef.dismiss(); + } + } + + edit() { + this.instanceMinCountEdit = this.instanceMinCountCurrent; + this.instanceMaxCountEdit = this.instanceMaxCountCurrent; + this.isEditing = true; + } + + finishEdit(ok: boolean) { + this.isEditing = false; + this.currentPolicy.instance_min_count = this.instanceMinCountEdit; + this.currentPolicy.instance_max_count = this.instanceMaxCountEdit; + if (ok) { + const doUpdate = () => this.updatePolicy(); + doUpdate().pipe( + first(), + ).subscribe(actionState => { + if (actionState.error) { + this.snackBarRef = this.snackBar.open(`Failed to update instance count: ${actionState.message}`, 'Dismiss'); + } + }); + } + } + + updatePolicy(): Observable { + this.store.dispatch( + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + ); + const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, + this.applicationService.appGuid, + UpdateAppAutoscalerPolicyAction.updateKey); + return this.store.select(actionState).pipe(filter(item => !!item)); + } + +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts new file mode 100644 index 0000000000..ef4fac690e --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -0,0 +1,50 @@ +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/actions/application.actions'; +import { applicationSchemaKey, entityFactory } from '../../../../../store/helpers/entity-factory'; +import { endpointStoreNames } from '../../../../../store/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 { SharedModule } from '../../../../shared.module'; +import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; + + + +describe('CfAppAutoscalerEventsConfigService', () => { + const initialState = getInitialTestStoreState(); + + const cfGuid = Object.keys(initialState.requestData[endpointStoreNames.type])[0]; + const appGuid = Object.keys(initialState.requestData.application)[0]; + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + CfAppAutoscalerEventsConfigService, + EntityServiceFactory, + generateTestEntityServiceProvider( + appGuid, + entityFactory(applicationSchemaKey), + new GetApplication(appGuid, cfGuid) + ), + generateTestApplicationServiceProvider(appGuid, cfGuid) + ], + imports: [ + CommonModule, + CoreModule, + SharedModule, + ApplicationsModule, + createBasicStoreModule(), + RouterTestingModule + ] + }); + }); + + it('should be created', inject([CfAppAutoscalerEventsConfigService], (service: CfAppAutoscalerEventsConfigService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts new file mode 100644 index 0000000000..407a771432 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -0,0 +1,114 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { BehaviorSubject, of as observableOf } from 'rxjs'; +import { ApplicationService } from '../../../../../features/applications/application.service'; +import { AppState } from '../../../../../store/app-state'; +import { EntityInfo } from '../../../../../store/types/api.types'; +import { ITableColumn } from '../../list-table/table.types'; +import { IListConfig, ListConfig, ListViewTypes, IListMultiFilterConfig } from '../../list.component.types'; +import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; +import { TableCellAutoscalerEventActionComponent } from './table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; +import { + TableCellAutoscalerEventTimestampComponent +} from './table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component'; +import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; +import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; +import { TableCellAutoscalerEventChangeComponent } from './table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; +import { TableCellAutoscalerEventErrorComponent } from './table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; +import { PaginatedAction } from '../../../../../store/types/pagination.types'; +import { selectPaginationState } from '../../../../../store/selectors/pagination.selectors'; +import { filter, first } from 'rxjs/operators'; +import { SetClientFilter } from '../../../../../store/actions/pagination.actions'; + +@Injectable() +export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { + autoscalerEventSource: CfAppAutoscalerEventsDataSource; + columns: Array> = [ + { + columnId: 'timestamp', headerCell: () => + 'Timestamp', cellComponent: TableCellAutoscalerEventTimestampComponent, sort: true, cellFlex: '3' + }, + { + columnId: 'status', headerCell: () => 'Status', cellComponent: TableCellAutoscalerEventStatusComponent, cellFlex: '2' + }, + { + columnId: 'type', headerCell: () => 'Type', cellComponent: TableCellAutoscalerEventTypeComponent, cellFlex: '2' + }, + { + columnId: 'change', headerCell: () => 'Instance Change', cellComponent: TableCellAutoscalerEventChangeComponent, cellFlex: '2' + }, + { + columnId: 'action', headerCell: () => 'Action', cellComponent: TableCellAutoscalerEventActionComponent, cellFlex: '4' + }, + { + columnId: 'error', headerCell: () => 'Error', cellComponent: TableCellAutoscalerEventErrorComponent, cellFlex: '4' + }, + ]; + viewType = ListViewTypes.TABLE_ONLY; + text = { + title: null, + noEntries: 'There are no scale events' + }; + private multiFilterConfigs: IListMultiFilterConfig[]; + + constructor(private store: Store, private appService: ApplicationService) { + super(); + this.autoscalerEventSource = new CfAppAutoscalerEventsDataSource( + this.store, + this.appService.cfGuid, + this.appService.appGuid, + ); + + this.assignMultiConfig(); + this.initialiseMultiFilter(this.autoscalerEventSource.action); + } + + getGlobalActions = () => null; + getMultiActions = () => null; + getSingleActions = () => null; + getColumns = () => this.columns; + getDataSource = () => this.autoscalerEventSource; + getMultiFiltersConfigs = () => this.multiFilterConfigs; + + private assignMultiConfig = () => { + this.multiFilterConfigs = [ + { + key: 'queryRange', + label: 'Last week', + allLabel: 'Last week', + list$: observableOf([ + { + label: 'Last month', + item: 'month', + value: 'month' + }, + { + label: 'Custom range', + item: 'custom', + value: 'custom' + } + ]), + loading$: observableOf(false), + select: new BehaviorSubject('month') + } + ]; + } + + private initialiseMultiFilter(action: PaginatedAction) { + this.store.select(selectPaginationState(action.entityKey, action.paginationKey)).pipe( + filter((pag) => !!pag), + first(), + ).subscribe(pag => { + const currentFilter = pag.clientPagination.filter.items['queryRange']; + if (!currentFilter) { + this.store.dispatch(new SetClientFilter(action.entityKey, action.paginationKey, { + string: '', + items: { + ['queryRange']: 'week' + } + })); + } + }); + } + +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts new file mode 100644 index 0000000000..60bee81057 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -0,0 +1,58 @@ +import { Store } from '@ngrx/store'; +import { GetAppAutoscalerScalingHistoryAction } from '../../../../../store/actions/app-autoscaler.actions'; +import { AddParams, RemoveParams } from '../../../../../store/actions/pagination.actions'; +import { AppState } from '../../../../../store/app-state'; +import { EntityInfo } from '../../../../../store/types/api.types'; +import { PaginationEntityState, QParam } from '../../../../../store/types/pagination.types'; +import { ListDataSource } from '../../data-sources-controllers/list-data-source'; +import { entityFactory } from '../../../../../store/helpers/entity-factory'; +import { appAutoscalerScalingHistorySchemaKey } from '../../../../../store/helpers/entity-factory'; + +export class CfAppAutoscalerEventsDataSource extends ListDataSource { + action: any; + + public getFilterFromParams(pag: PaginationEntityState) { + const qParams = pag.params.q; + if (qParams) { + const qParam = qParams.find((q: QParam) => { + return q.key === 'type'; + }); + return qParam ? qParam.value as string : ''; + } + } + public setFilterParam(filterString: string, pag: PaginationEntityState) { + if (filterString && filterString.length) { + this.store.dispatch(new AddParams(this.entityKey, this.paginationKey, { + q: [ + new QParam('type', filterString, ' IN '), + ] + })); + } else if (pag.params.q.find((q: QParam) => q.key === 'type')) { + this.store.dispatch(new RemoveParams(this.entityKey, this.paginationKey, [], ['type'])); + } + } + + constructor( + store: Store, + _cfGuid: string, + _appGuid: string, + ) { + const paginationKey = `app-autoscaler-events:${_cfGuid}${_appGuid}`; + const aaction = new GetAppAutoscalerScalingHistoryAction(paginationKey, _appGuid, _cfGuid); + + super( + { + store, + action: aaction, + schema: entityFactory(appAutoscalerScalingHistorySchemaKey), + getRowUniqueId: (object: EntityInfo) => { + return object.entity.metadata ? object.entity.metadata.guid : null; + }, + paginationKey, + } + ); + + this.action = aaction; + } + +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts new file mode 100644 index 0000000000..4b38211288 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts @@ -0,0 +1,19 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'tableCellAutoscalerEventActionLabel' +}) +export class TableCellAutoscalerEventActionLabelPipe implements PipeTransform { + transform(value: number): string { + if (value['message']) { + const change = value['new_instances'] - value['old_instances']; + if (change >= 0) { + return '+' + change + ' instance(s) because ' + value['message']; + } else { + return change + ' instance(s) because ' + value['message']; + } + } else { + return value['reason']; + } + } +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html new file mode 100644 index 0000000000..9fc5f0dd39 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html @@ -0,0 +1,2 @@ + +{{row.entity | tableCellAutoscalerEventActionLabel}} \ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts new file mode 100644 index 0000000000..5978175ce5 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-action', + templateUrl: './table-cell-autoscaler-event-action.component.html', + styleUrls: ['./table-cell-autoscaler-event-action.component.scss'] +}) +export class TableCellAutoscalerEventActionComponent extends TableCellCustom { } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts new file mode 100644 index 0000000000..a71f4bfa30 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts @@ -0,0 +1,31 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'tableCellAutoscalerEventChangeIcon' +}) +export class TableCellAutoscalerEventChangeIconPipe implements PipeTransform { + + private result(outputType: string, value: number, cssClass: string, icon: string) { + switch (outputType) { + case 'class': + return cssClass; + case 'icon': + return icon; + default: + return ''; + } + } + + transform(value: number, args?: string): string { + if (!args || !args.length) { + return ''; + } + if (value > 0) { + return this.result(args, value, 'text-danger', 'trending_up'); + } else if (value < 0) { + return this.result(args, value, 'text-success', 'trending_down'); + } else { + return this.result(args, value, 'text-tentative', 'trending_flat'); + } + } +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html new file mode 100644 index 0000000000..5ca8cea981 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html @@ -0,0 +1,6 @@ +
+ {{row.entity.old_instances}} + + {{row.entity.new_instances-row.entity.old_instances | tableCellAutoscalerEventChangeIcon:'icon'}} + {{row.entity.new_instances}} +
\ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss new file mode 100644 index 0000000000..ec00191352 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss @@ -0,0 +1,5 @@ +div { + align-items: center; + display: flex; + flex-direction: row; +} \ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts new file mode 100644 index 0000000000..128ee130ac --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-change', + templateUrl: './table-cell-autoscaler-event-change.component.html', + styleUrls: ['./table-cell-autoscaler-event-change.component.scss'] +}) +export class TableCellAutoscalerEventChangeComponent extends TableCellCustom { } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html new file mode 100644 index 0000000000..6a81045b52 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html @@ -0,0 +1 @@ +{{row.entity.error}} \ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts new file mode 100644 index 0000000000..b387f20f63 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-error', + templateUrl: './table-cell-autoscaler-event-error.component.html', + styleUrls: ['./table-cell-autoscaler-event-error.component.scss'] +}) +export class TableCellAutoscalerEventErrorComponent extends TableCellCustom { } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts new file mode 100644 index 0000000000..cd6217d3fd --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts @@ -0,0 +1,38 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'tableCellAutoscalerEventStatusIcon' +}) +export class TableCellAutoscalerEventStatusIconPipe implements PipeTransform { + + private result(outputType: string, value: number, cssClass: string, icon: string, label: string) { + switch (outputType) { + case 'class': + return cssClass; + case 'icon': + return icon; + case 'label': + return label; + default: + return ''; + } + } + + transform(value: number, args?: string): string { + if (!args || !args.length) { + return ''; + } + switch (value) { + case 0: + return this.result(args, value, 'text-success', 'lens', 'succeeded'); + case 1: + return this.result(args, value, 'text-danger', 'warning', 'failed'); + case 2: + return this.result(args, value, 'text-tentative', 'broken_image', 'ignored'); + default: + return ''; + } + + } + +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html new file mode 100644 index 0000000000..818a6ae638 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html @@ -0,0 +1,5 @@ +
+ + {{row.entity.status | tableCellAutoscalerEventStatusIcon:'icon'}} + {{row.entity.status | tableCellAutoscalerEventStatusIcon:'label'}} +
\ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss new file mode 100644 index 0000000000..b6ca492066 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss @@ -0,0 +1,12 @@ +div { + align-items: center; + display: flex; + flex-direction: row; + .mat-icon { + height: 14px; + width: 14px; + } + .material-icons { + font-size: 14px; + } + } \ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts new file mode 100644 index 0000000000..c19feac6b3 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts @@ -0,0 +1,31 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status.component'; +import { EntityInfo } from '../../../../../../store/types/api.types'; + +describe('TableCellAutoscalerEventTypeComponent', () => { + let component: TableCellAutoscalerEventStatusComponent; + let fixture: ComponentFixture>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TableCellAutoscalerEventStatusComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent>(TableCellAutoscalerEventStatusComponent); + component = fixture.componentInstance; + component.row = { + entity: { + type: '' + } + } as EntityInfo; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts new file mode 100644 index 0000000000..8a4bee51e9 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-status', + templateUrl: './table-cell-autoscaler-event-status.component.html', + styleUrls: ['./table-cell-autoscaler-event-status.component.scss'] +}) +export class TableCellAutoscalerEventStatusComponent extends TableCellCustom { } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html new file mode 100644 index 0000000000..9acccf82bc --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html @@ -0,0 +1 @@ +{{row.entity.timestamp/1000000 | date:'medium'}} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts new file mode 100644 index 0000000000..6d099271ef --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts @@ -0,0 +1,29 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TableCellAutoscalerEventTimestampComponent } from './table-cell-autoscler-event-timestamp.component'; +import { EntityInfo } from '../../../../../../store/types/api.types'; + +describe('TableCellAutoscalerEventTimestampComponent', () => { + let component: TableCellAutoscalerEventTimestampComponent; + let fixture: ComponentFixture>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TableCellAutoscalerEventTimestampComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent>(TableCellAutoscalerEventTimestampComponent); + component = fixture.componentInstance; + component.row = { + entity: {} + } as EntityInfo; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts new file mode 100644 index 0000000000..3dada49709 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-timestamp', + templateUrl: './table-cell-autoscaler-event-timestamp.component.html', + styleUrls: ['./table-cell-autoscaler-event-timestamp.component.scss'] +}) +export class TableCellAutoscalerEventTimestampComponent extends TableCellCustom { } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html new file mode 100644 index 0000000000..425feebbb5 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html @@ -0,0 +1 @@ +{{row.entity.scaling_type == 0 ? 'dynamic' : 'schedule'}} \ No newline at end of file diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts new file mode 100644 index 0000000000..c48df21274 --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts @@ -0,0 +1,31 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TableCellAutoscalerEventTypeComponent } from './table-cell-event-type.component'; +import { EntityInfo } from '../../../../../../store/types/api.types'; + +describe('TableCellAutoscalerEventTypeComponent', () => { + let component: TableCellAutoscalerEventTypeComponent; + let fixture: ComponentFixture>; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TableCellAutoscalerEventTypeComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent>(TableCellAutoscalerEventTypeComponent); + component = fixture.componentInstance; + component.row = { + entity: { + type: '' + } + } as EntityInfo; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts new file mode 100644 index 0000000000..95b9d4344d --- /dev/null +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts @@ -0,0 +1,10 @@ +/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ +import { Component, OnInit } from '@angular/core'; +import { TableCellCustom } from '../../../list.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-type', + templateUrl: './table-cell-autoscaler-event-type.component.html', + styleUrls: ['./table-cell-autoscaler-event-type.component.scss'] +}) +export class TableCellAutoscalerEventTypeComponent extends TableCellCustom { } diff --git a/src/frontend/app/store/actions/app-autoscaler.actions.ts b/src/frontend/app/store/actions/app-autoscaler.actions.ts index fcf9cb2991..c5c7896eaf 100644 --- a/src/frontend/app/store/actions/app-autoscaler.actions.ts +++ b/src/frontend/app/store/actions/app-autoscaler.actions.ts @@ -1,19 +1,15 @@ -import { RequestOptions, Headers, URLSearchParams } from '@angular/http'; import { PaginatedAction } from '../types/pagination.types'; -import { createEntityRelationPaginationKey } from '../../store/helpers/entity-relations/entity-relations.types' -import { RequestEntityLocation } from '../types/request.types'; - +import { CFStartAction } from '../types/request.types'; import { appAutoscalerHealthSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, appAutoscalerAppMetricSchemaKey, appAutoscalerInsMetricSchemaKey, - entityFactory, + entityFactory } from '../helpers/entity-factory'; -import { CFStartAction, ICFAction } from '../types/request.types'; - -const endpointApiHostHeader = 'x-cap-api-host'; +import { IRequestAction } from '../types/request.types'; +import { RequestOptions } from '@angular/http'; export const AppAutoscalerPolicyEvents = { GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', @@ -27,10 +23,10 @@ export const AppAutoscalerScalingHistoryEvents = { GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED: '[App Autoscaler] Get autoscaler scaling history failed' }; -export const AppAutoscalerAppMetricEvents = { - GET_APP_AUTOSCALER_APP_METRIC: '[App Autoscaler] Get autoscaler app metric', - GET_APP_AUTOSCALER_APP_METRIC_SUCCESS: '[App Autoscaler] Get autoscaler app metric success', - GET_APP_AUTOSCALER_APP_METRIC_FAILED: '[App Autoscaler] Get autoscaler app metric failed' +export const AppAutoscalerMetricEvents = { + GET_APP_AUTOSCALER_METRIC: '[App Autoscaler] Get autoscaler metric', + GET_APP_AUTOSCALER_METRIC_SUCCESS: '[App Autoscaler] Get autoscaler metric success', + GET_APP_AUTOSCALER_METRIC_FAILED: '[App Autoscaler] Get autoscaler metric failed' }; export const AppAutoscalerHealthEvents = { @@ -39,99 +35,130 @@ export const AppAutoscalerHealthEvents = { GET_APP_AUTOSCALER_HEALTH_FAILED: '[App Autoscaler] Get autoscaler health failed' }; -export class GetAppAutoscalerHealthAction extends CFStartAction implements ICFAction { - options: RequestOptions; +export const APP_AUTOSCALER_POLICY = '[New App Autoscaler] Fetch policy'; +export const UPDATE_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Update policy'; +export const DETACH_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Detach policy'; +export const APP_AUTOSCALER_HEALTH = '[New App Autoscaler] Fetch Health'; +export const APP_AUTOSCALER_SCALING_HISTORY = '[New App Autoscaler] Fetch Scaling History'; +export const FETCH_APP_AUTOSCALER_METRIC = '[New App Autoscaler] Fetch Metric'; + +export class GetAppAutoscalerHealthAction implements IRequestAction { constructor( - ) { - super(); - this.options = new RequestOptions(); - this.options.url = `public/health_check` - this.options.method = 'get' - this.options.headers = new Headers(); - this.options.headers.set(endpointApiHostHeader, 'scalingconsole'); - } - entity = [entityFactory(appAutoscalerHealthSchemaKey)]; + public appGuid: string, + public cfGuid: string, + ) { } + type = APP_AUTOSCALER_HEALTH; entityKey = appAutoscalerHealthSchemaKey; - paginationKey: string; - actions = [ - AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH, - AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH_SUCCESS, - AppAutoscalerHealthEvents.GET_APP_AUTOSCALER_HEALTH_FAILED - ]; } -export class GetAppAutoscalerPolicyAction extends CFStartAction implements ICFAction { - options: RequestOptions; +export class GetAppAutoscalerPolicyAction implements IRequestAction { constructor( - public guid: string, + public appGuid: string, + public cfGuid: string, + ) { } + type = APP_AUTOSCALER_POLICY; + entityKey = appAutoscalerPolicySchemaKey; +} + +export class UpdateAppAutoscalerPolicyAction implements IRequestAction { + static updateKey = 'Updating-Existing-Application-Policy'; + constructor( + public appGuid: string, + public cfGuid: string, + public policy: any, + ) { } + type = UPDATE_APP_AUTOSCALER_POLICY; + entityKey = appAutoscalerPolicySchemaKey; +} + +export class DetachAppAutoscalerPolicyAction implements IRequestAction { + static updateKey = 'Detaching-Existing-Application-Policy'; + constructor( + public appGuid: string, + public cfGuid: string, + public policy: any, + ) { } + type = DETACH_APP_AUTOSCALER_POLICY; + entityKey = appAutoscalerPolicySchemaKey; +} + +export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements PaginatedAction { + private static sortField = 'timestamp'; + constructor( + public paginationKey: string, + public appGuid: string, + public cfGuid: string, + public normalFormat?, + public params?, ) { super(); - this.options = new RequestOptions(); - this.options.url = `apps/${guid}/policy` - this.options.method = 'get' - this.options.headers = new Headers(); - this.options.headers.set(endpointApiHostHeader, 'autoscaler'); } - entity = [entityFactory(appAutoscalerPolicySchemaKey)]; - entityKey = appAutoscalerPolicySchemaKey; - paginationKey: string; actions = [ - AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY, - AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_SUCCESS, - AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_FAILED + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_SUCCESS, + AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED ]; + type = APP_AUTOSCALER_SCALING_HISTORY; + entity = [entityFactory(appAutoscalerScalingHistorySchemaKey)]; + entityKey = appAutoscalerScalingHistorySchemaKey; + options: RequestOptions; + initialParams = { + 'order-direction-field': GetAppAutoscalerScalingHistoryAction.sortField, + 'order-direction': 'desc', + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + '000000', + }; } -export class GetAppAutoscalerAppMetricAction extends CFStartAction implements PaginatedAction { - constructor(public paginationKey: string, public appGuid: string, public cfGuid: string, public metricName: string, public params: any) { - super(); - this.options = new RequestOptions(); - this.options.url = `apps/${appGuid}/aggregated_metric_histories/${metricName}`; - this.options.method = 'get'; - this.options.params = new URLSearchParams(); - this.options.params.append('', ''); - this.options.headers = new Headers(); - this.options.headers.set(endpointApiHostHeader, 'autoscaler'); +export abstract class GetAppAutoscalerMetricAction implements PaginatedAction { + constructor( + public appGuid: string, + public cfGuid: string, + public metricName: string, + public skipFormat: boolean, + public trigger, + public params + ) { + this.paginationKey = appGuid + '-' + metricName; } actions = [ - AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC, - AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC_SUCCESS, - AppAutoscalerAppMetricEvents.GET_APP_AUTOSCALER_APP_METRIC_FAILED + AppAutoscalerMetricEvents.GET_APP_AUTOSCALER_METRIC, + AppAutoscalerMetricEvents.GET_APP_AUTOSCALER_METRIC_SUCCESS, + AppAutoscalerMetricEvents.GET_APP_AUTOSCALER_METRIC_FAILED ]; + url: string; + type = FETCH_APP_AUTOSCALER_METRIC; + entityKey: string; + paginationKey: string; + initialParams = this.params; +} - entity = [entityFactory(appAutoscalerAppMetricSchemaKey)]; +export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricAction implements PaginatedAction { + constructor( + public appGuid: string, + public cfGuid: string, + public metricName: string, + public skipFormat: boolean, + public trigger, + public params + ) { + super(appGuid, cfGuid, metricName, skipFormat, trigger, params); + this.url = `apps/${appGuid}/aggregated_metric_histories/${metricName}`; + } entityKey = appAutoscalerAppMetricSchemaKey; - options: RequestOptions; - initialParams = this.params; - skipValidation = false - entityLocation = RequestEntityLocation.AUTOSCALER_ARRAY; } -export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements ICFAction { - options: RequestOptions; +export class GetAppAutoscalerInsMetricAction extends GetAppAutoscalerMetricAction implements PaginatedAction { constructor( - public guid: string, + public appGuid: string, + public cfGuid: string, + public metricName: string, + public skipFormat: boolean, + public trigger, + public params ) { - super(); - this.options = new RequestOptions(); - this.options.url = `apps/${guid}/scaling_histories` - this.options.method = 'get' - this.options.headers = new Headers(); - this.options.headers.set(endpointApiHostHeader, 'autoscaler'); - this.options.params = new URLSearchParams(); - this.options.params.append('start-time', '1542124800000000000'); - this.options.params.append('end-time', '1542729600000000000'); - this.options.params.append('page', '1'); - this.options.params.append('results-per-page', '10'); - this.options.params.append('order', 'desc'); + super(appGuid, cfGuid, metricName, skipFormat, trigger, params); + this.url = `apps/${appGuid}/metric_histories/${metricName}`; } - entity = [entityFactory(appAutoscalerScalingHistorySchemaKey)]; - entityKey = appAutoscalerScalingHistorySchemaKey; - paginationKey: string; - flattenPagination: false; - actions = [ - AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, - AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_SUCCESS, - AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY_FAILED - ]; -} \ No newline at end of file + entityKey = appAutoscalerInsMetricSchemaKey; +} diff --git a/src/frontend/app/store/effects/autoscaler.effects.ts b/src/frontend/app/store/effects/autoscaler.effects.ts new file mode 100644 index 0000000000..c971de5638 --- /dev/null +++ b/src/frontend/app/store/effects/autoscaler.effects.ts @@ -0,0 +1,364 @@ +import { Injectable } from '@angular/core'; +import { Actions, Effect } from '@ngrx/effects'; +import { Store } from '@ngrx/store'; +import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; +import { LoggerService } from '../../core/logger.service'; +import { + GetAppAutoscalerPolicyAction, + GetAppAutoscalerHealthAction, + GetAppAutoscalerScalingHistoryAction, + GetAppAutoscalerMetricAction, + UpdateAppAutoscalerPolicyAction, + DetachAppAutoscalerPolicyAction, + APP_AUTOSCALER_POLICY, + APP_AUTOSCALER_HEALTH, + APP_AUTOSCALER_SCALING_HISTORY, + FETCH_APP_AUTOSCALER_METRIC, + UPDATE_APP_AUTOSCALER_POLICY, + DETACH_APP_AUTOSCALER_POLICY, +} from '../actions/app-autoscaler.actions'; +import { NormalizedResponse } from '../types/api.types'; +import { + ICFAction, + StartRequestAction, + WrapperRequestActionFailed, + WrapperRequestActionSuccess, +} from '../types/request.types'; +import { AppState } from '../app-state'; +import { environment } from '../../../environments/environment'; +import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angular/http'; +import { PaginatedAction } from './../types/pagination.types'; +import { + autoscalerTransformArrayToMap, + autoscalerTransformMapToArray, + buildMetricData +} from '../helpers/autoscaler-helpers'; +import { selectPaginationState } from '../selectors/pagination.selectors'; +import { PaginationEntityState, PaginationParam } from '../types/pagination.types'; +import { resultPerPageParam, resultPerPageParamDefault } from '../reducers/pagination-reducer/pagination-reducer.types'; + +const { proxyAPIVersion, autoscalerAPIVersion } = environment; +const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; +const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; + +export function createFailedAutoscalerRequestMessage(requestType, error) { + return `Unable to ${requestType}: ${error.status} ${error._body}`; +} + +@Injectable() +export class AutoscalerEffects { + constructor( + private http: Http, + private actions$: Actions, + private store: Store, + private logger: LoggerService, + ) { } + + @Effect() + fetchAppAutoscalerHealth$ = this.actions$ + .ofType(APP_AUTOSCALER_HEALTH).pipe( + mergeMap(action => { + const actionType = 'fetch'; + const apiAction = { + entityKey: action.entityKey, + type: action.type, + guid: action.appGuid + } as ICFAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${healthPrefix}/health`; + options.method = 'get'; + options.headers = this.addHeaders(action.cfGuid); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const healthInfo = response.json(); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.transformData(action.entityKey, mappedData, action.appGuid, healthInfo); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch health info', err), apiAction, actionType) + ])); + })); + + @Effect() + updateAppAutoscalerPolicy$ = this.actions$ + .ofType(UPDATE_APP_AUTOSCALER_POLICY).pipe( + mergeMap(action => { + const actionType = 'update'; + const apiAction = { + entityKey: action.entityKey, + type: action.type, + guid: action.appGuid + } as ICFAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/apps/${action.appGuid}/policy`; + options.method = 'put'; + options.headers = this.addHeaders(action.cfGuid); + options.body = autoscalerTransformMapToArray(action.policy); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const policyInfo = autoscalerTransformArrayToMap(response.json(), undefined); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.transformData(action.entityKey, mappedData, action.appGuid, policyInfo); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('update policy', err), apiAction, actionType) + ])); + })); + + @Effect() + getAppAutoscalerPolicy$ = this.actions$ + .ofType(APP_AUTOSCALER_POLICY).pipe( + mergeMap(action => { + const actionType = 'fetch'; + const apiAction = { + entityKey: action.entityKey, + type: action.type, + guid: action.appGuid + } as ICFAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/apps/${action.appGuid}/policy`; + options.method = 'get'; + options.headers = this.addHeaders(action.cfGuid); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const policyInfo = autoscalerTransformArrayToMap(response.json(), undefined); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.transformData(action.entityKey, mappedData, action.appGuid, policyInfo); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType) + ]; + }), + catchError(err => { + if (err.status === 404 && err._body === '{}') { + return [ + new WrapperRequestActionFailed('No policy is defined for this application.', apiAction, actionType) + ]; + } else { + return [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch policy', err), apiAction, actionType) + ]; + } + })); + })); + + + @Effect() + detachAppAutoscalerPolicy$ = this.actions$ + .ofType(DETACH_APP_AUTOSCALER_POLICY).pipe( + mergeMap(action => { + const actionType = 'update'; + const apiAction = { + entityKey: action.entityKey, + type: action.type, + guid: action.appGuid + } as ICFAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/apps/${action.appGuid}/policy`; + options.method = 'delete'; + options.headers = this.addHeaders(action.cfGuid); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.transformData(action.entityKey, mappedData, action.appGuid, { enabled: false }); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('update policy', err), apiAction, actionType) + ])); + })); + + @Effect() + fetchAppAutoscalerScalingHistory$ = this.actions$ + .ofType(APP_AUTOSCALER_SCALING_HISTORY).pipe( + withLatestFrom(this.store), + mergeMap(([action, state]) => { + const actionType = 'fetch'; + const apiAction = action as ICFAction; + const paginatedAction = action as PaginatedAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/apps/${action.appGuid}/scaling_histories`; + options.method = 'get'; + options.headers = this.addHeaders(action.cfGuid); + // Set params from store + const paginationState = selectPaginationState( + apiAction.entityKey, + paginatedAction.paginationKey, + )(state); + const paginationParams = this.getPaginationParams(paginationState); + paginatedAction.pageNumber = paginationState + ? paginationState.currentPage + : 1; + options.params = this.buildParams(action.initialParams, action.params, paginationParams); + if (!options.params.has(resultPerPageParam)) { + options.params.set( + resultPerPageParam, + resultPerPageParamDefault.toString(), + ); + } + if (options.params.has('order-direction-field')) { + options.params.delete('order-direction-field'); + } + if (options.params.has('order-direction')) { + options.params.set('order', options.params.get('order-direction')); + options.params.delete('order-direction'); + } + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const histories = response.json(); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + if (action.normalFormat) { + this.transformData(action.entityKey, mappedData, action.appGuid, histories); + } else { + this.transformEventData(action.entityKey, mappedData, action.appGuid, histories); + } + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType, histories['total_results'], histories['total_pages']) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch scaling history', err), apiAction, actionType) + ])); + })); + + @Effect() + fetchAppAutoscalerAppMetric$ = this.actions$ + .ofType(FETCH_APP_AUTOSCALER_METRIC).pipe( + mergeMap(action => { + const actionType = 'fetch'; + const apiAction = { + entityKey: action.entityKey, + type: action.type, + paginationKey: action.paginationKey, + guid: action.appGuid + } as PaginatedAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/${action.url}`; + options.method = 'get'; + options.headers = this.addHeaders(action.cfGuid); + options.params = this.buildParams(action.initialParams, action.params); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const data = response.json(); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.addMetric(action.entityKey, mappedData, action.appGuid, action.metricName, data, + action.initialParams['start-time'], action.initialParams['end-time'], action.skipFormat, action.trigger); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch metrics', err), apiAction, actionType) + ])); + })); + + addMetric(schemaKey: string, mappedData: NormalizedResponse, appid, metricName, data, startTime, endTime, skipFormat, trigger) { + const id = appid + '-' + metricName; + mappedData.entities[schemaKey][id] = { + entity: buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger), + metadata: {} + }; + mappedData.result.push(id); + } + + transformData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) { + mappedData.entities[key][appGuid] = { + entity: data, + metadata: {} + }; + mappedData.result.push(appGuid); + } + + transformEventData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) { + mappedData.entities[key] = []; + data.resources.map((item) => { + mappedData.entities[key][item.timestamp] = { + entity: item, + metadata: { + created_at: item.timestamp, + guid: item.timestamp, + updated_at: item.timestamp + } + }; + }); + mappedData.result = Object.keys(mappedData.entities[key]); + } + + addHeaders(cfGuid: string) { + const headers = new Headers(); + headers.set('x-cap-api-host', 'autoscaler'); + headers.set('x-cap-passthrough', 'true'); + headers.set('x-cap-cnsi-list', cfGuid); + return headers; + } + + buildParams(initialParams, params?, paginationParams?) { + const searchParams = new URLSearchParams(); + if (initialParams) { + Object.keys(initialParams).map((key) => { + searchParams.set(key, initialParams[key]); + }); + } + if (params) { + Object.keys(params).map((key) => { + searchParams.set(key, params[key]); + }); + } + if (paginationParams) { + Object.keys(paginationParams).map((key) => { + searchParams.set(key, paginationParams[key]); + }); + } + return searchParams; + } + + getPaginationParams(paginationState: PaginationEntityState): PaginationParam { + return paginationState + ? { + ...paginationState.params, + q: [ + ...(paginationState.params.q || []) + ], + page: paginationState.currentPage.toString(), + } + : {}; + } + +} diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts b/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts new file mode 100644 index 0000000000..92cde7f389 --- /dev/null +++ b/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts @@ -0,0 +1,407 @@ +import { + autoscalerTransformArrayToMap, + autoscalerTransformMapToArray, + isEqual, + isPolicyMapEqual +} from './autoscaler-helpers'; + +describe('Autoscaler Helper', () => { + it('Test policy transformation', function () { + const arrayPolicy = { + 'instance_min_count': 1, + 'instance_max_count': 10, + 'scaling_rules': [ + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 10, + 'operator': '<=', + 'cool_down_secs': 300, + 'adjustment': '-2' + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 30, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-1' + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 120, + 'operator': '>', + 'cool_down_secs': 300, + 'adjustment': '+3' + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+2' + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 200, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4' + }, + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 20, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-3' + }, + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 50, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4' + }, + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 40, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-5' + }, + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+6' + } + ], + 'schedules': { + 'timezone': 'Asia/Shanghai', + 'recurring_schedule': [ + { + 'start_time': '10:00', + 'end_time': '18:00', + 'days_of_week': [ + 1, + 2, + 3 + ], + 'instance_min_count': 1, + 'instance_max_count': 10, + 'initial_min_instance_count': 5 + }, + { + 'start_date': '2099-06-27', + 'end_date': '2099-07-23', + 'start_time': '11:00', + 'end_time': '19:30', + 'days_of_month': [ + 5, + 15, + 25 + ], + 'instance_min_count': 3, + 'instance_max_count': 10, + 'initial_min_instance_count': 5 + } + ], + 'specific_date': [ + { + 'start_date_time': '2099-06-02T10:00', + 'end_date_time': '2099-06-15T13:59', + 'instance_min_count': 1, + 'instance_max_count': 4, + 'initial_min_instance_count': 2 + }, + { + 'start_date_time': '2099-01-04T20:00', + 'end_date_time': '2099-02-19T23:15', + 'instance_min_count': 2, + 'instance_max_count': 5, + 'initial_min_instance_count': 3 + } + ] + } + }; + const mapPolicy = { + 'instance_min_count': 1, + 'instance_max_count': 10, + 'schedules': { + 'timezone': 'Asia/Shanghai', + 'recurring_schedule': [ + { + 'start_time': '10:00', + 'end_time': '18:00', + 'days_of_week': [ + 1, + 2, + 3 + ], + 'instance_min_count': 1, + 'instance_max_count': 10, + 'initial_min_instance_count': 5 + }, + { + 'start_date': '2099-06-27', + 'end_date': '2099-07-23', + 'start_time': '11:00', + 'end_time': '19:30', + 'days_of_month': [ + 5, + 15, + 25 + ], + 'instance_min_count': 3, + 'instance_max_count': 10, + 'initial_min_instance_count': 5 + } + ], + 'specific_date': [ + { + 'start_date_time': '2099-06-02T10:00', + 'end_date_time': '2099-06-15T13:59', + 'instance_min_count': 1, + 'instance_max_count': 4, + 'initial_min_instance_count': 2 + }, + { + 'start_date_time': '2099-01-04T20:00', + 'end_date_time': '2099-02-19T23:15', + 'instance_min_count': 2, + 'instance_max_count': 5, + 'initial_min_instance_count': 3 + } + ] + }, + 'scaling_rules_map': { + 'memoryused': { + 'lower': [ + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 30, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-1', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 10, + 'operator': '<=', + 'cool_down_secs': 300, + 'adjustment': '-2', + 'expand': false + } + ], + 'upper': [ + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 200, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 120, + 'operator': '>', + 'cool_down_secs': 300, + 'adjustment': '+3', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+2', + 'expand': false + } + ] + }, + 'memoryutil': { + 'lower': [ + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 20, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-3', + 'expand': false + } + ], + 'upper': [ + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+6', + 'expand': false + } + ] + }, + 'responsetime': { + 'upper': [ + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 50, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4', + 'expand': false + } + ], + 'lower': [ + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 40, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-5', + 'expand': false + } + ] + } + }, + 'scaling_rules_form': [ + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 200, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 120, + 'operator': '>', + 'cool_down_secs': 300, + 'adjustment': '+3', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+2', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 30, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-1', + 'expand': false + }, + { + 'metric_type': 'memoryused', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 10, + 'operator': '<=', + 'cool_down_secs': 300, + 'adjustment': '-2', + 'expand': false + }, + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 90, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+6', + 'expand': false + }, + { + 'metric_type': 'memoryutil', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 20, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-3', + 'expand': false + }, + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 50, + 'operator': '>=', + 'cool_down_secs': 300, + 'adjustment': '+4', + 'expand': false + }, + { + 'metric_type': 'responsetime', + 'stat_window_secs': 300, + 'breach_duration_secs': 600, + 'threshold': 40, + 'operator': '<', + 'cool_down_secs': 300, + 'adjustment': '-5', + 'expand': false + } + ] + }; + const mapPolicyFromArray = autoscalerTransformArrayToMap(arrayPolicy, undefined); + const arrayPolicyFromMap = autoscalerTransformMapToArray(mapPolicy); + expect(isEqual(mapPolicyFromArray, mapPolicy)).toBe(true); + expect(isEqual(arrayPolicyFromMap, autoscalerTransformMapToArray(autoscalerTransformArrayToMap(arrayPolicy, undefined)))).toBe(true); + delete arrayPolicy['scaling_rules']; + expect(isPolicyMapEqual(arrayPolicy, autoscalerTransformArrayToMap(arrayPolicy, undefined))).toBe(true); + delete mapPolicy['scaling_rules_map']; + delete mapPolicy['scaling_rules_form']; + expect(isEqual(mapPolicy, autoscalerTransformMapToArray(mapPolicy))).toBe(true); + }); +}); diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.ts b/src/frontend/app/store/helpers/autoscaler-helpers.ts new file mode 100644 index 0000000000..5b8fc09757 --- /dev/null +++ b/src/frontend/app/store/helpers/autoscaler-helpers.ts @@ -0,0 +1,425 @@ +import moment from 'moment-timezone'; + +export const PolicyDefaultSetting = { + breach_duration_secs_default: 120, + cool_down_secs_default: 120, +}; +export const MetricTypes = ['memoryused', 'memoryutil', 'responsetime', 'throughput']; +export const ScaleTypes = ['upper', 'lower']; +export const UpperOperators = ['>', '>=']; +export const LowerOperators = ['<', '<=']; + +export const normalColor = 'rgba(90,167,0,0.6)'; +export const MomentFormateTimeS = 'HH:mm:ss'; + +export const metricMap = { + memoryused: { + unit: 'metric_unit_mb', + unit_internal: 'MB', + type: 'value', + type_string: 'metric_type_memoryused', + interval: 15, + }, + memoryutil: { + unit: 'metric_unit_percentage', + unit_internal: 'percent', + type: 'percentage', + type_string: 'metric_type_memoryutil', + interval: 15, + }, + responsetime: { + unit: 'metric_unit_ms', + unit_internal: 'ms', + type: 'value', + type_string: 'metric_type_responsetime', + interval: 30, + }, + throughput: { + unit: 'metric_unit_rps', + unit_internal: 'RPS', + type: 'value', + type_string: 'metric_type_throughput', + interval: 30, + } +}; + +export const S2NS = 1000000000; + +export function autoscalerTransformArrayToMap(newPolicy, timezone) { + if (timezone === undefined || timezone === '') { + timezone = moment.tz.guess(); + } + newPolicy.enabled = true; + newPolicy.scaling_rules_map = {}; + newPolicy.scaling_rules_form = []; + if (newPolicy.scaling_rules) { + newPolicy.scaling_rules.map((trigger) => { + initIfUndefined(trigger, 'breach_duration_secs', PolicyDefaultSetting.breach_duration_secs_default); + initIfUndefined(trigger, 'cool_down_secs', PolicyDefaultSetting.cool_down_secs_default); + pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); + }); + } + let maxThreshold = 0; + Object.keys(newPolicy.scaling_rules_map).map((metricName) => { + if (newPolicy.scaling_rules_map[metricName].upper && newPolicy.scaling_rules_map[metricName].upper.length > 0) { + maxThreshold = newPolicy.scaling_rules_map[metricName].upper[0].threshold; + setUpperColor(newPolicy.scaling_rules_map[metricName].upper); + } + if (newPolicy.scaling_rules_map[metricName].lower && newPolicy.scaling_rules_map[metricName].lower.length > 0) { + maxThreshold = newPolicy.scaling_rules_map[metricName].lower[0].threshold > maxThreshold ? + newPolicy.scaling_rules_map[metricName].lower[0].threshold : maxThreshold; + setLowerColor(newPolicy.scaling_rules_map[metricName].lower); + } + ScaleTypes.map((triggerType) => { + if (newPolicy.scaling_rules_map[metricName][triggerType]) { + newPolicy.scaling_rules_map[metricName][triggerType].map((trigger) => { + newPolicy.scaling_rules_form.push(trigger); + }); + } + }); + }); + initIfUndefined(newPolicy, 'schedules', { timezone }); + initIfUndefined(newPolicy.schedules, 'recurring_schedule', []); + initIfUndefined(newPolicy.schedules, 'specific_date', []); + return newPolicy; +} + +function setUpperColor(array) { + // from FF0000 to FFFF00 + // from rgba(255,0,0,0.6) to rgba(255,255,0,0.6) + const max = 255; // parseInt('FF', 16) + const min = 0; // parseInt('00', 16) + const scope = max - min; + if (array && array.length > 0) { + const interval = Math.round(scope / array.length); + for (let i = 0; i < array.length; i++) { + let color10 = 0 + i * interval; + if (color10 > max) { + color10 = max; + } + // let color16 = color10.toString(16) + // if (color16.length == 1) color16 = '0' + color16 + array[i].color = 'rgba(255, ' + color10 + ', 0, 0.6)'; // '#ff' + color16 + '00' + } + } +} + +function setLowerColor(array) { + // from 3344ff to 33ccff + // from rgba(51,68,255,0.6) to rgba(51,204,255,0.6) + const max = 204; // parseInt('CC', 16) + const min = 68; // parseInt('44', 16) + const scope = max - min; + if (array && array.length > 0) { + const interval = Math.round(scope / array.length); + for (let i = 0; i < array.length; i++) { + let color10 = max - i * interval; + if (color10 < min) { + color10 = min; + } + // let color16 = color10.toString(16) + // if (color16.length == 1) color16 = '0' + color16 + array[i].color = 'rgba(51, ' + color10 + ', 255, 0.6)'; // '#33' + color16 + 'ff' + } + } +} + +export function autoscalerTransformMapToArray(newPolicy) { + if (newPolicy.scaling_rules_form) { + const scaling_rules = []; + newPolicy.scaling_rules_form.map((trigger) => { + deleteIf(trigger, 'breach_duration_secs', trigger.breach_duration_secs === PolicyDefaultSetting.breach_duration_secs_default); + deleteIf(trigger, 'cool_down_secs', trigger.cool_down_secs === PolicyDefaultSetting.cool_down_secs_default); + scaling_rules.push(trigger); + }); + if (scaling_rules.length > 0) { + newPolicy.scaling_rules = scaling_rules; + } + } + delete newPolicy['scaling_rules_form']; + delete newPolicy['scaling_rules_map']; + if (newPolicy.schedules) { + deleteIf( + newPolicy.schedules, + 'recurring_schedule', + newPolicy.schedules.recurring_schedule && newPolicy.schedules.recurring_schedule.length === 0); + deleteIf( + newPolicy.schedules, + 'specific_date', + newPolicy.schedules.specific_date && newPolicy.schedules.specific_date.length === 0); + deleteIf(newPolicy, 'schedules', !newPolicy.schedules.recurring_schedule && !newPolicy.schedules.specific_date); + } + return newPolicy; +} + +export function isEqual(a, b) { + if (typeof (a) !== typeof (b)) { + return false; + } else { + if (typeof (a) === 'object') { + if (Object.keys(a).length !== Object.keys(b).length) { + return false; + } + let equal = true; + Object.keys(a).map((key) => { + equal = equal && isEqual(a[key], b[key]); + }); + return equal; + } else { + return JSON.stringify(a) === JSON.stringify(b); + } + } +} + +export function isPolicyMapEqual(a, b) { + return isEqual(autoscalerTransformMapToArray(a), autoscalerTransformMapToArray(b)); +} + +function pushAndSortTrigger(map, metricName, newTrigger) { + const scaleType = LowerOperators.indexOf(newTrigger.operator) < 0 ? ScaleTypes[0] : ScaleTypes[1]; + if (!map[metricName]) { + map[metricName] = {}; + } + if (!map[metricName][scaleType]) { + map[metricName][scaleType] = []; + } + for (let i = 0; i < map[metricName][scaleType].length; i++) { + if (newTrigger.threshold > map[metricName][scaleType][i].threshold) { + map[metricName][scaleType].splice(i, 0, newTrigger); + return; + } + } + map[metricName][scaleType].push(newTrigger); +} + +function initIfUndefined(fatherEntity, childName, defaultData) { + if (fatherEntity[childName] === undefined || fatherEntity[childName] === '') { + fatherEntity[childName] = defaultData; + } +} + +function deleteIf(fatherEntity, childName, condition) { + if (condition) { + delete fatherEntity[childName]; + } +} + +export function buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger) { + const result = { + latest: { + target: [{ + name: metricName, + value: 0 + }, { + name: '', + value: 0 + }], + colorTarget: [ + { + name: metricName, + value: 'rgba(0,0,0,0.2)' + }, { + name: '', + value: 'rgba(0,0,0,0.2)' + } + ] + }, + formated: { + target: [], + colorTarget: [] + }, + unit: '', + maxValue: 0, + chartMaxValue: 0, + }; + if (data.resources.length > 0) { + const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); + result.unit = basicInfo.unit; + result.maxValue = basicInfo.maxValue; + result.chartMaxValue = basicInfo.chartMaxValue; + if (!skipFormat) { + const transformed = transformMetricData(data.resources, basicInfo.interval, startTime, endTime, trigger); + result.formated = { + target: transformed['target'], + colorTarget: transformed['colorTarget'] + }; + } + result.latest = { + target: [{ + name: metricName, + value: data.resources[data.resources.length - 1].value + }, { + name: '', + value: basicInfo.chartMaxValue - data.resources[data.resources.length - 1].value + }], + colorTarget: [ + { + name: metricName, + value: getColor(trigger, data.resources[data.resources.length - 1].value) + }, { + name: '', + value: 'rgba(0,0,0,0.2)' + } + ] + }; + } + return result; +} + +function transformMetricData(source, interval, startTime, endTime, trigger) { + startTime = Math.round(startTime / S2NS); + endTime = Math.round(endTime / S2NS); + if (source.length === 0) { + return []; + } + const scope = Math.round(interval / 2); + const target = []; + let targetTimestamp = Math.round(source[0].timestamp / S2NS); + let targetIndex = 0; + + const insertEmptyNumber = Math.floor((targetTimestamp - startTime) / interval); + const startTimestamp = targetTimestamp - insertEmptyNumber * interval; + for (; targetIndex < insertEmptyNumber; targetIndex++) { + target[targetIndex] = { + time: startTimestamp + targetIndex * interval, + name: moment((startTimestamp + targetIndex * interval) * 1000).format(MomentFormateTimeS), + value: 0 + }; + } + + let sourceIndex = 0; + while (sourceIndex < source.length) { + if (!target[targetIndex]) { + target[targetIndex] = { + time: targetTimestamp, + name: moment(targetTimestamp * 1000).format(MomentFormateTimeS), + value: 0 + }; + } + const metric = source[sourceIndex]; + const sourceTimestamp = Math.round(metric.timestamp / S2NS); + if (sourceTimestamp < targetTimestamp - scope) { + sourceIndex++; + } else if (sourceTimestamp > targetTimestamp + scope) { + targetIndex++; + targetTimestamp += interval; + } else { + target[targetIndex]['value'] = parseInt(metric.value, 10); + sourceIndex++; + } + } + let currentLatestTime = target[targetIndex].time + interval; + while (currentLatestTime < endTime) { + target.push({ + time: currentLatestTime, + name: moment(currentLatestTime * 1000).format(MomentFormateTimeS), + value: 0 + }); + currentLatestTime = currentLatestTime + interval; + } + const colorTarget = []; + target.map((cell) => { + colorTarget.push({ + name: cell.name, + value: getColor(trigger, cell.value), + }); + }); + return { + target, + colorTarget + }; +} + +function getColor(trigger, value) { + if (!isNaN(value)) { + for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { + if (trigger.upper[i].operator === '>=' && value >= trigger.upper[i].threshold) { + return trigger.upper[i].color; + } + if (trigger.upper[i].operator === '>' && value > trigger.upper[i].threshold) { + return trigger.upper[i].color; + } + } + for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { + const index = trigger.lower.length - 1 - i; + if (trigger.lower[index].operator === '<=' && value <= trigger.lower[index].threshold) { + return trigger.lower[index].color; + } + if (trigger.lower[index].operator === '<' && value < trigger.lower[index].threshold) { + return trigger.lower[index].color; + } + } + } + return normalColor; +} + +function getMetricBasicInfo(metricName, source, trigger) { + const map = {}; + let interval = metricMap[metricName]['interval']; + let maxCount = 0; + const preTimestampMap = {}; + let maxIndex = -1; + let maxValue = -1; + for (let i = 0; i < source.length; i++) { + maxValue = parseInt(source[i].value, 10) > maxValue ? parseInt(source[i].value, 10) : maxValue; + const thisTimestamp = Math.round(parseInt(source[i].timestamp, 10) / S2NS); + const thisIndex = source[i].instance_index ? source[i].instance_index : 0; + if (preTimestampMap[thisIndex] === undefined) { + if (thisIndex > maxIndex) { + maxIndex = thisIndex; + } + preTimestampMap[thisIndex] = thisTimestamp; + } else { + const currentInterval = thisTimestamp - preTimestampMap[thisIndex]; + if (map[currentInterval] === undefined) { + map[currentInterval] = 1; + } else { + map[currentInterval]++; + } + if (map[currentInterval] > maxCount) { + interval = currentInterval; + maxCount = map[currentInterval]; + } + preTimestampMap[thisIndex] = thisTimestamp; + } + } + return { + interval: interval, + maxIndex: maxIndex, + unit: source[0].unit, + maxValue: maxValue, + chartMaxValue: getChartMax(trigger, maxValue) + }; +} + +function getChartMax(trigger, maxValue) { + let upperThresholdCount = 0; + let lowerThresholdCount = 0; + let maxThreshold = 0; + if (trigger.upper && trigger.upper.length > 0) { + upperThresholdCount = trigger.upper.length; + maxThreshold = trigger.upper[0].threshold; + } + if (trigger.lower && trigger.lower.length > 0) { + lowerThresholdCount = trigger.lower.length; + maxThreshold = trigger.lower[0].threshold > maxThreshold ? trigger.lower[0].threshold : maxThreshold; + } + let thresholdmax = 0; + if (maxThreshold > 0) { + const thresholdCount = upperThresholdCount + lowerThresholdCount; + thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); + } + thresholdmax = maxValue > thresholdmax ? maxValue : thresholdmax; + thresholdmax = thresholdmax > 10 ? thresholdmax : 10; + for (let i = 10; i < Number.MAX_VALUE && i < thresholdmax; i = i * 10) { + if (thresholdmax / i >= 1 && thresholdmax / i < 10) { + if (thresholdmax > 100) { + thresholdmax = (Math.ceil(thresholdmax / i * 10)) * i / 10; + } else { + thresholdmax = (Math.ceil(thresholdmax / i)) * i; + } + break; + } + } + return thresholdmax; +} diff --git a/src/frontend/app/store/types/app-autoscaler.types.ts b/src/frontend/app/store/types/app-autoscaler.types.ts index 5fb4f5932d..3a97254c74 100644 --- a/src/frontend/app/store/types/app-autoscaler.types.ts +++ b/src/frontend/app/store/types/app-autoscaler.types.ts @@ -1,17 +1,22 @@ export interface AppAutoscalerPolicy { - guid: string; + instance_min_count: number; + instance_max_count: number; } export interface AppAutoscalerHealth { - status: boolean; - error: { - cloudfoundry_autoscaler: string; - cloudfoundry_autoscaler_timestamp: string; - } + entity: { + uptime: number; + }; } export interface AppAutoscalerScalingHistory { + total_results: number; } export interface AppAutoscalerAppMetric { -} \ No newline at end of file + total_results: number; +} + +export interface AppAutoscalerInsMetric { + total_results: number; +} diff --git a/src/frontend/packages/core/src/environments/environment.prod.ts b/src/frontend/packages/core/src/environments/environment.prod.ts index 651a68d984..873ddff692 100644 --- a/src/frontend/packages/core/src/environments/environment.prod.ts +++ b/src/frontend/packages/core/src/environments/environment.prod.ts @@ -5,6 +5,7 @@ export const environment = { logLevel: LogLevel.WARN, proxyAPIVersion: 'v1', cfAPIVersion: 'v2', + autoscalerAPIVersion: 'v1', logToConsole: true, logEnableConsoleActions: false, showObsDebug: false, diff --git a/src/frontend/packages/core/src/environments/environment.ts b/src/frontend/packages/core/src/environments/environment.ts index bb1db6f839..fab48d64b8 100644 --- a/src/frontend/packages/core/src/environments/environment.ts +++ b/src/frontend/packages/core/src/environments/environment.ts @@ -9,6 +9,7 @@ export const environment = { production: false, proxyAPIVersion: 'v1', cfAPIVersion: 'v2', + autoscalerAPIVersion: 'v1', logLevel: LogLevel.DEBUG, logToConsole: true, logEnableConsoleActions: false, diff --git a/src/frontend/packages/core/src/features/applications/application.service.ts b/src/frontend/packages/core/src/features/applications/application.service.ts index 0bcf6cd910..f34be06934 100644 --- a/src/frontend/packages/core/src/features/applications/application.service.ts +++ b/src/frontend/packages/core/src/features/applications/application.service.ts @@ -15,6 +15,9 @@ import { } from '../../../../store/src/actions/application.actions'; import { GetSpace } from '../../../../store/src/actions/space.actions'; import { AppState } from '../../../../store/src/app-state'; +import { GetAppAutoscalerHealthAction } from '../../store/actions/app-autoscaler.actions'; +import { AppAutoscalerHealth } from '../../store/types/app-autoscaler.types'; + import { appEnvVarsSchemaKey, applicationSchemaKey, @@ -28,6 +31,7 @@ import { spaceSchemaKey, spaceWithOrgKey, stackSchemaKey, + appAutoscalerHealthSchemaKey, } from '../../../../store/src/helpers/entity-factory'; import { createEntityRelationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; import { ActionState, rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types'; @@ -86,6 +90,7 @@ export class ApplicationService { private appEntityService: EntityService>; private appSummaryEntityService: EntityService>; + private appAutoscalerHealthService: EntityService; constructor( @Inject(CF_GUID) public cfGuid: string, @@ -112,6 +117,14 @@ export class ApplicationService { false ); + this.appAutoscalerHealthService = this.entityServiceFactory.create>( + appAutoscalerHealthSchemaKey, + entityFactory(appAutoscalerHealthSchemaKey), + appGuid, + new GetAppAutoscalerHealthAction(appGuid, cfGuid), + false + ); + this.constructCoreObservables(); this.constructAmalgamatedObservables(); this.constructStatusObservables(); @@ -145,6 +158,8 @@ export class ApplicationService { applicationUrl$: Observable; applicationRunning$: Observable; + waitForAppAutoscalerHealth$: Observable>; + /** * Fetch the current state of the app (given it's instances) as an object ready */ @@ -213,6 +228,8 @@ export class ApplicationService { ); this.appEnvVars = this.appEnvVarsService.createEnvVarsObs(this.appGuid, this.cfGuid); + + this.waitForAppAutoscalerHealth$ = this.appAutoscalerHealthService.waitForEntity$.pipe(publishReplay(1), refCount()); } public getApplicationEnvVarsMonitor() { diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index 3a211e4f49..99ddb3b6ee 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -101,6 +101,22 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { private currentUserPermissionsService: CurrentUserPermissionsService, scmService: GitSCMService ) { + const appDoesNotHaveEnvVars$ = this.applicationService.appSpace$.pipe( + switchMap(space => this.currentUserPermissionsService.can(CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS, + this.applicationService.cfGuid, space.metadata.guid) + ), + map(can => !can) + ); + this.tabLinks = [ + { link: 'summary', label: 'Summary' }, + { link: 'instances', label: 'Instances' }, + { link: 'routes', label: 'Routes' }, + { link: 'log-stream', label: 'Log Stream' }, + { link: 'services', label: 'Services' }, + { link: 'variables', label: 'Variables', hidden: appDoesNotHaveEnvVars$ }, + { link: 'events', label: 'Events' } + ]; + const endpoints$ = store.select(endpointEntitiesSelector); this.breadcrumbs$ = applicationService.waitForAppEntity$.pipe( withLatestFrom( @@ -118,23 +134,32 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { }), first() ); - - const appDoesNotHaveEnvVars$ = this.applicationService.appSpace$.pipe( - switchMap(space => this.currentUserPermissionsService.can(CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS, - this.applicationService.cfGuid, space.metadata.guid) - ), - map(can => !can) - ); - - this.tabLinks = [ - { link: 'summary', label: 'Summary' }, - { link: 'instances', label: 'Instances' }, - { link: 'routes', label: 'Routes' }, - { link: 'log-stream', label: 'Log Stream' }, - { link: 'services', label: 'Services' }, - { link: 'variables', label: 'Variables', hidden: appDoesNotHaveEnvVars$ }, - { link: 'events', label: 'Events' } - ]; + this.applicationService.applicationStratProject$ + .pipe(first()) + .subscribe(stratProject => { + if ( + stratProject && + stratProject.deploySource && + stratProject.deploySource.type === 'github' + ) { + this.tabLinks.push({ link: 'github', label: 'GitHub' }); + } + }); + this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => { + if (hasMetrics) { + this.tabLinks.push({ + link: 'metrics', + label: 'Metrics' + }); + } + }); + this.applicationService.waitForAppAutoscalerHealth$ + .pipe(first()) + .subscribe(entity => { + if (entity && entity.entity && entity.entity.entity && entity.entity.entity.uptime > 0) { + this.tabLinks.push({ link: 'auto-scaler', label: 'Autoscale' }); + } + }); this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => { if (hasMetrics) { diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index d03deb8285..caaf21305a 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -1,5 +1,6 @@ import { DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; import { CoreModule } from '../../core/core.module'; import { SharedModule } from '../../shared/shared.module'; @@ -17,13 +18,16 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; -import { AutoScalerTabComponent } from './application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component'; +import { AutoscalerTabComponent } from './application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; import { VariablesTabComponent } from './application/application-tabs-base/tabs/variables-tab/variables-tab.component'; import { ApplicationsRoutingModule } from './applications.routing'; import { EditApplicationComponent } from './edit-application/edit-application.component'; +import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; +import { AutoscalerMetricChartPageComponent } from './autoscaler-metric-chart-page/autoscaler-metric-chart-page.component'; +import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { AddRoutesComponent } from './routes/add-routes/add-routes.component'; import { MapRoutesComponent } from './routes/map-routes/map-routes.component'; @@ -40,14 +44,15 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new CoreModule, SharedModule, ApplicationsRoutingModule, - CustomImportModule + CustomImportModule, + NgxChartsModule ], declarations: [ ApplicationWallComponent, ApplicationBaseComponent, EventsTabComponent, LogStreamTabComponent, - AutoScalerTabComponent, + AutoscalerTabComponent, ServicesTabComponent, BuildTabComponent, VariablesTabComponent, @@ -55,6 +60,9 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new ApplicationTabsBaseComponent, SshApplicationComponent, EditApplicationComponent, + EditAutoscalerPolicyComponent, + AutoscalerMetricChartPageComponent, + AutoscalerScaleHistoryPageComponent, InstancesTabComponent, AddRoutesComponent, GitSCMTabComponent, diff --git a/src/frontend/packages/core/src/features/applications/applications.routing.ts b/src/frontend/packages/core/src/features/applications/applications.routing.ts index 526de56cfb..9c8d3d139e 100644 --- a/src/frontend/packages/core/src/features/applications/applications.routing.ts +++ b/src/frontend/packages/core/src/features/applications/applications.routing.ts @@ -19,7 +19,7 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; -import { AutoScalerTabComponent } from './application/application-tabs-base/tabs/auto-scaler-tab/auto-scaler-tab.component'; +import { AutoscalerTabComponent } from './application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; @@ -30,6 +30,9 @@ import { CreateApplicationModule } from './create-application/create-application import { DeployApplicationComponent } from './deploy-application/deploy-application.component'; import { DeployApplicationModule } from './deploy-application/deploy-application.module'; import { EditApplicationComponent } from './edit-application/edit-application.component'; +import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; +import { AutoscalerMetricChartPageComponent } from './autoscaler-metric-chart-page/autoscaler-metric-chart-page.component'; +import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { SshApplicationComponent } from './ssh-application/ssh-application.component'; import { NewApplicationBaseStepComponent } from './new-application-base-step/new-application-base-step.component'; @@ -107,7 +110,7 @@ const applicationsRoutes: Routes = [ { path: 'events', component: EventsTabComponent }, { path: 'gitscm', component: GitSCMTabComponent }, { path: 'metrics', component: MetricsTabComponent }, - { path: 'auto-scaler', component: AutoScalerTabComponent }, + { path: 'auto-scaler', component: AutoscalerTabComponent }, { path: '**', component: PageNotFoundComponentComponent, @@ -122,6 +125,18 @@ const applicationsRoutes: Routes = [ path: 'add-route', component: AddRouteStepperComponent, }, + { + path: 'edit-autoscaler-policy', + component: EditAutoscalerPolicyComponent, + }, + { + path: 'app-autoscaler-metric-chart-page', + component: AutoscalerMetricChartPageComponent, + }, + { + path: 'app-autoscaler-scale-history-page', + component: AutoscalerScaleHistoryPageComponent, + }, { path: '**', component: PageNotFoundComponentComponent, diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts index fa6e19cfde..c97a384411 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts @@ -24,6 +24,24 @@ import { import { TableCellEventTypeComponent, } from '../../list-types/app-event/table-cell-event-type/table-cell-event-type.component'; +import { + TableCellAutoscalerEventActionComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; +import { + TableCellAutoscalerEventTimestampComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component'; +import { + TableCellAutoscalerEventTypeComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; +import { + TableCellAutoscalerEventChangeComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; +import { + TableCellAutoscalerEventErrorComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; +import { + TableCellAutoscalerEventStatusComponent, +} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; import { TableCellCfCellComponent } from '../../list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component'; import { TableCellUsageComponent } from '../../list-types/app-instance/table-cell-usage/table-cell-usage.component'; import { @@ -116,6 +134,7 @@ import { TableCellSelectComponent } from '../table-cell-select/table-cell-select import { TableHeaderSelectComponent } from '../table-header-select/table-header-select.component'; import { ICellDefinition } from '../table.types'; import { MultiActionListEntity } from './../../../../monitors/pagination-monitor'; +import { TableCellAutoscalerEventStatusIconPipe } from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; /* tslint:enable:max-line-length */ export const listTableCells = [ @@ -128,6 +147,12 @@ export const listTableCells = [ TableCellEventTypeComponent, TableCellEventActionComponent, TableCellEventDetailComponent, + TableCellAutoscalerEventTimestampComponent, + TableCellAutoscalerEventTypeComponent, + TableCellAutoscalerEventActionComponent, + TableCellAutoscalerEventStatusComponent, + TableCellAutoscalerEventChangeComponent, + TableCellAutoscalerEventErrorComponent, TableCellActionsComponent, TableCellAppNameComponent, TableCellEndpointStatusComponent, diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index 5ff7a05752..1af8b51597 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -41,6 +41,7 @@ import { CardAppInstancesComponent } from './components/cards/card-app-instances import { CardAppStatusComponent } from './components/cards/card-app-status/card-app-status.component'; import { CardAppUptimeComponent } from './components/cards/card-app-uptime/card-app-uptime.component'; import { CardAppUsageComponent } from './components/cards/card-app-usage/card-app-usage.component'; +import { CardAutoscalerDefaultComponent } from './components/cards/card-autoscaler-default/card-autoscaler-default.component'; import { CardCfInfoComponent } from './components/cards/card-cf-info/card-cf-info.component'; import { CardCfOrgUserDetailsComponent, @@ -102,6 +103,15 @@ import { EventTabActorIconPipe, } from './components/list/list-types/app-event/table-cell-event-action/event-tab-actor-icon.pipe'; import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; +import { + TableCellAutoscalerEventActionLabelPipe, +} from './components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe'; +import { + TableCellAutoscalerEventStatusIconPipe, +} from './components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; +import { + TableCellAutoscalerEventChangeIconPipe, +} from './components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe'; import { ListComponent } from './components/list/list.component'; import { ListConfig } from './components/list/list.component.types'; import { LoadingPageComponent } from './components/loading-page/loading-page.component'; @@ -192,6 +202,9 @@ import { UserPermissionDirective } from './user-permission.directive'; UniqueDirective, CodeBlockComponent, EventTabActorIconPipe, + TableCellAutoscalerEventActionLabelPipe, + TableCellAutoscalerEventStatusIconPipe, + TableCellAutoscalerEventChangeIconPipe, LogViewerComponent, EndpointsMissingComponent, DialogErrorComponent, @@ -208,6 +221,7 @@ import { UserPermissionDirective } from './user-permission.directive'; CardAppStatusComponent, CardAppInstancesComponent, CardAppUsageComponent, + CardAutoscalerDefaultComponent, RunningInstancesComponent, DialogConfirmComponent, CardAppUptimeComponent, @@ -319,6 +333,7 @@ import { UserPermissionDirective } from './user-permission.directive'; CardAppInstancesComponent, UsageGaugeComponent, CardAppUsageComponent, + CardAutoscalerDefaultComponent, DialogConfirmComponent, CardAppUptimeComponent, ListComponent, diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss index 1fe35bd298..595b69730e 100644 --- a/src/frontend/packages/core/src/styles.scss +++ b/src/frontend/packages/core/src/styles.scss @@ -65,3 +65,21 @@ button.mat-simple-snackbar-action { // flex: 1; // flex-direction: column; // } + +.autoscaler-chart-legend { + .ngx-charts { + display: none; + } + header { + display: none; + } + .legend-wrap { + width: unset; + .legend-labels { + width:unset; + li { + display: inline-block; + } + } + } +} \ No newline at end of file diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts index b665e3b421..e2ab5a37b4 100644 --- a/src/frontend/packages/core/test-framework/application-service-helper.ts +++ b/src/frontend/packages/core/test-framework/application-service-helper.ts @@ -52,8 +52,12 @@ export class ApplicationServiceMock { appSummary$: Observable>> = observableOf({ entityRequestInfo: { fetching: false } } as EntityInfo>); - appAutoscalerPolicy$: Observable> = observableOf(({ entityRequestInfo: { fetching: false } } as EntityInfo)); - appAutoscalerHealth$: Observable> = observableOf(({ entityRequestInfo: { fetching: false } } as EntityInfo)); + appAutoscalerPolicy$: Observable> = observableOf(({ + entityRequestInfo: { fetching: false } + } as EntityInfo)); + appAutoscalerHealth$: Observable> = observableOf(({ + entityRequestInfo: { fetching: false } + } as EntityInfo)); appStats$: Observable[]> = observableOf(new Array>()); applicationStratProject$: Observable = observableOf({ deploySource: { type: '', timestamp: 0, commit: '' }, deployOverrides: null }); diff --git a/src/frontend/packages/store/src/effects/api.effects.ts b/src/frontend/packages/store/src/effects/api.effects.ts index 3622730597..7f97fe18a5 100644 --- a/src/frontend/packages/store/src/effects/api.effects.ts +++ b/src/frontend/packages/store/src/effects/api.effects.ts @@ -412,27 +412,6 @@ export class APIEffect { }); case RequestEntityLocation.OBJECT: // The response is the entity return this.completeResourceEntity(cfData, cfGuid, apiAction.guid); - case RequestEntityLocation.AUTOSCALER_ARRAY: - if (!cfData.resources) { - // Treat the response as RequestEntityLocation.OBJECT - return this.completeResourceEntity( - cfData, - cfGuid, - apiAction.guid, - ); - } - totalResults += cfData['total_results']; - totalPages += cfData['total_pages']; - if (!cfData.resources.length) { - return null; - } - return cfData.resources.map(resource => { - return this.completeResourceEntity( - resource, - cfGuid, - resource.timestamp, - ); - }); case RequestEntityLocation.RESOURCE: // The response is an object and the entities list is within a 'resource' param default: if (!cfData.resources) { diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts index 8c177769ae..79b47f4de5 100644 --- a/src/frontend/packages/store/src/store.module.ts +++ b/src/frontend/packages/store/src/store.module.ts @@ -29,6 +29,7 @@ import { UpdateAppEffects } from './effects/update-app-effects'; import { UserFavoritesEffect } from './effects/user-favorites-effect'; import { UserProfileEffect } from './effects/user-profile.effects'; import { UsersRolesEffects } from './effects/users-roles.effects'; +import { AutoscalerEffects} from './effects/autoscaler.effects'; import { AppReducersModule } from './reducers.module'; import { AppStoreExtensionsModule } from './store.extensions.module'; @@ -65,7 +66,8 @@ import { AppStoreExtensionsModule } from './store.extensions.module'; RecursiveDeleteEffect, AppEffects, RouteEffect, - UserFavoritesEffect + UserFavoritesEffect, + AutoscalerEffects, ]) ] }) diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts index e6f1de702c..a9a227c82b 100644 --- a/src/frontend/packages/store/src/types/request.types.ts +++ b/src/frontend/packages/store/src/types/request.types.ts @@ -26,7 +26,6 @@ export enum RequestEntityLocation { RESOURCE, // The response is an object and the entities list is within a 'resource' param. Falls back to 'OBJECT' if missing. ARRAY, // The response is an array which contains the entities OBJECT, // The response is the entity - AUTOSCALER_ARRAY, // The response is for autoscaler } export type IRequestActionEntity = EntitySchema | EntitySchema[]; diff --git a/src/jetstream/passthrough.go b/src/jetstream/passthrough.go index 37fb8c0cf5..604817f08d 100644 --- a/src/jetstream/passthrough.go +++ b/src/jetstream/passthrough.go @@ -254,12 +254,6 @@ func (p *portalProxy) ProxyRequest(c echo.Context, uri *url.URL) (map[string]*in if strings.HasPrefix(cnsiRequest.URL.Host, apiPrefix) { // Replace 'api.' prefix with supplied prefix cnsiRequest.URL.Host = strings.Replace(cnsiRequest.URL.Host, apiPrefix, apiHost, 1) - if apiHost == "autoscaler." { - cnsiRequest.URL.Path = strings.Replace(cnsiRequest.URL.Path, "v2", "v1", 1) - } - if apiHost == "scalingconsole." { - cnsiRequest.URL.Path = strings.Replace(cnsiRequest.URL.Path, "v2", "v1", 1) - } } else { // Add supplied prefix to the domain cnsiRequest.URL.Host = apiHost + cnsiRequest.URL.Host From 1e2e3a309d092990671bc8303ac18bce25192d30 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 6 Mar 2019 16:21:17 +0800 Subject: [PATCH 07/98] [autoscaler]auto-refresh metrics and history page --- .../autoscaler-tab.component.ts | 9 +- ...utoscaler-metric-chart-page.component.html | 51 +- ...utoscaler-metric-chart-page.component.scss | 39 +- .../autoscaler-metric-chart-page.component.ts | 168 ++++-- .../combo-chart/combo-chart.component.scss | 86 +++ .../combo-chart/combo-chart.component.ts | 509 ++++++++++++++++++ .../combo-series-vertical.component.ts | 218 ++++++++ .../combo-chart/index.ts | 2 + .../edit-autoscaler-policy.component.scss | 4 +- .../card-autoscaler-default.component.scss | 113 ---- ...cf-app-autoscaler-events-config.service.ts | 80 +-- ...ell-autoscaler-event-change.component.scss | 2 +- ...ell-autoscaler-event-status.component.scss | 22 +- ...toscaler-event-timestamp.component.spec.ts | 2 +- ...ll-autoscaler-event-type.component.spec.ts | 2 +- .../store/actions/app-autoscaler.actions.ts | 5 + .../app/store/effects/autoscaler.effects.ts | 6 +- .../store/helpers/autoscaler-helpers.spec.ts | 24 +- .../app/store/helpers/autoscaler-helpers.ts | 356 +++++++----- .../applications/applications.module.ts | 4 + .../components/list/list.component.html | 3 +- .../metrics-range-selector.component.ts | 15 +- .../metrics-range-selector.service.ts | 7 +- src/frontend/packages/core/src/styles.scss | 28 +- .../pagination-reducer.types.ts | 2 +- 25 files changed, 1368 insertions(+), 389 deletions(-) create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts create mode 100644 src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index 1228ea3bec..aac292954f 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -156,7 +156,8 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { appAutoscalerScalingHistorySchemaKey, entityFactory(appAutoscalerScalingHistorySchemaKey), this.applicationService.appGuid, - new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, this.applicationService.cfGuid, this.paramsHistory), + new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, + this.applicationService.cfGuid, true, this.paramsHistory), false ); this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( @@ -205,7 +206,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { this.appAutoscalerAppMetrics = {}; Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); + this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); }); } } @@ -255,7 +256,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { ).subscribe(actionState => { if (actionState.error) { this.appAutoscalerPolicySnackBarRef = - this.appAutoscalerPolicySnackBar.open(`Failed to detach policy: ${actionState.message}`, 'Dismiss'); + this.appAutoscalerPolicySnackBar.open(`Failed to detach policy: ${actionState.message}`, 'Dismiss'); } }); }); @@ -332,7 +333,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { ).subscribe(actionState => { if (actionState.error) { this.appAutoscalerPolicySnackBarRef = - this.appAutoscalerPolicySnackBar.open(`Failed to create policy: ${actionState.message}`, 'Dismiss'); + this.appAutoscalerPolicySnackBar.open(`Failed to create policy: ${actionState.message}`, 'Dismiss'); } }); this.detachConfirmOk = 0; diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html index 8f396fd4b0..7a2fec70c5 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html @@ -8,6 +8,21 @@

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.
+ + + + + + Select time range: + + + + + + + + + @@ -21,7 +36,7 @@

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app. -
+
- - AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.
- - + --> +
+ + +
+
+ + +
diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss index bec9e1cd26..dfe34eb31b 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss @@ -28,36 +28,35 @@ app-tile-grid { } .autoscaler-chart-gauge { - margin-top: 1em; - width: 30%; display: inline-block; + margin-top: 1em; + width: 20%; + height: 250px; } .autoscaler-chart-bar { - margin-top: 1em; - width: 70%; display: inline-block; + margin-top: 1em; + width: 80%; + height: 250px; } -.autoscaler-chart-legend { - width: 100%; - svg { - width: 0px; - } - .ngx-charts { - width: 0em; - } - .legend-labels { - width: 15em; - } +.autoscaler-chart-bar-combo { + width: 75%; + height: 250px; + display: inline-block; + margin-top: 1em; } -.ngx-charts { - width: 0px; +.autoscaler-chart-bar-legend { + position: absolute; + display: inline-block; + margin-top: 1em; + margin-left: 1.75em; } .autoscaler-metric-subtitle { - color: rgba(0, 0, 0, 0.54); - font-size: 0.9em; - margin-top: 0.3em; + color: rgba(0, 0, 0, .54); + font-size: .9em; + margin-top: .3em; } diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts index 96276176e6..c30b68416f 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts @@ -1,8 +1,8 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, NgZone, ContentChild, Input } from '@angular/core'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; -import { filter, map, take } from 'rxjs/operators'; +import { filter, map, take, tap } from 'rxjs/operators'; import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; import { AppState } from '../../../store/app-state'; import { ApplicationService } from '../application.service'; @@ -26,7 +26,19 @@ import { } from '../../../store/helpers/entity-factory'; import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper'; import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { normalColor } from '../../../store/helpers/autoscaler-helpers'; +import { normalColor, buildLegendData } from '../../../store/helpers/autoscaler-helpers'; +import { MetricsRangeSelectorComponent } from '../../../shared/components/metrics-range-selector/metrics-range-selector.component'; +import { MetricsAction } from '../../../store/actions/metrics.actions'; +import { ChartSeries, IMetrics, MetricResultTypes, MetricsFilterSeries } from './../../../store/types/base-metric.types'; + +export interface MetricsConfig { + metricsAction: MetricsAction; + getSeriesName: (T) => string; + mapSeriesItemName?: (value) => string | Date; + mapSeriesItemValue?: (value) => any; + filterSeries?: MetricsFilterSeries; + sort?: (a: ChartSeries, b: ChartSeries) => number; +} const monthName = new Intl.DateTimeFormat('en-us', { month: 'short' }); const weekdayName = new Intl.DateTimeFormat('en-us', { weekday: 'short' }); @@ -48,6 +60,13 @@ function formatLabel(label: any): string { ] }) export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { + @Input() + public metricsConfig: MetricsConfig; + @ContentChild(MetricsRangeSelectorComponent) + public timeRangeSelector: MetricsRangeSelectorComponent; + + private timeSelectorSub: Subscription; + private committedAction: MetricsAction; parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; current = (new Date()).getTime(); @@ -63,12 +82,26 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { appAutoscalerAppMetricNames = []; appAutoscalerAppMetricLegend = {}; + comboBarScheme = { + name: 'singleLightBlue', + selectable: true, + group: 'Ordinal', + domain: ['#01579b'] + }; + lineChartScheme = { + name: 'coolthree', + selectable: true, + group: 'Ordinal', + domain: ['#01579b'] + }; + constructor( public applicationService: ApplicationService, private store: Store, private snackBar: MatSnackBar, private entityServiceFactory: EntityServiceFactory, private paginationMonitorFactory: PaginationMonitorFactory, + private ngZone: NgZone, ) { } @@ -82,6 +115,12 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { public appAutoscalerPolicy$: Observable; private snackBarRef: MatSnackBarRef; + entityServiceAppRefresh$: Subscription; + + private refreshTime = 0; + private refreshInterval = 60000; + private autoRefreshString = 'auto-refresh'; + clearSub() { if (this.sub) { this.sub.unsubscribe(); @@ -90,6 +129,33 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { } ngOnInit() { + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + const current = (new Date()).getTime() + if (this.refreshTime === 0 || current - this.refreshTime > 0.5 * this.refreshInterval) { + this.refreshTime = current; + this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); + this.loadLatestMetricsUponPolicy(entity); + } + } + return entity && entity.entity; + }) + ); + this.ngZone.runOutsideAngular(() => { + this.entityServiceAppRefresh$ = this.appAutoscalerPolicyService + .poll(this.refreshInterval, this.autoRefreshString).pipe( + tap(() => { })) + .subscribe(); + }); + this.sub = this.applicationService.application$.pipe( filter(app => !!app.app.entity), take(1), @@ -105,26 +171,26 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { // Don't want the values to change while the user is editing this.clearSub(); }); + } - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), - false - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - if (entity && entity.entity) { - this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.loadLatestMetricsUponPolicy(entity); - } - return entity && entity.entity; - }) - ); + ngAfterContentInit() { + if (this.timeRangeSelector) { + this.timeRangeSelector.baseAction = this.metricsConfig.metricsAction; + this.timeSelectorSub = this.timeRangeSelector.metricsAction.subscribe((action) => { + this.commitAction(action); + }); + } + } + + private commitAction(action: MetricsAction) { + this.committedAction = action; + this.store.dispatch(action); } ngOnDestroy(): void { + if (this.timeSelectorSub) { + this.timeSelectorSub.unsubscribe(); + } if (this.snackBarRef) { this.snackBarRef.dismiss(); } @@ -137,6 +203,7 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { getAppMetric(metricName: string, trigger: any, params: any) { const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, this.applicationService.cfGuid, metricName, false, trigger, params); + this.store.dispatch(action); return getPaginationObservables({ store: this.store, action, @@ -151,7 +218,7 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { if (policyEntity && policyEntity.entity && policyEntity.entity.scaling_rules_map) { this.appAutoscalerAppMetrics = {}; Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { - this.appAutoscalerAppMetricLegend[metricName] = this.getLegend(policyEntity.entity.scaling_rules_map[metricName]); + this.appAutoscalerAppMetricLegend[metricName] = this.getLegend2(policyEntity.entity.scaling_rules_map[metricName]); this.appAutoscalerAppMetrics[metricName] = this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); }); @@ -167,20 +234,26 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { `; } - getLegend(trigger) { + getLegend2(trigger) { + const legendColor = buildLegendData(trigger); const legendValue = []; - const legendColor = []; - for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { - const current = trigger.upper[i]; - const name = `${current.adjustment} if ${current.metric_type} ${current.operator} ${current.threshold}`; + legendColor.map((item) => { legendValue.push({ - name, + name: item.name, value: 1 }); - legendColor.push({ - name, - value: current.color - }); + }); + return { + legendValue, + legendColor + }; + } + + getLegend(trigger) { + const legendValue = []; + const legendColor = []; + if (trigger.upper) { + this.buildSingleLegend(legendValue, legendColor, trigger.upper); } legendValue.push({ name: 'ideal state', @@ -190,9 +263,24 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { name: 'ideal state', value: normalColor }); + if (trigger.lower) { + this.buildSingleLegend(legendValue, legendColor, trigger.lower); + } + return { + legendValue, + legendColor + }; + } + + updateSingleLineChartScheme(colors, ul) { + ul.map((item) => { + colors.push(item.color); + }); + } - for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { - const current = trigger.lower[i]; + buildSingleLegend(legendValue, legendColor, ul) { + for (let i = 0; i < ul.length; i++) { + const current = ul[i]; const name = `${current.adjustment} if ${current.metric_type} ${current.operator} ${current.threshold}`; legendValue.push({ name, @@ -203,10 +291,18 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { value: current.color }); } - return { - legendValue, - legendColor - }; + } + + yLeftTickFormat(data) { + return `${data.toLocaleString()}`; + } + + yRightTickFormat(data) { + return `${data}%`; + } + + yLeftAxisScale(min, max) { + return { min: `${min}`, max: `${max}` }; } } diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss new file mode 100644 index 0000000000..942345646a --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss @@ -0,0 +1,86 @@ +.ngx-charts { + float: left; + overflow: visible; + + .circle, + .bar, + .arc { + cursor: pointer; + } + + .bar, + .cell, + .arc, + .card { + &.active, + &:hover { + opacity: 0.8; + transition: opacity 100ms ease-in-out; + } + + &:focus { + outline: none; + } + } + + g { + &:focus { + outline: none; + } + } + + .line-series, + .line-series-range, + .area-series { + &.inactive { + transition: opacity 100ms ease-in-out; + opacity: .2 + } + } + + .line-highlight { + display: none; + + &.active { + display: block; + } + } + + .area { + opacity: 0.6; + } + + .circle { + &:hover { + cursor: pointer; + } + } + + .label { + font-size: 12px; + font-weight: normal; + } + + .tooltip-anchor { + fill: rgb(0,0,0); + } + + .gridline-path { + stroke: #ddd; + stroke-width: 1; + fill: none; + } + + .grid-panel { + rect { + fill: none; + } + + &.odd { + rect { + fill: rgba(0,0,0,0.05); + } + } + } + +} \ No newline at end of file diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts new file mode 100644 index 0000000000..71d9fefef2 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts @@ -0,0 +1,509 @@ +import { + Component, + Input, + ViewEncapsulation, + Output, + EventEmitter, + ChangeDetectionStrategy, + ViewChild, + HostListener, + OnInit, + OnChanges, + ContentChild, + TemplateRef +} from '@angular/core'; +import { + trigger, + state, + style, + animate, + transition +} from '@angular/animations'; + +import { + NgxChartsModule, BaseChartComponent, LineComponent, LineSeriesComponent, + calculateViewDimensions, ViewDimensions, ColorHelper +} from '@swimlane/ngx-charts'; +import { area, line, curveLinear } from 'd3-shape'; +import { scaleBand, scaleLinear, scalePoint, scaleTime } from 'd3-scale'; + +@Component({ + selector: 'app-autoscaler-combo-chart-component', + template: ` + + + + + + + + + + + + + + + + + + + + + + + + + + + `, + styleUrls: ['./combo-chart.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class ComboChartComponent extends BaseChartComponent { + + @ViewChild(LineSeriesComponent) lineSeriesComponent: LineSeriesComponent; + + @Input() curve: any = curveLinear; + @Input() legend = false; + @Input() legendTitle = 'Legend'; + @Input() legendPosition = 'right'; + @Input() xAxis; + @Input() yAxis; + @Input() showXAxisLabel; + @Input() showYAxisLabel; + @Input() xAxisLabel; + @Input() yAxisLabel; + @Input() tooltipDisabled = false; + @Input() gradient: boolean; + @Input() showGridLines = true; + @Input() activeEntries: any[] = []; + @Input() schemeType: string; + @Input() xAxisTickFormatting: any; + @Input() yAxisTickFormatting: any; + @Input() roundDomains = false; + @Input() colorSchemeLine: any[]; + @Input() autoScale; + @Input() lineChart: any; + @Input() yLeftAxisScaleFactor: any; + @Input() rangeFillOpacity: number; + @Input() animations = true; + @Input() yScaleMax: number; + + @Output() activate: EventEmitter = new EventEmitter(); + @Output() deactivate: EventEmitter = new EventEmitter(); + + @ContentChild('tooltipTemplate') tooltipTemplate: TemplateRef; + @ContentChild('seriesTooltipTemplate') seriesTooltipTemplate: TemplateRef; + + dims: ViewDimensions; + xScale: any; + yScale: any; + xDomain: any; + yDomain: any; + transform: string; + colors: ColorHelper; + colorsLine: ColorHelper; + margin: any[] = [10, 20, 10, 20]; + xAxisHeight = 0; + yAxisWidth = 0; + legendOptions: any; + scaleType = 'linear'; + xScaleLine; + yScaleLine; + xDomainLine; + yDomainLine; + seriesDomain; + scaledAxis; + combinedSeries; + xSet; + filteredDomain; + hoveredVertical; + yOrientLeft = 'left'; + yOrientRight = 'right'; + legendSpacing = 0; + bandwidth; + barPadding = 2; + + trackBy(index, item): string { + return item.name; + } + + update(): void { + super.update(); + this.dims = calculateViewDimensions({ + width: this.width, + height: this.height, + margins: this.margin, + showXAxis: this.xAxis, + showYAxis: this.yAxis, + xAxisHeight: this.xAxisHeight, + yAxisWidth: this.yAxisWidth, + showXLabel: this.showXAxisLabel, + showYLabel: this.showYAxisLabel, + showLegend: this.legend, + legendType: this.schemeType, + }); + + if (!this.yAxis) { + this.legendSpacing = 0; + } else { + this.legendSpacing = 30; + } + this.xScale = this.getXScale(); + this.yScale = this.getYScale(); + + // line chart + this.xDomainLine = this.getXDomainLine(); + if (this.filteredDomain) { + this.xDomainLine = this.filteredDomain; + } + + this.yDomainLine = this.getYDomain(); + this.seriesDomain = this.getSeriesDomain(); + + this.xScaleLine = this.getXScaleLine(this.xDomainLine, this.dims.width); + this.yScaleLine = this.getYScaleLine(this.yDomainLine, this.dims.height); + + this.setColors(); + this.legendOptions = this.getLegendOptions(); + + this.transform = `translate(${this.dims.xOffset} , ${this.margin[0]})`; + } + + deactivateAll() { + this.activeEntries = [...this.activeEntries]; + for (const entry of this.activeEntries) { + this.deactivate.emit({ value: entry, entries: [] }); + } + this.activeEntries = []; + } + + @HostListener('mouseleave') + hideCircles(): void { + this.hoveredVertical = null; + this.deactivateAll(); + } + + updateHoveredVertical(item): void { + this.hoveredVertical = item.value; + this.deactivateAll(); + } + + updateDomain(domain): void { + this.filteredDomain = domain; + this.xDomainLine = this.filteredDomain; + this.xScaleLine = this.getXScaleLine(this.xDomainLine, this.dims.width); + } + + getSeriesDomain(): any[] { + this.combinedSeries = this.lineChart.slice(0); + return this.combinedSeries.map(d => d.name); + } + + isDate(value): boolean { + if (value instanceof Date) { + return true; + } + + return false; + } + + getScaleType(values): string { + let date = true; + let num = true; + + for (const value of values) { + if (!this.isDate(value)) { + date = false; + } + + if (typeof value !== 'number') { + num = false; + } + } + + if (date) { + return 'time'; + } + if (num) { + return 'linear'; + } + return 'ordinal'; + } + + getXDomainLine(): any[] { + let values = []; + + for (const results of this.lineChart) { + for (const d of results.series) { + if (!values.includes(d.name)) { + values.push(d.name); + } + } + } + + this.scaleType = this.getScaleType(values); + let domain = []; + + if (this.scaleType === 'time') { + const min = Math.min(...values); + const max = Math.max(...values); + domain = [min, max]; + } else if (this.scaleType === 'linear') { + values = values.map(v => Number(v)); + const min = Math.min(...values); + const max = Math.max(...values); + domain = [min, max]; + } else { + domain = values; + } + + this.xSet = values; + return domain; + } + + getYDomainLine(): any[] { + const domain = []; + + for (const results of this.lineChart) { + for (const d of results.series) { + if (domain.indexOf(d.value) < 0) { + domain.push(d.value); + } + if (d.min !== undefined) { + if (domain.indexOf(d.min) < 0) { + domain.push(d.min); + } + } + if (d.max !== undefined) { + if (domain.indexOf(d.max) < 0) { + domain.push(d.max); + } + } + } + } + + const min = Math.min(...domain); + const max = this.yScaleMax + ? this.yScaleMax + : Math.max(...domain); + return [min, max]; + } + + getXScaleLine(domain, width): any { + let scale; + if (this.bandwidth === undefined) { + this.bandwidth = (this.dims.width - this.barPadding); + } + + if (this.scaleType === 'time') { + scale = scaleTime() + .range([0, width]) + .domain(domain); + } else if (this.scaleType === 'linear') { + scale = scaleLinear() + .range([0, width]) + .domain(domain); + + if (this.roundDomains) { + scale = scale.nice(); + } + } else if (this.scaleType === 'ordinal') { + scale = scalePoint() + .range([this.bandwidth / 2, width - this.bandwidth / 2]) + .domain(domain); + } + + return scale; + } + + getYScaleLine(domain, height): any { + const scale = scaleLinear() + .range([height, 0]) + .domain(domain); + + return this.roundDomains ? scale.nice() : scale; + } + + getXScale(): any { + this.xDomain = this.getXDomain(); + const spacing = this.xDomain.length / (this.dims.width / this.barPadding + 1); + return scaleBand() + .rangeRound([0, this.dims.width]) + .paddingInner(spacing) + .domain(this.xDomain); + } + + getYScale(): any { + this.yDomain = this.getYDomain(); + const scale = scaleLinear() + .range([this.dims.height, 0]) + .domain(this.yDomain); + return this.roundDomains ? scale.nice() : scale; + } + + getXDomain(): any[] { + return this.results.map(d => d.name); + } + + getYDomain() { + const values = this.results.map(d => d.value); + const min = Math.min(0, ...values); + const max = this.yScaleMax + ? Math.max(this.yScaleMax, ...values) + : Math.max(0, ...values); + if (this.yLeftAxisScaleFactor) { + const minMax = this.yLeftAxisScaleFactor(min, max); + return [Math.min(0, minMax.min), minMax.max]; + } else { + return [min, max]; + } + } + + onClick(data) { + this.select.emit(data); + } + + setColors(): void { + let domain; + if (this.schemeType === 'ordinal') { + domain = this.xDomain; + } else { + domain = this.yDomain; + } + this.colors = new ColorHelper(this.scheme, this.schemeType, domain, this.customColors); + this.colorsLine = new ColorHelper(this.colorSchemeLine, this.schemeType, domain, this.customColors); + } + + getLegendOptions() { + const opts = { + scaleType: this.schemeType, + colors: undefined, + domain: [], + title: undefined, + position: this.legendPosition + }; + if (opts.scaleType === 'ordinal') { + opts.domain = this.seriesDomain; + opts.colors = this.colorsLine; + opts.title = this.legendTitle; + } else { + opts.domain = this.seriesDomain; + opts.colors = this.colors.scale; + } + return opts; + } + + updateLineWidth(width): void { + this.bandwidth = width; + } + + updateYAxisWidth({ width }): void { + this.yAxisWidth = width + 20; + this.update(); + } + + updateXAxisHeight({ height }): void { + this.xAxisHeight = height; + this.update(); + } + + onActivate(item) { + const idx = this.activeEntries.findIndex(d => { + return d.name === item.name && d.value === item.value && d.series === item.series; + }); + if (idx > -1) { + return; + } + + this.activeEntries = [item, ...this.activeEntries]; + this.activate.emit({ value: item, entries: this.activeEntries }); + } + + onDeactivate(item) { + const idx = this.activeEntries.findIndex(d => { + return d.name === item.name && d.value === item.value && d.series === item.series; + }); + + this.activeEntries.splice(idx, 1); + this.activeEntries = [...this.activeEntries]; + + this.deactivate.emit({ value: item, entries: this.activeEntries }); + } +} diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts new file mode 100644 index 0000000000..7c2aba3312 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts @@ -0,0 +1,218 @@ +import { + Component, + Input, + Output, + EventEmitter, + OnChanges, + ChangeDetectionStrategy +} from '@angular/core'; +import { + trigger, + state, + style, + animate, + transition +} from '@angular/animations'; + +function formatLabel(label: any): string { + if (label instanceof Date) { + label = label.toLocaleDateString(); + } else { + label = label.toLocaleString(); + } + + return label; +} + +@Component({ + selector: 'g[ngx-combo-charts-series-vertical]', + template: ` + + + `, + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [ + trigger('animationState', [ + transition('* => void', [ + style({ + opacity: 1, + transform: '*', + }), + animate(500, style({ opacity: 0, transform: 'scale(0)' })) + ]) + ]) + ] +}) +export class ComboSeriesVerticalComponent implements OnChanges { + + @Input() dims; + @Input() type = 'standard'; + @Input() series; + @Input() seriesLine; + @Input() xScale; + @Input() yScale; + @Input() colors; + @Input() tooltipDisabled = false; + @Input() gradient: boolean; + @Input() activeEntries: any[]; + @Input() seriesName: string; + @Input() animations = true; + + @Output() select = new EventEmitter(); + @Output() activate = new EventEmitter(); + @Output() deactivate = new EventEmitter(); + @Output() bandwidth = new EventEmitter(); + + bars: any; + x: any; + y: any; + + ngOnChanges(changes): void { + this.update(); + } + + update(): void { + let width; + if (this.series.length) { + width = this.xScale.bandwidth(); + this.bandwidth.emit(width); + } + + let d0 = 0; + let total; + if (this.type === 'normalized') { + total = this.series.map(d => d.value).reduce((sum, d) => sum + d, 0); + } + + this.bars = this.series.map((d, index) => { + + let value = d.value; + const label = d.name; + const formattedLabel = formatLabel(label); + const roundEdges = this.type === 'standard'; + + const bar: any = { + value, + label, + roundEdges, + data: d, + width, + formattedLabel, + height: 0, + x: 0, + y: 0 + }; + + if (this.type === 'standard') { + bar.height = Math.abs(this.yScale(value) - this.yScale(0)); + bar.x = this.xScale(label); + + if (value < 0) { + bar.y = this.yScale(0); + } else { + bar.y = this.yScale(value); + } + } else if (this.type === 'stacked') { + const offset0 = d0; + const offset1 = offset0 + value; + d0 += value; + + bar.height = this.yScale(offset0) - this.yScale(offset1); + bar.x = 0; + bar.y = this.yScale(offset1); + bar.offset0 = offset0; + bar.offset1 = offset1; + } else if (this.type === 'normalized') { + let offset0 = d0; + let offset1 = offset0 + value; + d0 += value; + + if (total > 0) { + offset0 = (offset0 * 100) / total; + offset1 = (offset1 * 100) / total; + } else { + offset0 = 0; + offset1 = 0; + } + + bar.height = this.yScale(offset0) - this.yScale(offset1); + bar.x = 0; + bar.y = this.yScale(offset1); + bar.offset0 = offset0; + bar.offset1 = offset1; + value = (offset1 - offset0).toFixed(2); + } + + if (this.colors.scaleType === 'ordinal') { + bar.color = this.colors.getColor(label); + } else { + if (this.type === 'standard') { + bar.color = this.colors.getColor(value); + bar.gradientStops = this.colors.getLinearGradientStops(value); + } else { + bar.color = this.colors.getColor(bar.offset1); + bar.gradientStops = this.colors.getLinearGradientStops(bar.offset1, bar.offset0); + } + } + + let tooltipLabel = formattedLabel; + if (this.seriesName) { + tooltipLabel = `${this.seriesName} • ${formattedLabel}`; + } + + this.getSeriesTooltips(this.seriesLine, index); + const lineValue = this.seriesLine[0].series[index].value; + const lineName = this.seriesLine[0].series[index].name; + bar.tooltipText = ` + ${tooltipLabel} + Y1 - ${value.toLocaleString()} • Y2 - ${lineValue.toLocaleString()}% + `; + + return bar; + }); + } + getSeriesTooltips(seriesLine, index) { + return seriesLine.map(d => { + return d.series[index]; + }); + } + isActive(entry): boolean { + if (!this.activeEntries) { + return false; + } + const item = this.activeEntries.find(d => { + return entry.name === d.name && entry.series === d.series; + }); + return item !== undefined; + } + + onClick(data): void { + this.select.emit(data); + } + + trackBy(index, bar): string { + return bar.label; + } + +} diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts new file mode 100644 index 0000000000..2a0ab4f222 --- /dev/null +++ b/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts @@ -0,0 +1,2 @@ +export * from './combo-chart.component'; +export * from './combo-series-vertical.component'; diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index 8b46d8b617..979a72e20b 100644 --- a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -4,8 +4,8 @@ .mat-radio-outer-circle { height: 15px; - width: 15px; top: 2.5px; + width: 15px; } app-tile-grid { @@ -39,4 +39,4 @@ app-tile-grid { .edit-recurring-schedule { max-width: 100%; -} \ No newline at end of file +} diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss index ca6c89291d..62daaf0f0c 100644 --- a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss +++ b/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss @@ -56,116 +56,3 @@ } } } - -// .mat-card { -// padding: 24px 10px 24px 24px; - -// .create-policy { -// margin-top: 1rem; -// text-decoration: none; -// } - -// .mat-card-heading { -// font-weight: 600; -// } - -// .mat-card-container { -// display: flex; -// flex-direction: column; -// padding-right: 2rem; - -// a { -// margin-left: auto; -// margin-bottom: 2px; -// } - -// &.instances { -// border-right: 1px solid gray; -// } - -// &.limits-container { -// padding-left: 2rem; -// padding-right: 0; - -// .limits { -// display: flex; -// } -// .min-limit { -// padding-right: 1rem; -// } -// } - -// &.limits-link { -// padding-right: 0; -// margin-top: -15px; -// } - -// } - -// &.status-card { -// width: 160px; - -// &.green { -// border-top: 4px solid #4caf50; -// } -// } - -// &.instances-card { -// width: 348px; -// } - -// &.most-recent-event-card { -// width: 525px; -// } - -// .row-container { -// display: flex; -// justify-content: space-between; -// } - -// .column-container { -// display: flex; -// flex-direction: column; -// } - -// .text-padding { -// padding-left: 5px; -// } - -// table { -// width: 100%; - -// thead th { -// text-align: left; -// font-weight: 200; -// font-size: small; -// border-bottom: 1px solid lightgrey; -// } -// } - -// th, td { -// padding-top: 5px; - -// &.recent-event-when { -// width: 38%; -// } - -// &.recent-event-change { -// width: 15%; -// } -// } - -// p { -// &.configured { -// color: green; -// } -// &.not-configured { -// color: gray; -// font-style: italic; -// } -// &.scale-recur-heading { -// margin-top: 2.0rem; -// } -// } - -// } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 407a771432..7df7eba83c 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { BehaviorSubject, of as observableOf } from 'rxjs'; import { ApplicationService } from '../../../../../features/applications/application.service'; import { AppState } from '../../../../../store/app-state'; import { EntityInfo } from '../../../../../store/types/api.types'; import { ITableColumn } from '../../list-table/table.types'; -import { IListConfig, ListConfig, ListViewTypes, IListMultiFilterConfig } from '../../list.component.types'; +import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; import { TableCellAutoscalerEventActionComponent } from './table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; import { @@ -15,10 +14,7 @@ import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-e import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; import { TableCellAutoscalerEventChangeComponent } from './table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; import { TableCellAutoscalerEventErrorComponent } from './table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; -import { PaginatedAction } from '../../../../../store/types/pagination.types'; -import { selectPaginationState } from '../../../../../store/selectors/pagination.selectors'; -import { filter, first } from 'rxjs/operators'; -import { SetClientFilter } from '../../../../../store/actions/pagination.actions'; +import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; @Injectable() export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { @@ -49,7 +45,30 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig i title: null, noEntries: 'There are no scale events' }; - private multiFilterConfigs: IListMultiFilterConfig[]; + + showMetricsRange = true; + selectedTimeValue = '1:week'; + times: ITimeRange[] = [ + { + value: '1:day', + label: 'The past day', + queryType: MetricQueryType.QUERY + }, + { + value: '1:week', + label: 'The past week', + queryType: MetricQueryType.QUERY + }, + { + value: '1:month', + label: 'The past month', + queryType: MetricQueryType.QUERY + }, + { + label: 'Custom time window', + queryType: MetricQueryType.RANGE_QUERY + } + ]; constructor(private store: Store, private appService: ApplicationService) { super(); @@ -58,9 +77,6 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig i this.appService.cfGuid, this.appService.appGuid, ); - - this.assignMultiConfig(); - this.initialiseMultiFilter(this.autoscalerEventSource.action); } getGlobalActions = () => null; @@ -68,47 +84,5 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig i getSingleActions = () => null; getColumns = () => this.columns; getDataSource = () => this.autoscalerEventSource; - getMultiFiltersConfigs = () => this.multiFilterConfigs; - - private assignMultiConfig = () => { - this.multiFilterConfigs = [ - { - key: 'queryRange', - label: 'Last week', - allLabel: 'Last week', - list$: observableOf([ - { - label: 'Last month', - item: 'month', - value: 'month' - }, - { - label: 'Custom range', - item: 'custom', - value: 'custom' - } - ]), - loading$: observableOf(false), - select: new BehaviorSubject('month') - } - ]; - } - - private initialiseMultiFilter(action: PaginatedAction) { - this.store.select(selectPaginationState(action.entityKey, action.paginationKey)).pipe( - filter((pag) => !!pag), - first(), - ).subscribe(pag => { - const currentFilter = pag.clientPagination.filter.items['queryRange']; - if (!currentFilter) { - this.store.dispatch(new SetClientFilter(action.entityKey, action.paginationKey, { - string: '', - items: { - ['queryRange']: 'week' - } - })); - } - }); - } - + getMultiFiltersConfigs = () => []; } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss index ec00191352..3cb8006227 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss @@ -2,4 +2,4 @@ div { align-items: center; display: flex; flex-direction: row; -} \ No newline at end of file +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss index b6ca492066..855064aeb0 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss @@ -1,12 +1,12 @@ div { - align-items: center; - display: flex; - flex-direction: row; - .mat-icon { - height: 14px; - width: 14px; - } - .material-icons { - font-size: 14px; - } - } \ No newline at end of file + align-items: center; + display: flex; + flex-direction: row; + .mat-icon { + height: 14px; + width: 14px; + } + .material-icons { + font-size: 14px; + } +} diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts index 6d099271ef..2ae108c6d2 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TableCellAutoscalerEventTimestampComponent } from './table-cell-autoscler-event-timestamp.component'; +import { TableCellAutoscalerEventTimestampComponent } from './table-cell-autoscaler-event-timestamp.component'; import { EntityInfo } from '../../../../../../store/types/api.types'; describe('TableCellAutoscalerEventTimestampComponent', () => { diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts index c48df21274..57e35654f8 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts +++ b/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts @@ -1,6 +1,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TableCellAutoscalerEventTypeComponent } from './table-cell-event-type.component'; +import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-event-type.component'; import { EntityInfo } from '../../../../../../store/types/api.types'; describe('TableCellAutoscalerEventTypeComponent', () => { diff --git a/src/frontend/app/store/actions/app-autoscaler.actions.ts b/src/frontend/app/store/actions/app-autoscaler.actions.ts index c5c7896eaf..ba6fc447a7 100644 --- a/src/frontend/app/store/actions/app-autoscaler.actions.ts +++ b/src/frontend/app/store/actions/app-autoscaler.actions.ts @@ -92,6 +92,9 @@ export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implemen public params?, ) { super(); + this.query = { + metric: 'history' + }; } actions = [ AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, @@ -108,6 +111,8 @@ export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implemen 'start-time': 0, 'end-time': (new Date()).getTime().toString() + '000000', }; + query: any; + windowValue: string; } export abstract class GetAppAutoscalerMetricAction implements PaginatedAction { diff --git a/src/frontend/app/store/effects/autoscaler.effects.ts b/src/frontend/app/store/effects/autoscaler.effects.ts index c971de5638..c4934e4b16 100644 --- a/src/frontend/app/store/effects/autoscaler.effects.ts +++ b/src/frontend/app/store/effects/autoscaler.effects.ts @@ -217,7 +217,7 @@ export class AutoscalerEffects { paginatedAction.pageNumber = paginationState ? paginationState.currentPage : 1; - options.params = this.buildParams(action.initialParams, action.params, paginationParams); + options.params = this.buildParams(action.initialParams, paginationParams, action.params); if (!options.params.has(resultPerPageParam)) { options.params.set( resultPerPageParam, @@ -231,6 +231,10 @@ export class AutoscalerEffects { options.params.set('order', options.params.get('order-direction')); options.params.delete('order-direction'); } + if (action.query && action.query.params) { + options.params.set('start-time', action.query.params.start + '000000000'); + options.params.set('end-time', action.query.params.end + '000000000'); + } return this.http .request(new Request(options)).pipe( mergeMap(response => { diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts b/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts index 92cde7f389..f70f765ea2 100644 --- a/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts +++ b/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts @@ -2,10 +2,32 @@ import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, isEqual, - isPolicyMapEqual + isPolicyMapEqual, + insertEmptyMetrics } from './autoscaler-helpers'; describe('Autoscaler Helper', () => { + it('insertEmptyMetrics', function () { + const descTarget = [20, 40, 60, 80, 100]; + const descSource1 = insertEmptyMetrics([], 100, 10, -20); + descSource1.map((item, index) => { + expect(isEqual(item.time, descTarget[index])).toBe(true); + }); + const descSource2 = insertEmptyMetrics([], 100, 20, -20); + descSource2.map((item, index) => { + expect(isEqual(item.time, descTarget[index])).toBe(true); + }); + const ascTarget = [10, 30, 50, 70, 90]; + const ascSource1 = insertEmptyMetrics([], 10, 90, 20); + ascSource1.map((item, index) => { + expect(isEqual(item.time, ascTarget[index])).toBe(true); + }); + const ascSource2 = insertEmptyMetrics([], 10, 100, 20); + ascSource2.map((item, index) => { + expect(isEqual(item.time, ascTarget[index])).toBe(true); + }); + }); + it('Test policy transformation', function () { const arrayPolicy = { 'instance_min_count': 1, diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.ts b/src/frontend/app/store/helpers/autoscaler-helpers.ts index 5b8fc09757..08c0fe4f64 100644 --- a/src/frontend/app/store/helpers/autoscaler-helpers.ts +++ b/src/frontend/app/store/helpers/autoscaler-helpers.ts @@ -1,3 +1,4 @@ +// import * as moment from 'moment'; import moment from 'moment-timezone'; export const PolicyDefaultSetting = { @@ -14,32 +15,20 @@ export const MomentFormateTimeS = 'HH:mm:ss'; export const metricMap = { memoryused: { - unit: 'metric_unit_mb', unit_internal: 'MB', - type: 'value', - type_string: 'metric_type_memoryused', - interval: 15, + interval: 40, }, memoryutil: { - unit: 'metric_unit_percentage', - unit_internal: 'percent', - type: 'percentage', - type_string: 'metric_type_memoryutil', - interval: 15, + unit_internal: '%', + interval: 40, }, responsetime: { - unit: 'metric_unit_ms', unit_internal: 'ms', - type: 'value', - type_string: 'metric_type_responsetime', - interval: 30, + interval: 40, }, throughput: { - unit: 'metric_unit_rps', - unit_internal: 'RPS', - type: 'value', - type_string: 'metric_type_throughput', - interval: 30, + unit_internal: 'rps', + interval: 40, } }; @@ -98,7 +87,7 @@ function setUpperColor(array) { color10 = max; } // let color16 = color10.toString(16) - // if (color16.length == 1) color16 = '0' + color16 + // if (color16.length === 1) color16 = '0' + color16 array[i].color = 'rgba(255, ' + color10 + ', 0, 0.6)'; // '#ff' + color16 + '00' } } @@ -118,7 +107,7 @@ function setLowerColor(array) { color10 = min; } // let color16 = color10.toString(16) - // if (color16.length == 1) color16 = '0' + color16 + // if (color16.length === 1) color16 = '0' + color16 array[i].color = 'rgba(51, ' + color10 + ', 255, 0.6)'; // '#33' + color16 + 'ff' } } @@ -204,23 +193,17 @@ function deleteIf(fatherEntity, childName, condition) { } } -export function buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger) { - const result = { +function initMeticData(metricName) { + return { latest: { target: [{ name: metricName, value: 0 - }, { - name: '', - value: 0 }], colorTarget: [ { name: metricName, value: 'rgba(0,0,0,0.2)' - }, { - name: '', - value: 'rgba(0,0,0,0.2)' } ] }, @@ -228,73 +211,71 @@ export function buildMetricData(metricName, data, startTime, endTime, skipFormat target: [], colorTarget: [] }, - unit: '', - maxValue: 0, + markline: [], + unit: metricMap[metricName]['unit_internal'], chartMaxValue: 0, }; +} + +export function buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger) { + const result = initMeticData(metricName); if (data.resources.length > 0) { const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); result.unit = basicInfo.unit; - result.maxValue = basicInfo.maxValue; result.chartMaxValue = basicInfo.chartMaxValue; if (!skipFormat) { - const transformed = transformMetricData(data.resources, basicInfo.interval, startTime, endTime, trigger); + startTime = Math.round(startTime / S2NS); + endTime = Math.round(endTime / S2NS); + const target = transformMetricData(data.resources, basicInfo.interval, startTime, endTime); + const colorTarget = buildMetricColorData(target, trigger); result.formated = { - target: transformed['target'], - colorTarget: transformed['colorTarget'] + target: target, + colorTarget }; + result.markline = buildMarkLineData(target, trigger); } - result.latest = { - target: [{ - name: metricName, - value: data.resources[data.resources.length - 1].value - }, { - name: '', - value: basicInfo.chartMaxValue - data.resources[data.resources.length - 1].value - }], - colorTarget: [ - { - name: metricName, - value: getColor(trigger, data.resources[data.resources.length - 1].value) - }, { - name: '', - value: 'rgba(0,0,0,0.2)' - } - ] - }; + result.latest.target = [{ + name: metricName, + value: Number(data.resources[data.resources.length - 1].value) + }]; + result.latest.colorTarget = buildMetricColorData(result.latest.target, trigger); } return result; } -function transformMetricData(source, interval, startTime, endTime, trigger) { - startTime = Math.round(startTime / S2NS); - endTime = Math.round(endTime / S2NS); +export function insertEmptyMetrics(data, startTime, endTime, interval) { + const insertEmptyNumber = Math.floor((endTime - startTime) / interval) + 1; + for (let i = 0; i < insertEmptyNumber; i++) { + const emptyMetric = buildSingleMetricData(startTime + i * interval, 0); + if (interval < 0) { + data.unshift(emptyMetric); + } else { + data.push(emptyMetric); + } + } + return data; +} + +function buildSingleMetricData(timestamp, value) { + return { + time: timestamp, + name: moment(timestamp * 1000).format(MomentFormateTimeS), + value + }; +} + +function transformMetricData(source, interval, startTime, endTime) { if (source.length === 0) { return []; } const scope = Math.round(interval / 2); const target = []; let targetTimestamp = Math.round(source[0].timestamp / S2NS); - let targetIndex = 0; - - const insertEmptyNumber = Math.floor((targetTimestamp - startTime) / interval); - const startTimestamp = targetTimestamp - insertEmptyNumber * interval; - for (; targetIndex < insertEmptyNumber; targetIndex++) { - target[targetIndex] = { - time: startTimestamp + targetIndex * interval, - name: moment((startTimestamp + targetIndex * interval) * 1000).format(MomentFormateTimeS), - value: 0 - }; - } - + let targetIndex = insertEmptyMetrics(target, targetTimestamp - interval, startTime, -interval).length; let sourceIndex = 0; while (sourceIndex < source.length) { if (!target[targetIndex]) { - target[targetIndex] = { - time: targetTimestamp, - name: moment(targetTimestamp * 1000).format(MomentFormateTimeS), - value: 0 - }; + target[targetIndex] = buildSingleMetricData(targetTimestamp, 0); } const metric = source[sourceIndex]; const sourceTimestamp = Math.round(metric.timestamp / S2NS); @@ -304,109 +285,232 @@ function transformMetricData(source, interval, startTime, endTime, trigger) { targetIndex++; targetTimestamp += interval; } else { - target[targetIndex]['value'] = parseInt(metric.value, 10); + target[targetIndex]['value'] = Number(metric.value); sourceIndex++; } } - let currentLatestTime = target[targetIndex].time + interval; - while (currentLatestTime < endTime) { - target.push({ - time: currentLatestTime, - name: moment(currentLatestTime * 1000).format(MomentFormateTimeS), - value: 0 - }); - currentLatestTime = currentLatestTime + interval; - } + return insertEmptyMetrics(target, target[targetIndex].time + interval, endTime, interval); +} + +function buildMetricColorData(metricData, trigger) { const colorTarget = []; - target.map((cell) => { + metricData.map((item) => { colorTarget.push({ - name: cell.name, - value: getColor(trigger, cell.value), + name: item.name, + value: getColor(trigger, item.value), }); }); - return { - target, - colorTarget - }; + if (trigger.upper && trigger.upper.length > 0) { + buildSingleColor(colorTarget, trigger.upper); + } + if (trigger.lower && trigger.lower.length > 0) { + buildSingleColor(colorTarget, trigger.lower); + } + return colorTarget; +} + +function buildSingleColor(lineChartSeries, ul) { + ul.map((item) => { + const lineData = { + name: `${item.operator} ${item.threshold}`, + value: item.color + }; + lineChartSeries.push(lineData); + }); +} + +function getOppositeOperator(operator) { + switch (operator) { + case '>': + return '<='; + case '>=': + return '<'; + case '<': + return '>='; + default: + return '>'; + } +} + +function getRightOperator(operator) { + switch (operator) { + case '>': + return '<='; + case '>=': + return '<'; + default: + return operator; + } +} + +function getLeftOperator(operator) { + switch (operator) { + case '>': + return '<'; + case '>=': + return '<='; + case '<': + return '<='; + default: + return '<'; + } +} + +function buildMarkLineData(metricData, trigger) { + const lineChartSeries = []; + if (trigger.upper && trigger.upper.length > 0) { + buildSingleMarkLine(lineChartSeries, metricData, trigger.upper); + } + if (trigger.lower && trigger.lower.length > 0) { + buildSingleMarkLine(lineChartSeries, metricData, trigger.lower); + } + return lineChartSeries; +} + +export function buildLegendData(trigger) { + const legendData = []; + let latestUl = {}; + if (trigger.upper && trigger.upper.length > 0) { + latestUl = buildUpperLegendData(legendData, trigger.upper, !trigger.lower || trigger.lower.length === 0); + } + if (trigger.lower && trigger.lower.length > 0) { + latestUl = buildLowerLegendData(legendData, trigger.lower, latestUl); + } + return legendData; +} + +function buildUpperLegendData(legendData, upper, nolower) { + let latestUl = {}; + upper.map((item, index) => { + let name = ''; + if (index === 0) { + name = `${item.metric_type} ${item.operator} ${item.threshold}`; + } else { + name = `${item.threshold} ${getLeftOperator(item.operator)} ${item. + metric_type} ${getRightOperator(latestUl['operator'])} ${latestUl['threshold']}`; + } + legendData.push({ + name, + value: item.color + }); + latestUl = item; + }); + if (nolower) { + legendData.push({ + name: `${upper[0].metric_type} ${getOppositeOperator(latestUl['operator'])} ${latestUl['threshold']}`, + value: normalColor + }); + } + return latestUl; +} + +function buildLowerLegendData(legendData, lower, latestUl) { + lower.map((item, index) => { + let name = ''; + if (!latestUl['threshold']) { + name = `${item.metric_type} ${getOppositeOperator(item.operator)} ${item.threshold}`; + } else { + name = `${item.threshold} ${getLeftOperator(item.operator)} ${item. + metric_type} ${getRightOperator(latestUl['operator'])} ${latestUl['threshold']}`; + } + legendData.push({ + name, + value: index === 0 ? normalColor : latestUl.color + }); + latestUl = item; + }); + legendData.push({ + name: `${lower[0].metric_type} ${latestUl['operator']} ${latestUl['threshold']}`, + value: latestUl['color'] + }); + return {}; +} + +function buildSingleMarkLine(lineChartSeries, metricData, ul) { + ul.map((item) => { + const lineData = { + name: `${item.operator} ${item.threshold}`, + series: [] + }; + metricData.map((data) => { + lineData.series.push({ + name: data.name, + value: item.threshold, + }); + }); + lineChartSeries.push(lineData); + }); } function getColor(trigger, value) { - if (!isNaN(value)) { + let color = normalColor; + if (!Number.isNaN(value)) { for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { if (trigger.upper[i].operator === '>=' && value >= trigger.upper[i].threshold) { - return trigger.upper[i].color; + color = trigger.upper[i].color; + break; } if (trigger.upper[i].operator === '>' && value > trigger.upper[i].threshold) { - return trigger.upper[i].color; + color = trigger.upper[i].color; + break; } } for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { const index = trigger.lower.length - 1 - i; if (trigger.lower[index].operator === '<=' && value <= trigger.lower[index].threshold) { - return trigger.lower[index].color; + color = trigger.lower[index].color; + break; } if (trigger.lower[index].operator === '<' && value < trigger.lower[index].threshold) { - return trigger.lower[index].color; + color = trigger.lower[index].color; + break; } } } - return normalColor; + return color; } function getMetricBasicInfo(metricName, source, trigger) { const map = {}; let interval = metricMap[metricName]['interval']; - let maxCount = 0; - const preTimestampMap = {}; - let maxIndex = -1; + let maxCount = 1, preTimestamp = 0; let maxValue = -1; + let unit = metricMap[metricName]['unit_internal']; + map[interval] = 1; for (let i = 0; i < source.length; i++) { - maxValue = parseInt(source[i].value, 10) > maxValue ? parseInt(source[i].value, 10) : maxValue; + maxValue = Number(source[i].value) > maxValue ? Number(source[i].value) : maxValue; const thisTimestamp = Math.round(parseInt(source[i].timestamp, 10) / S2NS); - const thisIndex = source[i].instance_index ? source[i].instance_index : 0; - if (preTimestampMap[thisIndex] === undefined) { - if (thisIndex > maxIndex) { - maxIndex = thisIndex; - } - preTimestampMap[thisIndex] = thisTimestamp; + const currentInterval = thisTimestamp - preTimestamp; + if (map[currentInterval] === undefined) { + map[currentInterval] = 1; } else { - const currentInterval = thisTimestamp - preTimestampMap[thisIndex]; - if (map[currentInterval] === undefined) { - map[currentInterval] = 1; - } else { - map[currentInterval]++; - } - if (map[currentInterval] > maxCount) { - interval = currentInterval; - maxCount = map[currentInterval]; - } - preTimestampMap[thisIndex] = thisTimestamp; + map[currentInterval]++; } + if (map[currentInterval] > maxCount) { + interval = currentInterval; + maxCount = map[currentInterval]; + } + preTimestamp = thisTimestamp; + unit = source[i].unit === '' ? unit : source[i].unit; } return { interval: interval, - maxIndex: maxIndex, - unit: source[0].unit, - maxValue: maxValue, + unit: unit, chartMaxValue: getChartMax(trigger, maxValue) }; } function getChartMax(trigger, maxValue) { - let upperThresholdCount = 0; - let lowerThresholdCount = 0; - let maxThreshold = 0; + let thresholdCount = 0, maxThreshold = 0, thresholdmax = 0; if (trigger.upper && trigger.upper.length > 0) { - upperThresholdCount = trigger.upper.length; + thresholdCount += trigger.upper.length; maxThreshold = trigger.upper[0].threshold; } if (trigger.lower && trigger.lower.length > 0) { - lowerThresholdCount = trigger.lower.length; + thresholdCount += trigger.lower.length; maxThreshold = trigger.lower[0].threshold > maxThreshold ? trigger.lower[0].threshold : maxThreshold; } - let thresholdmax = 0; if (maxThreshold > 0) { - const thresholdCount = upperThresholdCount + lowerThresholdCount; thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); } thresholdmax = maxValue > thresholdmax ? maxValue : thresholdmax; diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index caaf21305a..18dec0a0f1 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -28,6 +28,8 @@ import { EditApplicationComponent } from './edit-application/edit-application.co import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; import { AutoscalerMetricChartPageComponent } from './autoscaler-metric-chart-page/autoscaler-metric-chart-page.component'; import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; +import { ComboChartComponent } from './autoscaler-metric-chart-page/combo-chart/combo-chart.component'; +import { ComboSeriesVerticalComponent } from './autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { AddRoutesComponent } from './routes/add-routes/add-routes.component'; import { MapRoutesComponent } from './routes/map-routes/map-routes.component'; @@ -63,6 +65,8 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new EditAutoscalerPolicyComponent, AutoscalerMetricChartPageComponent, AutoscalerScaleHistoryPageComponent, + ComboChartComponent, + ComboSeriesVerticalComponent, InstancesTabComponent, AddRoutesComponent, GitSCMTabComponent, diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html index 5830008ec9..68f5a6f6f6 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list.component.html @@ -16,7 +16,8 @@
+ (metricsAction)="config.getDataSource().updateMetricsAction($event)" + [times]="config.times" [selectedTimeValue]="config.selectedTimeValue">
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts index 118c13d341..85d6f94ff7 100644 --- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts +++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs'; import { EntityMonitor } from '../../monitors/entity-monitor'; import { EntityMonitorFactory } from '../../monitors/entity-monitor.factory.service'; import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service'; -import { MetricQueryType } from '../../services/metrics-range-selector.types'; +import { MetricQueryType, ITimeRange } from '../../services/metrics-range-selector.types'; import { IMetrics } from '../../../../../store/src/types/base-metric.types'; import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'; import { metricSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; @@ -60,6 +60,19 @@ export class MetricsRangeSelectorComponent implements OnDestroy { this.rangeSelectorManager.init(this.metricsMonitor, action); } + @Input() + set times(customTimes: ITimeRange[]) { + if (customTimes && customTimes.length > 0) { + this.rangeSelectorManager.times = customTimes; + this.rangeSelectorManager.metricRangeService.times = customTimes; + } + } + + @Input() + set selectedTimeValue(timeValue: string) { + this.rangeSelectorManager.metricRangeService.defaultTimeValue = timeValue; + } + get baseAction() { return this.baseActionValue; } diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts index 5082f41bbf..f96c98363e 100644 --- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts +++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts @@ -9,6 +9,7 @@ export class MetricsRangeSelectorService { constructor() { } + public defaultTimeValue: string; public times: ITimeRange[] = [ { value: '5:minute', @@ -87,7 +88,11 @@ export class MetricsRangeSelectorService { } private getDefaultTimeRange(times = this.times) { - return times.find(time => time.value === '1:hour') || this.times[0]; + if (this.defaultTimeValue) { + return times.find(time => time.value === this.defaultTimeValue) || this.times[0]; + } else { + return times.find(time => time.value === '1:hour') || this.times[0]; + } } } diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss index 595b69730e..41aea0a3b6 100644 --- a/src/frontend/packages/core/src/styles.scss +++ b/src/frontend/packages/core/src/styles.scss @@ -73,13 +73,31 @@ button.mat-simple-snackbar-action { header { display: none; } + li { + display: inline-block; + } + .legend-wrap { + width: unset; + .legend-labels { + width: unset; + } + } +} + +.autoscaler-chart-bar-legend { + .ngx-charts { + display: none; + } + // header { + // display: none; + // } + // li { + // display: inline-block; + // } .legend-wrap { width: unset; .legend-labels { - width:unset; - li { - display: inline-block; - } + width: unset; } } -} \ No newline at end of file +} diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts index 4175f69173..7460e01676 100644 --- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts +++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts @@ -1,5 +1,5 @@ export const resultPerPageParam = 'results-per-page'; -export const resultPerPageParamDefault = 5; +export const resultPerPageParamDefault = 9; From 10b79e924f5a38e2505addcfebd948eb730c614b Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 6 Mar 2019 20:15:53 +0800 Subject: [PATCH 08/98] [autoscaler]reconstruct upon Monorepo - Phase 1 --- ...autoscaler-scale-history-page.component.ts | 52 ------------------- .../applications/application.service.ts | 4 +- .../autoscaler-tab.component.html | 0 .../autoscaler-tab.component.scss | 0 .../autoscaler-tab.component.spec.ts | 0 .../autoscaler-tab.component.ts | 18 +++---- .../tabs/events-tab/events-tab.component.scss | 2 +- ...utoscaler-metric-chart-page.component.html | 15 ------ ...utoscaler-metric-chart-page.component.scss | 12 ++--- .../autoscaler-metric-chart-page.component.ts | 49 +++++------------ .../combo-chart/combo-chart.component.scss | 14 ++--- .../combo-chart/combo-chart.component.ts | 0 .../combo-series-vertical.component.ts | 0 .../combo-chart/index.ts | 0 ...toscaler-scale-history-page.component.html | 0 ...toscaler-scale-history-page.component.scss | 2 +- ...autoscaler-scale-history-page.component.ts | 25 +++++++++ .../edit-autoscaler-policy.component.html | 0 .../edit-autoscaler-policy.component.scss | 0 .../edit-autoscaler-policy.component.ts | 20 +++---- .../card-autoscaler-default.component.html | 0 .../card-autoscaler-default.component.scss | 0 .../card-autoscaler-default.component.spec.ts | 0 .../card-autoscaler-default.component.ts | 12 ++--- ...p-autoscaler-events-config.service.spec.ts | 12 ++--- ...cf-app-autoscaler-events-config.service.ts | 4 +- .../cf-app-autoscaler-events-data-source.ts | 22 ++++---- ...cell-autoscaler-event-action-label.pipe.ts | 0 ...ell-autoscaler-event-action.component.html | 0 ...ell-autoscaler-event-action.component.scss | 0 ...-cell-autoscaler-event-action.component.ts | 0 ...-cell-autoscaler-event-change-icon.pipe.ts | 0 ...ell-autoscaler-event-change.component.html | 0 ...ell-autoscaler-event-change.component.scss | 0 ...-cell-autoscaler-event-change.component.ts | 0 ...cell-autoscaler-event-error.component.html | 0 ...cell-autoscaler-event-error.component.scss | 0 ...e-cell-autoscaler-event-error.component.ts | 0 ...-cell-autoscaler-event-status-icon.pipe.ts | 0 ...ell-autoscaler-event-status.component.html | 0 ...ell-autoscaler-event-status.component.scss | 0 ...-autoscaler-event-status.component.spec.ts | 0 ...-cell-autoscaler-event-status.component.ts | 0 ...-autoscaler-event-timestamp.component.html | 0 ...-autoscaler-event-timestamp.component.scss | 0 ...toscaler-event-timestamp.component.spec.ts | 0 ...ll-autoscaler-event-timestamp.component.ts | 0 ...-cell-autoscaler-event-type.component.html | 0 ...-cell-autoscaler-event-type.component.scss | 0 ...ll-autoscaler-event-type.component.spec.ts | 0 ...le-cell-autoscaler-event-type.component.ts | 0 .../application-service-helper.ts | 2 +- .../src}/actions/app-autoscaler.actions.ts | 0 .../store/src}/effects/autoscaler.effects.ts | 6 +-- .../src}/helpers/autoscaler-helpers.spec.ts | 0 .../store/src}/helpers/autoscaler-helpers.ts | 12 ++--- .../store/src}/types/app-autoscaler.types.ts | 0 57 files changed, 107 insertions(+), 176 deletions(-) delete mode 100644 src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts rename src/frontend/{app => packages/core/src}/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html (100%) rename src/frontend/{app => packages/core/src}/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss (100%) rename src/frontend/{app => packages/core/src}/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts (100%) rename src/frontend/{app => packages/core/src}/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts (94%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html (89%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss (100%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts (81%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss (88%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts (100%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts (100%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts (100%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html (100%) rename src/frontend/{app => packages/core/src}/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss (92%) create mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts rename src/frontend/{app => packages/core/src}/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html (100%) rename src/frontend/{app => packages/core/src}/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss (100%) rename src/frontend/{app => packages/core/src}/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts (90%) rename src/frontend/{app => packages/core/src}/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts (89%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts (82%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts (96%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts (70%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts (100%) rename src/frontend/{app => packages/core/src}/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts (100%) rename src/frontend/{app/store => packages/store/src}/actions/app-autoscaler.actions.ts (100%) rename src/frontend/{app/store => packages/store/src}/effects/autoscaler.effects.ts (98%) rename src/frontend/{app/store => packages/store/src}/helpers/autoscaler-helpers.spec.ts (100%) rename src/frontend/{app/store => packages/store/src}/helpers/autoscaler-helpers.ts (98%) rename src/frontend/{app/store => packages/store/src}/types/app-autoscaler.types.ts (100%) diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts deleted file mode 100644 index 4cdd1ee201..0000000000 --- a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Component, OnDestroy, OnInit, HostBinding } from '@angular/core'; -import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, Subscription } from 'rxjs'; -import { filter, map, take } from 'rxjs/operators'; -import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; -import { AppState } from '../../../store/app-state'; -import { ApplicationService } from '../application.service'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { - entityFactory, - appAutoscalerPolicySchemaKey, -} from '../../../store/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; -import { - GetAppAutoscalerAppMetricAction, -} from '../../../store/actions/app-autoscaler.actions'; -import { - AppAutoscalerAppMetric, -} from '../../../store/types/app-autoscaler.types'; -import { - appAutoscalerAppMetricSchemaKey, -} from '../../../store/helpers/entity-factory'; -import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { normalColor } from '../../../store/helpers/autoscaler-helpers'; -import { - CfAppAutoscalerEventsConfigService, -} from '../../../shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; -import { ListConfig } from '../../../shared/components/list/list.component.types'; - -@Component({ - selector: 'app-autoscaler-scale-history-page', - templateUrl: './autoscaler-scale-history-page.component.html', - styleUrls: ['./autoscaler-scale-history-page.component.scss'], - providers: [{ - provide: ListConfig, - useClass: CfAppAutoscalerEventsConfigService, - }] -}) -export class AutoscalerScaleHistoryPageComponent { - - parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; - - constructor( - public applicationService: ApplicationService, - ) { - } -} diff --git a/src/frontend/packages/core/src/features/applications/application.service.ts b/src/frontend/packages/core/src/features/applications/application.service.ts index f34be06934..dcc78f03b9 100644 --- a/src/frontend/packages/core/src/features/applications/application.service.ts +++ b/src/frontend/packages/core/src/features/applications/application.service.ts @@ -15,8 +15,8 @@ import { } from '../../../../store/src/actions/application.actions'; import { GetSpace } from '../../../../store/src/actions/space.actions'; import { AppState } from '../../../../store/src/app-state'; -import { GetAppAutoscalerHealthAction } from '../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerHealth } from '../../store/types/app-autoscaler.types'; +import { GetAppAutoscalerHealthAction } from '../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerHealth } from '../../../../store/src/types/app-autoscaler.types'; import { appEnvVarsSchemaKey, diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html similarity index 100% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html rename to src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss similarity index 100% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss rename to src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts similarity index 100% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts rename to src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts diff --git a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts similarity index 94% rename from src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts rename to src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index aac292954f..7813b11312 100644 --- a/src/frontend/app/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -8,7 +8,7 @@ import { appAutoscalerScalingHistorySchemaKey, appAutoscalerAppMetricSchemaKey, appAutoscalerInsMetricSchemaKey, -} from '../../../../../../store/helpers/entity-factory'; +} from '../../../../../../../../store/src/helpers/entity-factory'; import { ApplicationService } from '../../../../application.service'; import { GetAppAutoscalerPolicyAction, @@ -17,21 +17,21 @@ import { GetAppAutoscalerInsMetricAction, UpdateAppAutoscalerPolicyAction, DetachAppAutoscalerPolicyAction, -} from '../../../../../../store/actions/app-autoscaler.actions'; +} from '../../../../../../../../store/src/actions/app-autoscaler.actions'; import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, AppAutoscalerAppMetric, AppAutoscalerInsMetric -} from '../../../../../../store/types/app-autoscaler.types'; +} from '../../../../../../../../store/src/types/app-autoscaler.types'; import { map, filter, distinctUntilChanged, first } from 'rxjs/operators'; -import { getPaginationObservables } from '../../../../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +import { getPaginationObservables } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../store/app-state'; +import { AppState } from '../../../../../../../../store/src/app-state'; import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { ActionState } from '../../../../../../store/reducers/api-request-reducer/types'; -import { selectUpdateInfo } from '../../../../../../store/selectors/api.selectors'; +import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types'; +import { selectUpdateInfo } from '../../../../../../../../store/src/selectors/api.selectors'; import { ConfirmationDialogConfig } from '../../../../../../shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; import { ListConfig } from '../../../../../../shared/components/list/list.component.types'; @@ -41,8 +41,8 @@ import { CfAppRoutesListConfigService, } from '../../../../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service'; import { CfOrgSpaceDataService } from '../../../../../../shared/data-services/cf-org-space-service.service'; -import { RouterNav } from '../../../../../../store/actions/router.actions'; -import { MetricTypes } from '../../../../../../store/helpers/autoscaler-helpers'; +import { RouterNav } from '../../../../../../../../store/src/actions/router.actions'; +import { MetricTypes } from '../../../../../../../../store/src/helpers/autoscaler-helpers'; @Component({ selector: 'app-autoscaler-tab', diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss index b7248b408e..6cca554326 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss @@ -4,7 +4,7 @@ flex-grow: 1; } - .cdk-column-actor_name { + .cdk-column-actor-name { align-items: center; display: flex; flex-basis: 100px; diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html similarity index 89% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html index 7a2fec70c5..9df0e64401 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html @@ -8,21 +8,6 @@

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.
- - - - - - Select time range: - - - - - - - - - diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss similarity index 100% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss index dfe34eb31b..51e0b54d27 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss @@ -29,30 +29,30 @@ app-tile-grid { .autoscaler-chart-gauge { display: inline-block; + height: 250px; margin-top: 1em; width: 20%; - height: 250px; } .autoscaler-chart-bar { display: inline-block; + height: 250px; margin-top: 1em; width: 80%; - height: 250px; } .autoscaler-chart-bar-combo { - width: 75%; - height: 250px; display: inline-block; + height: 250px; margin-top: 1em; + width: 75%; } .autoscaler-chart-bar-legend { - position: absolute; display: inline-block; - margin-top: 1em; margin-left: 1.75em; + margin-top: 1em; + position: absolute; } .autoscaler-metric-subtitle { diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts similarity index 81% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts index c30b68416f..4303a35e10 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts @@ -3,8 +3,8 @@ import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/materi import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { filter, map, take, tap } from 'rxjs/operators'; -import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; -import { AppState } from '../../../store/app-state'; +import { SetCFDetails, SetNewAppName } from '../../../../../store/src/actions/create-applications-page.actions'; +import { AppState } from '../../../../../store/src/app-state'; import { ApplicationService } from '../application.service'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { EntityService } from '../../../core/entity-service'; @@ -12,24 +12,23 @@ import { EntityServiceFactory } from '../../../core/entity-service-factory.servi import { entityFactory, appAutoscalerPolicySchemaKey, -} from '../../../store/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; +} from '../../../../../store/src/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction } from '../../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscaler.types'; import { GetAppAutoscalerAppMetricAction, -} from '../../../store/actions/app-autoscaler.actions'; +} from '../../../../../store/src/actions/app-autoscaler.actions'; import { AppAutoscalerAppMetric, -} from '../../../store/types/app-autoscaler.types'; +} from '../../../../../store/src/types/app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, -} from '../../../store/helpers/entity-factory'; -import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper'; +} from '../../../../../store/src/helpers/entity-factory'; +import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { normalColor, buildLegendData } from '../../../store/helpers/autoscaler-helpers'; -import { MetricsRangeSelectorComponent } from '../../../shared/components/metrics-range-selector/metrics-range-selector.component'; -import { MetricsAction } from '../../../store/actions/metrics.actions'; -import { ChartSeries, IMetrics, MetricResultTypes, MetricsFilterSeries } from './../../../store/types/base-metric.types'; +import { normalColor, buildLegendData } from '../../../../../store/src/helpers/autoscaler-helpers'; +import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'; +import { ChartSeries, MetricsFilterSeries } from './../../../../../store/src/types/base-metric.types'; export interface MetricsConfig { metricsAction: MetricsAction; @@ -62,11 +61,6 @@ function formatLabel(label: any): string { export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { @Input() public metricsConfig: MetricsConfig; - @ContentChild(MetricsRangeSelectorComponent) - public timeRangeSelector: MetricsRangeSelectorComponent; - - private timeSelectorSub: Subscription; - private committedAction: MetricsAction; parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; current = (new Date()).getTime(); @@ -139,7 +133,7 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( map(({ entity }) => { if (entity && entity.entity) { - const current = (new Date()).getTime() + const current = (new Date()).getTime(); if (this.refreshTime === 0 || current - this.refreshTime > 0.5 * this.refreshInterval) { this.refreshTime = current; this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); @@ -173,24 +167,7 @@ export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { }); } - ngAfterContentInit() { - if (this.timeRangeSelector) { - this.timeRangeSelector.baseAction = this.metricsConfig.metricsAction; - this.timeSelectorSub = this.timeRangeSelector.metricsAction.subscribe((action) => { - this.commitAction(action); - }); - } - } - - private commitAction(action: MetricsAction) { - this.committedAction = action; - this.store.dispatch(action); - } - ngOnDestroy(): void { - if (this.timeSelectorSub) { - this.timeSelectorSub.unsubscribe(); - } if (this.snackBarRef) { this.snackBarRef.dismiss(); } diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss similarity index 88% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss index 942345646a..8ab2dec933 100644 --- a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss @@ -14,7 +14,7 @@ .card { &.active, &:hover { - opacity: 0.8; + opacity: .8; transition: opacity 100ms ease-in-out; } @@ -33,8 +33,8 @@ .line-series-range, .area-series { &.inactive { + opacity: .2; transition: opacity 100ms ease-in-out; - opacity: .2 } } @@ -47,7 +47,7 @@ } .area { - opacity: 0.6; + opacity: .6; } .circle { @@ -62,13 +62,13 @@ } .tooltip-anchor { - fill: rgb(0,0,0); + fill: rgb(0, 0, 0); } .gridline-path { + fill: none; stroke: #ddd; stroke-width: 1; - fill: none; } .grid-panel { @@ -78,9 +78,9 @@ &.odd { rect { - fill: rgba(0,0,0,0.05); + fill: rgba(0, 0, 0, .05); } } } -} \ No newline at end of file +} diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts similarity index 100% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts similarity index 100% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts diff --git a/src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts similarity index 100% rename from src/frontend/app/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts rename to src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html similarity index 100% rename from src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html rename to src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html diff --git a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss similarity index 92% rename from src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss rename to src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss index b7248b408e..6cca554326 100644 --- a/src/frontend/app/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss +++ b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss @@ -4,7 +4,7 @@ flex-grow: 1; } - .cdk-column-actor_name { + .cdk-column-actor-name { align-items: center; display: flex; flex-basis: 100px; diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts new file mode 100644 index 0000000000..a12c836e86 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { ApplicationService } from '../application.service'; +import { + CfAppAutoscalerEventsConfigService, +} from '../../../shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; +import { ListConfig } from '../../../shared/components/list/list.component.types'; + +@Component({ + selector: 'app-autoscaler-scale-history-page', + templateUrl: './autoscaler-scale-history-page.component.html', + styleUrls: ['./autoscaler-scale-history-page.component.scss'], + providers: [{ + provide: ListConfig, + useClass: CfAppAutoscalerEventsConfigService, + }] +}) +export class AutoscalerScaleHistoryPageComponent { + + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + + constructor( + public applicationService: ApplicationService, + ) { + } +} diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html similarity index 100% rename from src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html rename to src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss similarity index 100% rename from src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss rename to src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss diff --git a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts similarity index 90% rename from src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts rename to src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 7c013dc51c..b2848391a1 100644 --- a/src/frontend/app/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -7,9 +7,9 @@ import { Observable, of as observableOf, Subscription } from 'rxjs'; import { filter, map, take, first } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; -import { AppMetadataTypes } from '../../../store/actions/app-metadata.actions'; -import { SetCFDetails, SetNewAppName } from '../../../store/actions/create-applications-page.actions'; -import { AppState } from '../../../store/app-state'; +import { AppMetadataTypes } from '../../../../../store/src/actions/app-metadata.actions'; +import { SetCFDetails, SetNewAppName } from '../../../../../store/src/actions/create-applications-page.actions'; +import { AppState } from '../../../../../store/src/app-state'; import { AppNameUniqueChecking, AppNameUniqueDirective } from '../app-name-unique.directive/app-name-unique.directive'; import { ApplicationService } from '../application.service'; @@ -19,13 +19,13 @@ import { EntityServiceFactory } from '../../../core/entity-service-factory.servi import { entityFactory, appAutoscalerPolicySchemaKey, -} from '../../../store/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../store/types/app-autoscaler.types'; -import { selectUpdateInfo } from '../../../store/selectors/api.selectors'; -import { ActionState } from '../../../store/reducers/api-request-reducer/types'; -import { SourceType } from '../../../store/types/deploy-application.types'; -import { MetricTypes, UpperOperators, LowerOperators } from '../../../store/helpers/autoscaler-helpers'; +} from '../../../../../store/src/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscaler.types'; +import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; +import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; +import { SourceType } from '../../../../../store/src/types/deploy-application.types'; +import { MetricTypes, UpperOperators, LowerOperators } from '../../../../../store/src/helpers/autoscaler-helpers'; @Component({ selector: 'app-edit-autoscaler-policy', diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html similarity index 100% rename from src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html rename to src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss similarity index 100% rename from src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss rename to src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts similarity index 100% rename from src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts rename to src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts diff --git a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts similarity index 89% rename from src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts rename to src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts index 0704148589..51ea3ff1ad 100644 --- a/src/frontend/app/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co import { Observable } from 'rxjs'; import { map, first, filter } from 'rxjs/operators'; import { Store } from '@ngrx/store'; -import { AppState } from '../../../../store/app-state'; +import { AppState } from '../../../../../../store/src/app-state'; import { ApplicationService } from '../../../../features/applications/application.service'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { EntityService } from '../../../../core/entity-service'; @@ -10,11 +10,11 @@ import { EntityServiceFactory } from '../../../../core/entity-service-factory.se import { entityFactory, appAutoscalerPolicySchemaKey, -} from '../../../../store/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../store/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../store/types/app-autoscaler.types'; -import { selectUpdateInfo } from '../../../../store/selectors/api.selectors'; -import { ActionState } from '../../../../store/reducers/api-request-reducer/types'; +} from '../../../../../../store/src/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; +import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors'; +import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; import { CardStatus } from '../../../shared.types'; @Component({ diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts similarity index 82% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index ef4fac690e..971a788228 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -5,12 +5,12 @@ 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/actions/application.actions'; -import { applicationSchemaKey, entityFactory } from '../../../../../store/helpers/entity-factory'; -import { endpointStoreNames } from '../../../../../store/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 { 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 { SharedModule } from '../../../../shared.module'; import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts similarity index 96% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 7df7eba83c..5bb9515e8f 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; import { ApplicationService } from '../../../../../features/applications/application.service'; -import { AppState } from '../../../../../store/app-state'; -import { EntityInfo } from '../../../../../store/types/api.types'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { EntityInfo } from '../../../../../../../store/src/types/api.types'; import { ITableColumn } from '../../list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts similarity index 70% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 60bee81057..36d8e7070c 100644 --- a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -1,12 +1,12 @@ import { Store } from '@ngrx/store'; -import { GetAppAutoscalerScalingHistoryAction } from '../../../../../store/actions/app-autoscaler.actions'; -import { AddParams, RemoveParams } from '../../../../../store/actions/pagination.actions'; -import { AppState } from '../../../../../store/app-state'; -import { EntityInfo } from '../../../../../store/types/api.types'; -import { PaginationEntityState, QParam } from '../../../../../store/types/pagination.types'; +import { GetAppAutoscalerScalingHistoryAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; +import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pagination.actions'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { PaginationEntityState, QParam } from '../../../../../../../store/src/types/pagination.types'; import { ListDataSource } from '../../data-sources-controllers/list-data-source'; -import { entityFactory } from '../../../../../store/helpers/entity-factory'; -import { appAutoscalerScalingHistorySchemaKey } from '../../../../../store/helpers/entity-factory'; +import { entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; +import { appAutoscalerScalingHistorySchemaKey } from '../../../../../../../store/src/helpers/entity-factory'; export class CfAppAutoscalerEventsDataSource extends ListDataSource { action: any; @@ -38,12 +38,11 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource _appGuid: string, ) { const paginationKey = `app-autoscaler-events:${_cfGuid}${_appGuid}`; - const aaction = new GetAppAutoscalerScalingHistoryAction(paginationKey, _appGuid, _cfGuid); - + const action = new GetAppAutoscalerScalingHistoryAction(paginationKey, _appGuid, _cfGuid); super( { store, - action: aaction, + action, schema: entityFactory(appAutoscalerScalingHistorySchemaKey), getRowUniqueId: (object: EntityInfo) => { return object.entity.metadata ? object.entity.metadata.guid : null; @@ -51,8 +50,5 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource paginationKey, } ); - - this.action = aaction; } - } diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts diff --git a/src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts similarity index 100% rename from src/frontend/app/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts index e2ab5a37b4..b796d2798e 100644 --- a/src/frontend/packages/core/test-framework/application-service-helper.ts +++ b/src/frontend/packages/core/test-framework/application-service-helper.ts @@ -13,7 +13,7 @@ import { AppState } from '../../store/src/app-state'; import { EntityServiceFactory } from '../src/core/entity-service-factory.service'; import { PaginationMonitorFactory } from '../src/shared/monitors/pagination-monitor.factory'; import { Observable, of as observableOf } from 'rxjs'; -import { AppAutoscalerPolicy, AppAutoscalerHealth } from '../store/types/app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerHealth } from '../../store/src/types/app-autoscaler.types' function createEntity(entity: T): APIResource { return { diff --git a/src/frontend/app/store/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts similarity index 100% rename from src/frontend/app/store/actions/app-autoscaler.actions.ts rename to src/frontend/packages/store/src/actions/app-autoscaler.actions.ts diff --git a/src/frontend/app/store/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts similarity index 98% rename from src/frontend/app/store/effects/autoscaler.effects.ts rename to src/frontend/packages/store/src/effects/autoscaler.effects.ts index c4934e4b16..38f239e8c2 100644 --- a/src/frontend/app/store/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { Actions, Effect } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; -import { LoggerService } from '../../core/logger.service'; +import { LoggerService } from '../../../core/src/core/logger.service'; import { GetAppAutoscalerPolicyAction, GetAppAutoscalerHealthAction, @@ -25,7 +25,7 @@ import { WrapperRequestActionSuccess, } from '../types/request.types'; import { AppState } from '../app-state'; -import { environment } from '../../../environments/environment'; +import { environment } from '../../../core/src/environments/environment.prod'; import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angular/http'; import { PaginatedAction } from './../types/pagination.types'; import { @@ -139,7 +139,7 @@ export class AutoscalerEffects { return this.http .request(new Request(options)).pipe( mergeMap(response => { - const policyInfo = autoscalerTransformArrayToMap(response.json(), undefined); + const policyInfo = autoscalerTransformArrayToMap(response.json()); const mappedData = { entities: { [action.entityKey]: {} }, result: [] diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.spec.ts b/src/frontend/packages/store/src/helpers/autoscaler-helpers.spec.ts similarity index 100% rename from src/frontend/app/store/helpers/autoscaler-helpers.spec.ts rename to src/frontend/packages/store/src/helpers/autoscaler-helpers.spec.ts diff --git a/src/frontend/app/store/helpers/autoscaler-helpers.ts b/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts similarity index 98% rename from src/frontend/app/store/helpers/autoscaler-helpers.ts rename to src/frontend/packages/store/src/helpers/autoscaler-helpers.ts index 08c0fe4f64..f50f6653ed 100644 --- a/src/frontend/app/store/helpers/autoscaler-helpers.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts @@ -1,5 +1,5 @@ -// import * as moment from 'moment'; -import moment from 'moment-timezone'; +import * as moment from 'moment'; +// import moment from 'moment-timezone'; export const PolicyDefaultSetting = { breach_duration_secs_default: 120, @@ -34,10 +34,10 @@ export const metricMap = { export const S2NS = 1000000000; -export function autoscalerTransformArrayToMap(newPolicy, timezone) { - if (timezone === undefined || timezone === '') { - timezone = moment.tz.guess(); - } +export function autoscalerTransformArrayToMap(newPolicy, timezone?) { + // if (timezone) { + // timezone = moment.tz.guess(); + // } newPolicy.enabled = true; newPolicy.scaling_rules_map = {}; newPolicy.scaling_rules_form = []; diff --git a/src/frontend/app/store/types/app-autoscaler.types.ts b/src/frontend/packages/store/src/types/app-autoscaler.types.ts similarity index 100% rename from src/frontend/app/store/types/app-autoscaler.types.ts rename to src/frontend/packages/store/src/types/app-autoscaler.types.ts From da9e52b81dd26858a894cae31c8714acea56e337 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Mon, 11 Mar 2019 19:22:35 +0800 Subject: [PATCH 09/98] [autoscaler]add filter and auto-refresh for event and metric --- .../autoscaler-tab.component.ts | 7 +- .../applications/applications.module.ts | 8 +- .../applications/applications.routing.ts | 6 +- ...utoscaler-metric-chart-page.component.html | 77 ----- .../autoscaler-metric-chart-page.component.ts | 285 ------------------ .../autoscaler-metric-page.component.html | 13 + .../autoscaler-metric-page.component.scss | 5 + .../autoscaler-metric-page.component.spec.ts | 41 +++ .../autoscaler-metric-page.component.ts | 30 ++ .../list/list-cards/card/card.component.ts | 16 + ...ell-autoscaler-event-change.component.html | 2 +- ...p-autoscaler-metric-card.component.spec.ts | 68 +++++ ...utoscaler-metric-chart-card.component.html | 62 ++++ ...toscaler-metric-chart-card.component.scss} | 17 +- ...-autoscaler-metric-chart-card.component.ts | 133 ++++++++ .../combo-chart/combo-chart.component.scss | 0 .../combo-chart/combo-chart.component.ts | 9 +- .../combo-series-vertical.component.ts | 2 +- .../combo-chart/index.ts | 0 ...app-autoscaler-metric-chart-data-source.ts | 53 ++++ ...r-metric-chart-list-config.service.spec.ts | 27 ++ ...scaler-metric-chart-list-config.service.ts | 73 +++++ src/frontend/packages/core/src/styles.scss | 4 + .../src/actions/app-autoscaler.actions.ts | 25 ++ .../store/src/effects/autoscaler.effects.ts | 59 +++- .../store/src/helpers/autoscaler-helpers.ts | 10 +- 26 files changed, 642 insertions(+), 390 deletions(-) delete mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html delete mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts create mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.html create mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.scss create mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts create mode 100644 src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html rename src/frontend/packages/core/src/{features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss => shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss} (78%) create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts rename src/frontend/packages/core/src/{features/applications/autoscaler-metric-chart-page => shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card}/combo-chart/combo-chart.component.scss (100%) rename src/frontend/packages/core/src/{features/applications/autoscaler-metric-chart-page => shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card}/combo-chart/combo-chart.component.ts (98%) rename src/frontend/packages/core/src/{features/applications/autoscaler-metric-chart-page => shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card}/combo-chart/combo-series-vertical.component.ts (98%) rename src/frontend/packages/core/src/{features/applications/autoscaler-metric-chart-page => shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card}/combo-chart/index.ts (100%) create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index 7813b11312..b15df7c82a 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -380,11 +380,8 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { 'applications', this.applicationService.cfGuid, this.applicationService.appGuid, - 'app-autoscaler-metric-chart-page' - ], - query: { - // spaceGuid: app.app.entity.space_guid - } + 'app-autoscaler-metric-page' + ] })); } diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index 18dec0a0f1..27cc3cd2f6 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -26,10 +26,8 @@ import { VariablesTabComponent } from './application/application-tabs-base/tabs/ import { ApplicationsRoutingModule } from './applications.routing'; import { EditApplicationComponent } from './edit-application/edit-application.component'; import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { AutoscalerMetricChartPageComponent } from './autoscaler-metric-chart-page/autoscaler-metric-chart-page.component'; +import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; -import { ComboChartComponent } from './autoscaler-metric-chart-page/combo-chart/combo-chart.component'; -import { ComboSeriesVerticalComponent } from './autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { AddRoutesComponent } from './routes/add-routes/add-routes.component'; import { MapRoutesComponent } from './routes/map-routes/map-routes.component'; @@ -63,10 +61,8 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new SshApplicationComponent, EditApplicationComponent, EditAutoscalerPolicyComponent, - AutoscalerMetricChartPageComponent, + AutoscalerMetricPageComponent, AutoscalerScaleHistoryPageComponent, - ComboChartComponent, - ComboSeriesVerticalComponent, InstancesTabComponent, AddRoutesComponent, GitSCMTabComponent, diff --git a/src/frontend/packages/core/src/features/applications/applications.routing.ts b/src/frontend/packages/core/src/features/applications/applications.routing.ts index 9c8d3d139e..fe4aac715a 100644 --- a/src/frontend/packages/core/src/features/applications/applications.routing.ts +++ b/src/frontend/packages/core/src/features/applications/applications.routing.ts @@ -31,7 +31,7 @@ import { DeployApplicationComponent } from './deploy-application/deploy-applicat import { DeployApplicationModule } from './deploy-application/deploy-application.module'; import { EditApplicationComponent } from './edit-application/edit-application.component'; import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { AutoscalerMetricChartPageComponent } from './autoscaler-metric-chart-page/autoscaler-metric-chart-page.component'; +import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { SshApplicationComponent } from './ssh-application/ssh-application.component'; @@ -130,8 +130,8 @@ const applicationsRoutes: Routes = [ component: EditAutoscalerPolicyComponent, }, { - path: 'app-autoscaler-metric-chart-page', - component: AutoscalerMetricChartPageComponent, + path: 'app-autoscaler-metric-page', + component: AutoscalerMetricPageComponent, }, { path: 'app-autoscaler-scale-history-page', diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html deleted file mode 100644 index 9df0e64401..0000000000 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.html +++ /dev/null @@ -1,77 +0,0 @@ - -

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.entity.name }}

-
- -
- -
- - - - - - - {{metricName}}
-
- {{paramsMetrics['start-time'] / 1000000 | date:'medium'}} ~ - {{paramsMetrics['end-time'] / 1000000 | date:'medium'}} -
- - - - -
- - -
-
- -
- - -
-
- - -
-
- - - - - \ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts deleted file mode 100644 index 4303a35e10..0000000000 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.ts +++ /dev/null @@ -1,285 +0,0 @@ -import { Component, OnDestroy, OnInit, NgZone, ContentChild, Input } from '@angular/core'; -import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, Subscription } from 'rxjs'; -import { filter, map, take, tap } from 'rxjs/operators'; -import { SetCFDetails, SetNewAppName } from '../../../../../store/src/actions/create-applications-page.actions'; -import { AppState } from '../../../../../store/src/app-state'; -import { ApplicationService } from '../application.service'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { - entityFactory, - appAutoscalerPolicySchemaKey, -} from '../../../../../store/src/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction } from '../../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscaler.types'; -import { - GetAppAutoscalerAppMetricAction, -} from '../../../../../store/src/actions/app-autoscaler.actions'; -import { - AppAutoscalerAppMetric, -} from '../../../../../store/src/types/app-autoscaler.types'; -import { - appAutoscalerAppMetricSchemaKey, -} from '../../../../../store/src/helpers/entity-factory'; -import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { normalColor, buildLegendData } from '../../../../../store/src/helpers/autoscaler-helpers'; -import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'; -import { ChartSeries, MetricsFilterSeries } from './../../../../../store/src/types/base-metric.types'; - -export interface MetricsConfig { - metricsAction: MetricsAction; - getSeriesName: (T) => string; - mapSeriesItemName?: (value) => string | Date; - mapSeriesItemValue?: (value) => any; - filterSeries?: MetricsFilterSeries; - sort?: (a: ChartSeries, b: ChartSeries) => number; -} - -const monthName = new Intl.DateTimeFormat('en-us', { month: 'short' }); -const weekdayName = new Intl.DateTimeFormat('en-us', { weekday: 'short' }); -function formatLabel(label: any): string { - if (label instanceof Date) { - label = label.toLocaleDateString(); - } else { - label = label.toLocaleString(); - } - return label; -} - -@Component({ - selector: 'app-autoscaler-metric-chart-page', - templateUrl: './autoscaler-metric-chart-page.component.html', - styleUrls: ['./autoscaler-metric-chart-page.component.scss'], - providers: [ - { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } - ] -}) -export class AutoscalerMetricChartPageComponent implements OnInit, OnDestroy { - @Input() - public metricsConfig: MetricsConfig; - - parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; - current = (new Date()).getTime(); - paramsMetrics = { - 'start-time': this.current - 30 * 60 * 1000 + '000000', - 'end-time': this.current + '000000', - 'page': '1', - 'results-per-page': '10000000', - 'order': 'asc' - }; - - appAutoscalerAppMetrics = {}; - appAutoscalerAppMetricNames = []; - appAutoscalerAppMetricLegend = {}; - - comboBarScheme = { - name: 'singleLightBlue', - selectable: true, - group: 'Ordinal', - domain: ['#01579b'] - }; - lineChartScheme = { - name: 'coolthree', - selectable: true, - group: 'Ordinal', - domain: ['#01579b'] - }; - - constructor( - public applicationService: ApplicationService, - private store: Store, - private snackBar: MatSnackBar, - private entityServiceFactory: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory, - private ngZone: NgZone, - ) { - } - - private app: any = { - entity: {} - }; - - private sub: Subscription; - - appAutoscalerPolicyService: EntityService; - public appAutoscalerPolicy$: Observable; - private snackBarRef: MatSnackBarRef; - - entityServiceAppRefresh$: Subscription; - - private refreshTime = 0; - private refreshInterval = 60000; - private autoRefreshString = 'auto-refresh'; - - clearSub() { - if (this.sub) { - this.sub.unsubscribe(); - this.sub = undefined; - } - } - - ngOnInit() { - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), - false - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - if (entity && entity.entity) { - const current = (new Date()).getTime(); - if (this.refreshTime === 0 || current - this.refreshTime > 0.5 * this.refreshInterval) { - this.refreshTime = current; - this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.loadLatestMetricsUponPolicy(entity); - } - } - return entity && entity.entity; - }) - ); - this.ngZone.runOutsideAngular(() => { - this.entityServiceAppRefresh$ = this.appAutoscalerPolicyService - .poll(this.refreshInterval, this.autoRefreshString).pipe( - tap(() => { })) - .subscribe(); - }); - - this.sub = this.applicationService.application$.pipe( - filter(app => !!app.app.entity), - take(1), - map(app => app.app.entity) - ).subscribe(app => { - this.app = app; - this.store.dispatch(new SetCFDetails({ - cloudFoundry: this.applicationService.cfGuid, - org: '', - space: this.app.space_guid, - })); - this.store.dispatch(new SetNewAppName(this.app.name)); - // Don't want the values to change while the user is editing - this.clearSub(); - }); - } - - ngOnDestroy(): void { - if (this.snackBarRef) { - this.snackBarRef.dismiss(); - } - this.clearSub(); - } - - select(data) { - } - - getAppMetric(metricName: string, trigger: any, params: any) { - const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, - this.applicationService.cfGuid, metricName, false, trigger, params); - this.store.dispatch(action); - return getPaginationObservables({ - store: this.store, - action, - paginationMonitor: this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(appAutoscalerAppMetricSchemaKey) - ) - }, false).entities$; - } - - loadLatestMetricsUponPolicy(policyEntity) { - if (policyEntity && policyEntity.entity && policyEntity.entity.scaling_rules_map) { - this.appAutoscalerAppMetrics = {}; - Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { - this.appAutoscalerAppMetricLegend[metricName] = this.getLegend2(policyEntity.entity.scaling_rules_map[metricName]); - this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); - }); - } - } - - pieTooltipText({ data }) { - const label = formatLabel(data.name); - const val = formatLabel(data.value); - return ` - ${label} - $${val} - `; - } - - getLegend2(trigger) { - const legendColor = buildLegendData(trigger); - const legendValue = []; - legendColor.map((item) => { - legendValue.push({ - name: item.name, - value: 1 - }); - }); - return { - legendValue, - legendColor - }; - } - - getLegend(trigger) { - const legendValue = []; - const legendColor = []; - if (trigger.upper) { - this.buildSingleLegend(legendValue, legendColor, trigger.upper); - } - legendValue.push({ - name: 'ideal state', - value: 1 - }); - legendColor.push({ - name: 'ideal state', - value: normalColor - }); - if (trigger.lower) { - this.buildSingleLegend(legendValue, legendColor, trigger.lower); - } - return { - legendValue, - legendColor - }; - } - - updateSingleLineChartScheme(colors, ul) { - ul.map((item) => { - colors.push(item.color); - }); - } - - buildSingleLegend(legendValue, legendColor, ul) { - for (let i = 0; i < ul.length; i++) { - const current = ul[i]; - const name = `${current.adjustment} if ${current.metric_type} ${current.operator} ${current.threshold}`; - legendValue.push({ - name, - value: 1 - }); - legendColor.push({ - name, - value: current.color - }); - } - } - - yLeftTickFormat(data) { - return `${data.toLocaleString()}`; - } - - yRightTickFormat(data) { - return `${data}%`; - } - - yLeftAxisScale(min, max) { - return { min: `${min}`, max: `${max}` }; - } - -} diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.html b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.html new file mode 100644 index 0000000000..121506aa48 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.html @@ -0,0 +1,13 @@ + +

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.entity.name }}

+
+ +
+ +
+
+ +
+
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.scss b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.scss new file mode 100644 index 0000000000..208b05bac8 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.scss @@ -0,0 +1,5 @@ +app-list { + flex: 1; +} + + diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts new file mode 100644 index 0000000000..d5fb3f1a04 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts @@ -0,0 +1,41 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../core/core.module'; +import { SharedModule } from '../../../shared/shared.module'; +import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; +import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component'; + +describe('AutoscalerMetricPageComponent', () => { + let component: AutoscalerMetricPageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AutoscalerMetricPageComponent], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + ], + providers: [ + DatePipe + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscalerMetricPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts new file mode 100644 index 0000000000..fe9e543323 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { ListConfig } from '../../../shared/components/list/list.component.types'; +import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service'; +import { ApplicationService } from '../application.service'; +import { + AppAutoscalerMetricChartListConfigService, +} from '../../../shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service'; + +@Component({ + selector: 'app-autoscaler-metric-page', + templateUrl: './autoscaler-metric-page.component.html', + styleUrls: ['./autoscaler-metric-page.component.scss'], + providers: [ + { + provide: ListConfig, + useClass: AppAutoscalerMetricChartListConfigService + } + ] +}) +export class AutoscalerMetricPageComponent { + + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + + constructor( + public applicationService: ApplicationService, + public cloudFoundryService: CloudFoundryService, + ) { + } + +} diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts index 2724511dab..65d6039009 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts @@ -23,6 +23,19 @@ import { } from '../../list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component'; import { CardCell } from '../../list.types'; import { CardDynamicComponent, CardMultiActionComponents } from '../card.component.types'; +import { + AppServiceBindingCardComponent +} from '../../list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component'; +import { ServiceInstanceCardComponent } from '../../list-types/services-wall/service-instance-card/service-instance-card.component'; +import { + AppAutoscalerMetricChartCardComponent +} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; +import { + AppAutoscalerComboChartComponent +} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component'; +import { + AppAutoscalerComboSeriesVerticalComponent +} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component'; export const listCards = [ @@ -37,6 +50,9 @@ export const listCards = [ ServiceInstanceCardComponent, UserProvidedServiceInstanceCardComponent, EndpointCardComponent + AppAutoscalerMetricChartCardComponent, + AppAutoscalerComboChartComponent, + AppAutoscalerComboSeriesVerticalComponent ]; export type CardTypes = Type> | CardMultiActionComponents | CardDynamicComponent; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html index 5ca8cea981..8216d3828c 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html @@ -1,4 +1,4 @@ -
+
{{row.entity.old_instances}} {{row.entity.new_instances-row.entity.old_instances | tableCellAutoscalerEventChangeIcon:'icon'}} diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts new file mode 100644 index 0000000000..aab6e5ee8c --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts @@ -0,0 +1,68 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { + ApplicationEnvVarsHelper, +} from '../../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; +import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper'; +import { BaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; +import { createBasicStoreModule } from '../../../../../../../test-framework/store-test-helper'; +import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service'; +import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory'; +import { ApplicationStateService } from '../../../../application-state/application-state.service'; +import { ConfirmationDialogService } from '../../../../confirmation-dialog.service'; +import { AppServiceBindingCardComponent } from './app-service-binding-card.component'; + +describe('AppServiceBindingCardComponent', () => { + let component: AppServiceBindingCardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + ...BaseTestModules, + createBasicStoreModule(), + ], + providers: [ + EntityMonitorFactory, + generateTestApplicationServiceProvider('1', '1'), + ApplicationEnvVarsHelper, + ApplicationStateService, + PaginationMonitorFactory, + ConfirmationDialogService, + DatePipe, + ServiceActionHelperService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AppServiceBindingCardComponent); + component = fixture.componentInstance; + component.row = { + entity: { + app_guid: '', + service_instance_guid: '', + credentials: {}, + binding_options: {}, + gateway_name: '', + volume_mounts: [], + app_url: '', + service_instance_url: '', + }, + metadata: { + guid: '', + created_at: '', + updated_at: '', + url: '' + } + }; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html new file mode 100644 index 0000000000..17d04ea5e7 --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -0,0 +1,62 @@ + + + + {{row.metadata.guid}}
+
+ {{paramsMetrics['start-time'] / 1000000 | date:'medium'}} ~ + {{paramsMetrics['end-time'] / 1000000 | date:'medium'}} +
+ + + + +
+ + +
+
+ +
+ + +
+
+ + +
+
+ + diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss similarity index 78% rename from src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index 51e0b54d27..4b78e94c43 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/autoscaler-metric-chart-page.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -1,3 +1,18 @@ +.app-service-card { + &__title { + align-content: center; + align-items: center; + display: flex; + flex-direction: row; + justify-content: space-between; + padding-right: 20px; + width: 100%; + } + &__env-link { + cursor: pointer; + } +} + app-tile-grid { width: 100%; } @@ -59,4 +74,4 @@ app-tile-grid { color: rgba(0, 0, 0, .54); font-size: .9em; margin-top: .3em; -} +} \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts new file mode 100644 index 0000000000..48736c7b85 --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -0,0 +1,133 @@ +import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material'; +import { IServiceBinding } from '../../../../../../core/cf-api-svc.types'; +import { ApplicationService } from '../../../../../../features/applications/application.service'; +import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service'; +import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component'; +import { CardCell, IListRowCell, IListRowCellData } from '../../../list.types'; +import { APIResource } from '../../../../../../../../store/src/types/api.types'; +import { + entityFactory, + appAutoscalerAppMetricSchemaKey +} from '../../../../../../../../store/src/helpers/entity-factory'; +import { + GetAppAutoscalerAppMetricAction, +} from '../../../../../../../../store/src/actions/app-autoscaler.actions'; +import { getPaginationObservables } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { AppState } from '../../../../../../../../store/src/app-state'; +import { Store } from '@ngrx/store'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { + AppAutoscalerAppMetric, +} from '../../../../../../../../store/src/types/app-autoscaler.types'; +import { buildLegendData } from '../../../../../../../../store/src/helpers/autoscaler-helpers'; + +interface EnvVarData { + key: string; + value: string; +} +@Component({ + selector: 'app-app-autoscaler-metric-chart-card', + templateUrl: './app-autoscaler-metric-chart-card.component.html', + styleUrls: ['./app-autoscaler-metric-chart-card.component.scss'] +}) +export class AppAutoscalerMetricChartCardComponent extends CardCell> implements OnInit, IListRowCell { + + listData: IListRowCellData[]; + envVarUrl: string; + + comboBarScheme = { + name: 'singleLightBlue', + selectable: true, + group: 'Ordinal', + domain: ['#01579b'] + }; + lineChartScheme = { + name: 'coolthree', + selectable: true, + group: 'Ordinal', + domain: ['#01579b'] + }; + + public current = (new Date()).getTime(); + public paramsMetrics = { + 'start-time': this.current - 30 * 60 * 1000 + '000000', + 'end-time': this.current + '000000', + 'page': '1', + 'results-per-page': '10000000', + 'order': 'asc' + }; + + constructor( + private dialog: MatDialog, + private appService: ApplicationService, + private serviceActionHelperService: ServiceActionHelperService, + private store: Store, + private paginationMonitorFactory: PaginationMonitorFactory, + ) { + super(); + } + + public metricData$; + public appAutoscalerAppMetricLegend; + + getLegend2(trigger) { + const legendColor = buildLegendData(trigger); + const legendValue = []; + legendColor.map((item) => { + legendValue.push({ + name: item.name, + value: 1 + }); + }); + return { + legendValue, + legendColor + }; + } + + ngOnInit(): void { + if (this.row.entity['query'] && this.row.entity['query']['params']) { + this.paramsMetrics['start-time'] = this.row.entity['query']['params']['start'] + '000000000'; + this.paramsMetrics['end-time'] = this.row.entity['query']['params']['end'] + '000000000'; + } + this.appAutoscalerAppMetricLegend = this.getLegend2(this.row.entity); + this.metricData$ = this.getAppMetric(this.row.metadata.guid, this.row.entity, this.paramsMetrics); + } + + showEnvVars = (envVarData: EnvVarData) => { + this.dialog.open(EnvVarViewComponent, { + data: envVarData, + disableClose: false + }); + } + + detach = () => { + this.serviceActionHelperService.detachServiceBinding( + [this.row], + this.row.entity.service_instance_guid, + this.appService.cfGuid + ); + } + + edit = () => this.serviceActionHelperService.editServiceBinding( + this.row.entity.service_instance_guid, + this.appService.cfGuid, + { 'appId': this.appService.appGuid } + ) + + getAppMetric(metricName: string, trigger: any, params: any) { + const action = new GetAppAutoscalerAppMetricAction(this.appService.appGuid, + this.appService.cfGuid, metricName, false, trigger, params); + this.store.dispatch(action); + return getPaginationObservables({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerAppMetricSchemaKey) + ) + }, false).entities$; + } + +} diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss similarity index 100% rename from src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.scss rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts similarity index 98% rename from src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts index 71d9fefef2..ba57e7d685 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-chart.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts @@ -135,7 +135,7 @@ import { scaleBand, scaleLinear, scalePoint, scaleTime } from 'd3-scale'; styleUrls: ['./combo-chart.component.scss'], encapsulation: ViewEncapsulation.None }) -export class ComboChartComponent extends BaseChartComponent { +export class AppAutoscalerComboChartComponent extends BaseChartComponent { @ViewChild(LineSeriesComponent) lineSeriesComponent: LineSeriesComponent; @@ -164,6 +164,7 @@ export class ComboChartComponent extends BaseChartComponent { @Input() rangeFillOpacity: number; @Input() animations = true; @Input() yScaleMax: number; + @Input() metricName: string; @Output() activate: EventEmitter = new EventEmitter(); @Output() deactivate: EventEmitter = new EventEmitter(); @@ -272,7 +273,11 @@ export class ComboChartComponent extends BaseChartComponent { } getSeriesDomain(): any[] { - this.combinedSeries = this.lineChart.slice(0); + this.combinedSeries = []; + this.combinedSeries.push({ + name: this.metricName, + series: this.results + }); return this.combinedSeries.map(d => d.name); } diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts similarity index 98% rename from src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts index 7c2aba3312..393b74ad99 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/combo-series-vertical.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts @@ -64,7 +64,7 @@ function formatLabel(label: any): string { ]) ] }) -export class ComboSeriesVerticalComponent implements OnChanges { +export class AppAutoscalerComboSeriesVerticalComponent implements OnChanges { @Input() dims; @Input() type = 'standard'; diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts similarity index 100% rename from src/frontend/packages/core/src/features/applications/autoscaler-metric-chart-page/combo-chart/index.ts rename to src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts new file mode 100644 index 0000000000..a0e306465b --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -0,0 +1,53 @@ +import { Store } from '@ngrx/store'; +import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pagination.actions'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { PaginationEntityState, QParam } from '../../../../../../../store/src/types/pagination.types'; +import { ListDataSource } from '../../data-sources-controllers/list-data-source'; +import { entityFactory, appAutoscalerPolicySchemaKey } from '../../../../../../../store/src/helpers/entity-factory'; +import { GetAppAutoscalerPolicyTriggerAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; + +export class AppAutoscalerMetricChartDataSource extends ListDataSource { + action: any; + + public getFilterFromParams(pag: PaginationEntityState) { + const qParams = pag.params.q; + if (qParams) { + const qParam = qParams.find((q: QParam) => { + return q.key === 'type'; + }); + return qParam ? qParam.value as string : ''; + } + } + public setFilterParam(filterString: string, pag: PaginationEntityState) { + if (filterString && filterString.length) { + this.store.dispatch(new AddParams(this.entityKey, this.paginationKey, { + q: [ + new QParam('type', filterString, ' IN '), + ] + })); + } else if (pag.params.q.find((q: QParam) => q.key === 'type')) { + this.store.dispatch(new RemoveParams(this.entityKey, this.paginationKey, [], ['type'])); + } + } + + constructor( + store: Store, + _cfGuid: string, + _appGuid: string, + ) { + const paginationKey = `app-autoscaler-policy-triggers:${_cfGuid}${_appGuid}`; + const action = new GetAppAutoscalerPolicyTriggerAction(paginationKey, _appGuid, _cfGuid); + super( + { + store, + action, + schema: entityFactory(appAutoscalerPolicySchemaKey), + getRowUniqueId: (object: EntityInfo) => { + return object.entity.metadata ? object.entity.metadata.guid : null; + }, + paginationKey, + } + ); + } +} diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts new file mode 100644 index 0000000000..4bcb83d53e --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts @@ -0,0 +1,27 @@ +import { inject, TestBed } from '@angular/core/testing'; + +import { + ApplicationEnvVarsHelper, +} from '../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; +import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper'; +import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; +import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service'; +import { DatePipe } from '@angular/common'; + +describe('AppAutoscalerMetricChartListConfigService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + AppAutoscalerMetricChartListConfigService, + generateTestApplicationServiceProvider('1', '1'), + ApplicationEnvVarsHelper, + DatePipe + ], + imports: [...BaseTestModules] + }); + }); + + it('should be created', inject([AppAutoscalerMetricChartListConfigService], (service: AppAutoscalerMetricChartListConfigService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts new file mode 100644 index 0000000000..2b837dfcd4 --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -0,0 +1,73 @@ +import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; +import { AppAutoscalerMetricChartDataSource } from './app-autoscaler-metric-chart-data-source'; +import { ListView } from '../../../../../../../store/src/actions/list.actions'; +import { Injectable } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { ApplicationService } from '../../../../../features/applications/application.service'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; +import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; +import { ITableColumn } from '../../list-table/table.types'; + +@Injectable() +export class AppAutoscalerMetricChartListConfigService extends ListConfig implements IListConfig { + autoscalerMetricSource: AppAutoscalerMetricChartDataSource; + cardComponent = AppAutoscalerMetricChartCardComponent; + viewType = ListViewTypes.CARD_ONLY; + defaultView = 'cards' as ListView; + columns: Array> = [ + { + columnId: 'name', + headerCell: () => 'Metric type', + cellDefinition: { + getValue: (row) => row['metadata']['guid'] + }, + cellFlex: '2' + } + ]; + text = { + title: null, + noEntries: 'There are no metrics defined in the policy' + }; + + showMetricsRange = true; + selectedTimeValue = '30:minute'; + times: ITimeRange[] = [ + { + value: '30:minute', + label: 'The past 30 minutes', + queryType: MetricQueryType.QUERY + }, + { + value: '1:hour', + label: 'The past 1 hour', + queryType: MetricQueryType.QUERY + }, + { + value: '2:hour', + label: 'The past 2 hours', + queryType: MetricQueryType.QUERY + }, + { + label: 'Custom time window', + queryType: MetricQueryType.RANGE_QUERY + } + ]; + + constructor(private store: Store, private appService: ApplicationService) { + super(); + this.autoscalerMetricSource = new AppAutoscalerMetricChartDataSource( + this.store, + this.appService.cfGuid, + this.appService.appGuid, + ); + } + + getGlobalActions = () => null; + getMultiActions = () => null; + getSingleActions = () => null; + getDataSource = () => this.autoscalerMetricSource; + getMultiFiltersConfigs = () => []; + getColumns = () => this.columns; +} diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss index 41aea0a3b6..d21bfb939c 100644 --- a/src/frontend/packages/core/src/styles.scss +++ b/src/frontend/packages/core/src/styles.scss @@ -101,3 +101,7 @@ button.mat-simple-snackbar-action { } } } + +.autoscaler-metric-page .cards__columns-3 app-card { + width: 100%; +} diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index ba6fc447a7..257ada5a7a 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -82,6 +82,31 @@ export class DetachAppAutoscalerPolicyAction implements IRequestAction { entityKey = appAutoscalerPolicySchemaKey; } +export class GetAppAutoscalerPolicyTriggerAction extends CFStartAction implements PaginatedAction { + constructor( + public paginationKey: string, + public appGuid: string, + public cfGuid: string, + public normalFormat?, + ) { + super(); + this.query = { + metric: 'policy' + }; + } + actions = [ + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY, + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_SUCCESS, + AppAutoscalerPolicyEvents.GET_APP_AUTOSCALER_POLICY_FAILED + ]; + type = APP_AUTOSCALER_POLICY; + entity = [entityFactory(appAutoscalerPolicySchemaKey)]; + entityKey = appAutoscalerPolicySchemaKey; + options: RequestOptions; + query: any; + windowValue: string; +} + export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements PaginatedAction { private static sortField = 'timestamp'; constructor( diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts index 38f239e8c2..390f21d6ed 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -6,6 +6,7 @@ import { LoggerService } from '../../../core/src/core/logger.service'; import { GetAppAutoscalerPolicyAction, GetAppAutoscalerHealthAction, + GetAppAutoscalerPolicyTriggerAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerMetricAction, UpdateAppAutoscalerPolicyAction, @@ -41,7 +42,7 @@ const { proxyAPIVersion, autoscalerAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; -export function createFailedAutoscalerRequestMessage(requestType, error) { +export function createAutoscalerRequestMessage(requestType, error) { return `Unable to ${requestType}: ${error.status} ${error._body}`; } @@ -83,7 +84,7 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch health info', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch health info', err), apiAction, actionType) ])); })); @@ -117,7 +118,7 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('update policy', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('update policy', err), apiAction, actionType) ])); })); @@ -156,7 +157,7 @@ export class AutoscalerEffects { ]; } else { return [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch policy', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), apiAction, actionType) ]; } })); @@ -191,7 +192,37 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('update policy', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('update policy', err), apiAction, actionType) + ])); + })); + + @Effect() + fetchAppAutoscalerPolicyTrigger$ = this.actions$ + .ofType(APP_AUTOSCALER_POLICY).pipe( + withLatestFrom(this.store), + mergeMap(([action, state]) => { + const actionType = 'fetch'; + const apiAction = action as ICFAction; + this.store.dispatch(new StartRequestAction(apiAction, actionType)); + const options = new RequestOptions(); + options.url = `${commonPrefix}/apps/${action.appGuid}/policy`; + options.method = 'get'; + options.headers = this.addHeaders(action.cfGuid); + return this.http + .request(new Request(options)).pipe( + mergeMap(response => { + const policyInfo = autoscalerTransformArrayToMap(response.json()); + const mappedData = { + entities: { [action.entityKey]: {} }, + result: [] + } as NormalizedResponse; + this.transformTriggerData(action.entityKey, mappedData, policyInfo, action.query); + return [ + new WrapperRequestActionSuccess(mappedData, apiAction, actionType, Object.keys(policyInfo.scaling_rules_map).length, 1) + ]; + }), + catchError(err => [ + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch scaling policy trigger', err), apiAction, actionType) ])); })); @@ -253,7 +284,7 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch scaling history', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch scaling history', err), apiAction, actionType) ])); })); @@ -289,7 +320,7 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createFailedAutoscalerRequestMessage('fetch metrics', err), apiAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch metrics', err), apiAction, actionType) ])); })); @@ -325,6 +356,20 @@ export class AutoscalerEffects { mappedData.result = Object.keys(mappedData.entities[key]); } + transformTriggerData(key: string, mappedData: NormalizedResponse, data: any, query: any) { + mappedData.entities[key] = []; + Object.keys(data.scaling_rules_map).map((metricType) => { + data.scaling_rules_map[metricType]['query'] = query + mappedData.entities[key][metricType] = { + entity: data.scaling_rules_map[metricType], + metadata: { + guid: metricType + } + }; + }); + mappedData.result = Object.keys(mappedData.entities[key]); + } + addHeaders(cfGuid: string) { const headers = new Headers(); headers.set('x-cap-api-host', 'autoscaler'); diff --git a/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts b/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts index f50f6653ed..a0dfc0b880 100644 --- a/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler-helpers.ts @@ -312,7 +312,7 @@ function buildMetricColorData(metricData, trigger) { function buildSingleColor(lineChartSeries, ul) { ul.map((item) => { const lineData = { - name: `${item.operator} ${item.threshold}`, + name: buildTriggerName(item), value: item.color }; lineChartSeries.push(lineData); @@ -426,10 +426,16 @@ function buildLowerLegendData(legendData, lower, latestUl) { return {}; } +function buildTriggerName(item) { + const type = LowerOperators.indexOf(item.operator) >= 0 ? 'lower' : 'upper'; + return `${type} threshold: ${item.operator} ${item.threshold}`; +} + function buildSingleMarkLine(lineChartSeries, metricData, ul) { ul.map((item) => { + const type = LowerOperators.indexOf(item.operator) ? 'lower' : 'upper'; const lineData = { - name: `${item.operator} ${item.threshold}`, + name: buildTriggerName(item), series: [] }; metricData.map((data) => { From 799c4b676e2f13bdc0307e739cf80989ddd1096a Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 19 Mar 2019 21:14:44 +0800 Subject: [PATCH 10/98] [autoscaler] update policy edit page --- package.json | 4 +- .../autoscaler-tab.component.ts | 8 +- .../edit-autoscaler-policy.component.html | 416 +++++++---- .../edit-autoscaler-policy.component.scss | 18 + .../edit-autoscaler-policy.component.ts | 671 ++++++++++++++++-- .../list/list-cards/card/card.component.ts | 2 +- ...cf-app-autoscaler-events-config.service.ts | 1 + ...scaler-metric-chart-list-config.service.ts | 1 + .../metrics-range-selector.component.ts | 5 + .../components/stepper/step/step.component.ts | 12 + .../stepper/steppers/steppers.component.html | 5 +- .../stepper/steppers/steppers.component.ts | 4 + .../metrics-range-selector-manager.service.ts | 4 +- src/frontend/packages/core/src/styles.scss | 11 + .../store/src/effects/autoscaler.effects.ts | 508 ++++++------- .../store/src/helpers/autoscaler-helpers.ts | 4 + 16 files changed, 1244 insertions(+), 430 deletions(-) diff --git a/package.json b/package.json index b850862c3d..eb9731cabb 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,10 @@ "hammerjs": "^2.0.8", "lodash-es": "^4.17.11", "marked": "^0.6.2", + "intersect": "^1.0.1", "moment": "^2.24.0", "moment-timezone": "^0.5.23", + "moment-range": "^4.0.2", "ngx-moment": "^3.3.0", "normalizr": "^3.2.3", "reselect": "^3.0.1", @@ -116,7 +118,7 @@ "karma-jasmine": "~2.0.1", "karma-jasmine-html-reporter": "^1.4.0", "karma-spec-reporter": "0.0.31", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mem": "4.0.0", "mktemp": "^0.4.0", "ng-packagr": "^4.7.1", diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index b15df7c82a..8b38d4567d 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -106,16 +106,16 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { paramsMetrics = { 'start-time': 0, 'end-time': (new Date()).getTime().toString() + '000000', - 'page': '1', + page: '1', 'results-per-page': '1', - 'order': 'desc' + order: 'desc' }; paramsHistory = { 'start-time': 0, 'end-time': (new Date()).getTime().toString() + '000000', - 'page': '1', + page: '1', 'results-per-page': '5', - 'order': 'desc' + order: 'desc' }; ngOnDestroy(): void { diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 2463b9f05a..05a599c672 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -7,19 +7,29 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en

- -
+ + - + + + {{alert_invalid_policy_minimum_range}} + - - + + + + {{alert_invalid_policy_maximum_range}} +
- + - + @@ -27,43 +37,99 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en Rule {{index+1}}: - - If average - - - - {{ metricType }} - - - - - - - {{ operator }} - - - - - - - for - - - - seconsds, then - - - - instances. Cooldown: - - - - seconds. + +
+ If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} + seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds. +
+
+
+ If average + + + + {{ metricType }} + + + + + + + {{ operator }} + + + + + + + for + + + + seconsds, then {{rule.operator=='>'||rule.operator=='>='?'add':'remove'}} + + + + + + instances + % instances + + + . Cooldown: + + + + seconds. +
+ + Threshold is required + + + {{alert_invalid_policy_trigger_threshold_100}} + + + + {{alert_invalid_policy_trigger_upper_threshold_range}} + + + {{alert_invalid_policy_trigger_lower_threshold_range}} + + + + {{alert_invalid_policy_trigger_breachduration_range}} + + + Adjustment is required + + + + {{alert_invalid_policy_trigger_step_range}} + + + {{alert_invalid_policy_trigger_step_percentage_range}} + + + + {{alert_invalid_policy_trigger_cooldown_range}} + +
- + + @@ -72,7 +138,8 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + @@ -83,62 +150,147 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en -
-
-
- - - Always - - - - - - - - - - - - - Week - - Month - - - - - {{day}} - - - -
-
- +
+ The initial number of application instance is + {{rule.initial_min_instance_count}}, and the range + The number of application instance + is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} during + {{rule.start_time}} ~ {{rule.end_time}} every + {{rule.days_of_month}} of the month + {{rule.days_of_week}} of the week + , effective from {{rule.start_date}} to {{rule.end_date}}. + . +
+
+ +
+
+ + + Always + + + + + + + + + + + + + + + Week + + + Month + + + - + + + {{day}} + + + + + {{day}} + + - - - - - - - - - - - - +
+
+ + + + + + + + + + + + + + + + + + + +
-
- + + + {{alert_invalid_policy_minimum_range}} + + + {{alert_invalid_policy_maximum_range}} + + + {{alert_invalid_policy_initial_minimum_range}} + + + {{alert_invalid_policy_schedule_start_date_before_now}} + + + {{alert_invalid_policy_schedule_end_date_before_start_date}} + + + {{alert_invalid_policy_schedule_end_date_before_now}} + + + {{alert_invalid_policy_schedule_end_date_before_start_date}} + + + {{alert_invalid_policy_schedule_end_time_before_start_time}} + + + {{alert_invalid_policy_schedule_end_time_before_start_time}} + + + {{alert_invalid_policy_schedule_repeat_on}} + + + days_of_week {{alert_invalid_policy_schedule_recurring_conflict}} + + + {{alert_invalid_policy_schedule_repeat_on}} + + + days_of_month {{alert_invalid_policy_schedule_recurring_conflict}} + +
- + + @@ -147,7 +299,8 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + @@ -158,35 +311,56 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en -
-
-
- - - - - - - - +
+ The initial number of application instance is + {{rule.initial_min_instance_count}}, and the range + The number of application instance + is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} from + {{rule.start_date_time}} to {{rule.end_date_time}}. +
+
+ +
+
+ + + + + + + + +
+
+ + + + + + + + + + + +
-
- - - - - - - - -
-
- + +
- + + diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index 979a72e20b..334d038f7e 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -40,3 +40,21 @@ app-tile-grid { .edit-recurring-schedule { max-width: 100%; } + +// .steppers__contents { +// height: unset; +// } + +// .app-autoscaler-edit-specific-date .mat-form-field-infix { +// width: unset; +// } + + +.app-autoscaler-edit-policy-item { + .app-autoscaler-edit-policy-desc { + margin-bottom: .5em; + } + mat-error { + font-size: 85%; + } +} \ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index b2848391a1..f794c0d5ae 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -1,18 +1,16 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; import { Http } from '@angular/http'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; import { Observable, of as observableOf, Subscription } from 'rxjs'; import { filter, map, take, first } from 'rxjs/operators'; - import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; import { AppMetadataTypes } from '../../../../../store/src/actions/app-metadata.actions'; import { SetCFDetails, SetNewAppName } from '../../../../../store/src/actions/create-applications-page.actions'; import { AppState } from '../../../../../store/src/app-state'; import { AppNameUniqueChecking, AppNameUniqueDirective } from '../app-name-unique.directive/app-name-unique.directive'; import { ApplicationService } from '../application.service'; - import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { EntityService } from '../../../core/entity-service'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; @@ -24,8 +22,16 @@ import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '. import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscaler.types'; import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; -import { SourceType } from '../../../../../store/src/types/deploy-application.types'; -import { MetricTypes, UpperOperators, LowerOperators } from '../../../../../store/src/helpers/autoscaler-helpers'; +import { MetricTypes, UpperOperators, LowerOperators, PolicyDefaultSetting } from '../../../../../store/src/helpers/autoscaler-helpers'; +// import * as moment from 'moment'; +import intersect from 'intersect'; +import Moment from 'moment-timezone'; +import { + extendMoment +} from 'moment-range'; +const moment = extendMoment(Moment); + + @Component({ selector: 'app-edit-autoscaler-policy', @@ -39,28 +45,54 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; - scalingRuleColumns: string[] = ['metric', 'condition', 'action']; - specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; - recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; + alert_invalid_policy_minimum_range = 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.'; + alert_invalid_policy_maximum_range = 'The Maximum Instance Count must be a integer greater than the Minimum Instance Count.'; + alert_invalid_policy_initial_minimum_range = 'The Initial Minimum Instance Count must be a integer in the range of Minimum Instance Count to Maximum Instance Count.'; + alert_invalid_policy_trigger_upper_threshold_range = 'The Upper Threshold value must be an integer greater than the Lower Threshold value.'; + alert_invalid_policy_trigger_lower_threshold_range = 'The Lower Threshold value must be an integer in the range of 1 to (Upper Threshold-1).'; + alert_invalid_policy_trigger_threshold_100 = 'The Lower/Upper Threshold value of memoryutil must be an integer below or equal to 100.'; + alert_invalid_policy_trigger_step_percentage_range = 'The Instance Step Up/Down percentage must be a integer greater than 1.'; + alert_invalid_policy_trigger_step_range = 'The Instance Step Up/Down value must be a integer in the range of 1 to (Maximum Instance-1).'; + alert_invalid_policy_trigger_breachduration_range = `The breach duration value must be an integer in the range of ${PolicyDefaultSetting.breach_duration_secs_min} to ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`; + alert_invalid_policy_trigger_cooldown_range = `The cooldown period value must be an integer in the range of ${PolicyDefaultSetting.cool_down_secs_min} to ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`; + alert_invalid_policy_schedule_start_date_before_now = 'Start date should be after or equal to current date.'; + alert_invalid_policy_schedule_end_date_before_now = 'End date should be after or equal to current date.'; + alert_invalid_policy_schedule_end_date_before_start_date = 'Start date must be earlier than the end date.'; + alert_invalid_policy_schedule_end_time_before_start_time = 'Start time must be earlier than the end time.'; - weekdayOptions: string[] = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; - metricTypes = MetricTypes; - operatorTypes = UpperOperators.concat(LowerOperators); - sourceTypes: SourceType[] = [ - { name: 'Public GitHub', id: 'github', group: 'gitscm' }, - { name: 'Public GitLab', id: 'gitlab', group: 'gitscm' }, - { name: 'Public Git URL', id: 'giturl' }, - { name: 'Application Archive File', id: 'file' }, - { name: 'Application Folder', id: 'folder' }, - ]; - editAppForm: FormGroup; + alert_invalid_policy_trigger_schedule_empty = 'At least one trigger rule or schedule should be defined.'; + + alert_invalid_policy_schedule_repeat_on = 'Please select at least one "Repeat On" day.'; + + alert_invalid_policy_schedule_end_datetime_before_start_datetime = 'Start date and time {start_time} must be earlier than the end date and time {end_time}.'; + alert_invalid_policy_schedule_start_datetime_before_now = 'Start date and time {time} must be after or equal to current date time.'; + alert_invalid_policy_schedule_end_datetime_before_now = 'End date and time {time} must be after or equal the current date and time.'; + alert_invalid_policy_schedule_recurring_conflict = 'Recurring schedule configuration conflict occurs.'; + alert_invalid_policy_schedule_specific_conflict = 'Specific date configuration conflict occurs.'; + + + weekdayOptions: string[] = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + monthdayOptions: number[] = (() => { + const days = []; + for (let i = 0; i < 31; i++) { + days[i] = i + 1; + } + return days; + })(); + MomentFormateDateTimeT = 'YYYY-MM-DDTHH:mm'; + MomentFormateDate = 'YYYY-MM-DD'; + MomentFormateTime: 'HH:mm'; - uniqueNameValidator: AppNameUniqueDirective; + metricTypes = MetricTypes; + operatorTypes = UpperOperators.concat(LowerOperators); - appNameChecking: AppNameUniqueChecking = new AppNameUniqueChecking(); + editLimitForm: FormGroup; + editTriggerForm: FormGroup; + editRecurringScheduleForm: FormGroup; + editSpecificDateForm: FormGroup; constructor( public applicationService: ApplicationService, @@ -70,8 +102,7 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { private snackBar: MatSnackBar, private entityServiceFactory: EntityServiceFactory, ) { - this.uniqueNameValidator = new AppNameUniqueDirective(this.store, this.http); - this.editAppForm = this.fb.group({ + this.editLimitForm = this.fb.group({ instance_min_count: [0, [ Validators.required, Validators.min(1) @@ -79,8 +110,91 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { instance_max_count: [0, [ Validators.required, Validators.min(1) + ]] + }); + this.editTriggerForm = this.fb.group({ + metric_type: [0, [ + ]], + operator: [0, [ + ]], + threshold: [0, [ + Validators.required, + Validators.min(1) + ]], + adjustment: [0, [ + Validators.required, + Validators.min(1) + ]], + breach_duration_secs: [0, [ + Validators.min(PolicyDefaultSetting.breach_duration_secs_min), + Validators.max(PolicyDefaultSetting.breach_duration_secs_max) + ]], + cool_down_secs: [0, [ + Validators.min(PolicyDefaultSetting.cool_down_secs_min), + Validators.max(PolicyDefaultSetting.cool_down_secs_max), + ]], + adjustment_type: [0, [ ]], }); + this.editRecurringScheduleForm = this.fb.group({ + days_of_week: [0], + days_of_month: [0], + instance_min_count: [0, [ + Validators.required, + Validators.min(1) + ]], + instance_max_count: [0, [ + Validators.required, + Validators.min(1) + ]], + initial_min_instance_count: [0, [ + Validators.required, + Validators.min(1) + ]], + start_date: [0, [ + Validators.required, + Validators.min(1) + ]], + end_date: [0, [ + Validators.required, + Validators.min(1) + ]], + start_time: [0, [ + Validators.required, + Validators.min(1) + ]], + end_time: [0, [ + Validators.required, + Validators.min(1) + ]], + effective_type: [0, [ + Validators.required, + ]], + repeat_type: [0, [ + Validators.required, + ]], + }); + this.editSpecificDateForm = this.fb.group({ + instance_min_count: [0, [ + Validators.required, + Validators.min(1) + ]], + instance_max_count: [0, [ + Validators.required, + Validators.min(1) + ]], + initial_min_instance_count: [0, [ + Validators.min(1) + ]], + start_date_time: [0, [ + Validators.required, + Validators.min(1) + ]], + end_date_time: [0, [ + Validators.required, + Validators.min(1) + ]] + }); } private app: any = { @@ -97,19 +211,21 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { private currentPolicy: any; public isEditing = false; - public instanceMinCountCurrent: number; - public instanceMinCountEdit: number; - public instanceMaxCountCurrent: any; - public instanceMaxCountEdit: any; private snackBarRef: MatSnackBarRef; + editingIndex = -1; + editingScaleType = 'upper'; + editingAdjustmentType = 'value'; + editingEffectiveType = 'always'; + editingRepeatType = 'week'; + updateApp: StepOnNextFunction = () => { const updates = {}; // We will only send the values that were actually edited - for (const key of Object.keys(this.editAppForm.value)) { - if (!this.editAppForm.controls[key].pristine) { - updates[key] = this.editAppForm.value[key]; + for (const key of Object.keys(this.editLimitForm.value)) { + if (!this.editLimitForm.controls[key].pristine) { + updates[key] = this.editLimitForm.value[key]; } } @@ -167,13 +283,11 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( map(({ entity }) => { if (entity && entity.entity) { - this.instanceMinCountCurrent = entity.entity.instance_min_count; - this.instanceMaxCountCurrent = entity.entity.instance_max_count; this.currentPolicy = entity.entity; - this.editAppForm.setValue({ - instance_min_count: this.currentPolicy.instance_min_count, - instance_max_count: this.currentPolicy.instance_max_count, - }); + this.editLimitForm.controls.instance_min_count.setValue(this.currentPolicy.instance_min_count); + this.editLimitForm.controls.instance_max_count.setValue(this.currentPolicy.instance_max_count); + this.editLimitForm.controls.instance_min_count.setValidators([Validators.required, this.validateGlobalLimitMin()]); + this.editLimitForm.controls.instance_max_count.setValidators([Validators.required, this.validateGlobalLimitMax()]); } return entity && entity.entity; }) @@ -187,16 +301,8 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.clearSub(); } - edit() { - this.instanceMinCountEdit = this.instanceMinCountCurrent; - this.instanceMaxCountEdit = this.instanceMaxCountCurrent; - this.isEditing = true; - } - finishEdit(ok: boolean) { this.isEditing = false; - this.currentPolicy.instance_min_count = this.instanceMinCountEdit; - this.currentPolicy.instance_max_count = this.instanceMaxCountEdit; if (ok) { const doUpdate = () => this.updatePolicy(); doUpdate().pipe( @@ -209,7 +315,8 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } } - updatePolicy(): Observable { + updatePolicy = () => { + console.log('submit', this.currentPolicy) this.store.dispatch( new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) ); @@ -219,7 +326,477 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { return this.store.select(actionState).pipe(filter(item => !!item)); } - remove() { - // console.log('remove') + // step1 + finishLimit: StepOnNextFunction = () => { + this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); + this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); + console.log('finishLimit', this.currentPolicy) + return observableOf({ success: true }); + } + validateGlobalLimitMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value, true); + return invalid ? { alert_invalid_policy_minimum_range: { value: control.value } } : null; + }; + } + validateGlobalLimitMax(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.numberWithFractionOrExceedRange(control.value, this.editLimitForm.get('instance_min_count').value, Number.MAX_VALUE, true); + return invalid ? { alert_invalid_policy_maximum_range: { value: control.value } } : null; + }; + } + + // step2 + addTrigger = () => { + this.currentPolicy.scaling_rules_form.push({ + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 10, + operator: '<=', + cool_down_secs: 300, + adjustment: '-2' + }) + } + removeTrigger(index) { + if (this.editingIndex == index) { + this.editingIndex = -1; + } + this.currentPolicy.scaling_rules_form.splice(index, 1) + } + editTrigger(index) { + this.editingIndex = index; + this.editingScaleType = this.getScaleType(this.currentPolicy.scaling_rules_form[index].operator); + this.editingAdjustmentType = this.getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment); + this.editTriggerForm.setValue({ + metric_type: this.currentPolicy.scaling_rules_form[index].metric_type, + operator: this.currentPolicy.scaling_rules_form[index].operator, + threshold: this.currentPolicy.scaling_rules_form[index].threshold, + adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)), + breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs, + cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs, + adjustment_type: this.currentPolicy.scaling_rules_form[index].adjustment.indexOf('%') >= 0 ? 'percentage' : 'value' + }); + this.editTriggerForm.controls.adjustment.setValidators([Validators.required, Validators.min(1), this.validateTriggerAdjustment()]); + this.editTriggerForm.controls.threshold.setValidators([Validators.required, Validators.min(1), this.validateTriggerThreshold()]); + } + finishTrigger: StepOnNextFunction = () => { + if (this.editingIndex != -1) { + const adjustmentp = this.editTriggerForm.get('adjustment_type').value == 'value' ? '' : '%'; + const adjustmenti = this.editTriggerForm.get('adjustment').value; + const adjustmentm = (adjustmenti > 0 ? `+${adjustmenti}${adjustmentp}` : `${adjustmenti}${adjustmentp}`); + this.currentPolicy.scaling_rules_form[this.editingIndex].metric_type = this.editTriggerForm.get('metric_type').value; + this.currentPolicy.scaling_rules_form[this.editingIndex].operator = this.editTriggerForm.get('operator').value; + this.currentPolicy.scaling_rules_form[this.editingIndex].threshold = this.editTriggerForm.get('threshold').value; + this.currentPolicy.scaling_rules_form[this.editingIndex].adjustment = adjustmentm; + if (this.editTriggerForm.get('breach_duration_secs').value) { + this.currentPolicy.scaling_rules_form[this.editingIndex].breach_duration_secs = this.editTriggerForm.get('breach_duration_secs').value; + } else { + delete this.currentPolicy.scaling_rules_form[this.editingIndex].breach_duration_secs + } + if (this.editTriggerForm.get('cool_down_secs').value) { + this.currentPolicy.scaling_rules_form[this.editingIndex].cool_down_secs = this.editTriggerForm.get('cool_down_secs').value; + } else { + delete this.currentPolicy.scaling_rules_form[this.editingIndex].cool_down_secs + } + this.editingIndex = -1; + } + console.log('finishTrigger', this.currentPolicy.scaling_rules_form) + return observableOf({ success: true }); + } + validateTriggerThreshold(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const metricType = this.editTriggerForm.get('metric_type').value; + this.editingScaleType = this.getScaleType(this.editTriggerForm.get('operator').value); + this.editingAdjustmentType = this.editTriggerForm.get('adjustment_type').value; + const errors = {}; + if (metricType == 'memoryutil') { + if (this.numberWithFractionOrExceedRange(control.value, 1, 100, true)) { + errors['alert_invalid_policy_trigger_threshold_100'] = { value: control.value }; + } + } + if (this.numberWithFractionOrExceedRange(control.value, this.getThresthodMin(this.currentPolicy.scaling_rules_form, metricType, this.editingScaleType, this.editingIndex), this.getThresthodMax(this.currentPolicy.scaling_rules_form, metricType, this.editingScaleType, this.editingIndex), true)) { + errors['alert_invalid_policy_trigger_threshold_range'] = { value: control.value }; + } + return Object.keys(errors).length === 0 ? null : errors + }; + } + validateTriggerAdjustment(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + this.editingScaleType = this.getScaleType(this.editTriggerForm.get('operator').value); + this.editingAdjustmentType = this.editTriggerForm.get('adjustment_type').value; + const errors = {}; + const max = this.editingAdjustmentType == 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; + if (this.numberWithFractionOrExceedRange(control.value, 1, max, true)) { + errors['alert_invalid_policy_trigger_step_range'] = {}; + } + return Object.keys(errors).length === 0 ? null : errors + }; + } + + // step3 + addRecurringSchedule = () => { + this.currentPolicy.schedules.recurring_schedule.push({ + start_time: '10:00', + end_time: '18:00', + days_of_week: [ + 1, 2, 3 + ], + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }) + } + removeRecurringSchedule(index) { + if (this.editingIndex == index) { + this.editingIndex = -1; + } + this.currentPolicy.schedules.recurring_schedule.splice(index, 1) + } + editRecurringSchedule(index) { + this.editingIndex = index; + this.editingEffectiveType = this.currentPolicy.schedules.recurring_schedule[index].start_date ? 'custom' : 'always'; + this.editingRepeatType = this.currentPolicy.schedules.recurring_schedule[index].days_of_week ? 'week' : 'month'; + this.editRecurringScheduleForm.setValue({ + days_of_week: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), + days_of_month: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), + instance_min_count: this.currentPolicy.schedules.recurring_schedule[index].instance_min_count, + instance_max_count: Math.abs(Number(this.currentPolicy.schedules.recurring_schedule[index].instance_max_count)), + initial_min_instance_count: this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count, + start_date: this.currentPolicy.schedules.recurring_schedule[index].start_date || '', + end_date: this.currentPolicy.schedules.recurring_schedule[index].end_date || '', + start_time: this.currentPolicy.schedules.recurring_schedule[index].start_time, + end_time: this.currentPolicy.schedules.recurring_schedule[index].end_time, + effective_type: this.editingEffectiveType, + repeat_type: this.editingRepeatType, + }); + this.editRecurringScheduleForm.controls.instance_min_count.setValidators([Validators.required, this.validateRecurringScheduleMin()]); + this.editRecurringScheduleForm.controls.instance_max_count.setValidators([Validators.required, this.validateRecurringScheduleMax()]); + this.editRecurringScheduleForm.controls.initial_min_instance_count.setValidators([this.validateRecurringScheduleInitialMin()]); + this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, this.validateRecurringScheduleStartDate()]); + this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, this.validateRecurringScheduleEndDate()]); + this.editRecurringScheduleForm.controls.start_time.setValidators([Validators.required, this.validateRecurringScheduleStartTime()]); + this.editRecurringScheduleForm.controls.end_time.setValidators([Validators.required, this.validateRecurringScheduleEndTime()]); + if (this.editingRepeatType === 'week') { + this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeek()]); + this.editRecurringScheduleForm.controls.days_of_month.clearValidators(); + } else { + this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleMonth()]); + this.editRecurringScheduleForm.controls.days_of_week.clearValidators(); + } + } + finishRecurringSchedule(index) { + if (this.editRecurringScheduleForm.get('effective_type').value == 'custom') { + this.currentPolicy.schedules.recurring_schedule[index].start_date = this.editRecurringScheduleForm.get('start_date').value; + this.currentPolicy.schedules.recurring_schedule[index].end_date = this.editRecurringScheduleForm.get('end_date').value; + } else { + delete this.currentPolicy.schedules.recurring_schedule[index].start_date + delete this.currentPolicy.schedules.recurring_schedule[index].end_date + } + if (this.editRecurringScheduleForm.get('repeat_type').value == 'week') { + this.currentPolicy.schedules.recurring_schedule[index].days_of_week = this.shiftArray(this.editRecurringScheduleForm.get('days_of_week').value, 1); + delete this.currentPolicy.schedules.recurring_schedule[index].days_of_month; + } else { + this.currentPolicy.schedules.recurring_schedule[index].days_of_month = this.shiftArray(this.editRecurringScheduleForm.get('days_of_month').value, 1); + delete this.currentPolicy.schedules.recurring_schedule[index].days_of_week; + } + if (this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count) { + this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count = this.editRecurringScheduleForm.get('initial_min_instance_count').value; + } else { + delete this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count; + } + this.currentPolicy.schedules.recurring_schedule[index].instance_min_count = this.editRecurringScheduleForm.get('instance_min_count').value; + this.currentPolicy.schedules.recurring_schedule[index].instance_max_count = this.editRecurringScheduleForm.get('instance_max_count').value; + this.currentPolicy.schedules.recurring_schedule[index].start_time = this.editRecurringScheduleForm.get('start_time').value; + this.currentPolicy.schedules.recurring_schedule[index].end_time = this.editRecurringScheduleForm.get('end_time').value; + this.editingIndex = -1; + console.log('finishRecurringSchedule', this.currentPolicy.schedules.recurring_schedule) + } + validateRecurringScheduleMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.numberWithFractionOrExceedRange(control.value, 1, this.editRecurringScheduleForm.get('instance_max_count').value - 1, true); + return invalid ? { alert_invalid_policy_minimum_range: { value: control.value } } : null; + }; + } + validateRecurringScheduleMax(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.numberWithFractionOrExceedRange(control.value, this.editRecurringScheduleForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + return invalid ? { alert_invalid_policy_maximum_range: { value: control.value } } : null; + }; + } + validateRecurringScheduleInitialMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.numberWithFractionOrExceedRange(control.value, this.editRecurringScheduleForm.get('instance_min_count').value, this.editRecurringScheduleForm.get('instance_max_count').value + 1, false); + return invalid ? { alert_invalid_policy_initial_minimum_range: { value: control.value } } : null; + }; + } + validateRecurringScheduleStartDate(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editingEffectiveType === 'always') return null; + const errors = {}; + if (this.dateIsAfter(moment().format(this.MomentFormateDate), control.value)) { + errors['alert_invalid_policy_schedule_start_date_before_now'] = { value: control.value }; + } + if (this.dateIsAfter(control.value, this.editRecurringScheduleForm.get('end_date').value)) { + errors['alert_invalid_policy_schedule_end_date_before_start_date'] = { value: control.value }; + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + validateRecurringScheduleEndDate(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editingEffectiveType === 'always') return null; + const errors = {}; + if (this.dateIsAfter(moment().format(this.MomentFormateDate), control.value)) { + errors['alert_invalid_policy_schedule_end_date_before_now'] = { value: control.value }; + } + if (this.dateIsAfter(this.editRecurringScheduleForm.get('start_date').value, control.value)) { + errors['alert_invalid_policy_schedule_end_date_before_start_date'] = { value: control.value }; + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + validateRecurringScheduleStartTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.timeIsSameOrAfter(control.value, this.editRecurringScheduleForm.get('end_time').value); + return invalid ? { alert_invalid_policy_schedule_end_time_before_start_time: { value: control.value } } : null; + }; + } + validateRecurringScheduleEndTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.timeIsSameOrAfter(this.editRecurringScheduleForm.get('start_time').value, control.value); + return invalid ? { alert_invalid_policy_schedule_end_time_before_start_time: { value: control.value } } : null; + }; + } + validateRecurringScheduleWeek(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const newSchedule = { + days_of_week: this.shiftArray(control.value, 1), + start_time: this.editRecurringScheduleForm.get('start_time').value, + end_time: this.editRecurringScheduleForm.get('end_time').value + }; + if (this.editingEffectiveType === 'custom') { + newSchedule['start_date'] = this.editRecurringScheduleForm.get('start_date').value; + newSchedule['end_date'] = this.editRecurringScheduleForm.get('end_date').value; + } + const invalid = this.recurringSchedulesOverlapping(newSchedule, this.editingIndex, this.currentPolicy.schedules.recurring_schedule, 'days_of_week'); + return invalid ? { alert_invalid_policy_schedule_recurring_conflict: { value: control.value } } : null; + }; + } + validateRecurringScheduleMonth(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const newSchedule = { + days_of_month: this.shiftArray(control.value, 1), + start_time: this.editRecurringScheduleForm.get('start_time').value, + end_time: this.editRecurringScheduleForm.get('end_time').value + }; + if (this.editingEffectiveType === 'custom') { + newSchedule['start_date'] = this.editRecurringScheduleForm.get('start_date').value; + newSchedule['end_date'] = this.editRecurringScheduleForm.get('end_date').value; + } + const invalid = this.recurringSchedulesOverlapping(newSchedule, this.editingIndex, this.currentPolicy.schedules.recurring_schedule, 'days_of_month'); + return invalid ? { alert_invalid_policy_schedule_recurring_conflict: { value: control.value } } : null; + }; + } + shiftArray(days_of_week, step) { + const days = [] + for (let i = 0; i < days_of_week.length; i++) { + days[i] = days_of_week[i] + step; + } + return days; + } + resetEffectiveType(key) { + this.editingEffectiveType = key; + if (key === 'custom') { + if (!this.currentPolicy.schedules.recurring_schedule[this.editingIndex].start_date && !this.editRecurringScheduleForm.get('start_date').value) { + this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(this.MomentFormateDate)); + this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(this.MomentFormateDate)); + } + } + } + resetRepeatType(key) { + this.editingRepeatType = key; + if (key === 'week') { + if (!this.editRecurringScheduleForm.controls.days_of_week.value || this.editRecurringScheduleForm.controls.days_of_week.value.length === 0) { + this.editRecurringScheduleForm.controls.days_of_week.setValue([0]); + } + this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeek()]); + this.editRecurringScheduleForm.controls.days_of_month.clearValidators(); + } else { + if (!this.editRecurringScheduleForm.controls.days_of_month.value || this.editRecurringScheduleForm.controls.days_of_month.value.length === 0) { + this.editRecurringScheduleForm.controls.days_of_month.setValue([0]); + } + this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleMonth()]); + this.editRecurringScheduleForm.controls.days_of_week.clearValidators(); + } + } + + // step4 + addSpecificDate = () => { + let nextStartDateTime = moment().add(1, 'days') + let nextEndDateTime = moment().add(1, 'days') + nextStartDateTime.set('hour', 10) + nextStartDateTime.set('minute', 0) + nextEndDateTime.set('hour', 18) + nextEndDateTime.set('minute', 0) + this.currentPolicy.schedules.specific_date.push({ + start_date_time: nextStartDateTime.format(this.MomentFormateDateTimeT), + end_date_time: nextEndDateTime.format(this.MomentFormateDateTimeT), + days_of_week: [ + 1, 2, 3 + ], + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }) + } + removeSpecificDate(index) { + if (this.editingIndex == index) { + this.editingIndex = -1; + } + this.currentPolicy.schedules.specific_date.splice(index, 1) + } + editSpecificDate(index) { + this.editingIndex = index; + this.editSpecificDateForm.setValue({ + instance_min_count: this.currentPolicy.schedules.specific_date[index].instance_min_count, + instance_max_count: Math.abs(Number(this.currentPolicy.schedules.specific_date[index].instance_max_count)), + initial_min_instance_count: this.currentPolicy.schedules.specific_date[index].initial_min_instance_count, + start_date_time: this.currentPolicy.schedules.specific_date[index].start_date_time, + end_date_time: this.currentPolicy.schedules.specific_date[index].end_date_time, + }); + } + finishSpecificDate(index) { + if (this.currentPolicy.schedules.specific_date[index].initial_min_instance_count) { + this.currentPolicy.schedules.specific_date[index].initial_min_instance_count = this.editRecurringScheduleForm.get('initial_min_instance_count').value; + } + this.currentPolicy.schedules.specific_date[index].instance_min_count = this.editSpecificDateForm.get('instance_min_count').value; + this.currentPolicy.schedules.specific_date[index].instance_max_count = this.editSpecificDateForm.get('instance_max_count').value; + this.currentPolicy.schedules.specific_date[index].initial_min_instance_count = this.editSpecificDateForm.get('initial_min_instance_count').value; + this.currentPolicy.schedules.specific_date[index].start_date_time = this.editSpecificDateForm.get('start_date_time').value; + this.currentPolicy.schedules.specific_date[index].end_date_time = this.editSpecificDateForm.get('end_date_time').value; + this.editingIndex = -1; } + + // reset editing index + resetEditingIndex: StepOnNextFunction = () => { + this.editingIndex = -1; + return observableOf({ success: true }); + } + + getScaleType(operator) { + if (LowerOperators.indexOf(operator) >= 0) { + return 'lower' + } else { + return 'upper' + } + } + getAdjustmentType(adjustment) { + return adjustment.indexOf('%') >= 0 ? 'percentage' : 'value' + } + + numberWithFractionOrExceedRange(value, min, max, required) { + if ((!value || isNaN(value)) && !required) { + return false + } + if ((!value || isNaN(value)) && required) { + return true + } + return value.toString().indexOf('.') > -1 || value > max || value < min + } + + timeIsSameOrAfter(startTime, endTime) { + return moment('2000-01-01T' + startTime, this.MomentFormateDateTimeT).isSameOrAfter(moment('2000-01-01T' + endTime, this.MomentFormateDateTimeT)); + } + + dateIsAfter(startDate, endDate) { + return moment(startDate, this.MomentFormateDate).isAfter(moment(endDate, this.MomentFormateDate)); + } + + dateTimeIsSameOrAfter(startDateTime, endDateTime, timezone) { + // return moment.tz(startDateTime, timezone).isSameOrAfter(moment.tz(endDateTime, timezone)); + return moment(startDateTime, timezone).isSameOrAfter(moment(endDateTime, timezone)); + } + + recurringSchedulesInvalidRepeatOn(inputRecurringSchedules) { + let weekdayCount = inputRecurringSchedules.hasOwnProperty('days_of_week') ? inputRecurringSchedules['days_of_week'].length : 0 + let monthdayCount = inputRecurringSchedules.hasOwnProperty('days_of_month') ? inputRecurringSchedules['days_of_month'].length : 0 + return (weekdayCount > 0 && monthdayCount > 0) || (weekdayCount == 0 && monthdayCount == 0) + } + + recurringSchedulesOverlapping(newSchedule, index, inputRecurringSchedules, property) { + for (let i = 0; i != index && i < inputRecurringSchedules.length; i++) { + if (inputRecurringSchedules[i].hasOwnProperty(property) && newSchedule.hasOwnProperty(property)) { + if (inputRecurringSchedules[i].hasOwnProperty('start_date') && inputRecurringSchedules[i].hasOwnProperty('end_date') && newSchedule.hasOwnProperty('start_date') && newSchedule.hasOwnProperty('end_date')) { + if (!this.dateOverlaps(inputRecurringSchedules[i]['start_date'], inputRecurringSchedules[i]['end_date'], newSchedule['start_date'], newSchedule['end_date'])) { + continue + } + } + if (this.timeOverlaps(inputRecurringSchedules[i]['start_time'], inputRecurringSchedules[i]['end_time'], newSchedule['start_time'], newSchedule['end_time'])) { + let intersects = intersect(inputRecurringSchedules[i][property], newSchedule[property]) + return intersects.length > 0; + } + } + } + return false; + } + + specificDateRangeOverlapping(inputSpecificDates) { + let errorpairs = {} + var dateRangeList = [] + if (inputSpecificDates.length > 0) { + for (let i = 0; inputSpecificDates && i < inputSpecificDates.length; i++) { + let start = moment(inputSpecificDates[i].start_date_time, this.MomentFormateDateTimeT) + let end = moment(inputSpecificDates[i].end_date_time, this.MomentFormateDateTimeT) + let range = moment.range(start, end) + dateRangeList[i] = range; + } + for (let j = 0; j < dateRangeList.length; j++) { + for (let i = j + 1; i < dateRangeList.length; i++) { + if (dateRangeList[j].overlaps(dateRangeList[i])) { + errorpairs[i] = true + errorpairs[j] = true + } + } + } + } + return errorpairs + } + + timeOverlaps(start_time_i, end_time_i, start_time_j, end_time_j) { + let rangei = moment.range(moment('1970-01-01T' + start_time_i, this.MomentFormateDateTimeT), moment('1970-01-01T' + end_time_i, this.MomentFormateDateTimeT)) + let rangej = moment.range(moment('1970-01-01T' + start_time_j, this.MomentFormateDateTimeT), moment('1970-01-01T' + end_time_j, this.MomentFormateDateTimeT)) + console.log(rangei, rangej, rangei.overlaps(rangej)) + return rangei.overlaps(rangej) + } + + dateOverlaps(start_date_i, end_date_i, start_date_j, end_date_j) { + let rangei = moment.range(moment(start_date_i + 'T00:00', this.MomentFormateDateTimeT), moment(end_date_i + 'T23:59', this.MomentFormateDateTimeT)) + let rangej = moment.range(moment(start_date_j + 'T00:00', this.MomentFormateDateTimeT), moment(end_date_j + 'T23:59', this.MomentFormateDateTimeT)) + return rangei.overlaps(rangej) + } + + getThresthodMin(policyTriggers, metricType, scaleType, index) { + let thresholdMin = 1; + if (scaleType == 'upper') { + policyTriggers.map((trigger, triggerIndex) => { + if (triggerIndex != index && trigger.metric_type == metricType && LowerOperators.indexOf(trigger.operator) >= 0) { + thresholdMin = Math.max(trigger.threshold + 1, thresholdMin); + } + }) + } + return thresholdMin; + } + + getThresthodMax(policyTriggers, metricType, scaleType, index) { + let thresholdMax = Number.MAX_VALUE + if (scaleType == 'lower') { + policyTriggers.map((trigger, triggerIndex) => { + if (triggerIndex != index && trigger.metric_type == metricType && UpperOperators.indexOf(trigger.operator) >= 0) { + thresholdMax = Math.min(trigger.threshold - 1, thresholdMax); + } + }) + } + return thresholdMax + } + } diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts index 65d6039009..4fa362dbae 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts @@ -49,7 +49,7 @@ export const listCards = [ AppServiceBindingCardComponent, ServiceInstanceCardComponent, UserProvidedServiceInstanceCardComponent, - EndpointCardComponent + EndpointCardComponent, AppAutoscalerMetricChartCardComponent, AppAutoscalerComboChartComponent, AppAutoscalerComboSeriesVerticalComponent diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 5bb9515e8f..4730ca9ea2 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -47,6 +47,7 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig i }; showMetricsRange = true; + pollInterval = 120000; selectedTimeValue = '1:week'; times: ITimeRange[] = [ { diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index 2b837dfcd4..70049a9540 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -32,6 +32,7 @@ export class AppAutoscalerMetricChartListConfigService extends ListConfig void = () => { } + @Input() + onAdd: () => void = () => { } + constructor() { this.pOnEnter = (data?: any) => { if (this.onEnter) { diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html index ba82ed8443..988559c867 100644 --- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html +++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html @@ -27,13 +27,16 @@
+ [disabled]="!canGoto(currentIndex - 1) || steps[currentIndex].disablePrevious">Previous
+
+ + + @@ -62,7 +59,8 @@ - - - - - - Scaling Rules - - -
- - - - - - - - - - - - - - - -
Metric {{element.metric_type}} Condition {{element.operator}} {{element.threshold}} for - {{element.breach_duration_secs}} secs. Action {{element.adjustment}} instances
-
- - - - - - - - - - Scheduled Limit Rules - - -
- - - - - - - - - - - - - - - - - - - - - - - -
From {{element.start_date_time}} To {{element.end_date_time}} Initial - {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + - element.end_date : 'Aways'}} Repeats On {{element.days_of_month}} {{element.days_of_week}} of - the - {{element.days_of_week? 'week': 'month'}} From {{element.start_time}} To {{element.end_time}} Initial - {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
-
- - - - - - - +
+ + + + + Scaling Rules + + +
+ + + + + + + + + + + + + + + +
Metric {{element.metric_type}} Condition {{element.operator}} {{element.threshold}} for + {{element.breach_duration_secs}} secs. Action {{element.adjustment}} instances
+
+ + + + + + + + + + Scheduled Limit Rules + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
From {{element.start_date_time}} To {{element.end_date_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + + element.end_date : 'Aways'}} Repeats On {{element.days_of_month}} {{element.days_of_week}} of + the + {{element.days_of_week? 'week': 'month'}} From {{element.start_time}} To {{element.end_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
+
+ + + + + + + +
@@ -228,12 +228,12 @@

- - + + -

\ No newline at end of file +
diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index 8b38d4567d..d0d1514d30 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -65,9 +65,6 @@ import { MetricTypes } from '../../../../../../../../store/src/helpers/autoscale CfOrgSpaceDataService ] }) - - - export class AutoscalerTabComponent implements OnInit, OnDestroy { scalingRuleColumns: string[] = ['metric', 'condition', 'action']; @@ -78,25 +75,14 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { appAutoscalerPolicyService: EntityService; appAutoscalerScalingHistoryService: EntityService; - appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; - private currentPolicy: any; - public isEditing = false; - public instanceMinCountCurrent: number; - public instanceMinCountEdit: number; - public instanceMaxCountCurrent: any; - public instanceMaxCountEdit: any; - - appAutoscalerPolicyErrorSub: Subscription; - appAutoscalerScalingHistoryErrorSub: Subscription; - + private appAutoscalerPolicyErrorSub: Subscription; + private appAutoscalerScalingHistoryErrorSub: Subscription; private appAutoscalerPolicySnackBarRef: MatSnackBarRef; private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef; - // private confirmDialog: ConfirmationDialogService; - private attachConfirmOk = 0; private detachConfirmOk = 0; appAutoscalerAppMetrics = {}; @@ -242,14 +228,9 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { 'Detach and Delete', true ); - if (this.detachConfirmOk === 1) { - this.detachConfirmOk = 0; - } else { - this.detachConfirmOk = 1; - } + this.detachConfirmOk = this.detachConfirmOk === 1 ? 0 : 1; this.confirmDialog.open(confirmation, () => { this.detachConfirmOk = 2; - this.isEditing = false; const doUpdate = () => this.detachPolicy(); doUpdate().pipe( first(), @@ -260,99 +241,11 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { } }); }); - this.attachConfirmOk = 0; - } - - createDefaultPolicy() { - const confirmation = new ConfirmationDialogConfig( - 'Attach Default Policy', - 'Confirm to attach a default AutoScaler policy, you can update it later.', - 'Attach', - ); - if (this.attachConfirmOk === 1) { - this.attachConfirmOk = 0; - } else { - this.attachConfirmOk = 1; - } - this.confirmDialog.open(confirmation, () => { - this.attachConfirmOk = 2; - this.isEditing = false; - this.currentPolicy = { - 'instance_min_count': 1, - 'instance_max_count': 10, - 'scaling_rules': [ - { - 'metric_type': 'memoryused', - 'stat_window_secs': 300, - 'breach_duration_secs': 600, - 'threshold': 10, - 'operator': '<=', - 'cool_down_secs': 300, - 'adjustment': '-2' - }, - { - 'metric_type': 'responsetime', - 'stat_window_secs': 300, - 'breach_duration_secs': 600, - 'threshold': 40, - 'operator': '<', - 'cool_down_secs': 300, - 'adjustment': '-5' - } - ], - 'schedules': { - 'timezone': 'Asia/Shanghai', - 'recurring_schedule': [ - { - 'start_time': '10:00', - 'end_time': '18:00', - 'days_of_week': [ - 1, - 2, - 3 - ], - 'instance_min_count': 1, - 'instance_max_count': 10, - 'initial_min_instance_count': 5 - } - ], - 'specific_date': [ - { - 'start_date_time': '2099-06-02T10:00', - 'end_date_time': '2099-06-15T13:59', - 'instance_min_count': 1, - 'instance_max_count': 4, - 'initial_min_instance_count': 2 - } - ] - } - }; - const doUpdate = () => this.updatePolicy(); - doUpdate().pipe( - first(), - ).subscribe(actionState => { - if (actionState.error) { - this.appAutoscalerPolicySnackBarRef = - this.appAutoscalerPolicySnackBar.open(`Failed to create policy: ${actionState.message}`, 'Dismiss'); - } - }); - this.detachConfirmOk = 0; - }); - } - - updatePolicy(): Observable { - this.store.dispatch( - new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) - ); - const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, - this.applicationService.appGuid, - UpdateAppAutoscalerPolicyAction.updateKey); - return this.store.select(actionState).pipe(filter(item => !!item)); } detachPolicy(): Observable { this.store.dispatch( - new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) ); const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, this.applicationService.appGuid, @@ -367,10 +260,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { this.applicationService.cfGuid, this.applicationService.appGuid, 'edit-autoscaler-policy' - ], - query: { - // spaceGuid: app.app.entity.space_guid - } + ] })); } @@ -392,10 +282,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { this.applicationService.cfGuid, this.applicationService.appGuid, 'app-autoscaler-scale-history-page' - ], - query: { - // spaceGuid: app.app.entity.space_guid - } + ] })); } } diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 05a599c672..358294ee16 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -12,22 +12,22 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - - {{alert_invalid_policy_minimum_range}} + + {{alertInvalidPolicyMinimumRange}} - - {{alert_invalid_policy_maximum_range}} + + {{alertInvalidPolicyMaximumRange}} - + @@ -38,11 +38,11 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en -
+
If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds.
-
+
If average @@ -87,45 +87,46 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en Threshold is required - {{alert_invalid_policy_trigger_threshold_100}} + *ngIf="editTriggerForm.get('threshold').hasError('alertInvalidPolicyTriggerThreshold100')"> + {{alertInvalidPolicyTriggerThreshold100}} - - {{alert_invalid_policy_trigger_upper_threshold_range}} + *ngIf="editTriggerForm.get('threshold').hasError('alertInvalidPolicyTriggerThresholdRange')"> + + {{alertInvalidPolicyTriggerUpperThresholdRange}} - - {{alert_invalid_policy_trigger_lower_threshold_range}} + + {{alertInvalidPolicyTriggerLowerThresholdRange}} - {{alert_invalid_policy_trigger_breachduration_range}} + {{alertInvalidPolicyTriggerBreachDurationRange}} Adjustment is required - - {{alert_invalid_policy_trigger_step_range}} + *ngIf="editTriggerForm.get('adjustment').hasError('alertInvalidPolicyTriggerStepRange')"> + + {{alertInvalidPolicyTriggerStepRange}} - - {{alert_invalid_policy_trigger_step_percentage_range}} + + {{alertInvalidPolicyTriggerStepPercentageRange}} - {{alert_invalid_policy_trigger_cooldown_range}} + {{alertInvalidPolicyTriggerCooldownRange}}

- - @@ -138,8 +139,8 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + @@ -150,7 +151,7 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en -
+
The initial number of application instance is {{rule.initial_min_instance_count}}, and the range The number of application instance @@ -161,20 +162,25 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en , effective from {{rule.start_date}} to {{rule.end_date}}. .

-
+
- Always + Always - - + + + Custom + + - + @@ -182,22 +188,22 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + Week - + Month - {{day}} - {{day}} @@ -232,62 +238,66 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en

- {{alert_invalid_policy_minimum_range}} + *ngIf="editRecurringScheduleForm.get('instance_min_count').hasError('alertInvalidPolicyMinimumRange')"> + {{alertInvalidPolicyMinimumRange}} - {{alert_invalid_policy_maximum_range}} + *ngIf="editRecurringScheduleForm.get('instance_max_count').hasError('alertInvalidPolicyMaximumRange')"> + {{alertInvalidPolicyMaximumRange}} - {{alert_invalid_policy_initial_minimum_range}} + *ngIf="editRecurringScheduleForm.get('initial_min_instance_count').hasError('alertInvalidPolicyInitialMaximumRange')"> + {{alertInvalidPolicyInitialMaximumRange}} - {{alert_invalid_policy_schedule_start_date_before_now}} + *ngIf="editRecurringScheduleForm.get('start_date').hasError('alertInvalidPolicyScheduleStartDateBeforeNow')"> + {{alertInvalidPolicyScheduleStartDateBeforeNow}} - {{alert_invalid_policy_schedule_end_date_before_start_date}} + *ngIf="editRecurringScheduleForm.get('start_date').hasError('alertInvalidPolicyScheduleEndDateBeforeStartDate')"> + {{alertInvalidPolicyScheduleEndDateBeforeStartDate}} - {{alert_invalid_policy_schedule_end_date_before_now}} + *ngIf="editRecurringScheduleForm.get('end_date').hasError('alertInvalidPolicyScheduleEndDateBeforeNow')"> + {{alertInvalidPolicyScheduleEndDateBeforeNow}} - {{alert_invalid_policy_schedule_end_date_before_start_date}} + *ngIf="editRecurringScheduleForm.get('end_date').hasError('alertInvalidPolicyScheduleEndDateBeforeStartDate')"> + {{alertInvalidPolicyScheduleEndDateBeforeStartDate}} - {{alert_invalid_policy_schedule_end_time_before_start_time}} + *ngIf="editRecurringScheduleForm.get('start_time').hasError('alertInvalidPolicyScheduleEndTimeBeforeStartTime')"> + {{alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - {{alert_invalid_policy_schedule_end_time_before_start_time}} + *ngIf="editRecurringScheduleForm.get('end_time').hasError('alertInvalidPolicyScheduleEndTimeBeforeStartTime')"> + {{alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - - {{alert_invalid_policy_schedule_repeat_on}} + + {{alertInvalidPolicyScheduleRepeatOn}} - days_of_week {{alert_invalid_policy_schedule_recurring_conflict}} + *ngIf="editRepeatType=='week' && editRecurringScheduleForm.get('days_of_week').hasError('alertInvalidPolicyScheduleRecurringConflict')"> + days_of_week {{alertInvalidPolicyScheduleRecurringConflict}} - - {{alert_invalid_policy_schedule_repeat_on}} + + {{alertInvalidPolicyScheduleRepeatOn}} - days_of_month {{alert_invalid_policy_schedule_recurring_conflict}} + *ngIf="editRepeatType=='month' && editRecurringScheduleForm.get('days_of_month').hasError('alertInvalidPolicyScheduleRecurringConflict')"> + days_of_month {{alertInvalidPolicyScheduleRecurringConflict}}
- - -
-
- -
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts index fcee16209b..9356670852 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts @@ -6,11 +6,11 @@ import { StoreModule } from '@ngrx/store'; import { CoreModule } from '../../../../../../core/core.module'; import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; import { SharedModule } from '../../../../../../shared/shared.module'; -import { appReducers } from '../../../../../../store/reducers.module'; -import { AppStoreModule } from '../../../../../../store/store.module'; -import { endpointStoreNames } from '../../../../../../store/types/endpoint.types'; -import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper'; -import { getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper'; +import { appReducers } from '../../../../../../../../store/src/reducers.module'; +import { AppStoreModule } from '../../../../../../../../store/src/store.module'; +import { endpointStoreNames } from '../../../../../../../../store//src/types/endpoint.types'; +import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper'; +import { getInitialTestStoreState } from '../../../../../../../test-framework/store-test-helper'; import { ApplicationService } from '../../../../application.service'; import { AutoscalerTabComponent } from './autoscaler-tab.component'; import { HttpModule, Http, ConnectionBackend } from '@angular/http'; diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index 0247dea0ef..ffc6767cac 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -7,22 +7,19 @@ import { appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, appAutoscalerAppMetricSchemaKey, - appAutoscalerInsMetricSchemaKey, } from '../../../../../../../../store/src/helpers/entity-factory'; import { ApplicationService } from '../../../../application.service'; import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, GetAppAutoscalerAppMetricAction, - GetAppAutoscalerInsMetricAction, UpdateAppAutoscalerPolicyAction, DetachAppAutoscalerPolicyAction, } from '../../../../../../../../store/src/actions/app-autoscaler.actions'; import { AppAutoscalerPolicy, AppAutoscalerScalingHistory, - AppAutoscalerAppMetric, - AppAutoscalerInsMetric + AppAutoscalerAppMetric } from '../../../../../../../../store/src/types/app-autoscaler.types'; import { map, filter, distinctUntilChanged, first } from 'rxjs/operators'; import { getPaginationObservables } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; @@ -150,7 +147,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { map(({ entity }) => { if (entity && entity.entity) { this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.loadLatestMetricsUponPolicy(entity); + this.loadLatestMetricsUponPolicy(entity.entity); } return entity && entity.entity; }) @@ -174,25 +171,12 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { }, false).entities$; } - getInsMetric(metricName: string, trigger: any, params: any) { - const action = new GetAppAutoscalerInsMetricAction(this.applicationService.appGuid, - this.applicationService.cfGuid, metricName, true, trigger, params); - return getPaginationObservables({ - store: this.store, - action, - paginationMonitor: this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(appAutoscalerInsMetricSchemaKey) - ) - }, false).entities$; - } - loadLatestMetricsUponPolicy(policyEntity) { - if (policyEntity && policyEntity.entity && policyEntity.entity.scaling_rules_map) { + if (policyEntity.scaling_rules_map) { this.appAutoscalerAppMetrics = {}; - Object.keys(policyEntity.entity.scaling_rules_map).map((metricName) => { + Object.keys(policyEntity.scaling_rules_map).map((metricName) => { this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, policyEntity.entity.scaling_rules_map[metricName], this.paramsMetrics); + this.getAppMetric(metricName, policyEntity.scaling_rules_map[metricName], this.paramsMetrics); }); } } @@ -253,7 +237,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { return this.store.select(actionState).pipe(filter(item => !!item)); } - updatePolicyPage() { + updatePolicyPage = () => { this.store.dispatch(new RouterNav({ path: [ 'applications', diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html index 9eb3a90edd..1632e4a08c 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html @@ -52,7 +52,7 @@

- diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts index 14702c9648..91e26ce991 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component'; import { CoreModule } from '../../../../core/core.module'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; -import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; +import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper'; import { ApplicationStateService } from '../../application-state/application-state.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { CommonModule } from '@angular/common'; diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts index 51ea3ff1ad..8d6d18ebb7 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnDestroy, OnInit, ViewChild, Input } from '@angular/core'; import { Observable } from 'rxjs'; import { map, first, filter } from 'rxjs/operators'; import { Store } from '@ngrx/store'; @@ -12,10 +12,10 @@ import { appAutoscalerPolicySchemaKey, } from '../../../../../../store/src/helpers/entity-factory'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors'; import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types'; import { CardStatus } from '../../../shared.types'; +import { autoscalerTransformArrayToMap } from '../../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; @Component({ selector: 'app-card-autoscaler-default', @@ -41,12 +41,9 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { status$: Observable; appAutoscalerPolicyService: EntityService; appAutoscalerPolicyUpdateService: EntityService; - public appAutoscalerPolicy$: Observable; + public appAutoscalerPolicy$: Observable; - currentPolicy = { - instance_min_count: 0, - instance_max_count: 0 - }; + currentPolicy: any; public isEditing = false; public instanceMinCountCurrent: number; public instanceMinCountEdit: number; @@ -55,6 +52,9 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { private snackBarRef: MatSnackBarRef; + @Input() + onUpdate: () => void = () => { } + ngOnInit() { this.appAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerPolicySchemaKey, @@ -69,6 +69,9 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { this.instanceMinCountCurrent = entity.entity.instance_min_count; this.instanceMaxCountCurrent = entity.entity.instance_max_count; this.currentPolicy = entity.entity; + if (!this.currentPolicy.scaling_rules_form) { + this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); + } } return entity && entity.entity; }) @@ -110,6 +113,9 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, this.applicationService.appGuid, UpdateAppAutoscalerPolicyAction.updateKey); + this.store.dispatch( + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) + ); return this.store.select(actionState).pipe(filter(item => !!item)); } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts index c19feac6b3..85fd9675b7 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status.component'; -import { EntityInfo } from '../../../../../../store/types/api.types'; +import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; describe('TableCellAutoscalerEventTypeComponent', () => { let component: TableCellAutoscalerEventStatusComponent; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts index 2ae108c6d2..b0a82bbcbe 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TableCellAutoscalerEventTimestampComponent } from './table-cell-autoscaler-event-timestamp.component'; -import { EntityInfo } from '../../../../../../store/types/api.types'; +import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; describe('TableCellAutoscalerEventTimestampComponent', () => { let component: TableCellAutoscalerEventTimestampComponent; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts index 57e35654f8..ae4be2d34a 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts @@ -1,7 +1,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-event-type.component'; -import { EntityInfo } from '../../../../../../store/types/api.types'; +import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; describe('TableCellAutoscalerEventTypeComponent', () => { let component: TableCellAutoscalerEventTypeComponent; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts index aab6e5ee8c..2946bf57ee 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts @@ -12,11 +12,11 @@ import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.fac import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory'; import { ApplicationStateService } from '../../../../application-state/application-state.service'; import { ConfirmationDialogService } from '../../../../confirmation-dialog.service'; -import { AppServiceBindingCardComponent } from './app-service-binding-card.component'; +import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component'; describe('AppServiceBindingCardComponent', () => { - let component: AppServiceBindingCardComponent; - let fixture: ComponentFixture; + let component: AppAutoscalerMetricChartCardComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -39,7 +39,7 @@ describe('AppServiceBindingCardComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent(AppServiceBindingCardComponent); + fixture = TestBed.createComponent(AppAutoscalerMetricChartCardComponent); component = fixture.componentInstance; component.row = { entity: { diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts index 7d13eb5f56..cdebeecdd1 100644 --- a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts @@ -396,12 +396,12 @@ describe('Autoscaler Transform Policy Helper', () => { } ] }; - const mapPolicyFromArray = autoscalerTransformArrayToMap(arrayPolicy, undefined); + const mapPolicyFromArray = autoscalerTransformArrayToMap(arrayPolicy); const arrayPolicyFromMap = autoscalerTransformMapToArray(mapPolicy); expect(isEqual(mapPolicyFromArray, mapPolicy)).toBe(true); - expect(isEqual(arrayPolicyFromMap, autoscalerTransformMapToArray(autoscalerTransformArrayToMap(arrayPolicy, undefined)))).toBe(true); + expect(isEqual(arrayPolicyFromMap, autoscalerTransformMapToArray(autoscalerTransformArrayToMap(arrayPolicy)))).toBe(true); delete arrayPolicy.scaling_rules; - expect(isPolicyMapEqual(arrayPolicy, autoscalerTransformArrayToMap(arrayPolicy, undefined))).toBe(true); + expect(isPolicyMapEqual(arrayPolicy, autoscalerTransformArrayToMap(arrayPolicy))).toBe(true); delete mapPolicy.scaling_rules_map; delete mapPolicy.scaling_rules_form; expect(isEqual(mapPolicy, autoscalerTransformMapToArray(mapPolicy))).toBe(true); From b74fe885831d14532df7cef41a7ab6428ad9d7bb Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 26 Mar 2019 17:14:21 +0000 Subject: [PATCH 15/98] Minor tweaks --- .../application-tabs-base.component.ts | 19 ------ .../autoscaler-tab.component.scss | 20 +++--- .../autoscaler-tab.component.ts | 68 +++++++------------ .../tabs/events-tab/events-tab.component.scss | 42 ++++++------ ...toscaler-scale-history-page.component.scss | 42 ++++++------ .../edit-autoscaler-policy.component.scss | 9 --- .../edit-autoscaler-policy.component.ts | 20 +++--- .../favorites-entity-list.component.ts | 1 + ...utoscaler-metric-chart-card.component.html | 46 ++++--------- ...utoscaler-metric-chart-card.component.scss | 24 +++---- .../autoscaler/autoscaler-validation.ts | 4 +- 11 files changed, 116 insertions(+), 179 deletions(-) diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index 99ddb3b6ee..4bde06cad3 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -134,25 +134,6 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { }), first() ); - this.applicationService.applicationStratProject$ - .pipe(first()) - .subscribe(stratProject => { - if ( - stratProject && - stratProject.deploySource && - stratProject.deploySource.type === 'github' - ) { - this.tabLinks.push({ link: 'github', label: 'GitHub' }); - } - }); - this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => { - if (hasMetrics) { - this.tabLinks.push({ - link: 'metrics', - label: 'Metrics' - }); - } - }); this.applicationService.waitForAppAutoscalerHealth$ .pipe(first()) .subscribe(entity => { diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss index ee354edc11..71f22a22b6 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss @@ -44,16 +44,16 @@ table { flex: 0 0 40%; } -.app-auto-scaler-tile-1of2 { - flex: 0 0 50%; -} - -.app-auto-scaler-tile-1of3 { - flex: 0 0 30%; -} - -.app-auto-scaler-tile-1of6 { - flex: 0 0 16.78%; +.app-auto-scaler-tile { + &-1of2 { + flex: 0 0 50%; + } + &-1of3 { + flex: 0 0 30%; + } + &-1of6 { + flex: 0 0 16.78%; + } } .app-auto-scaler-limit { diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index ffc6767cac..984ac9f6cd 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -1,64 +1,48 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; -import { EntityService } from '../../../../../../core/entity-service'; -import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; -import { - entityFactory, - appAutoscalerPolicySchemaKey, - appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricSchemaKey, -} from '../../../../../../../../store/src/helpers/entity-factory'; -import { ApplicationService } from '../../../../application.service'; +import { distinctUntilChanged, filter, first, map } from 'rxjs/operators'; + import { + DetachAppAutoscalerPolicyAction, + GetAppAutoscalerAppMetricAction, GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, - GetAppAutoscalerAppMetricAction, UpdateAppAutoscalerPolicyAction, - DetachAppAutoscalerPolicyAction, } from '../../../../../../../../store/src/actions/app-autoscaler.actions'; +import { RouterNav } from '../../../../../../../../store/src/actions/router.actions'; +import { AppState } from '../../../../../../../../store/src/app-state'; +import { MetricTypes } from '../../../../../../../../store/src/helpers/autoscaler/autoscaler-util'; import { + appAutoscalerAppMetricSchemaKey, + appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + entityFactory, +} from '../../../../../../../../store/src/helpers/entity-factory'; +import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types'; +import { + getPaginationObservables, +} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { selectUpdateInfo } from '../../../../../../../../store/src/selectors/api.selectors'; +import { + AppAutoscalerAppMetric, AppAutoscalerPolicy, AppAutoscalerScalingHistory, - AppAutoscalerAppMetric } from '../../../../../../../../store/src/types/app-autoscaler.types'; -import { map, filter, distinctUntilChanged, first } from 'rxjs/operators'; -import { getPaginationObservables } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../../../store/src/app-state'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types'; -import { selectUpdateInfo } from '../../../../../../../../store/src/selectors/api.selectors'; +import { EntityService } from '../../../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; import { ConfirmationDialogConfig } from '../../../../../../shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; -import { ListConfig } from '../../../../../../shared/components/list/list.component.types'; -import { DatePipe } from '@angular/common'; -import { CurrentUserPermissionsService } from '../../../../../../core/current-user-permissions.service'; -import { - CfAppRoutesListConfigService, -} from '../../../../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service'; import { CfOrgSpaceDataService } from '../../../../../../shared/data-services/cf-org-space-service.service'; -import { RouterNav } from '../../../../../../../../store/src/actions/router.actions'; -import { MetricTypes } from '../../../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { ApplicationService } from '../../../../application.service'; @Component({ selector: 'app-autoscaler-tab', templateUrl: './autoscaler-tab.component.html', styleUrls: ['./autoscaler-tab.component.scss'], providers: [ - { - provide: ListConfig, - useFactory: ( - store: Store, - appService: ApplicationService, - confirmDialog: ConfirmationDialogService, - datePipe: DatePipe, - cups: CurrentUserPermissionsService - ) => { - return new CfAppRoutesListConfigService(store, appService, confirmDialog, datePipe, cups); - }, - deps: [Store, ApplicationService, ConfirmationDialogService, DatePipe, CurrentUserPermissionsService] - }, CfOrgSpaceDataService ] }) diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss index 6cca554326..8685ed0699 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss @@ -1,25 +1,25 @@ -[app-table-content] { - mat-header-cell, - mat-cell { - flex-grow: 1; - } +// .app-table__content { +// mat-header-cell, +// mat-cell { +// flex-grow: 1; +// } - .cdk-column-actor-name { - align-items: center; - display: flex; - flex-basis: 100px; - flex-direction: row; - } +// .cdk-column-actor_name { +// align-items: center; +// display: flex; +// flex-basis: 100px; +// flex-direction: row; +// } - .cdk-column-type { - flex-basis: 100px; - } +// .cdk-column-type { +// flex-basis: 100px; +// } - .cdk-column-detail { - flex-grow: 3; +// .cdk-column-detail { +// flex-grow: 3; - td { - padding-right: 5px; - } - } -} +// td { +// padding-right: 5px; +// } +// } +// } diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss index 6cca554326..87955fcc4f 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss +++ b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss @@ -1,25 +1,25 @@ -[app-table-content] { - mat-header-cell, - mat-cell { - flex-grow: 1; - } +// [app-table-content] { +// mat-header-cell, +// mat-cell { +// flex-grow: 1; +// } - .cdk-column-actor-name { - align-items: center; - display: flex; - flex-basis: 100px; - flex-direction: row; - } +// .cdk-column-actor-name { +// align-items: center; +// display: flex; +// flex-basis: 100px; +// flex-direction: row; +// } - .cdk-column-type { - flex-basis: 100px; - } +// .cdk-column-type { +// flex-basis: 100px; +// } - .cdk-column-detail { - flex-grow: 3; +// .cdk-column-detail { +// flex-grow: 3; - td { - padding-right: 5px; - } - } -} +// td { +// padding-right: 5px; +// } +// } +// } diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index 09ad115647..9fc035b612 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -41,15 +41,6 @@ app-tile-grid { max-width: 100%; } -// .steppers__contents { -// height: unset; -// } - -// .app-autoscaler-edit-specific-date .mat-form-field-infix { -// width: unset; -// } - - .app-autoscaler-edit-policy-item { .app-autoscaler-edit-policy-desc { margin-bottom: .5em; diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index cb94bc4a22..81a47b8db0 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -29,8 +29,8 @@ import { import { autoscalerTransformArrayToMap } from '../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; import { numberWithFractionOrExceedRange, - getThresthodMin, - getThresthodMax, + getThresholdMin, + getThresholdMax, dateIsAfter, timeIsSameOrAfter, dateTimeIsSameOrAfter, @@ -126,6 +126,11 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { ]], adjustment_type: [0] }); + this.editTriggerForm.updateValueAndValidity(); + this.editTriggerForm.controls['a'].updateValueAndValidity + const subToUnsubOnDestroy = this.editTriggerForm.controls.a.valueChanges.subscribe(change => { + this.editTriggerForm.controls.b.updateValueAndValidity() + }) this.editRecurringScheduleForm = this.fb.group({ days_of_week: [0], days_of_month: [0], @@ -203,7 +208,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } updatePolicy: StepOnNextFunction = () => { - console.log('submit', this.currentPolicy); this.submitStatus = true; this.submitMessage = ''; let updateAppAutoscalerPolicyService: EntityService; @@ -246,7 +250,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); this.currentPolicy.schedules.timezone = this.editLimitForm.get('timezone').value; - console.log('finishLimit', this.currentPolicy); return observableOf({ success: true }); } validateGlobalLimitMin(): ValidatorFn { @@ -318,7 +321,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } this.editIndex = -1; } - console.log('finishTrigger', this.currentPolicy.scaling_rules_form); return observableOf({ success: true }); } validateTriggerThreshold(): ValidatorFn { @@ -335,9 +337,9 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; } } - const thresthodMin = getThresthodMin(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); - const thresthodMax = getThresthodMax(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); - if (numberWithFractionOrExceedRange(control.value, thresthodMin, thresthodMax, true)) { + const thresholdMin = getThresholdMin(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); + const thresholdMax = getThresholdMax(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); + if (numberWithFractionOrExceedRange(control.value, thresholdMin, thresholdMax, true)) { errors.alertInvalidPolicyTriggerThresholdRange = { value: control.value }; } return Object.keys(errors).length === 0 ? null : errors; @@ -429,7 +431,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { currentSchedule.start_time = this.editRecurringScheduleForm.get('start_time').value; currentSchedule.end_time = this.editRecurringScheduleForm.get('end_time').value; this.editIndex = -1; - console.log('finishRecurringSchedule', this.currentPolicy.schedules.recurring_schedule); } validateRecurringScheduleMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { @@ -610,7 +611,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.currentPolicy.schedules.specific_date[this.editIndex].start_date_time = this.editSpecificDateForm.get('start_date_time').value; this.currentPolicy.schedules.specific_date[this.editIndex].end_date_time = this.editSpecificDateForm.get('end_date_time').value; this.editIndex = -1; - console.log('finishSpecificDate', this.currentPolicy.schedules.specific_date); } validateSpecificDateMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { diff --git a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts index 86614b9737..f3096df225 100644 --- a/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts +++ b/src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts @@ -107,6 +107,7 @@ export class FavoritesEntityListComponent implements AfterViewInit { return entities.filter(entity => entity.favorite.entityType === type); }) ); + this.searchedEntities$ = combineLatest( typesEntities$, this.nameChange.valueChanges.pipe(startWith('')), diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html index 17d04ea5e7..3d922de3ca 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -9,54 +9,34 @@ -
+ [min]="0" [max]="metricData[0].entity.chartMaxValue" [units]="metricData[0].entity.unit" [angleSpan]="240" + [startAngle]="-120" [showAxis]="true" [bigSegments]="10" [smallSegments]="5" [tooltipDisabled]="false" + (select)="select($event)">
-
- + \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index e8bacd6fd9..1ea3e3cc63 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -54,20 +54,20 @@ app-tile-grid { height: 250px; margin-top: 1em; width: 80%; -} -.autoscaler-chart-bar-combo { - display: inline-block; - height: 250px; - margin-top: 1em; - width: 75%; -} + &-combo { + display: inline-block; + height: 250px; + margin-top: 1em; + width: 75%; + } -.autoscaler-chart-bar-legend { - display: inline-block; - margin-left: 1.75em; - margin-top: 1em; - position: absolute; + &-legend { + display: inline-block; + margin-left: 1.75em; + margin-top: 1em; + position: absolute; + } } .autoscaler-metric-subtitle { diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts index 12a3151173..417cb04d6d 100644 --- a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts @@ -97,7 +97,7 @@ function dateTimeOverlaps(startDateTimeI, endDateTimeI, startDateTimeJ, endDateT } } -export function getThresthodMin(policyTriggers, metricType, scaleType, index) { +export function getThresholdMin(policyTriggers, metricType, scaleType, index) { let thresholdMin = 1; if (scaleType === 'upper') { policyTriggers.map((trigger, triggerIndex) => { @@ -109,7 +109,7 @@ export function getThresthodMin(policyTriggers, metricType, scaleType, index) { return thresholdMin; } -export function getThresthodMax(policyTriggers, metricType, scaleType, index) { +export function getThresholdMax(policyTriggers, metricType, scaleType, index) { let thresholdMax = Number.MAX_VALUE; if (scaleType === 'lower') { policyTriggers.map((trigger, triggerIndex) => { From e0af636136f2dc078453b8e44be4f1aa49862f9c Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 27 Mar 2019 14:53:01 +0000 Subject: [PATCH 16/98] Minor tweaks --- .../autoscaler-tab.component.ts | 2 +- .../edit-autoscaler-policy.component.ts | 5 --- .../list/list-cards/cards.component.ts | 2 + .../list-cards/cards.components.theme.scss | 5 +++ ...utoscaler-metric-chart-card.component.scss | 3 +- ...-autoscaler-metric-chart-card.component.ts | 37 ++++++++++--------- src/frontend/packages/core/src/styles.scss | 37 ------------------- .../src/actions/app-autoscaler.actions.ts | 16 ++++---- 8 files changed, 38 insertions(+), 69 deletions(-) diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index 984ac9f6cd..d981e02545 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -192,7 +192,7 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { diableAutoscaler() { const confirmation = new ConfirmationDialogConfig( 'Detach And Delete Policy', - 'Are you sure you want to detach and delete the policy?.', + 'Are you sure you want to detach and delete the policy?', 'Detach and Delete', true ); diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 81a47b8db0..5b8be6a490 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -126,11 +126,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { ]], adjustment_type: [0] }); - this.editTriggerForm.updateValueAndValidity(); - this.editTriggerForm.controls['a'].updateValueAndValidity - const subToUnsubOnDestroy = this.editTriggerForm.controls.a.valueChanges.subscribe(change => { - this.editTriggerForm.controls.b.updateValueAndValidity() - }) this.editRecurringScheduleForm = this.fb.group({ days_of_week: [0], days_of_month: [0], diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts index ec7c9954a7..fe3e9fd174 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts @@ -18,6 +18,8 @@ export class CardsComponent { get component() { return this.pComponent; } set component(cardCell: CardTypes) { this.pComponent = cardCell; + /* tslint:disable-next-line */ + this.columns = cardCell['columns']; } public multiActionTrackBy(index: number, item: any | MultiActionListEntity) { diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.components.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.components.theme.scss index 197f88dde1..83cca6ab3a 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.components.theme.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.components.theme.scss @@ -6,6 +6,11 @@ margin-bottom: $space; width: 100%; } + &__columns-1 { + app-card { + width: 100%; + } + } &__columns-2 { app-card { @include breakpoint(tablet) { diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index 1ea3e3cc63..0f214688cf 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -74,4 +74,5 @@ app-tile-grid { color: rgba(0, 0, 0, .54); font-size: .9em; margin-top: .3em; -} + +} \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 1602551aa5..9b4c6e8752 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -1,23 +1,20 @@ import { Component, OnInit } from '@angular/core'; -import { ApplicationService } from '../../../../../../features/applications/application.service'; -import { CardCell, IListRowCell } from '../../../list.types'; -import { APIResource } from '../../../../../../../../store/src/types/api.types'; -import { - entityFactory, - appAutoscalerAppMetricSchemaKey -} from '../../../../../../../../store/src/helpers/entity-factory'; -import { - GetAppAutoscalerAppMetricAction, -} from '../../../../../../../../store/src/actions/app-autoscaler.actions'; -import { getPaginationObservables } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; +import { filter, first, publishReplay, refCount } from 'rxjs/operators'; + +import { GetAppAutoscalerAppMetricAction } from '../../../../../../../../store/src/actions/app-autoscaler.actions'; import { AppState } from '../../../../../../../../store/src/app-state'; -import { Store } from '@ngrx/store'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { - AppAutoscalerAppMetric, -} from '../../../../../../../../store/src/types/app-autoscaler.types'; import { buildLegendData } from '../../../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { appAutoscalerAppMetricSchemaKey, entityFactory } from '../../../../../../../../store/src/helpers/entity-factory'; +import { + getPaginationObservables, +} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { APIResource } from '../../../../../../../../store/src/types/api.types'; +import { AppAutoscalerAppMetric } from '../../../../../../../../store/src/types/app-autoscaler.types'; +import { ApplicationService } from '../../../../../../features/applications/application.service'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { CardCell, IListRowCell } from '../../../list.types'; @Component({ selector: 'app-app-autoscaler-metric-chart-card', @@ -26,6 +23,7 @@ import { buildLegendData } from '../../../../../../../../store/src/helpers/autos }) export class AppAutoscalerMetricChartCardComponent extends CardCell> implements OnInit, IListRowCell { + static columns = 1; listData: { label: string; data$: Observable; @@ -102,7 +100,12 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell !!entities), + first(), + publishReplay(1), + refCount(), + ); } } diff --git a/src/frontend/packages/core/src/styles.scss b/src/frontend/packages/core/src/styles.scss index 786de7d1a2..ba9972db10 100644 --- a/src/frontend/packages/core/src/styles.scss +++ b/src/frontend/packages/core/src/styles.scss @@ -66,34 +66,10 @@ button.mat-simple-snackbar-action { // flex-direction: column; // } -.autoscaler-chart-legend { - .ngx-charts { - display: none; - } - header { - display: none; - } - li { - display: inline-block; - } - .legend-wrap { - width: unset; - .legend-labels { - width: unset; - } - } -} - .autoscaler-chart-bar-legend { .ngx-charts { display: none; } - // header { - // display: none; - // } - // li { - // display: inline-block; - // } .legend-wrap { width: unset; .legend-labels { @@ -102,16 +78,3 @@ button.mat-simple-snackbar-action { } } -.autoscaler-metric-page .cards__columns-3 app-card { - width: 100%; -} - -app-edit-autoscaler-policy { - .steppers__contents { - display: unset; - height: unset; - } - .app-autoscaler-edit-specific-date .mat-form-field-infix { - width: unset; - } -} diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index 6f0d121c73..a860f6122d 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -1,16 +1,16 @@ -import { PaginatedAction } from '../types/pagination.types'; -import { CFStartAction } from '../types/request.types'; +import { RequestOptions } from '@angular/http'; + import { + appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, + appAutoscalerInsMetricSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerAppMetricSchemaKey, - appAutoscalerInsMetricSchemaKey, appAutoscalerUpdatedPolicySchemaKey, - entityFactory + entityFactory, } from '../helpers/entity-factory'; -import { IRequestAction } from '../types/request.types'; -import { RequestOptions } from '@angular/http'; +import { PaginatedAction } from '../types/pagination.types'; +import { CFStartAction, IRequestAction } from '../types/request.types'; export const AppAutoscalerPolicyEvents = { GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', @@ -69,7 +69,7 @@ export class UpdateAppAutoscalerPolicyAction implements IRequestAction { public policy: any, ) { } type = UPDATE_APP_AUTOSCALER_POLICY; - entityKey = appAutoscalerUpdatedPolicySchemaKey; // appAutoscalerPolicySchemaKey; + entityKey = appAutoscalerUpdatedPolicySchemaKey; } export class DetachAppAutoscalerPolicyAction implements IRequestAction { From 633ce29131627965010d47ac1a335d2426cc0382 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 27 Mar 2019 16:11:07 +0000 Subject: [PATCH 17/98] Fix multiActionTrackBy --- .../list/list-cards/cards.component.html | 2 +- .../list/list-cards/cards.component.ts | 16 +++++---- ...cf-app-autoscaler-events-config.service.ts | 33 ++++++++++++------- .../app-event/cf-app-events-config.service.ts | 6 ++-- .../app-event/cf-app-events-data-source.ts | 9 +++-- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.html b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.html index a288c4b4d3..1ad1028138 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.html @@ -1,5 +1,5 @@
- + diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts index fe3e9fd174..3231118444 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts @@ -22,14 +22,16 @@ export class CardsComponent { this.columns = cardCell['columns']; } - public multiActionTrackBy(index: number, item: any | MultiActionListEntity) { - if (!this.dataSource) { - return null; + public multiActionTrackBy() { + return (index: number, item: any | MultiActionListEntity) => { + if (!this.dataSource) { + return null; + } + if (this.isMultiActionItem(item)) { + return this.dataSource.trackBy(index, item.entity); + } + return this.dataSource.trackBy(index, item); } - if (this.isMultiActionItem(item)) { - return this.dataSource.trackBy(index, item.entity); - } - return this.dataSource.trackBy(index, item); } public isMultiActionItem(component: any | MultiActionListEntity) { diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 4730ca9ea2..d260c29af6 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,25 +1,36 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { ApplicationService } from '../../../../../features/applications/application.service'; + import { AppState } from '../../../../../../../store/src/app-state'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { APIResource } from '../../../../../../../store/src/types/api.types'; +import { ApplicationService } from '../../../../../features/applications/application.service'; +import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; import { ITableColumn } from '../../list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; -import { TableCellAutoscalerEventActionComponent } from './table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; import { - TableCellAutoscalerEventTimestampComponent + TableCellAutoscalerEventActionComponent, +} from './table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; +import { + TableCellAutoscalerEventChangeComponent, +} from './table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; +import { + TableCellAutoscalerEventErrorComponent, +} from './table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; +import { + TableCellAutoscalerEventStatusComponent, +} from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; +import { + TableCellAutoscalerEventTimestampComponent, } from './table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component'; -import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; -import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; -import { TableCellAutoscalerEventChangeComponent } from './table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; -import { TableCellAutoscalerEventErrorComponent } from './table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; -import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; +import { + TableCellAutoscalerEventTypeComponent, +} from './table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; @Injectable() -export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { +export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { autoscalerEventSource: CfAppAutoscalerEventsDataSource; - columns: Array> = [ + columns: Array> = [ { columnId: 'timestamp', headerCell: () => 'Timestamp', cellComponent: TableCellAutoscalerEventTimestampComponent, sort: true, cellFlex: '3' diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts index d5a20ddd81..bdab26cea5 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts @@ -9,14 +9,14 @@ import { TableCellEventActionComponent } from './table-cell-event-action/table-c import { TableCellEventDetailComponent } from './table-cell-event-detail/table-cell-event-detail.component'; import { TableCellEventTimestampComponent } from './table-cell-event-timestamp/table-cell-event-timestamp.component'; import { TableCellEventTypeComponent } from './table-cell-event-type/table-cell-event-type.component'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { EntityInfo, APIResource } from '../../../../../../../store/src/types/api.types'; import { AppState } from '../../../../../../../store/src/app-state'; @Injectable() -export class CfAppEventsConfigService extends ListConfig implements IListConfig { +export class CfAppEventsConfigService extends ListConfig implements IListConfig { eventSource: CfAppEventsDataSource; - columns: Array> = [ + columns: Array> = [ { columnId: 'timestamp', headerCell: () => 'Timestamp', cellComponent: TableCellEventTimestampComponent, sort: true, cellFlex: '3' }, diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts index e8b39c951c..c7e234ae05 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts @@ -4,11 +4,12 @@ import { GetAllAppEvents } from '../../../../../../../store/src/actions/app-even import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pagination.actions'; import { AppState } from '../../../../../../../store/src/app-state'; import { appEventSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { APIResource } from '../../../../../../../store/src/types/api.types'; import { PaginationEntityState, QParam } from '../../../../../../../store/src/types/pagination.types'; +import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../data-sources-controllers/list-data-source'; -export class CfAppEventsDataSource extends ListDataSource { +export class CfAppEventsDataSource extends ListDataSource { public getFilterFromParams(pag: PaginationEntityState) { const qParams = pag.params.q; @@ -44,9 +45,7 @@ export class CfAppEventsDataSource extends ListDataSource { store, action, schema: entityFactory(appEventSchemaKey), - getRowUniqueId: (object: EntityInfo) => { - return object.entity.metadata ? object.entity.metadata.guid : null; - }, + getRowUniqueId: getRowMetadata, paginationKey, } ); From 2564473e4a54e0e48d6ad8f5f37764a649ee3e6b Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 27 Mar 2019 16:21:46 +0000 Subject: [PATCH 18/98] Fix autoscaler getRowUniqueId, improve refresh on autoscaler metrics --- .../autoscaler-tab.component.ts | 6 ++- .../cf-app-autoscaler-events-data-source.ts | 13 +++--- ...-autoscaler-metric-chart-card.component.ts | 8 +--- ...app-autoscaler-metric-chart-data-source.ts | 16 ++++---- ...scaler-metric-chart-list-config.service.ts | 18 ++++---- .../src/actions/app-autoscaler.actions.ts | 8 ++-- .../store/src/effects/autoscaler.effects.ts | 41 ++++++++++--------- 7 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts index d981e02545..e7b66d9a22 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, first, map } from 'rxjs/operators'; +import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators'; import { DetachAppAutoscalerPolicyAction, @@ -134,7 +134,9 @@ export class AutoscalerTabComponent implements OnInit, OnDestroy { this.loadLatestMetricsUponPolicy(entity.entity); } return entity && entity.entity; - }) + }), + publishReplay(1), + refCount() ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( map(({ entity }) => entity && entity.entity) diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 8f711cfd02..115eadcfe4 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -1,12 +1,13 @@ import { Store } from '@ngrx/store'; + import { GetAppAutoscalerScalingHistoryAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; import { AppState } from '../../../../../../../store/src/app-state'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { appAutoscalerScalingHistorySchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; +import { APIResource } from '../../../../../../../store/src/types/api.types'; +import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../data-sources-controllers/list-data-source'; -import { entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; -import { appAutoscalerScalingHistorySchemaKey } from '../../../../../../../store/src/helpers/entity-factory'; -export class CfAppAutoscalerEventsDataSource extends ListDataSource { +export class CfAppAutoscalerEventsDataSource extends ListDataSource { action: any; constructor( store: Store, @@ -20,9 +21,7 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource store, action, schema: entityFactory(appAutoscalerScalingHistorySchemaKey), - getRowUniqueId: (object: EntityInfo) => { - return object.entity.metadata ? object.entity.metadata.guid : null; - }, + getRowUniqueId: getRowMetadata, paginationKey, } ); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 9b4c6e8752..a3e99cbb87 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { filter, first, publishReplay, refCount } from 'rxjs/operators'; +import { filter } from 'rxjs/operators'; import { GetAppAutoscalerAppMetricAction } from '../../../../../../../../store/src/actions/app-autoscaler.actions'; import { AppState } from '../../../../../../../../store/src/app-state'; @@ -92,7 +92,6 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell({ store: this.store, action, @@ -101,10 +100,7 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell !!entities), - first(), - publishReplay(1), - refCount(), + filter(entities => !!entities) ); } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index 856a7d79f2..be71feac35 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -1,12 +1,13 @@ import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../../store/src/app-state'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; -import { ListDataSource } from '../../data-sources-controllers/list-data-source'; -import { entityFactory, appAutoscalerPolicySchemaKey } from '../../../../../../../store/src/helpers/entity-factory'; + +import { getRowMetadata } from '../../../../../../../core/src/features/cloud-foundry/cf.helpers'; import { GetAppAutoscalerPolicyTriggerAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { appAutoscalerPolicySchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; import { APIResource } from '../../../../../../../store/src/types/api.types'; +import { ListDataSource } from '../../data-sources-controllers/list-data-source'; -export class AppAutoscalerMetricChartDataSource extends ListDataSource> { +export class AppAutoscalerMetricChartDataSource extends ListDataSource { action: any; constructor( store: Store, @@ -20,10 +21,9 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource { - return object.entity.metadata ? object.entity.metadata.guid : null; - }, + getRowUniqueId: getRowMetadata, paginationKey, + isLocal: true } ); } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index d6e2d39826..8b47c85de7 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -1,19 +1,21 @@ -import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; -import { AppAutoscalerMetricChartDataSource } from './app-autoscaler-metric-chart-data-source'; -import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { ApplicationService } from '../../../../../features/applications/application.service'; + +import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { AppState } from '../../../../../../../store/src/app-state'; -import { EntityInfo } from '../../../../../../../store/src/types/api.types'; -import { ListViewTypes } from '../../list.component.types'; +import { APIResource, EntityInfo } from '../../../../../../../store/src/types/api.types'; +import { ApplicationService } from '../../../../../features/applications/application.service'; import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; import { ITableColumn } from '../../list-table/table.types'; +import { ListViewTypes } from '../../list.component.types'; import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; -import { APIResource } from '../../../../../../../store/src/types/api.types'; +import { + AppAutoscalerMetricChartCardComponent, +} from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; +import { AppAutoscalerMetricChartDataSource } from './app-autoscaler-metric-chart-data-source'; @Injectable() -export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig> { +export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig { autoscalerMetricSource: AppAutoscalerMetricChartDataSource; cardComponent = AppAutoscalerMetricChartCardComponent; viewType = ListViewTypes.CARD_ONLY; diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index a860f6122d..6fa20018b0 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -10,7 +10,7 @@ import { entityFactory, } from '../helpers/entity-factory'; import { PaginatedAction } from '../types/pagination.types'; -import { CFStartAction, IRequestAction } from '../types/request.types'; +import { IRequestAction } from '../types/request.types'; export const AppAutoscalerPolicyEvents = { GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', @@ -82,14 +82,13 @@ export class DetachAppAutoscalerPolicyAction implements IRequestAction { entityKey = appAutoscalerPolicySchemaKey; } -export class GetAppAutoscalerPolicyTriggerAction extends CFStartAction implements PaginatedAction { +export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { constructor( public paginationKey: string, public appGuid: string, public cfGuid: string, public normalFormat?, ) { - super(); this.query = { metric: 'policy' }; @@ -107,7 +106,7 @@ export class GetAppAutoscalerPolicyTriggerAction extends CFStartAction implement windowValue: string; } -export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implements PaginatedAction { +export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { private static sortField = 'timestamp'; constructor( public paginationKey: string, @@ -116,7 +115,6 @@ export class GetAppAutoscalerScalingHistoryAction extends CFStartAction implemen public normalFormat?, public params?, ) { - super(); this.query = { metric: 'history' }; diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts index 32607a449a..9553ba9311 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -1,42 +1,43 @@ import { Injectable } from '@angular/core'; +import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angular/http'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; + import { LoggerService } from '../../../core/src/core/logger.service'; +import { environment } from '../../../core/src/environments/environment.prod'; import { - GetAppAutoscalerPolicyAction, - GetAppAutoscalerHealthAction, - GetAppAutoscalerPolicyTriggerAction, - GetAppAutoscalerScalingHistoryAction, - GetAppAutoscalerMetricAction, - UpdateAppAutoscalerPolicyAction, - DetachAppAutoscalerPolicyAction, - APP_AUTOSCALER_POLICY, APP_AUTOSCALER_HEALTH, + APP_AUTOSCALER_POLICY, APP_AUTOSCALER_SCALING_HISTORY, + DETACH_APP_AUTOSCALER_POLICY, + DetachAppAutoscalerPolicyAction, FETCH_APP_AUTOSCALER_METRIC, + GetAppAutoscalerHealthAction, + GetAppAutoscalerMetricAction, + GetAppAutoscalerPolicyAction, + GetAppAutoscalerPolicyTriggerAction, + GetAppAutoscalerScalingHistoryAction, UPDATE_APP_AUTOSCALER_POLICY, - DETACH_APP_AUTOSCALER_POLICY, + UpdateAppAutoscalerPolicyAction, } from '../actions/app-autoscaler.actions'; -import { NormalizedResponse } from '../types/api.types'; -import { - ICFAction, - StartRequestAction, - WrapperRequestActionFailed, - WrapperRequestActionSuccess, -} from '../types/request.types'; import { AppState } from '../app-state'; -import { environment } from '../../../core/src/environments/environment.prod'; -import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angular/http'; -import { PaginatedAction } from './../types/pagination.types'; import { buildMetricData } from '../helpers/autoscaler/autoscaler-transform-metric'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, } from '../helpers/autoscaler/autoscaler-transform-policy'; +import { resultPerPageParam, resultPerPageParamDefault } from '../reducers/pagination-reducer/pagination-reducer.types'; import { selectPaginationState } from '../selectors/pagination.selectors'; +import { NormalizedResponse } from '../types/api.types'; import { PaginationEntityState, PaginationParam } from '../types/pagination.types'; -import { resultPerPageParam, resultPerPageParamDefault } from '../reducers/pagination-reducer/pagination-reducer.types'; +import { + ICFAction, + StartRequestAction, + WrapperRequestActionFailed, + WrapperRequestActionSuccess, +} from '../types/request.types'; +import { PaginatedAction } from './../types/pagination.types'; const { proxyAPIVersion, autoscalerAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; From ee725632f9c23001b0c789fb46987f92856b1826 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 27 Mar 2019 16:22:04 +0000 Subject: [PATCH 19/98] fix tsconfig, ts-hero now works again --- src/tsconfig.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tsconfig.json b/src/tsconfig.json index 65c822f280..ef785a5cbb 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -2,8 +2,6 @@ "compileOnSave": false, "preserveWhitespaces": "off", "compilerOptions": { - "baseUrl": ".", - "paths": { "*": ["types/*"] }, "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, From d0b4ded641f56052a32f58c1e405ea17985f914d Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 28 Mar 2019 18:19:35 +0800 Subject: [PATCH 20/98] [autoscaler] add autoscaler plugin in jetstream --- .../src/actions/app-autoscaler.actions.ts | 2 +- .../store/src/effects/autoscaler.effects.ts | 9 ++- src/jetstream/load_plugins.go | 2 + .../plugins/autoscaler/autoscaler.go | 80 +++++++++++++++++++ src/jetstream/plugins/autoscaler/main.go | 53 ++++++++++++ 5 files changed, 141 insertions(+), 5 deletions(-) create mode 100644 src/jetstream/plugins/autoscaler/autoscaler.go create mode 100644 src/jetstream/plugins/autoscaler/main.go diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index 6fa20018b0..9b1c714a69 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -171,7 +171,7 @@ export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricActio public params ) { super(appGuid, cfGuid, metricName, skipFormat, trigger, params); - this.url = `apps/${appGuid}/aggregated_metric_histories/${metricName}`; + this.url = `apps/${appGuid}/metric/${metricName}`; } entityKey = appAutoscalerAppMetricSchemaKey; } diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts index 9553ba9311..1a7e1190f7 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -40,8 +40,9 @@ import { import { PaginatedAction } from './../types/pagination.types'; const { proxyAPIVersion, autoscalerAPIVersion } = environment; -const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; -const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; +const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; +// const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; +// const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; export function createAutoscalerRequestMessage(requestType, error) { return `Unable to ${requestType}: ${error.status} ${error._body}`; @@ -68,7 +69,7 @@ export class AutoscalerEffects { } as ICFAction; this.store.dispatch(new StartRequestAction(apiAction, actionType)); const options = new RequestOptions(); - options.url = `${healthPrefix}/health`; + options.url = `${commonPrefix}/health`; options.method = 'get'; options.headers = this.addHeaders(action.cfGuid); return this.http @@ -237,7 +238,7 @@ export class AutoscalerEffects { const paginatedAction = action as PaginatedAction; this.store.dispatch(new StartRequestAction(apiAction, actionType)); const options = new RequestOptions(); - options.url = `${commonPrefix}/apps/${action.appGuid}/scaling_histories`; + options.url = `${commonPrefix}/apps/${action.appGuid}/event`; options.method = 'get'; options.headers = this.addHeaders(action.cfGuid); // Set params from store diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go index 9a2b679e44..0c8b9fe639 100644 --- a/src/jetstream/load_plugins.go +++ b/src/jetstream/load_plugins.go @@ -1,6 +1,7 @@ package main import ( + "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/autoscaler" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfappssh" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry" @@ -32,6 +33,7 @@ func (pp *portalProxy) loadPlugins() { // userinvite depends on cloudfoundry & cloudfoundryhosting {"userinvite", userinvite.Init}, {"userfavorites", userfavorites.Init}, + {"autoscaler", autoscaler.Init}, } { plugin, err := p.Init(pp) pp.Plugins[p.Name] = plugin diff --git a/src/jetstream/plugins/autoscaler/autoscaler.go b/src/jetstream/plugins/autoscaler/autoscaler.go new file mode 100644 index 0000000000..8bb14dfb72 --- /dev/null +++ b/src/jetstream/plugins/autoscaler/autoscaler.go @@ -0,0 +1,80 @@ +package autoscaler + +import ( + "fmt" + "net/url" + + "github.com/labstack/echo" +) + +func (a *Autoscaler) getAutoscalerHealth(echoContext echo.Context) error { + healthURL, _ := url.Parse("/health") + responses, err := a.portalProxy.ProxyRequest(echoContext, healthURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} + +func (a *Autoscaler) getAutoscalerPolicy(echoContext echo.Context) error { + appID := echoContext.Param("appId") + policyURL, _ := url.Parse("/v1/apps/" + appID + "/policy") + responses, err := a.portalProxy.ProxyRequest(echoContext, policyURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} + +func (a *Autoscaler) attachAutoscalerPolicy(echoContext echo.Context) error { + appID := echoContext.Param("appId") + policyURL, _ := url.Parse("/v1/apps/" + appID + "/policy") + responses, err := a.portalProxy.ProxyRequest(echoContext, policyURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} + +func (a *Autoscaler) detachAutoscalerPolicy(echoContext echo.Context) error { + appID := echoContext.Param("appId") + policyURL, _ := url.Parse("/v1/apps/" + appID + "/policy") + responses, err := a.portalProxy.ProxyRequest(echoContext, policyURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} + +func (a *Autoscaler) getAutoscalerMetric(echoContext echo.Context) error { + appID := echoContext.Param("appId") + metricType := echoContext.Param("metricType") + start := echoContext.QueryParam("start-time") + end := echoContext.QueryParam("end-time") + page := echoContext.QueryParam("page") + perPage := echoContext.QueryParam("results-per-page") + order := echoContext.QueryParam("order") + queryURL := fmt.Sprintf("?start-time=%s&end-time=%s&page=%s&results-per-page=%s&order=%s", start, end, page, perPage, order) + metricURL, _ := url.Parse("/v1/apps/" + appID + "/aggregated_metric_histories/" + metricType + queryURL) + responses, err := a.portalProxy.ProxyRequest(echoContext, metricURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} + +func (a *Autoscaler) getAutoscalerEvent(echoContext echo.Context) error { + appID := echoContext.Param("appId") + start := echoContext.QueryParam("start-time") + end := echoContext.QueryParam("end-time") + page := echoContext.QueryParam("page") + perPage := echoContext.QueryParam("results-per-page") + order := echoContext.QueryParam("order") + queryURL := fmt.Sprintf("?start-time=%s&end-time=%s&page=%s&results-per-page=%s&order=%s", start, end, page, perPage, order) + eventURL, _ := url.Parse("/v1/apps/" + appID + "/scaling_histories" + queryURL) + responses, err := a.portalProxy.ProxyRequest(echoContext, eventURL) + if err != nil { + return err + } + return a.portalProxy.SendProxiedResponse(echoContext, responses) +} diff --git a/src/jetstream/plugins/autoscaler/main.go b/src/jetstream/plugins/autoscaler/main.go new file mode 100644 index 0000000000..28e7cba8d8 --- /dev/null +++ b/src/jetstream/plugins/autoscaler/main.go @@ -0,0 +1,53 @@ +package autoscaler + +import ( + "errors" + + "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" + "github.com/labstack/echo" +) + +// Autoscaler is a plugin to allow applications to be pushed to Cloud Foundry from Stratos +type Autoscaler struct { + portalProxy interfaces.PortalProxy +} + +// Init creates a new Autoscaler +func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) { + return &Autoscaler{portalProxy: portalProxy}, nil +} + +// GetMiddlewarePlugin gets the middleware plugin for this plugin +func (a *Autoscaler) GetMiddlewarePlugin() (interfaces.MiddlewarePlugin, error) { + return nil, errors.New("Not implemented") +} + +// GetEndpointPlugin gets the endpoint plugin for this plugin +func (a *Autoscaler) GetEndpointPlugin() (interfaces.EndpointPlugin, error) { + return nil, errors.New("Not implemented") +} + +// GetRoutePlugin gets the route plugin for this plugin +func (a *Autoscaler) GetRoutePlugin() (interfaces.RoutePlugin, error) { + return a, nil +} + +// AddAdminGroupRoutes adds the admin routes for this plugin to the Echo server +func (a *Autoscaler) AddAdminGroupRoutes(echoGroup *echo.Group) { + // no-op +} + +// AddSessionGroupRoutes adds the session routes for this plugin to the Echo server +func (a *Autoscaler) AddSessionGroupRoutes(echoGroup *echo.Group) { + echoGroup.GET("/autoscaler/health", a.getAutoscalerHealth) + echoGroup.GET("/autoscaler/apps/:appId/policy", a.getAutoscalerPolicy) + echoGroup.PUT("/autoscaler/apps/:appId/policy", a.attachAutoscalerPolicy) + echoGroup.DELETE("/autoscaler/apps/:appId/policy", a.detachAutoscalerPolicy) + echoGroup.GET("/autoscaler/apps/:appId/metric/:metricType", a.getAutoscalerMetric) + echoGroup.GET("/autoscaler/apps/:appId/event", a.getAutoscalerEvent) +} + +// Init performs plugin initialization +func (a *Autoscaler) Init() error { + return nil +} From 7b4f39351ce5c476be55af42afe4850c92129628 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Sun, 31 Mar 2019 21:44:24 +0800 Subject: [PATCH 21/98] [autoscaler] add autoscaler extension tab --- .../autoscaler-tab-extension.component.html | 265 ++++++++++++++++ .../autoscaler-tab-extension.component.scss | 65 ++++ .../autoscaler-tab-extension.component.ts | 283 ++++++++++++++++++ .../frontend/app/custom/custom.module.spec.ts | 13 + .../frontend/app/custom/custom.module.ts | 18 ++ .../src/core/extension/extension-service.ts | 1 + .../application-tabs-base.component.ts | 26 +- .../autoscaler-metric-page.component.ts | 2 +- ...autoscaler-scale-history-page.component.ts | 2 +- .../edit-autoscaler-policy.component.ts | 2 +- .../list/list-cards/cards.component.ts | 2 +- .../src/actions/app-autoscaler.actions.ts | 1 + .../store/src/effects/autoscaler.effects.ts | 7 +- 13 files changed, 671 insertions(+), 16 deletions(-) create mode 100644 custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html create mode 100644 custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss create mode 100644 custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.ts create mode 100644 custom-src/frontend/app/custom/custom.module.spec.ts create mode 100644 custom-src/frontend/app/custom/custom.module.ts diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html new file mode 100644 index 0000000000..394a44b742 --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -0,0 +1,265 @@ + +
+ + + + + + Status + + +
+
+ Policy + undefined +
+
+ + + + + + + + + + + + Status + + +
+
+ Policy defined + Policy defined + Policy undefined + Policy + undefined +
+
+ + + + + + + + + + + + + Latest Metrics + + +
+
+ + + + +
+
+ + + + + + + +
+ + + + + Scaling Rules + + +
+ + + + + + + + + + + + + + + +
Metric {{element.metric_type}} Condition {{element.operator}} {{element.threshold}} for + {{element.breach_duration_secs}} secs. Action {{element.adjustment}} instances
+
+ + + + + + + + + + + Scheduled Limit Rules + + in {{policy.schedules.timezone}} + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
From {{element.start_date_time}} To {{element.end_date_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + + element.end_date : 'Aways'}} Repeats On {{element.days_of_month}} {{element.days_of_week}} of + the + {{element.days_of_week? 'week': 'month'}} From {{element.start_time}} To {{element.end_time}} Initial + {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
+
+ + + + + + + +
+ + + + + Latest Events + + +
+ + + + + + + + + + + + + + + + + + + +
Event Instances scaled + {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to + {{element.new_instances}} Trigger {{element.reason}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.message}} {{element.error}}
+
+ + + + + + + + +
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss new file mode 100644 index 0000000000..c6a01d2eaf --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -0,0 +1,65 @@ +.app-auto-scaler { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } + } + + .app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + app-metadata-item:first-child { + margin-top: 0; + } + } + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } + app-metadata-item { + margin-bottom: 0; + } + } + + app-tile-grid { + width: 100%; + } + + table { + width: 100%; + } + + .app-auto-scaler-policy-left { + flex: 0 0 40%; + } + + .app-auto-scaler-tile { + &-1of2 { + flex: 0 0 50%; + } + &-1of3 { + flex: 0 0 30%; + } + &-1of6 { + flex: 0 0 16.78%; + } + } + + .app-auto-scaler-limit { + display: inherit; + mat-card { + width: 50%; + } + } + \ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.ts new file mode 100644 index 0000000000..218cb93c7a --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -0,0 +1,283 @@ +import { StratosTab, StratosTabType } from '../../core/extension/extension-service'; +import { ApplicationService } from '../../features/applications/application.service'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, Subscription } from 'rxjs'; +import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators'; +import { + DetachAppAutoscalerPolicyAction, + GetAppAutoscalerAppMetricAction, + GetAppAutoscalerPolicyAction, + GetAppAutoscalerHealthAction, + GetAppAutoscalerScalingHistoryAction, + UpdateAppAutoscalerPolicyAction, +} from '../../../../store/src/actions/app-autoscaler.actions'; +import { RouterNav } from '../../../../store/src/actions/router.actions'; +import { AppState } from '../../../../store/src/app-state'; +import { MetricTypes } from '../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { + appAutoscalerHealthSchemaKey, + appAutoscalerAppMetricSchemaKey, + appAutoscalerPolicySchemaKey, + appAutoscalerScalingHistorySchemaKey, + entityFactory, +} from '../../../../store/src/helpers/entity-factory'; +import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; +import { + getPaginationObservables, +} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'; +import { + AppAutoscalerAppMetric, + AppAutoscalerPolicy, + AppAutoscalerScalingHistory, +} from '../../../../store/src/types/app-autoscaler.types'; +import { EntityService } from '../../core/entity-service'; +import { EntityServiceFactory } from '../../core/entity-service-factory.service'; +import { ConfirmationDialogConfig } from '../../shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service'; +import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory'; + +@StratosTab({ + type: StratosTabType.Application, + label: 'Autoscale', + link: 'autoscale', + action: new GetAppAutoscalerHealthAction(window.location.pathname.split('/')[3], window.location.pathname.split('/')[2]) +}) +@Component({ + selector: 'app-autoscaler-tab-extension', + templateUrl: './autoscaler-tab-extension.component.html', + styleUrls: ['./autoscaler-tab-extension.component.scss'], +}) +export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { + + scalingRuleColumns: string[] = ['metric', 'condition', 'action']; + specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; + recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; + scalingHistoryColumns: string[] = ['event', 'trigger', 'date', 'error']; + metricTypes: string[] = MetricTypes; + + appAutoscalerHealthService: EntityService; + appAutoscalerPolicyService: EntityService; + appAutoscalerScalingHistoryService: EntityService; + appAutoscalerEnablement$: Observable; + appAutoscalerPolicy$: Observable; + appAutoscalerScalingHistory$: Observable; + + private appAutoscalerPolicyErrorSub: Subscription; + private appAutoscalerScalingHistoryErrorSub: Subscription; + private appAutoscalerPolicySnackBarRef: MatSnackBarRef; + private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef; + + private detachConfirmOk = 0; + + appAutoscalerAppMetrics = {}; + appAutoscalerInsMetrics = {}; + appAutoscalerAppMetricNames = []; + + paramsMetrics = { + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + '000000', + page: '1', + 'results-per-page': '1', + order: 'desc' + }; + paramsHistory = { + 'start-time': 0, + 'end-time': (new Date()).getTime().toString() + '000000', + page: '1', + 'results-per-page': '5', + order: 'desc' + }; + + ngOnDestroy(): void { + if (this.appAutoscalerPolicySnackBarRef) { + this.appAutoscalerPolicySnackBarRef.dismiss(); + } + if (this.appAutoscalerScalingHistorySnackBarRef) { + this.appAutoscalerScalingHistorySnackBarRef.dismiss(); + } + if (this.appAutoscalerPolicyErrorSub) { + this.appAutoscalerPolicyErrorSub.unsubscribe(); + } + if (this.appAutoscalerScalingHistoryErrorSub) { + this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); + } + } + + constructor( + private store: Store, + private applicationService: ApplicationService, + private entityServiceFactory: EntityServiceFactory, + private paginationMonitorFactory: PaginationMonitorFactory, + private appAutoscalerPolicySnackBar: MatSnackBar, + private appAutoscalerScalingHistorySnackBar: MatSnackBar, + private confirmDialog: ConfirmationDialogService, + ) { } + + ngOnInit() { + // this.appAutoscalerHealthService = this.entityServiceFactory.create( + // appAutoscalerHealthSchemaKey, + // entityFactory(appAutoscalerHealthSchemaKey), + // this.applicationService.appGuid, + // new GetAppAutoscalerHealthAction(this.applicationService.appGuid, this.applicationService.cfGuid), + // false + // ); + // this.appAutoscalerEnablement$ = this.appAutoscalerHealthService.entityObs$.pipe( + // map(({ entity }) => { + // if (entity && entity.entity && entity.entity.uptime > 0) { + // console.log(true) + // return true; + // } else { + // console.log(false) + // return false; + // } + // }), + // publishReplay(1), + // refCount() + // ); + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); + this.loadLatestMetricsUponPolicy(entity.entity); + } + return entity && entity.entity; + }), + publishReplay(1), + refCount() + ); + this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( + appAutoscalerScalingHistorySchemaKey, + entityFactory(appAutoscalerScalingHistorySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, + this.applicationService.cfGuid, true, this.paramsHistory), + false + ); + this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( + map(({ entity }) => entity && entity.entity) + ); + this.initErrorSub(); + } + + getAppMetric(metricName: string, trigger: any, params: any) { + const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, + this.applicationService.cfGuid, metricName, true, trigger, params); + return getPaginationObservables({ + store: this.store, + action, + paginationMonitor: this.paginationMonitorFactory.create( + action.paginationKey, + entityFactory(appAutoscalerAppMetricSchemaKey) + ) + }, false).entities$; + } + + loadLatestMetricsUponPolicy(policyEntity) { + if (policyEntity.scaling_rules_map) { + this.appAutoscalerAppMetrics = {}; + Object.keys(policyEntity.scaling_rules_map).map((metricName) => { + this.appAutoscalerAppMetrics[metricName] = + this.getAppMetric(metricName, policyEntity.scaling_rules_map[metricName], this.paramsMetrics); + }); + } + } + + initErrorSub() { + this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error), + map(request => request.message), + distinctUntilChanged(), + ).subscribe(errorMessage => { + if (this.appAutoscalerPolicySnackBarRef) { + this.appAutoscalerPolicySnackBarRef.dismiss(); + } + this.appAutoscalerPolicySnackBarRef = this.appAutoscalerPolicySnackBar.open(errorMessage, 'Dismiss'); + }); + + this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error), + map(request => request.message), + distinctUntilChanged(), + ).subscribe(errorMessage => { + if (this.appAutoscalerScalingHistorySnackBarRef) { + this.appAutoscalerScalingHistorySnackBarRef.dismiss(); + } + this.appAutoscalerScalingHistorySnackBarRef = this.appAutoscalerScalingHistorySnackBar.open(errorMessage, 'Dismiss'); + }); + } + + diableAutoscaler() { + const confirmation = new ConfirmationDialogConfig( + 'Detach And Delete Policy', + 'Are you sure you want to detach and delete the policy?', + 'Detach and Delete', + true + ); + this.detachConfirmOk = this.detachConfirmOk === 1 ? 0 : 1; + this.confirmDialog.open(confirmation, () => { + this.detachConfirmOk = 2; + const doUpdate = () => this.detachPolicy(); + doUpdate().pipe( + first(), + ).subscribe(actionState => { + if (actionState.error) { + this.appAutoscalerPolicySnackBarRef = + this.appAutoscalerPolicySnackBar.open(`Failed to detach policy: ${actionState.message}`, 'Dismiss'); + } + }); + }); + } + + detachPolicy(): Observable { + this.store.dispatch( + new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) + ); + const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, + this.applicationService.appGuid, + UpdateAppAutoscalerPolicyAction.updateKey); + return this.store.select(actionState).pipe(filter(item => !!item)); + } + + updatePolicyPage = () => { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'edit-autoscaler-policy' + ] + })); + } + + metricChartPage() { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'app-autoscaler-metric-page' + ] + })); + } + + scaleHistoryPage() { + this.store.dispatch(new RouterNav({ + path: [ + 'applications', + this.applicationService.cfGuid, + this.applicationService.appGuid, + 'app-autoscaler-scale-history-page' + ] + })); + } +} diff --git a/custom-src/frontend/app/custom/custom.module.spec.ts b/custom-src/frontend/app/custom/custom.module.spec.ts new file mode 100644 index 0000000000..cef2dc7211 --- /dev/null +++ b/custom-src/frontend/app/custom/custom.module.spec.ts @@ -0,0 +1,13 @@ +import { CustomModule } from './custom.module'; + +describe('CustomModule', () => { + let customModule: CustomModule; + + beforeEach(() => { + customModule = new CustomModule(); + }); + + it('should create an instance', () => { + expect(customModule).toBeTruthy(); + }); +}); diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts new file mode 100644 index 0000000000..c92b231f5c --- /dev/null +++ b/custom-src/frontend/app/custom/custom.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { AutoscalerTabExtensionComponent } from './autoscaler-tab-extension/autoscaler-tab-extension.component'; +import { SharedModule } from '../shared/shared.module'; +import { MDAppModule } from '../core/md.module'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +@NgModule({ + imports: [ + CommonModule, + SharedModule, + MDAppModule, + NgxChartsModule + ], + declarations: [AutoscalerTabExtensionComponent], + entryComponents: [AutoscalerTabExtensionComponent] +}) +export class CustomModule { } diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts index 60febeabbf..b98335e682 100644 --- a/src/frontend/packages/core/src/core/extension/extension-service.ts +++ b/src/frontend/packages/core/src/core/extension/extension-service.ts @@ -30,6 +30,7 @@ export interface StratosTabMetadata { type: StratosTabType; label: string; link: string; + action: any; } // The different types of Action diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index 4bde06cad3..fd69050160 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -134,13 +134,13 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { }), first() ); - this.applicationService.waitForAppAutoscalerHealth$ - .pipe(first()) - .subscribe(entity => { - if (entity && entity.entity && entity.entity.entity && entity.entity.entity.uptime > 0) { - this.tabLinks.push({ link: 'auto-scaler', label: 'Autoscale' }); - } - }); + // this.applicationService.waitForAppAutoscalerHealth$ + // .pipe(first()) + // .subscribe(entity => { + // if (entity && entity.entity && entity.entity.entity && entity.entity.entity.uptime > 0) { + // this.tabLinks.push({ link: 'auto-scaler', label: 'Autoscale' }); + // } + // }); this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => { if (hasMetrics) { @@ -152,7 +152,17 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { }); // Add any tabs from extensions - this.tabLinks = this.tabLinks.concat(getTabsFromExtensions(StratosTabType.Application)); + const tabs = getTabsFromExtensions(StratosTabType.Application); + tabs.map((extensionTab) => { + if (extensionTab.action) { + extensionTab.action.onSucceed = () => { + this.tabLinks.push(extensionTab); + }; + this.store.dispatch(extensionTab.action); + } else { + this.tabLinks.push(extensionTab); + } + }); // Ensure Git SCM tab gets updated if the app is redeployed from a different SCM Type this.stratosProjectSub = this.applicationService.applicationStratProject$ diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts index fe9e543323..a69552d55e 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts +++ b/src/frontend/packages/core/src/features/applications/autoscaler-metric-page/autoscaler-metric-page.component.ts @@ -19,7 +19,7 @@ import { }) export class AutoscalerMetricPageComponent { - parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`; constructor( public applicationService: ApplicationService, diff --git a/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts index a12c836e86..9dd85df071 100644 --- a/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts +++ b/src/frontend/packages/core/src/features/applications/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts @@ -16,7 +16,7 @@ import { ListConfig } from '../../../shared/components/list/list.component.types }) export class AutoscalerScaleHistoryPageComponent { - parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`; constructor( public applicationService: ApplicationService, diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 5b8be6a490..f97709edf5 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -49,7 +49,7 @@ import * as moment from 'moment-timezone'; }) export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { - parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/auto-scaler`; + parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`; alertInvalidPolicyMinimumRange = 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.'; alertInvalidPolicyMaximumRange = 'The Maximum Instance Count must be a integer greater than the Minimum Instance Count.'; diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts index 3231118444..c3e5c8193e 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/cards.component.ts @@ -31,7 +31,7 @@ export class CardsComponent { return this.dataSource.trackBy(index, item.entity); } return this.dataSource.trackBy(index, item); - } + }; } public isMultiActionItem(component: any | MultiActionListEntity) { diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index 9b1c714a69..40458374c7 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -48,6 +48,7 @@ export class GetAppAutoscalerHealthAction implements IRequestAction { public appGuid: string, public cfGuid: string, ) { } + onSucceed: any; type = APP_AUTOSCALER_HEALTH; entityKey = appAutoscalerHealthSchemaKey; } diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts index 1a7e1190f7..9a6ac56029 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -3,8 +3,6 @@ import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angula import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; - -import { LoggerService } from '../../../core/src/core/logger.service'; import { environment } from '../../../core/src/environments/environment.prod'; import { APP_AUTOSCALER_HEALTH, @@ -54,7 +52,6 @@ export class AutoscalerEffects { private http: Http, private actions$: Actions, private store: Store, - private logger: LoggerService, ) { } @Effect() @@ -81,6 +78,9 @@ export class AutoscalerEffects { result: [] } as NormalizedResponse; this.transformData(action.entityKey, mappedData, action.appGuid, healthInfo); + if (healthInfo.uptime > 0 && action.onSucceed) { + action.onSucceed(); + } return [ new WrapperRequestActionSuccess(mappedData, apiAction, actionType) ]; @@ -165,7 +165,6 @@ export class AutoscalerEffects { })); })); - @Effect() detachAppAutoscalerPolicy$ = this.actions$.pipe( ofType(DETACH_APP_AUTOSCALER_POLICY), From 683279a7289b814a30f49707175bbbd80644d2eb Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Sat, 6 Apr 2019 19:47:29 +0800 Subject: [PATCH 22/98] [autoscaler] force validate corelated input components --- .../autoscaler-tab-extension.component.scss | 111 ++++--- .../edit-autoscaler-policy.component.html | 16 +- .../edit-autoscaler-policy.component.ts | 293 ++++++++++++------ ...utoscaler-metric-chart-card.component.scss | 3 +- .../src/helpers/autoscaler/autoscaler-util.ts | 14 +- 5 files changed, 270 insertions(+), 167 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index c6a01d2eaf..71f22a22b6 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -1,65 +1,64 @@ .app-auto-scaler { - display: flex; - position: relative; - width: 100%; - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; } - - .app-metadata { - display: flex; - flex-direction: row; - &__two-cols { - flex: 1; - app-metadata-item:first-child { - margin-top: 0; - } - } - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } - app-metadata-item { - margin-bottom: 0; +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + app-metadata-item:first-child { + margin-top: 0; } } - - app-tile-grid { - width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; } - - table { - width: 100%; + app-metadata-item { + margin-bottom: 0; } - - .app-auto-scaler-policy-left { - flex: 0 0 40%; +} + +app-tile-grid { + width: 100%; +} + +table { + width: 100%; +} + +.app-auto-scaler-policy-left { + flex: 0 0 40%; +} + +.app-auto-scaler-tile { + &-1of2 { + flex: 0 0 50%; } - - .app-auto-scaler-tile { - &-1of2 { - flex: 0 0 50%; - } - &-1of3 { - flex: 0 0 30%; - } - &-1of6 { - flex: 0 0 16.78%; - } + &-1of3 { + flex: 0 0 30%; } - - .app-auto-scaler-limit { - display: inherit; - mat-card { - width: 50%; - } + &-1of6 { + flex: 0 0 16.78%; + } +} + +.app-auto-scaler-limit { + display: inherit; + mat-card { + width: 50%; } - \ No newline at end of file +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 70fe847d48..fe9ab6b292 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -263,18 +263,18 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en *ngIf="editRecurringScheduleForm.get('end_date').hasError('alertInvalidPolicyScheduleEndDateBeforeNow')"> {{alertInvalidPolicyScheduleEndDateBeforeNow}} - {{alertInvalidPolicyScheduleEndDateBeforeStartDate}} - + --> {{alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - {{alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - + --> {{alertInvalidPolicyScheduleRepeatOn}} @@ -388,13 +388,13 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en {{alertInvalidPolicyScheduleSpecificConflict}} - {{alert_invalid_policy_schedule_start_endtime_before_now}} + *ngIf="editSpecificDateForm.get('end_date_time').hasError('alertInvalidPolicyScheduleEndDateTimeBeforeNow')"> + {{alertInvalidPolicyScheduleEndDateTimeBeforeNow}} - {{alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime}} - + --> {{alertInvalidPolicyScheduleSpecificConflict}} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index f97709edf5..33468da892 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -19,6 +19,7 @@ import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscal import { UpperOperators, LowerOperators, + PolicyDefault, PolicyDefaultSetting, MetricTypes, getScaleType, @@ -94,8 +95,22 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { editTriggerForm: FormGroup; editRecurringScheduleForm: FormGroup; editSpecificDateForm: FormGroup; + private editLimitValid = true; + private editRecurringDateValid = true; + private editRecurringTimeValid = true; + private editSpecificDateTimeValid = true; private appAutoscalerPolicyErrorSub: Subscription; + private appAutoscalerPolicyService: EntityService; + private appAutoscalerPolicyUpdateService: EntityService; + appAutoscalerPolicy$: Observable; + + private currentPolicy: any; + private editIndex = -1; + private editScaleType = 'upper'; + private editAdjustmentType = 'value'; + private editEffectiveType = 'always'; + private editRepeatType = 'week'; submitMessage = ''; submitStatus = true; @@ -106,59 +121,12 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { private fb: FormBuilder, private entityServiceFactory: EntityServiceFactory, ) { - this.editLimitForm = this.fb.group({ - instance_min_count: [0, [Validators.required, this.validateGlobalLimitMin()]], - instance_max_count: [0, [Validators.required, this.validateGlobalLimitMax()]], - timezone: [0, [Validators.required]] - }); - this.editTriggerForm = this.fb.group({ - metric_type: [0], - operator: [0], - threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]], - adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]], - breach_duration_secs: [0, [ - Validators.min(PolicyDefaultSetting.breach_duration_secs_min), - Validators.max(PolicyDefaultSetting.breach_duration_secs_max) - ]], - cool_down_secs: [0, [ - Validators.min(PolicyDefaultSetting.cool_down_secs_min), - Validators.max(PolicyDefaultSetting.cool_down_secs_max) - ]], - adjustment_type: [0] - }); - this.editRecurringScheduleForm = this.fb.group({ - days_of_week: [0], - days_of_month: [0], - instance_min_count: [0, [Validators.required, this.validateRecurringScheduleMin()]], - instance_max_count: [0, [Validators.required, this.validateRecurringScheduleMax()]], - initial_min_instance_count: [0, [this.validateRecurringScheduleInitialMin()]], - start_date: [0], - end_date: [0], - start_time: [0, [Validators.required, this.validateRecurringScheduleStartTime()]], - end_time: [0, [Validators.required, this.validateRecurringScheduleEndTime()]], - effective_type: [0, [Validators.required]], - repeat_type: [0, [Validators.required]], - }); - this.editSpecificDateForm = this.fb.group({ - instance_min_count: [0, [Validators.required, this.validateSpecificDateMin()]], - instance_max_count: [0, [Validators.required, this.validateSpecificDateMax()]], - initial_min_instance_count: [0, [this.validateSpecificDateInitialMin()]], - start_date_time: [0, [Validators.required, this.validateSpecificDateStartDateTime()]], - end_date_time: [0, [Validators.required, this.validateSpecificDateEndDateTime()]] - }); + this.initLimitForm(); + this.initTriggerForm(); + this.initRecurringScheduleForm(); + this.initSpecificDateForm(); } - private appAutoscalerPolicyService: EntityService; - private appAutoscalerPolicyUpdateService: EntityService; - appAutoscalerPolicy$: Observable; - - private currentPolicy: any; - private editIndex = -1; - private editScaleType = 'upper'; - private editAdjustmentType = 'value'; - private editEffectiveType = 'always'; - private editRepeatType = 'week'; - ngOnInit() { this.appAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerPolicySchemaKey, @@ -172,16 +140,7 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (entity && entity.entity) { this.currentPolicy = entity.entity; } else { - this.currentPolicy = { - instance_min_count: 1, - instance_max_count: 10, - scaling_rules: [], - schedules: { - timezone: moment.tz.guess(), - recurring_schedule: [], - specific_date: [] - } - }; + this.currentPolicy = PolicyDefault; } if (!this.currentPolicy.scaling_rules_form) { this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); @@ -241,6 +200,13 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } // step1 + initLimitForm() { + this.editLimitForm = this.fb.group({ + instance_min_count: [0, [Validators.required, this.validateGlobalLimitMin()]], + instance_max_count: [0, [Validators.required, this.validateGlobalLimitMax()]], + timezone: [0, [Validators.required]] + }); + } finishLimit: StepOnNextFunction = () => { this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); @@ -249,20 +215,52 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } validateGlobalLimitMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editLimitForm && - numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true); + let invalid = false; + if (this.editLimitForm) { + invalid = numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true); + } + const lastValid = this.editLimitValid; + this.editLimitValid = this.editLimitForm && control.value < this.editLimitForm.get('instance_max_count').value; + if (this.editLimitForm && this.editLimitValid !== lastValid) { + this.editLimitForm.controls.instance_max_count.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; }; } validateGlobalLimitMax(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editLimitForm && numberWithFractionOrExceedRange(control.value, - this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + let invalid = false; + if (this.editLimitForm) { + invalid = numberWithFractionOrExceedRange(control.value, + this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + } + const lastValid = this.editLimitValid; + this.editLimitValid = this.editLimitForm && this.editLimitForm.get('instance_min_count').value < control.value; + if (this.editLimitForm && this.editLimitValid !== lastValid) { + this.editLimitForm.controls.instance_min_count.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; }; } // step2 + initTriggerForm() { + this.editTriggerForm = this.fb.group({ + metric_type: [0, this.validateTriggerMetricType()], + operator: [0, this.validateTriggerOperator()], + threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]], + adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]], + breach_duration_secs: [0, [ + Validators.min(PolicyDefaultSetting.breach_duration_secs_min), + Validators.max(PolicyDefaultSetting.breach_duration_secs_max) + ]], + cool_down_secs: [0, [ + Validators.min(PolicyDefaultSetting.cool_down_secs_min), + Validators.max(PolicyDefaultSetting.cool_down_secs_max) + ]], + adjustment_type: [0] + }); + } addTrigger = () => { this.currentPolicy.scaling_rules_form.push({ metric_type: 'memoryused', @@ -298,7 +296,7 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (this.editIndex !== -1) { const adjustmentp = this.editTriggerForm.get('adjustment_type').value === 'value' ? '' : '%'; const adjustmenti = this.editTriggerForm.get('adjustment').value; - const adjustmentm = (adjustmenti > 0 ? `+${adjustmenti}${adjustmentp}` : `${adjustmenti}${adjustmentp}`); + const adjustmentm = this.editScaleType === 'upper' ? `+${adjustmenti}${adjustmentp}` : `-${adjustmenti}${adjustmentp}`; this.currentPolicy.scaling_rules_form[this.editIndex].metric_type = this.editTriggerForm.get('metric_type').value; this.currentPolicy.scaling_rules_form[this.editIndex].operator = this.editTriggerForm.get('operator').value; this.currentPolicy.scaling_rules_form[this.editIndex].threshold = this.editTriggerForm.get('threshold').value; @@ -318,13 +316,29 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } return observableOf({ success: true }); } + validateTriggerMetricType(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editTriggerForm) { + this.editTriggerForm.controls.threshold.updateValueAndValidity(); + } + return null; + }; + } + validateTriggerOperator(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editTriggerForm) { + this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); + this.editTriggerForm.controls.threshold.updateValueAndValidity(); + } + return null; + }; + } validateTriggerThreshold(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (!this.editTriggerForm) { return null; } const metricType = this.editTriggerForm.get('metric_type').value; - this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; const errors: any = {}; if (metricType === 'memoryutil') { @@ -345,7 +359,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (!this.editTriggerForm) { return null; } - this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; const errors: any = {}; const max = this.editAdjustmentType === 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; @@ -357,6 +370,21 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } // step3 + initRecurringScheduleForm() { + this.editRecurringScheduleForm = this.fb.group({ + days_of_week: [0], + days_of_month: [0], + instance_min_count: [0], + instance_max_count: [0], + initial_min_instance_count: [0, [this.validateRecurringScheduleInitialMin()]], + start_date: [0, [this.validateRecurringScheduleGlobal()]], + end_date: [0, [this.validateRecurringScheduleGlobal()]], + start_time: [0, [Validators.required, this.validateRecurringScheduleStartTime(), this.validateRecurringScheduleGlobal()]], + end_time: [0, [Validators.required, this.validateRecurringScheduleEndTime(), this.validateRecurringScheduleGlobal()]], + effective_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], + repeat_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], + }); + } addRecurringSchedule = () => { this.currentPolicy.schedules.recurring_schedule.push({ start_time: '10:00', @@ -393,9 +421,18 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { effective_type: this.editEffectiveType, repeat_type: this.editRepeatType, }); + this.setRecurringScheduleValidator(); + } + setRecurringScheduleValidator() { + this.editRecurringScheduleForm.controls.instance_min_count. + setValidators([Validators.required, this.validateRecurringSpecificMin(this.editRecurringScheduleForm)]); + this.editRecurringScheduleForm.controls.instance_max_count. + setValidators([Validators.required, this.validateRecurringSpecificMax(this.editRecurringScheduleForm)]); if (this.editEffectiveType === 'custom') { - this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, this.validateRecurringScheduleStartDate()]); - this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, this.validateRecurringScheduleEndDate()]); + this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, + this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); + this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, + this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); } if (this.editRepeatType === 'week') { this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); @@ -427,18 +464,45 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { currentSchedule.end_time = this.editRecurringScheduleForm.get('end_time').value; this.editIndex = -1; } - validateRecurringScheduleMin(): ValidatorFn { + validateRecurringScheduleGlobal(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editRecurringScheduleForm && - this.editRecurringScheduleForm && numberWithFractionOrExceedRange(control.value, 1, - this.editRecurringScheduleForm.get('instance_max_count').value - 1, true); + if (this.editRecurringScheduleForm) { + if (this.editRepeatType === 'week') { + this.editRecurringScheduleForm.controls.days_of_week.updateValueAndValidity(); + } else { + this.editRecurringScheduleForm.controls.days_of_month.updateValueAndValidity(); + } + } + return null; + }; + } + validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); + const lastValid = this.editLimitValid; + this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_max_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; }; } - validateRecurringScheduleMax(): ValidatorFn { + validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editRecurringScheduleForm && numberWithFractionOrExceedRange(control.value, - this.editRecurringScheduleForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, + formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const lastValid = this.editLimitValid; + this.editLimitValid = + formGroup && formGroup.get('instance_min_count').value < control.value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_min_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; }; } @@ -459,9 +523,14 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { errors.alertInvalidPolicyScheduleStartDateBeforeNow = { value: control.value }; } - if (dateIsAfter(control.value, this.editRecurringScheduleForm.get('end_date').value)) { + const lastValid = this.editRecurringDateValid; + this.editRecurringDateValid = !dateIsAfter(control.value, this.editRecurringScheduleForm.get('end_date').value); + if (!this.editRecurringDateValid) { errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; } + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { + this.editRecurringScheduleForm.controls.end_date.updateValueAndValidity(); + } return Object.keys(errors).length === 0 ? null : errors; }; } @@ -474,9 +543,14 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { errors.alertInvalidPolicyScheduleEndDateBeforeNow = { value: control.value }; } - if (dateIsAfter(this.editRecurringScheduleForm.get('start_date').value, control.value)) { + const lastValid = this.editRecurringDateValid; + this.editRecurringDateValid = !dateIsAfter(this.editRecurringScheduleForm.get('start_date').value, control.value); + if (!this.editRecurringDateValid) { errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; } + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { + this.editRecurringScheduleForm.controls.start_date.updateValueAndValidity(); + } return Object.keys(errors).length === 0 ? null : errors; }; } @@ -484,6 +558,11 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { return (control: AbstractControl): { [key: string]: any } => { const invalid = this.editRecurringScheduleForm && this.editRecurringScheduleForm && timeIsSameOrAfter(control.value, this.editRecurringScheduleForm.get('end_time').value); + const lastValid = this.editRecurringTimeValid; + this.editRecurringTimeValid = !invalid; + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { + this.editRecurringScheduleForm.controls.end_time.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; }; } @@ -491,6 +570,11 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { return (control: AbstractControl): { [key: string]: any } => { const invalid = this.editRecurringScheduleForm && timeIsSameOrAfter(this.editRecurringScheduleForm.get('start_time').value, control.value); + const lastValid = this.editRecurringTimeValid; + this.editRecurringTimeValid = !invalid; + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { + this.editRecurringScheduleForm.controls.start_time.updateValueAndValidity(); + } return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; }; } @@ -529,8 +613,10 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); } - this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, this.validateRecurringScheduleStartDate()]); - this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, this.validateRecurringScheduleEndDate()]); + this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, + this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); + this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, + this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); } else { this.editRecurringScheduleForm.controls.start_date.clearValidators(); this.editRecurringScheduleForm.controls.end_date.clearValidators(); @@ -560,6 +646,15 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { } // step4 + initSpecificDateForm() { + this.editSpecificDateForm = this.fb.group({ + instance_min_count: [0], + instance_max_count: [0], + initial_min_instance_count: [0, [this.validateSpecificDateInitialMin()]], + start_date_time: [0, [Validators.required, this.validateSpecificDateStartDateTime()]], + end_date_time: [0, [Validators.required, this.validateSpecificDateEndDateTime()]] + }); + } addSpecificDate = () => { const nextStartDateTime = moment().add(1, 'days'); const nextEndDateTime = moment().add(1, 'days'); @@ -591,6 +686,10 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { start_date_time: this.currentPolicy.schedules.specific_date[index].start_date_time, end_date_time: this.currentPolicy.schedules.specific_date[index].end_date_time, }); + this.editSpecificDateForm.controls.instance_min_count. + setValidators([Validators.required, this.validateRecurringSpecificMin(this.editSpecificDateForm)]); + this.editSpecificDateForm.controls.instance_max_count. + setValidators([Validators.required, this.validateRecurringSpecificMax(this.editSpecificDateForm)]); } finishSpecificDate() { if (this.editSpecificDateForm.get('initial_min_instance_count').value) { @@ -607,20 +706,6 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { this.currentPolicy.schedules.specific_date[this.editIndex].end_date_time = this.editSpecificDateForm.get('end_date_time').value; this.editIndex = -1; } - validateSpecificDateMin(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, 1, - this.editSpecificDateForm.get('instance_max_count').value - 1, true); - return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; - }; - } - validateSpecificDateMax(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, - this.editSpecificDateForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); - return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; - }; - } validateSpecificDateInitialMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, @@ -641,9 +726,14 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { errors.alertInvalidPolicyScheduleStartDateTimeBeforeNow = { value: control.value }; } - if (dateTimeIsSameOrAfter(control.value, this.editSpecificDateForm.get('end_date_time').value)) { + const lastValid = this.editSpecificDateTimeValid; + this.editSpecificDateTimeValid = !dateTimeIsSameOrAfter(control.value, this.editSpecificDateForm.get('end_date_time').value); + if (!this.editSpecificDateTimeValid) { errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; } + if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { + this.editSpecificDateForm.controls.end_date_time.updateValueAndValidity(); + } if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; } @@ -660,14 +750,17 @@ export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { end_date_time: control.value }; const errors: any = {}; - if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), - control.value)) { + if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { errors.alertInvalidPolicyScheduleEndDateTimeBeforeNow = { value: control.value }; } - if (dateTimeIsSameOrAfter(this.editSpecificDateForm.get('start_date_time').value, - control.value)) { + const lastValid = this.editSpecificDateTimeValid; + this.editSpecificDateTimeValid = !dateTimeIsSameOrAfter(this.editSpecificDateForm.get('start_date_time').value, control.value); + if (!this.editSpecificDateTimeValid) { errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; } + if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { + this.editSpecificDateForm.controls.start_date_time.updateValueAndValidity(); + } if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index 0f214688cf..1ea3e3cc63 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -74,5 +74,4 @@ app-tile-grid { color: rgba(0, 0, 0, .54); font-size: .9em; margin-top: .3em; - -} \ No newline at end of file +} diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts index 43a2b0267d..345cc45d88 100644 --- a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts @@ -1,9 +1,21 @@ +import * as moment from 'moment-timezone'; + +export const PolicyDefault = { + instance_min_count: 1, + instance_max_count: 10, + scaling_rules: [], + schedules: { + timezone: moment.tz.guess(), + recurring_schedule: [], + specific_date: [] + } +}; export const PolicyDefaultSetting = { breach_duration_secs_default: 120, breach_duration_secs_min: 60, breach_duration_secs_max: 3600, - cool_down_secs_default: 120, + cool_down_secs_default: 300, cool_down_secs_min: 60, cool_down_secs_max: 3600, }; From 8c218238620f9e31b677b7abcff42f3f82fc86ae Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Mon, 8 Apr 2019 20:17:39 +0800 Subject: [PATCH 23/98] [autoscaler] split the edit page to 4 components --- .../autoscaler-tab-extension.component.html | 4 +- .../applications/applications.module.ts | 16 + ...dit-autoscaler-policy-step1.component.html | 23 + ...dit-autoscaler-policy-step1.component.scss | 3 + .../edit-autoscaler-policy-step1.component.ts | 131 +++ ...dit-autoscaler-policy-step2.component.html | 108 +++ ...dit-autoscaler-policy-step2.component.scss | 25 + .../edit-autoscaler-policy-step2.component.ts | 195 +++++ ...dit-autoscaler-policy-step3.component.html | 170 ++++ ...dit-autoscaler-policy-step3.component.scss | 38 + .../edit-autoscaler-policy-step3.component.ts | 360 +++++++++ ...dit-autoscaler-policy-step4.component.html | 114 +++ ...dit-autoscaler-policy-step4.component.scss | 32 + .../edit-autoscaler-policy-step4.component.ts | 274 +++++++ .../edit-autoscaler-policy.component.html | 427 +--------- .../edit-autoscaler-policy.component.scss | 51 -- .../edit-autoscaler-policy.component.ts | 753 +----------------- .../core/test-framework/store-test-helper.ts | 14 +- .../src/actions/app-autoscaler.actions.ts | 11 +- src/frontend/packages/store/src/app-state.ts | 2 + .../store/src/effects/autoscaler.effects.ts | 3 + .../src/helpers/autoscaler/autoscaler-util.ts | 28 + .../packages/store/src/reducers.module.ts | 4 +- .../edit-autoscaler-policy.reducer.ts | 20 + .../store/src/types/app-autoscaler.types.ts | 6 + 25 files changed, 1590 insertions(+), 1222 deletions(-) create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss create mode 100644 src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts create mode 100644 src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 394a44b742..817aaf48ee 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -80,13 +80,13 @@ - +

diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index 27cc3cd2f6..f8f9611ddb 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -26,6 +26,18 @@ import { VariablesTabComponent } from './application/application-tabs-base/tabs/ import { ApplicationsRoutingModule } from './applications.routing'; import { EditApplicationComponent } from './edit-application/edit-application.component'; import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; +import { + EditAutoscalerPolicyStep1Component +} from './edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component'; +import { + EditAutoscalerPolicyStep2Component +} from './edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component'; +import { + EditAutoscalerPolicyStep3Component +} from './edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component'; +import { + EditAutoscalerPolicyStep4Component +} from './edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; @@ -61,6 +73,10 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new SshApplicationComponent, EditApplicationComponent, EditAutoscalerPolicyComponent, + EditAutoscalerPolicyStep1Component, + EditAutoscalerPolicyStep2Component, + EditAutoscalerPolicyStep3Component, + EditAutoscalerPolicyStep4Component, AutoscalerMetricPageComponent, AutoscalerScaleHistoryPageComponent, InstancesTabComponent, diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html new file mode 100644 index 0000000000..e6b34922ba --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html @@ -0,0 +1,23 @@ +
+
+ + + + {{policyAlert.alertInvalidPolicyMinimumRange}} + + + + + + {{policyAlert.alertInvalidPolicyMaximumRange}} + + + + + + {{ timezone }} + + + +
+
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss new file mode 100644 index 0000000000..3d32b2c376 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss @@ -0,0 +1,3 @@ +.edit-app { + flex: 1; +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts new file mode 100644 index 0000000000..d84d286627 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -0,0 +1,131 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, of as observableOf, Subscription } from 'rxjs'; +import { map} from 'rxjs/operators'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../../store/src/app-state'; +import { ApplicationService } from '../../application.service'; +import { EntityService } from '../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerPolicySchemaKey +} from '../../../../../../store/src/helpers/entity-factory'; +import { + GetAppAutoscalerPolicyAction, + UpdateAppAutoscalerPolicyStepAction +} from '../../../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; +import { PolicyDefault, PolicyAlert } from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { autoscalerTransformArrayToMap } from '../../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; +import { numberWithFractionOrExceedRange } from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +import * as moment from 'moment-timezone'; + +@Component({ + selector: 'app-edit-autoscaler-policy-step1', + templateUrl: './edit-autoscaler-policy-step1.component.html', + styleUrls: ['./edit-autoscaler-policy-step1.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { + + policyAlert = PolicyAlert; + timezoneOptions = moment.tz.names(); + editLimitForm: FormGroup; + appAutoscalerPolicy$: Observable; + + private editLimitValid = true; + private appAutoscalerPolicyErrorSub: Subscription; + private appAutoscalerPolicyService: EntityService; + private currentPolicy: any; + + constructor( + public applicationService: ApplicationService, + private store: Store, + private fb: FormBuilder, + private entityServiceFactory: EntityServiceFactory, + ) { + this.editLimitForm = this.fb.group({ + instance_min_count: [0, [Validators.required, this.validateGlobalLimitMin()]], + instance_max_count: [0, [Validators.required, this.validateGlobalLimitMax()]], + timezone: [0, [Validators.required]] + }); + } + + ngOnInit() { + this.appAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + this.applicationService.appGuid, + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), + false + ); + this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + map(({ entity }) => { + if (entity && entity.entity) { + this.currentPolicy = entity.entity; + } else { + this.currentPolicy = PolicyDefault; + } + if (!this.currentPolicy.scaling_rules_form) { + this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); + } + this.editLimitForm.controls.timezone.setValue(this.currentPolicy.schedules.timezone); + this.editLimitForm.controls.instance_min_count.setValue(this.currentPolicy.instance_min_count); + this.editLimitForm.controls.instance_max_count.setValue(this.currentPolicy.instance_max_count); + this.editLimitForm.controls.instance_min_count.setValidators([Validators.required, this.validateGlobalLimitMin()]); + this.editLimitForm.controls.instance_max_count.setValidators([Validators.required, this.validateGlobalLimitMax()]); + return this.currentPolicy; + }) + ); + } + + ngOnDestroy(): void { + if (this.appAutoscalerPolicyErrorSub) { + this.appAutoscalerPolicyErrorSub.unsubscribe(); + } + } + + finishLimit: StepOnNextFunction = () => { + this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); + this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); + this.currentPolicy.schedules.timezone = this.editLimitForm.get('timezone').value; + this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); + return observableOf({ success: true }); + } + + validateGlobalLimitMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + let invalid = false; + if (this.editLimitForm) { + invalid = numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true); + } + const lastValid = this.editLimitValid; + this.editLimitValid = this.editLimitForm && control.value < this.editLimitForm.get('instance_max_count').value; + if (this.editLimitForm && this.editLimitValid !== lastValid) { + this.editLimitForm.controls.instance_max_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; + }; + } + + validateGlobalLimitMax(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + let invalid = false; + if (this.editLimitForm) { + invalid = numberWithFractionOrExceedRange(control.value, + this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + } + const lastValid = this.editLimitValid; + this.editLimitValid = this.editLimitForm && this.editLimitForm.get('instance_min_count').value < control.value; + if (this.editLimitForm && this.editLimitValid !== lastValid) { + this.editLimitForm.controls.instance_min_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; + }; + } +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html new file mode 100644 index 0000000000..2795c0a999 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -0,0 +1,108 @@ +
+ + + + + + + Rule {{index+1}}: + + + +
+ If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} + seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds. +
+
+
+ If average + + + + {{ metricType }} + + + + + + + {{ operator }} + + + + + + + for + + + + seconsds, then {{editScaleType=='upper'?'add':'remove'}} + + + + + + instances + % instances + + + . Cooldown: + + + + seconds. +
+ + Threshold is required + + + {{policyAlert.alertInvalidPolicyTriggerThreshold100}} + + + + {{policyAlert.alertInvalidPolicyTriggerUpperThresholdRange}} + + + {{policyAlert.alertInvalidPolicyTriggerLowerThresholdRange}} + + + + {{policyAlert.alertInvalidPolicyTriggerBreachDurationRange}} + + + Adjustment is required + + + + {{policyAlert.alertInvalidPolicyTriggerStepRange}} + + + {{policyAlert.alertInvalidPolicyTriggerStepPercentageRange}} + + + + {{policyAlert.alertInvalidPolicyTriggerCooldownRange}} + +
+ + + + + + + + + + +
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss new file mode 100644 index 0000000000..e8d2e304f7 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss @@ -0,0 +1,25 @@ +app-tile-grid { + width: 100%; +} + +.app-auto-scaler { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } +} + +.app-autoscaler-edit-policy-item { + .app-autoscaler-edit-policy-desc { + margin-bottom: .5em; + } + mat-error { + font-size: 85%; + } +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts new file mode 100644 index 0000000000..8301851d82 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -0,0 +1,195 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, of as observableOf } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../../store/src/app-state'; +import { ApplicationService } from '../../application.service'; +import { + UpperOperators, + LowerOperators, + PolicyDefaultSetting, + MetricTypes, + getScaleType, + getAdjustmentType, + PolicyAlert +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { + numberWithFractionOrExceedRange, + getThresholdMin, + getThresholdMax +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; +import { UpdateAppAutoscalerPolicyStepAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; + +@Component({ + selector: 'app-edit-autoscaler-policy-step2', + templateUrl: './edit-autoscaler-policy-step2.component.html', + styleUrls: ['./edit-autoscaler-policy-step2.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class EditAutoscalerPolicyStep2Component implements OnInit { + + policyAlert = PolicyAlert; + metricTypes = MetricTypes; + operatorTypes = UpperOperators.concat(LowerOperators); + editTriggerForm: FormGroup; + appAutoscalerPolicy$: Observable; + + public currentPolicy: any; + private editIndex = -1; + private editScaleType = 'upper'; + private editAdjustmentType = 'value'; + + constructor( + public applicationService: ApplicationService, + private store: Store, + private fb: FormBuilder, + ) { + this.editTriggerForm = this.fb.group({ + metric_type: [0, this.validateTriggerMetricType()], + operator: [0, this.validateTriggerOperator()], + threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]], + adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]], + breach_duration_secs: [0, [ + Validators.min(PolicyDefaultSetting.breach_duration_secs_min), + Validators.max(PolicyDefaultSetting.breach_duration_secs_max) + ]], + cool_down_secs: [0, [ + Validators.min(PolicyDefaultSetting.cool_down_secs_min), + Validators.max(PolicyDefaultSetting.cool_down_secs_max) + ]], + adjustment_type: [0] + }); + } + + ngOnInit() { + this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( + filter(state => true), + map(state => { + this.currentPolicy = state.policy; + return this.currentPolicy; + }) + ); + } + + addTrigger = () => { + this.currentPolicy.scaling_rules_form.push({ + metric_type: 'memoryused', + breach_duration_secs: PolicyDefaultSetting.breach_duration_secs_default, + threshold: 10, + operator: '<=', + cool_down_secs: PolicyDefaultSetting.cool_down_secs_default, + adjustment: '-1' + }); + this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); + } + + removeTrigger(index) { + if (this.editIndex === index) { + this.editIndex = -1; + } + this.currentPolicy.scaling_rules_form.splice(index, 1); + } + + editTrigger(index) { + this.editIndex = index; + this.editScaleType = getScaleType(this.currentPolicy.scaling_rules_form[index].operator); + this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment); + this.editTriggerForm.setValue({ + metric_type: this.currentPolicy.scaling_rules_form[index].metric_type, + operator: this.currentPolicy.scaling_rules_form[index].operator, + threshold: this.currentPolicy.scaling_rules_form[index].threshold, + adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)), + breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs, + cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs, + adjustment_type: this.currentPolicy.scaling_rules_form[index].adjustment.indexOf('%') >= 0 ? 'percentage' : 'value' + }); + } + + finishTrigger: StepOnNextFunction = () => { + if (this.editIndex !== -1) { + const adjustmentp = this.editTriggerForm.get('adjustment_type').value === 'value' ? '' : '%'; + const adjustmenti = this.editTriggerForm.get('adjustment').value; + const adjustmentm = this.editScaleType === 'upper' ? `+${adjustmenti}${adjustmentp}` : `-${adjustmenti}${adjustmentp}`; + this.currentPolicy.scaling_rules_form[this.editIndex].metric_type = this.editTriggerForm.get('metric_type').value; + this.currentPolicy.scaling_rules_form[this.editIndex].operator = this.editTriggerForm.get('operator').value; + this.currentPolicy.scaling_rules_form[this.editIndex].threshold = this.editTriggerForm.get('threshold').value; + this.currentPolicy.scaling_rules_form[this.editIndex].adjustment = adjustmentm; + if (this.editTriggerForm.get('breach_duration_secs').value) { + this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = + this.editTriggerForm.get('breach_duration_secs').value; + } else { + this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = PolicyDefaultSetting.breach_duration_secs_default; + } + if (this.editTriggerForm.get('cool_down_secs').value) { + this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = this.editTriggerForm.get('cool_down_secs').value; + } else { + this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = PolicyDefaultSetting.cool_down_secs_default; + } + this.editIndex = -1; + } + this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); + return observableOf({ success: true }); + } + + validateTriggerMetricType(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editTriggerForm) { + this.editTriggerForm.controls.threshold.updateValueAndValidity(); + } + return null; + }; + } + + validateTriggerOperator(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editTriggerForm) { + this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); + this.editTriggerForm.controls.threshold.updateValueAndValidity(); + } + return null; + }; + } + + validateTriggerThreshold(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (!this.editTriggerForm) { + return null; + } + const metricType = this.editTriggerForm.get('metric_type').value; + this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; + const errors: any = {}; + if (metricType === 'memoryutil') { + if (numberWithFractionOrExceedRange(control.value, 1, 100, true)) { + errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; + } + } + const thresholdMin = getThresholdMin(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); + const thresholdMax = getThresholdMax(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); + if (numberWithFractionOrExceedRange(control.value, thresholdMin, thresholdMax, true)) { + errors.alertInvalidPolicyTriggerThresholdRange = { value: control.value }; + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + + validateTriggerAdjustment(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (!this.editTriggerForm) { + return null; + } + this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; + const errors: any = {}; + const max = this.editAdjustmentType === 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; + if (numberWithFractionOrExceedRange(control.value, 1, max, true)) { + errors.alertInvalidPolicyTriggerStepRange = {}; + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html new file mode 100644 index 0000000000..5bf9285737 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -0,0 +1,170 @@ +
+ + + + + + + Schedule {{index+1}}: + + + +
+ The initial number of application instance is + {{rule.initial_min_instance_count}}, and the range + The number of application instance + is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} during + {{rule.start_time}} ~ {{rule.end_time}} every + {{rule.days_of_month}} of the month + {{rule.days_of_week}} of the week + , effective from {{rule.start_date}} to {{rule.end_date}}. + . +
+
+
+
+
+ + + Always + + + + Custom + + + + + + + + + + + + + + Week + + + Month + + + + + + + {{day}} + + + + + {{day}} + + + +
+
+ + + + + + + + + + + + + + + + + + + +
+
+
+ + {{policyAlert.alertInvalidPolicyMinimumRange}} + + + {{policyAlert.alertInvalidPolicyMaximumRange}} + + + {{policyAlert.alertInvalidPolicyInitialMaximumRange}} + + + {{policyAlert.alertInvalidPolicyScheduleStartDateBeforeNow}} + + + {{policyAlert.alertInvalidPolicyScheduleEndDateBeforeStartDate}} + + + {{policyAlert.alertInvalidPolicyScheduleEndDateBeforeNow}} + + + + {{policyAlert.alertInvalidPolicyScheduleEndTimeBeforeStartTime}} + + + + {{policyAlert.alertInvalidPolicyScheduleRepeatOn}} + + + days_of_week {{policyAlert.alertInvalidPolicyScheduleRecurringConflict}} + + + {{policyAlert.alertInvalidPolicyScheduleRepeatOn}} + + + days_of_month {{policyAlert.alertInvalidPolicyScheduleRecurringConflict}} + +
+ + + + + + + + + + +
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss new file mode 100644 index 0000000000..ed12a3d092 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss @@ -0,0 +1,38 @@ +.mat-radio-outer-circle { + height: 15px; + top: 2.5px; + width: 15px; +} + +app-tile-grid { + width: 100%; +} + +.app-auto-scaler { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + margin-right: 3em; + app-metadata-item:first-child { + margin-top: 0; + } + } +} + +.edit-recurring-schedule { + max-width: 100%; +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts new file mode 100644 index 0000000000..1386038d22 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -0,0 +1,360 @@ +import { Component, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, of as observableOf } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../../store/src/app-state'; +import { ApplicationService } from '../../application.service'; +import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; +import { UpdateAppAutoscalerPolicyStepAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; +import { + MomentFormateDate, PolicyAlert +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { + numberWithFractionOrExceedRange, + dateIsAfter, + timeIsSameOrAfter, + recurringSchedulesOverlapping, +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +import * as moment from 'moment-timezone'; + +@Component({ + selector: 'app-edit-autoscaler-policy-step3', + templateUrl: './edit-autoscaler-policy-step3.component.html', + styleUrls: ['./edit-autoscaler-policy-step3.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class EditAutoscalerPolicyStep3Component implements OnInit { + + policyAlert = PolicyAlert; + weekdayOptions: string[] = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + monthdayOptions: number[] = (() => { + const days = []; + for (let i = 0; i < 31; i++) { + days[i] = i + 1; + } + return days; + })(); + editRecurringScheduleForm: FormGroup; + appAutoscalerPolicy$: Observable; + + private editRecurringDateValid = true; + private editRecurringTimeValid = true; + private currentPolicy: any; + private editIndex = -1; + private editEffectiveType = 'always'; + private editRepeatType = 'week'; + private editLimitValid = true; + + constructor( + public applicationService: ApplicationService, + private store: Store, + private fb: FormBuilder, + ) { + this.editRecurringScheduleForm = this.fb.group({ + days_of_week: [0], + days_of_month: [0], + instance_min_count: [0], + instance_max_count: [0], + initial_min_instance_count: [0, [this.validateRecurringScheduleInitialMin()]], + start_date: [0, [this.validateRecurringScheduleGlobal()]], + end_date: [0, [this.validateRecurringScheduleGlobal()]], + start_time: [0, [Validators.required, this.validateRecurringScheduleStartTime(), this.validateRecurringScheduleGlobal()]], + end_time: [0, [Validators.required, this.validateRecurringScheduleEndTime(), this.validateRecurringScheduleGlobal()]], + effective_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], + repeat_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], + }); + } + + ngOnInit() { + this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( + filter(state => true), + map(state => { + this.currentPolicy = state.policy; + return this.currentPolicy; + }) + ); + } + + addRecurringSchedule = () => { + this.currentPolicy.schedules.recurring_schedule.push({ + start_time: '10:00', + end_time: '18:00', + days_of_week: [ + 1, 2, 3 + ], + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }); + this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); + } + + removeRecurringSchedule(index) { + if (this.editIndex === index) { + this.editIndex = -1; + } + this.currentPolicy.schedules.recurring_schedule.splice(index, 1); + } + + editRecurringSchedule(index) { + this.editIndex = index; + this.editEffectiveType = this.currentPolicy.schedules.recurring_schedule[index].start_date ? 'custom' : 'always'; + this.editRepeatType = this.currentPolicy.schedules.recurring_schedule[index].days_of_week ? 'week' : 'month'; + this.editRecurringScheduleForm.setValue({ + days_of_week: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), + days_of_month: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), + instance_min_count: this.currentPolicy.schedules.recurring_schedule[index].instance_min_count, + instance_max_count: Math.abs(Number(this.currentPolicy.schedules.recurring_schedule[index].instance_max_count)), + initial_min_instance_count: this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count, + start_date: this.currentPolicy.schedules.recurring_schedule[index].start_date || '', + end_date: this.currentPolicy.schedules.recurring_schedule[index].end_date || '', + start_time: this.currentPolicy.schedules.recurring_schedule[index].start_time, + end_time: this.currentPolicy.schedules.recurring_schedule[index].end_time, + effective_type: this.editEffectiveType, + repeat_type: this.editRepeatType, + }); + this.setRecurringScheduleValidator(); + } + + setRecurringScheduleValidator() { + this.editRecurringScheduleForm.controls.instance_min_count. + setValidators([Validators.required, this.validateRecurringSpecificMin(this.editRecurringScheduleForm)]); + this.editRecurringScheduleForm.controls.instance_max_count. + setValidators([Validators.required, this.validateRecurringSpecificMax(this.editRecurringScheduleForm)]); + if (this.editEffectiveType === 'custom') { + this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, + this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); + this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, + this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); + } + if (this.editRepeatType === 'week') { + this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); + } else { + this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); + } + } + + finishRecurringSchedule: StepOnNextFunction = () => { + const currentSchedule = this.currentPolicy.schedules.recurring_schedule[this.editIndex]; + const repeatOn = 'days_of_' + this.editRepeatType; + if (this.editRecurringScheduleForm.get('effective_type').value === 'custom') { + currentSchedule.start_date = this.editRecurringScheduleForm.get('start_date').value; + currentSchedule.end_date = this.editRecurringScheduleForm.get('end_date').value; + } else { + delete currentSchedule.start_date; + delete currentSchedule.end_date; + } + delete currentSchedule.days_of_month; + delete currentSchedule.days_of_week; + currentSchedule[repeatOn] = this.shiftArray(this.editRecurringScheduleForm.get(repeatOn).value, 1); + if (this.editRecurringScheduleForm.get('initial_min_instance_count').value) { + currentSchedule.initial_min_instance_count = this.editRecurringScheduleForm.get('initial_min_instance_count').value; + } else { + delete currentSchedule.initial_min_instance_count; + } + currentSchedule.instance_min_count = this.editRecurringScheduleForm.get('instance_min_count').value; + currentSchedule.instance_max_count = this.editRecurringScheduleForm.get('instance_max_count').value; + currentSchedule.start_time = this.editRecurringScheduleForm.get('start_time').value; + currentSchedule.end_time = this.editRecurringScheduleForm.get('end_time').value; + this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); + this.editIndex = -1; + return observableOf({ success: true }); + } + + validateRecurringScheduleGlobal(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editRecurringScheduleForm) { + if (this.editRepeatType === 'week') { + this.editRecurringScheduleForm.controls.days_of_week.updateValueAndValidity(); + } else { + this.editRecurringScheduleForm.controls.days_of_month.updateValueAndValidity(); + } + } + return null; + }; + } + + validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); + const lastValid = this.editLimitValid; + this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_max_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; + }; + } + + validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, + formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const lastValid = this.editLimitValid; + this.editLimitValid = + formGroup && formGroup.get('instance_min_count').value < control.value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_min_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; + }; + } + + validateRecurringScheduleInitialMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.editRecurringScheduleForm && + numberWithFractionOrExceedRange(control.value, this.editRecurringScheduleForm.get('instance_min_count').value, + this.editRecurringScheduleForm.get('instance_max_count').value + 1, false); + return invalid ? { alertInvalidPolicyInitialMaximumRange: { value: control.value } } : null; + }; + } + + validateRecurringScheduleStartDate(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editEffectiveType === 'always') { + return null; + } + const errors: any = {}; + if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { + errors.alertInvalidPolicyScheduleStartDateBeforeNow = { value: control.value }; + } + const lastValid = this.editRecurringDateValid; + this.editRecurringDateValid = !dateIsAfter(control.value, this.editRecurringScheduleForm.get('end_date').value); + if (!this.editRecurringDateValid) { + errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; + } + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { + this.editRecurringScheduleForm.controls.end_date.updateValueAndValidity(); + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + + validateRecurringScheduleEndDate(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editEffectiveType === 'always') { + return null; + } + const errors: any = {}; + if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { + errors.alertInvalidPolicyScheduleEndDateBeforeNow = { value: control.value }; + } + const lastValid = this.editRecurringDateValid; + this.editRecurringDateValid = !dateIsAfter(this.editRecurringScheduleForm.get('start_date').value, control.value); + if (!this.editRecurringDateValid) { + errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; + } + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { + this.editRecurringScheduleForm.controls.start_date.updateValueAndValidity(); + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + + validateRecurringScheduleStartTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.editRecurringScheduleForm && this.editRecurringScheduleForm && + timeIsSameOrAfter(control.value, this.editRecurringScheduleForm.get('end_time').value); + const lastValid = this.editRecurringTimeValid; + this.editRecurringTimeValid = !invalid; + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { + this.editRecurringScheduleForm.controls.end_time.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; + }; + } + + validateRecurringScheduleEndTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.editRecurringScheduleForm && + timeIsSameOrAfter(this.editRecurringScheduleForm.get('start_time').value, control.value); + const lastValid = this.editRecurringTimeValid; + this.editRecurringTimeValid = !invalid; + if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { + this.editRecurringScheduleForm.controls.start_time.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; + }; + } + + validateRecurringScheduleWeekMonth(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const newSchedule: any = { + start_time: this.editRecurringScheduleForm.get('start_time').value, + end_time: this.editRecurringScheduleForm.get('end_time').value + }; + if (this.editRepeatType === 'week') { + newSchedule.days_of_week = this.shiftArray(control.value, 1); + } else { + newSchedule.days_of_month = this.shiftArray(control.value, 1); + } + if (this.editEffectiveType === 'custom') { + newSchedule.start_date = this.editRecurringScheduleForm.get('start_date').value; + newSchedule.end_date = this.editRecurringScheduleForm.get('end_date').value; + } + const invalid = recurringSchedulesOverlapping(newSchedule, this.editIndex, + this.currentPolicy.schedules.recurring_schedule, 'days_of_' + this.editRepeatType); + return invalid ? { alertInvalidPolicyScheduleRecurringConflict: { value: control.value } } : null; + }; + } + + shiftArray(daysOfWeek, step) { + const days = []; + for (let i = 0; i < daysOfWeek.length; i++) { + days[i] = daysOfWeek[i] + step; + } + return days; + } + + resetEffectiveType(key) { + this.editEffectiveType = key; + if (key === 'custom') { + if (!this.currentPolicy.schedules.recurring_schedule[this.editIndex].start_date && + !this.editRecurringScheduleForm.get('start_date').value) { + this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); + this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); + } + this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, + this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); + this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, + this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); + } else { + this.editRecurringScheduleForm.controls.start_date.clearValidators(); + this.editRecurringScheduleForm.controls.end_date.clearValidators(); + this.editRecurringScheduleForm.controls.start_date.setValue(this.editRecurringScheduleForm.get('start_date').value); + this.editRecurringScheduleForm.controls.end_date.setValue(this.editRecurringScheduleForm.get('end_date').value); + } + } + + resetRepeatType(key) { + this.editRepeatType = key; + if (key === 'week') { + if (!this.editRecurringScheduleForm.controls.days_of_week.value || + this.editRecurringScheduleForm.controls.days_of_week.value.length === 0) { + this.editRecurringScheduleForm.controls.days_of_week.setValue([0]); + } + this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); + this.editRecurringScheduleForm.controls.days_of_month.clearValidators(); + this.editRecurringScheduleForm.controls.days_of_month.setValue(this.editRecurringScheduleForm.get('days_of_month').value); + } else { + if (!this.editRecurringScheduleForm.controls.days_of_month.value || + this.editRecurringScheduleForm.controls.days_of_month.value.length === 0) { + this.editRecurringScheduleForm.controls.days_of_month.setValue([0]); + } + this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); + this.editRecurringScheduleForm.controls.days_of_week.clearValidators(); + this.editRecurringScheduleForm.controls.days_of_week.setValue(this.editRecurringScheduleForm.get('days_of_week').value); + } + } +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html new file mode 100644 index 0000000000..c12aea14ba --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -0,0 +1,114 @@ +
+ + + + + + + Schedule {{index+1}}: + + + +
+ The initial number of application instance is + {{rule.initial_min_instance_count}}, and the range + The number of application instance + is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} from + {{rule.start_date_time}} to {{rule.end_date_time}}. +
+
+
+
+
+ + + + + + + + +
+
+ + + + + + + + + + + +
+
+
+ + {{policyAlert.alertInvalidPolicyMinimumRange}} + + + {{policyAlert.alertInvalidPolicyMaximumRange}} + + + {{policyAlert.alertInvalidPolicyInitialMaximumRange}} + + + {{policyAlert.alertInvalidPolicyScheduleStartDateTimeBeforeNow}} + + + {{policyAlert.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime}} + + + {{policyAlert.alertInvalidPolicyScheduleSpecificConflict}} + + + {{policyAlert.alertInvalidPolicyScheduleEndDateTimeBeforeNow}} + + + +
+ + + + + + + + + + + + {{submitMessage}} + +
+ {{submitMessage}} +
+
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss new file mode 100644 index 0000000000..2191714b72 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss @@ -0,0 +1,32 @@ +app-tile-grid { + width: 100%; +} + +.app-auto-scaler { + display: flex; + position: relative; + width: 100%; + &__actions { + bottom: 24px; + padding-top: 0; + position: absolute; + right: 24px; + text-align: right; + } +} + +.app-metadata { + display: flex; + flex-direction: row; + &__two-cols { + flex: 1; + margin-right: 3em; + app-metadata-item:first-child { + margin-top: 0; + } + } +} + +.edit-specific-date { + max-width: 100%; +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts new file mode 100644 index 0000000000..9001a95d70 --- /dev/null +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -0,0 +1,274 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; +import { Store } from '@ngrx/store'; +import { Observable, of as observableOf, Subscription } from 'rxjs'; +import { filter, map, distinctUntilChanged, publishReplay, refCount, first } from 'rxjs/operators'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../../store/src/app-state'; +import { ApplicationService } from '../../application.service'; +import { EntityService } from '../../../../core/entity-service'; +import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; +import { + entityFactory, + appAutoscalerUpdatedPolicySchemaKey +} from '../../../../../../store/src/helpers/entity-factory'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; +import { + MomentFormateDateTimeT, PolicyAlert +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { + numberWithFractionOrExceedRange, + dateTimeIsSameOrAfter, + specificDateRangeOverlapping +} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +import * as moment from 'moment-timezone'; +import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; + +@Component({ + selector: 'app-edit-autoscaler-policy-step4', + templateUrl: './edit-autoscaler-policy-step4.component.html', + styleUrls: ['./edit-autoscaler-policy-step4.component.scss'], + providers: [ + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + ] +}) +export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { + + policyAlert = PolicyAlert; + editSpecificDateForm: FormGroup; + submitMessage = ''; + submitStatus = true; + appAutoscalerPolicy$: Observable; + + private editLimitValid = true; + private editSpecificDateTimeValid = true; + private appAutoscalerPolicyErrorSub: Subscription; + private currentPolicy: any; + private editIndex = -1; + + constructor( + public applicationService: ApplicationService, + private store: Store, + private fb: FormBuilder, + private entityServiceFactory: EntityServiceFactory, + ) { + this.editSpecificDateForm = this.fb.group({ + instance_min_count: [0], + instance_max_count: [0], + initial_min_instance_count: [0, [this.validateSpecificDateInitialMin()]], + start_date_time: [0, [Validators.required, this.validateSpecificDateStartDateTime()]], + end_date_time: [0, [Validators.required, this.validateSpecificDateEndDateTime()]] + }); + } + + ngOnInit() { + this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( + filter(state => true), + map(state => { + this.currentPolicy = state.policy; + return this.currentPolicy; + }) + ); + } + + ngOnDestroy(): void { + if (this.appAutoscalerPolicyErrorSub) { + this.appAutoscalerPolicyErrorSub.unsubscribe(); + } + } + + updatePolicy: StepOnNextFunction = () => { + this.submitStatus = true; + this.submitMessage = ''; + let updateAppAutoscalerPolicyService: EntityService; + updateAppAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerUpdatedPolicySchemaKey, + entityFactory(appAutoscalerUpdatedPolicySchemaKey), + this.applicationService.appGuid, + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy), + false + ); + this.store.dispatch( + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) + ); + + let waitForAppAutoscalerUpdateStatus$: Observable; + waitForAppAutoscalerUpdateStatus$ = updateAppAutoscalerPolicyService.waitForEntity$.pipe(publishReplay(1), refCount()); + waitForAppAutoscalerUpdateStatus$ + .pipe(first()) + .subscribe(entity => { + this.submitStatus = true; + this.submitMessage = 'Policy is saved.'; + this.currentPolicy = entity.entity; + this.store.dispatch( + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) + ); + }); + this.appAutoscalerPolicyErrorSub = updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error), + map(request => request.message), + distinctUntilChanged(), + ).subscribe(errorMessage => { + this.submitStatus = false; + this.submitMessage = errorMessage; + }); + return observableOf({ success: this.submitStatus, message: this.submitMessage }); + } + + addSpecificDate = () => { + const nextStartDateTime = moment().add(1, 'days'); + const nextEndDateTime = moment().add(1, 'days'); + nextStartDateTime.set('hour', 10); + nextStartDateTime.set('minute', 0); + nextEndDateTime.set('hour', 18); + nextEndDateTime.set('minute', 0); + this.currentPolicy.schedules.specific_date.push({ + start_date_time: nextStartDateTime.format(MomentFormateDateTimeT), + end_date_time: nextEndDateTime.format(MomentFormateDateTimeT), + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }); + this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); + } + + removeSpecificDate(index) { + if (this.editIndex === index) { + this.editIndex = -1; + } + this.currentPolicy.schedules.specific_date.splice(index, 1); + } + + editSpecificDate(index) { + this.editIndex = index; + this.editSpecificDateForm.setValue({ + instance_min_count: this.currentPolicy.schedules.specific_date[index].instance_min_count, + instance_max_count: Math.abs(Number(this.currentPolicy.schedules.specific_date[index].instance_max_count)), + initial_min_instance_count: this.currentPolicy.schedules.specific_date[index].initial_min_instance_count, + start_date_time: this.currentPolicy.schedules.specific_date[index].start_date_time, + end_date_time: this.currentPolicy.schedules.specific_date[index].end_date_time, + }); + this.editSpecificDateForm.controls.instance_min_count. + setValidators([Validators.required, this.validateRecurringSpecificMin(this.editSpecificDateForm)]); + this.editSpecificDateForm.controls.instance_max_count. + setValidators([Validators.required, this.validateRecurringSpecificMax(this.editSpecificDateForm)]); + } + + finishSpecificDate() { + if (this.editSpecificDateForm.get('initial_min_instance_count').value) { + this.currentPolicy.schedules.specific_date[this.editIndex].initial_min_instance_count = + this.editSpecificDateForm.get('initial_min_instance_count').value; + } else { + delete this.currentPolicy.schedules.specific_date[this.editIndex].initial_min_instance_count; + } + this.currentPolicy.schedules.specific_date[this.editIndex].instance_min_count = + this.editSpecificDateForm.get('instance_min_count').value; + this.currentPolicy.schedules.specific_date[this.editIndex].instance_max_count = + this.editSpecificDateForm.get('instance_max_count').value; + this.currentPolicy.schedules.specific_date[this.editIndex].start_date_time = this.editSpecificDateForm.get('start_date_time').value; + this.currentPolicy.schedules.specific_date[this.editIndex].end_date_time = this.editSpecificDateForm.get('end_date_time').value; + this.editIndex = -1; + } + + validateSpecificDateInitialMin(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, + this.editSpecificDateForm.get('instance_min_count').value, this.editSpecificDateForm.get('instance_max_count').value + 1, false); + return invalid ? { alertInvalidPolicyInitialMaximumRange: { value: control.value } } : null; + }; + } + + validateSpecificDateStartDateTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (!this.editSpecificDateForm) { + return null; + } + const newSchedule = { + start_date_time: control.value, + end_date_time: this.editSpecificDateForm.get('end_date_time').value + }; + const lastValid = this.editSpecificDateTimeValid; + this.editSpecificDateTimeValid = true; + const errors: any = {}; + if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { + errors.alertInvalidPolicyScheduleStartDateTimeBeforeNow = { value: control.value }; + } + if (dateTimeIsSameOrAfter(control.value, this.editSpecificDateForm.get('end_date_time').value)) { + this.editSpecificDateTimeValid = false; + errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; + } + if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { + this.editSpecificDateTimeValid = false; + errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; + } + if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { + this.editSpecificDateForm.controls.end_date_time.updateValueAndValidity(); + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + + validateSpecificDateEndDateTime(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (!this.editSpecificDateForm) { + return null; + } + const newSchedule = { + start_date_time: this.editSpecificDateForm.get('start_date_time').value, + end_date_time: control.value + }; + const lastValid = this.editSpecificDateTimeValid; + this.editSpecificDateTimeValid = true; + const errors: any = {}; + if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { + errors.alertInvalidPolicyScheduleEndDateTimeBeforeNow = { value: control.value }; + } + if (dateTimeIsSameOrAfter(this.editSpecificDateForm.get('start_date_time').value, control.value)) { + this.editSpecificDateTimeValid = false; + errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; + } + if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { + this.editSpecificDateTimeValid = false; + errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; + } + if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { + this.editSpecificDateForm.controls.start_date_time.updateValueAndValidity(); + } + return Object.keys(errors).length === 0 ? null : errors; + }; + } + + validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); + const lastValid = this.editLimitValid; + this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_max_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; + }; + } + + validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + const invalid = formGroup && numberWithFractionOrExceedRange(control.value, + formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const lastValid = this.editLimitValid; + this.editLimitValid = + formGroup && formGroup.get('instance_min_count').value < control.value; + if (formGroup && lastValid !== this.editLimitValid) { + formGroup.controls.instance_min_count.updateValueAndValidity(); + } + if (formGroup) { + formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + } + return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; + }; + } +} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html index fe9ab6b292..d0269200dd 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -6,423 +6,20 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en

- - -
- - - - {{alertInvalidPolicyMinimumRange}} - - - - - - {{alertInvalidPolicyMaximumRange}} - - - - - - {{ timezone }} - - - -
+ + + - - - - - - - - Rule {{index+1}}: - - - -
- If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} - seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds. -
-
-
- If average - - - - {{ metricType }} - - - - - - - {{ operator }} - - - - - - - for - - - - seconsds, then {{editScaleType=='upper'?'add':'remove'}} - - - - - - instances - % instances - - - . Cooldown: - - - - seconds. -
- - Threshold is required - - - {{alertInvalidPolicyTriggerThreshold100}} - - - - {{alertInvalidPolicyTriggerUpperThresholdRange}} - - - {{alertInvalidPolicyTriggerLowerThresholdRange}} - - - - {{alertInvalidPolicyTriggerBreachDurationRange}} - - - Adjustment is required - - - - {{alertInvalidPolicyTriggerStepRange}} - - - {{alertInvalidPolicyTriggerStepPercentageRange}} - - - - {{alertInvalidPolicyTriggerCooldownRange}} - -
- - - - - - - - - - + + - - - - - - - - Schedule {{index+1}}: - - - -
- The initial number of application instance is - {{rule.initial_min_instance_count}}, and the range - The number of application instance - is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} during - {{rule.start_time}} ~ {{rule.end_time}} every - {{rule.days_of_month}} of the month - {{rule.days_of_week}} of the week - , effective from {{rule.start_date}} to {{rule.end_date}}. - . -
-
-
-
-
- - - Always - - - - Custom - - - - - - - - - - - - - - Week - - - Month - - - - - - - {{day}} - - - - - {{day}} - - - -
-
- - - - - - - - - - - - - - - - - - - -
-
-
- - {{alertInvalidPolicyMinimumRange}} - - - {{alertInvalidPolicyMaximumRange}} - - - {{alertInvalidPolicyInitialMaximumRange}} - - - {{alertInvalidPolicyScheduleStartDateBeforeNow}} - - - {{alertInvalidPolicyScheduleEndDateBeforeStartDate}} - - - {{alertInvalidPolicyScheduleEndDateBeforeNow}} - - - - {{alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - - - - {{alertInvalidPolicyScheduleRepeatOn}} - - - days_of_week {{alertInvalidPolicyScheduleRecurringConflict}} - - - {{alertInvalidPolicyScheduleRepeatOn}} - - - days_of_month {{alertInvalidPolicyScheduleRecurringConflict}} - -
- - - - - - - - - - + + - - - - - - - - Schedule {{index+1}}: - - - -
- The initial number of application instance is - {{rule.initial_min_instance_count}}, and the range - The number of application instance - is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} from - {{rule.start_date_time}} to {{rule.end_date_time}}. -
-
-
-
-
- - - - - - - - -
-
- - - - - - - - - - - -
-
-
- - {{alertInvalidPolicyMinimumRange}} - - - {{alertInvalidPolicyMaximumRange}} - - - {{alertInvalidPolicyInitialMaximumRange}} - - - {{alertInvalidPolicyScheduleStartDateTimeBeforeNow}} - - - {{alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime}} - - - {{alertInvalidPolicyScheduleSpecificConflict}} - - - {{alertInvalidPolicyScheduleEndDateTimeBeforeNow}} - - - - {{alertInvalidPolicyScheduleSpecificConflict}} - -
- - - - - - - - - - - - {{submitMessage}} - -
- {{submitMessage}} -
+ + \ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index 9fc035b612..e69de29bb2 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -1,51 +0,0 @@ -.edit-app { - flex: 1; -} - -.mat-radio-outer-circle { - height: 15px; - top: 2.5px; - width: 15px; -} - -app-tile-grid { - width: 100%; -} - -.app-auto-scaler { - display: flex; - position: relative; - width: 100%; - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } -} - -.app-metadata { - display: flex; - flex-direction: row; - &__two-cols { - flex: 1; - margin-right: 3em; - app-metadata-item:first-child { - margin-top: 0; - } - } -} - -.edit-recurring-schedule { - max-width: 100%; -} - -.app-autoscaler-edit-policy-item { - .app-autoscaler-edit-policy-desc { - margin-bottom: .5em; - } - mat-error { - font-size: 85%; - } -} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 33468da892..12e01e0add 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -1,44 +1,6 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { Component } from '@angular/core'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, of as observableOf, Subscription } from 'rxjs'; -import { filter, map, distinctUntilChanged, publishReplay, refCount, first } from 'rxjs/operators'; -import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; -import { AppState } from '../../../../../store/src/app-state'; import { ApplicationService } from '../application.service'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { - entityFactory, - appAutoscalerPolicySchemaKey, - appAutoscalerUpdatedPolicySchemaKey -} from '../../../../../store/src/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../store/src/types/app-autoscaler.types'; -import { - UpperOperators, - LowerOperators, - PolicyDefault, - PolicyDefaultSetting, - MetricTypes, - getScaleType, - getAdjustmentType, - MomentFormateDate, - MomentFormateDateTimeT -} from '../../../../../store/src/helpers/autoscaler/autoscaler-util'; -import { autoscalerTransformArrayToMap } from '../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; -import { - numberWithFractionOrExceedRange, - getThresholdMin, - getThresholdMax, - dateIsAfter, - timeIsSameOrAfter, - dateTimeIsSameOrAfter, - recurringSchedulesOverlapping, - specificDateRangeOverlapping -} from '../../../../../store/src/helpers/autoscaler/autoscaler-validation'; -import * as moment from 'moment-timezone'; @Component({ selector: 'app-edit-autoscaler-policy', @@ -48,723 +10,12 @@ import * as moment from 'moment-timezone'; { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyComponent implements OnInit, OnDestroy { +export class EditAutoscalerPolicyComponent { parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`; - alertInvalidPolicyMinimumRange = 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.'; - alertInvalidPolicyMaximumRange = 'The Maximum Instance Count must be a integer greater than the Minimum Instance Count.'; - alertInvalidPolicyInitialMaximumRange = - 'The Initial Minimum Instance Count must be a integer in the range of Minimum Instance Count to Maximum Instance Count.'; - alertInvalidPolicyTriggerUpperThresholdRange = 'The Upper Threshold value must be an integer greater than the Lower Threshold value.'; - alertInvalidPolicyTriggerLowerThresholdRange = 'The Lower Threshold value must be an integer in the range of 1 to (Upper Threshold-1).'; - alertInvalidPolicyTriggerThreshold100 = 'The Lower/Upper Threshold value of memoryutil must be an integer below or equal to 100.'; - alertInvalidPolicyTriggerStepPercentageRange = 'The Instance Step Up/Down percentage must be a integer greater than 1.'; - alertInvalidPolicyTriggerStepRange = 'The Instance Step Up/Down value must be a integer in the range of 1 to (Maximum Instance-1).'; - alertInvalidPolicyTriggerBreachDurationRange = - `The breach duration value must be an integer in the range of ${PolicyDefaultSetting.breach_duration_secs_min} to - ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`; - alertInvalidPolicyTriggerCooldownRange = - `The cooldown period value must be an integer in the range of ${PolicyDefaultSetting.cool_down_secs_min} to - ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`; - alertInvalidPolicyScheduleStartDateBeforeNow = 'Start date should be after or equal to current date.'; - alertInvalidPolicyScheduleEndDateBeforeNow = 'End date should be after or equal to current date.'; - alertInvalidPolicyScheduleEndDateBeforeStartDate = 'Start date must be earlier than the end date.'; - alertInvalidPolicyScheduleEndTimeBeforeStartTime = 'Start time must be earlier than the end time.'; - alertInvalidPolicyScheduleRepeatOn = 'Please select at least one "Repeat On" day.'; - alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = 'Start date and time must be earlier than the end date and time.'; - alertInvalidPolicyScheduleStartDateTimeBeforeNow = 'Start date and time must be after or equal to current date time.'; - alertInvalidPolicyScheduleEndDateTimeBeforeNow = 'End date and time must be after or equal the current date and time.'; - alertInvalidPolicyScheduleRecurringConflict = 'Recurring schedule configuration conflict occurs.'; - alertInvalidPolicyScheduleSpecificConflict = 'Specific date configuration conflict occurs.'; - - weekdayOptions: string[] = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; - monthdayOptions: number[] = (() => { - const days = []; - for (let i = 0; i < 31; i++) { - days[i] = i + 1; - } - return days; - })(); - timezoneOptions = moment.tz.names(); - - metricTypes = MetricTypes; - operatorTypes = UpperOperators.concat(LowerOperators); - - editLimitForm: FormGroup; - editTriggerForm: FormGroup; - editRecurringScheduleForm: FormGroup; - editSpecificDateForm: FormGroup; - private editLimitValid = true; - private editRecurringDateValid = true; - private editRecurringTimeValid = true; - private editSpecificDateTimeValid = true; - - private appAutoscalerPolicyErrorSub: Subscription; - private appAutoscalerPolicyService: EntityService; - private appAutoscalerPolicyUpdateService: EntityService; - appAutoscalerPolicy$: Observable; - - private currentPolicy: any; - private editIndex = -1; - private editScaleType = 'upper'; - private editAdjustmentType = 'value'; - private editEffectiveType = 'always'; - private editRepeatType = 'week'; - - submitMessage = ''; - submitStatus = true; - constructor( public applicationService: ApplicationService, - private store: Store, - private fb: FormBuilder, - private entityServiceFactory: EntityServiceFactory, ) { - this.initLimitForm(); - this.initTriggerForm(); - this.initRecurringScheduleForm(); - this.initSpecificDateForm(); - } - - ngOnInit() { - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), - false - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - if (entity && entity.entity) { - this.currentPolicy = entity.entity; - } else { - this.currentPolicy = PolicyDefault; - } - if (!this.currentPolicy.scaling_rules_form) { - this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); - } - this.editLimitForm.controls.timezone.setValue(this.currentPolicy.schedules.timezone); - this.editLimitForm.controls.instance_min_count.setValue(this.currentPolicy.instance_min_count); - this.editLimitForm.controls.instance_max_count.setValue(this.currentPolicy.instance_max_count); - this.editLimitForm.controls.instance_min_count.setValidators([Validators.required, this.validateGlobalLimitMin()]); - this.editLimitForm.controls.instance_max_count.setValidators([Validators.required, this.validateGlobalLimitMax()]); - return this.currentPolicy; - }) - ); - } - - ngOnDestroy(): void { - if (this.appAutoscalerPolicyErrorSub) { - this.appAutoscalerPolicyErrorSub.unsubscribe(); - } - } - - updatePolicy: StepOnNextFunction = () => { - this.submitStatus = true; - this.submitMessage = ''; - let updateAppAutoscalerPolicyService: EntityService; - updateAppAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerUpdatedPolicySchemaKey, - entityFactory(appAutoscalerUpdatedPolicySchemaKey), - this.applicationService.appGuid, - new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy), - false - ); - this.store.dispatch( - new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) - ); - - let waitForAppAutoscalerHealth$: Observable; - waitForAppAutoscalerHealth$ = updateAppAutoscalerPolicyService.waitForEntity$.pipe(publishReplay(1), refCount()); - waitForAppAutoscalerHealth$ - .pipe(first()) - .subscribe(entity => { - this.submitStatus = true; - this.submitMessage = 'Policy is saved.'; - this.currentPolicy = entity.entity; - this.store.dispatch( - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) - ); - }); - this.appAutoscalerPolicyErrorSub = updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( - filter(request => !!request.error), - map(request => request.message), - distinctUntilChanged(), - ).subscribe(errorMessage => { - this.submitStatus = false; - this.submitMessage = errorMessage; - }); - return observableOf({ success: this.submitStatus, message: this.submitMessage }); - } - - // step1 - initLimitForm() { - this.editLimitForm = this.fb.group({ - instance_min_count: [0, [Validators.required, this.validateGlobalLimitMin()]], - instance_max_count: [0, [Validators.required, this.validateGlobalLimitMax()]], - timezone: [0, [Validators.required]] - }); - } - finishLimit: StepOnNextFunction = () => { - this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); - this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); - this.currentPolicy.schedules.timezone = this.editLimitForm.get('timezone').value; - return observableOf({ success: true }); - } - validateGlobalLimitMin(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - let invalid = false; - if (this.editLimitForm) { - invalid = numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true); - } - const lastValid = this.editLimitValid; - this.editLimitValid = this.editLimitForm && control.value < this.editLimitForm.get('instance_max_count').value; - if (this.editLimitForm && this.editLimitValid !== lastValid) { - this.editLimitForm.controls.instance_max_count.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; - }; - } - validateGlobalLimitMax(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - let invalid = false; - if (this.editLimitForm) { - invalid = numberWithFractionOrExceedRange(control.value, - this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); - } - const lastValid = this.editLimitValid; - this.editLimitValid = this.editLimitForm && this.editLimitForm.get('instance_min_count').value < control.value; - if (this.editLimitForm && this.editLimitValid !== lastValid) { - this.editLimitForm.controls.instance_min_count.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; - }; - } - - // step2 - initTriggerForm() { - this.editTriggerForm = this.fb.group({ - metric_type: [0, this.validateTriggerMetricType()], - operator: [0, this.validateTriggerOperator()], - threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]], - adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]], - breach_duration_secs: [0, [ - Validators.min(PolicyDefaultSetting.breach_duration_secs_min), - Validators.max(PolicyDefaultSetting.breach_duration_secs_max) - ]], - cool_down_secs: [0, [ - Validators.min(PolicyDefaultSetting.cool_down_secs_min), - Validators.max(PolicyDefaultSetting.cool_down_secs_max) - ]], - adjustment_type: [0] - }); - } - addTrigger = () => { - this.currentPolicy.scaling_rules_form.push({ - metric_type: 'memoryused', - breach_duration_secs: PolicyDefaultSetting.breach_duration_secs_default, - threshold: 10, - operator: '<=', - cool_down_secs: PolicyDefaultSetting.cool_down_secs_default, - adjustment: '-1' - }); - this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); - } - removeTrigger(index) { - if (this.editIndex === index) { - this.editIndex = -1; - } - this.currentPolicy.scaling_rules_form.splice(index, 1); - } - editTrigger(index) { - this.editIndex = index; - this.editScaleType = getScaleType(this.currentPolicy.scaling_rules_form[index].operator); - this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment); - this.editTriggerForm.setValue({ - metric_type: this.currentPolicy.scaling_rules_form[index].metric_type, - operator: this.currentPolicy.scaling_rules_form[index].operator, - threshold: this.currentPolicy.scaling_rules_form[index].threshold, - adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)), - breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs, - cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs, - adjustment_type: this.currentPolicy.scaling_rules_form[index].adjustment.indexOf('%') >= 0 ? 'percentage' : 'value' - }); - } - finishTrigger: StepOnNextFunction = () => { - if (this.editIndex !== -1) { - const adjustmentp = this.editTriggerForm.get('adjustment_type').value === 'value' ? '' : '%'; - const adjustmenti = this.editTriggerForm.get('adjustment').value; - const adjustmentm = this.editScaleType === 'upper' ? `+${adjustmenti}${adjustmentp}` : `-${adjustmenti}${adjustmentp}`; - this.currentPolicy.scaling_rules_form[this.editIndex].metric_type = this.editTriggerForm.get('metric_type').value; - this.currentPolicy.scaling_rules_form[this.editIndex].operator = this.editTriggerForm.get('operator').value; - this.currentPolicy.scaling_rules_form[this.editIndex].threshold = this.editTriggerForm.get('threshold').value; - this.currentPolicy.scaling_rules_form[this.editIndex].adjustment = adjustmentm; - if (this.editTriggerForm.get('breach_duration_secs').value) { - this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = - this.editTriggerForm.get('breach_duration_secs').value; - } else { - this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = PolicyDefaultSetting.breach_duration_secs_default; - } - if (this.editTriggerForm.get('cool_down_secs').value) { - this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = this.editTriggerForm.get('cool_down_secs').value; - } else { - this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = PolicyDefaultSetting.cool_down_secs_default; - } - this.editIndex = -1; - } - return observableOf({ success: true }); - } - validateTriggerMetricType(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (this.editTriggerForm) { - this.editTriggerForm.controls.threshold.updateValueAndValidity(); - } - return null; - }; - } - validateTriggerOperator(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (this.editTriggerForm) { - this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); - this.editTriggerForm.controls.threshold.updateValueAndValidity(); - } - return null; - }; - } - validateTriggerThreshold(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (!this.editTriggerForm) { - return null; - } - const metricType = this.editTriggerForm.get('metric_type').value; - this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; - const errors: any = {}; - if (metricType === 'memoryutil') { - if (numberWithFractionOrExceedRange(control.value, 1, 100, true)) { - errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; - } - } - const thresholdMin = getThresholdMin(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); - const thresholdMax = getThresholdMax(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); - if (numberWithFractionOrExceedRange(control.value, thresholdMin, thresholdMax, true)) { - errors.alertInvalidPolicyTriggerThresholdRange = { value: control.value }; - } - return Object.keys(errors).length === 0 ? null : errors; - }; - } - validateTriggerAdjustment(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (!this.editTriggerForm) { - return null; - } - this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; - const errors: any = {}; - const max = this.editAdjustmentType === 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; - if (numberWithFractionOrExceedRange(control.value, 1, max, true)) { - errors.alertInvalidPolicyTriggerStepRange = {}; - } - return Object.keys(errors).length === 0 ? null : errors; - }; - } - - // step3 - initRecurringScheduleForm() { - this.editRecurringScheduleForm = this.fb.group({ - days_of_week: [0], - days_of_month: [0], - instance_min_count: [0], - instance_max_count: [0], - initial_min_instance_count: [0, [this.validateRecurringScheduleInitialMin()]], - start_date: [0, [this.validateRecurringScheduleGlobal()]], - end_date: [0, [this.validateRecurringScheduleGlobal()]], - start_time: [0, [Validators.required, this.validateRecurringScheduleStartTime(), this.validateRecurringScheduleGlobal()]], - end_time: [0, [Validators.required, this.validateRecurringScheduleEndTime(), this.validateRecurringScheduleGlobal()]], - effective_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], - repeat_type: [0, [Validators.required, this.validateRecurringScheduleGlobal()]], - }); - } - addRecurringSchedule = () => { - this.currentPolicy.schedules.recurring_schedule.push({ - start_time: '10:00', - end_time: '18:00', - days_of_week: [ - 1, 2, 3 - ], - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 - }); - this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); - } - removeRecurringSchedule(index) { - if (this.editIndex === index) { - this.editIndex = -1; - } - this.currentPolicy.schedules.recurring_schedule.splice(index, 1); - } - editRecurringSchedule(index) { - this.editIndex = index; - this.editEffectiveType = this.currentPolicy.schedules.recurring_schedule[index].start_date ? 'custom' : 'always'; - this.editRepeatType = this.currentPolicy.schedules.recurring_schedule[index].days_of_week ? 'week' : 'month'; - this.editRecurringScheduleForm.setValue({ - days_of_week: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), - days_of_month: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), - instance_min_count: this.currentPolicy.schedules.recurring_schedule[index].instance_min_count, - instance_max_count: Math.abs(Number(this.currentPolicy.schedules.recurring_schedule[index].instance_max_count)), - initial_min_instance_count: this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count, - start_date: this.currentPolicy.schedules.recurring_schedule[index].start_date || '', - end_date: this.currentPolicy.schedules.recurring_schedule[index].end_date || '', - start_time: this.currentPolicy.schedules.recurring_schedule[index].start_time, - end_time: this.currentPolicy.schedules.recurring_schedule[index].end_time, - effective_type: this.editEffectiveType, - repeat_type: this.editRepeatType, - }); - this.setRecurringScheduleValidator(); - } - setRecurringScheduleValidator() { - this.editRecurringScheduleForm.controls.instance_min_count. - setValidators([Validators.required, this.validateRecurringSpecificMin(this.editRecurringScheduleForm)]); - this.editRecurringScheduleForm.controls.instance_max_count. - setValidators([Validators.required, this.validateRecurringSpecificMax(this.editRecurringScheduleForm)]); - if (this.editEffectiveType === 'custom') { - this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, - this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); - this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, - this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); - } - if (this.editRepeatType === 'week') { - this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); - } else { - this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); - } - } - finishRecurringSchedule() { - const currentSchedule = this.currentPolicy.schedules.recurring_schedule[this.editIndex]; - const repeatOn = 'days_of_' + this.editRepeatType; - if (this.editRecurringScheduleForm.get('effective_type').value === 'custom') { - currentSchedule.start_date = this.editRecurringScheduleForm.get('start_date').value; - currentSchedule.end_date = this.editRecurringScheduleForm.get('end_date').value; - } else { - delete currentSchedule.start_date; - delete currentSchedule.end_date; - } - delete currentSchedule.days_of_month; - delete currentSchedule.days_of_week; - currentSchedule[repeatOn] = this.shiftArray(this.editRecurringScheduleForm.get(repeatOn).value, 1); - if (this.editRecurringScheduleForm.get('initial_min_instance_count').value) { - currentSchedule.initial_min_instance_count = this.editRecurringScheduleForm.get('initial_min_instance_count').value; - } else { - delete currentSchedule.initial_min_instance_count; - } - currentSchedule.instance_min_count = this.editRecurringScheduleForm.get('instance_min_count').value; - currentSchedule.instance_max_count = this.editRecurringScheduleForm.get('instance_max_count').value; - currentSchedule.start_time = this.editRecurringScheduleForm.get('start_time').value; - currentSchedule.end_time = this.editRecurringScheduleForm.get('end_time').value; - this.editIndex = -1; - } - validateRecurringScheduleGlobal(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (this.editRecurringScheduleForm) { - if (this.editRepeatType === 'week') { - this.editRecurringScheduleForm.controls.days_of_week.updateValueAndValidity(); - } else { - this.editRecurringScheduleForm.controls.days_of_month.updateValueAndValidity(); - } - } - return null; - }; - } - validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); - const lastValid = this.editLimitValid; - this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_max_count.updateValueAndValidity(); - } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; - }; - } - validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, - formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); - const lastValid = this.editLimitValid; - this.editLimitValid = - formGroup && formGroup.get('instance_min_count').value < control.value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_min_count.updateValueAndValidity(); - } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; - }; - } - validateRecurringScheduleInitialMin(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editRecurringScheduleForm && - numberWithFractionOrExceedRange(control.value, this.editRecurringScheduleForm.get('instance_min_count').value, - this.editRecurringScheduleForm.get('instance_max_count').value + 1, false); - return invalid ? { alertInvalidPolicyInitialMaximumRange: { value: control.value } } : null; - }; - } - validateRecurringScheduleStartDate(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (this.editEffectiveType === 'always') { - return null; - } - const errors: any = {}; - if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { - errors.alertInvalidPolicyScheduleStartDateBeforeNow = { value: control.value }; - } - const lastValid = this.editRecurringDateValid; - this.editRecurringDateValid = !dateIsAfter(control.value, this.editRecurringScheduleForm.get('end_date').value); - if (!this.editRecurringDateValid) { - errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; - } - if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { - this.editRecurringScheduleForm.controls.end_date.updateValueAndValidity(); - } - return Object.keys(errors).length === 0 ? null : errors; - }; - } - validateRecurringScheduleEndDate(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (this.editEffectiveType === 'always') { - return null; - } - const errors: any = {}; - if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { - errors.alertInvalidPolicyScheduleEndDateBeforeNow = { value: control.value }; - } - const lastValid = this.editRecurringDateValid; - this.editRecurringDateValid = !dateIsAfter(this.editRecurringScheduleForm.get('start_date').value, control.value); - if (!this.editRecurringDateValid) { - errors.alertInvalidPolicyScheduleEndDateBeforeStartDate = { value: control.value }; - } - if (this.editRecurringScheduleForm && lastValid !== this.editRecurringDateValid) { - this.editRecurringScheduleForm.controls.start_date.updateValueAndValidity(); - } - return Object.keys(errors).length === 0 ? null : errors; - }; - } - validateRecurringScheduleStartTime(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editRecurringScheduleForm && this.editRecurringScheduleForm && - timeIsSameOrAfter(control.value, this.editRecurringScheduleForm.get('end_time').value); - const lastValid = this.editRecurringTimeValid; - this.editRecurringTimeValid = !invalid; - if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { - this.editRecurringScheduleForm.controls.end_time.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; - }; - } - validateRecurringScheduleEndTime(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editRecurringScheduleForm && - timeIsSameOrAfter(this.editRecurringScheduleForm.get('start_time').value, control.value); - const lastValid = this.editRecurringTimeValid; - this.editRecurringTimeValid = !invalid; - if (this.editRecurringScheduleForm && lastValid !== this.editRecurringTimeValid) { - this.editRecurringScheduleForm.controls.start_time.updateValueAndValidity(); - } - return invalid ? { alertInvalidPolicyScheduleEndTimeBeforeStartTime: { value: control.value } } : null; - }; - } - validateRecurringScheduleWeekMonth(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const newSchedule: any = { - start_time: this.editRecurringScheduleForm.get('start_time').value, - end_time: this.editRecurringScheduleForm.get('end_time').value - }; - if (this.editRepeatType === 'week') { - newSchedule.days_of_week = this.shiftArray(control.value, 1); - } else { - newSchedule.days_of_month = this.shiftArray(control.value, 1); - } - if (this.editEffectiveType === 'custom') { - newSchedule.start_date = this.editRecurringScheduleForm.get('start_date').value; - newSchedule.end_date = this.editRecurringScheduleForm.get('end_date').value; - } - const invalid = recurringSchedulesOverlapping(newSchedule, this.editIndex, - this.currentPolicy.schedules.recurring_schedule, 'days_of_' + this.editRepeatType); - return invalid ? { alertInvalidPolicyScheduleRecurringConflict: { value: control.value } } : null; - }; - } - shiftArray(daysOfWeek, step) { - const days = []; - for (let i = 0; i < daysOfWeek.length; i++) { - days[i] = daysOfWeek[i] + step; - } - return days; - } - resetEffectiveType(key) { - this.editEffectiveType = key; - if (key === 'custom') { - if (!this.currentPolicy.schedules.recurring_schedule[this.editIndex].start_date && - !this.editRecurringScheduleForm.get('start_date').value) { - this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); - this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); - } - this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, - this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); - this.editRecurringScheduleForm.controls.end_date.setValidators([Validators.required, - this.validateRecurringScheduleEndDate(), this.validateRecurringScheduleGlobal()]); - } else { - this.editRecurringScheduleForm.controls.start_date.clearValidators(); - this.editRecurringScheduleForm.controls.end_date.clearValidators(); - this.editRecurringScheduleForm.controls.start_date.setValue(this.editRecurringScheduleForm.get('start_date').value); - this.editRecurringScheduleForm.controls.end_date.setValue(this.editRecurringScheduleForm.get('end_date').value); - } - } - resetRepeatType(key) { - this.editRepeatType = key; - if (key === 'week') { - if (!this.editRecurringScheduleForm.controls.days_of_week.value || - this.editRecurringScheduleForm.controls.days_of_week.value.length === 0) { - this.editRecurringScheduleForm.controls.days_of_week.setValue([0]); - } - this.editRecurringScheduleForm.controls.days_of_week.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); - this.editRecurringScheduleForm.controls.days_of_month.clearValidators(); - this.editRecurringScheduleForm.controls.days_of_month.setValue(this.editRecurringScheduleForm.get('days_of_month').value); - } else { - if (!this.editRecurringScheduleForm.controls.days_of_month.value || - this.editRecurringScheduleForm.controls.days_of_month.value.length === 0) { - this.editRecurringScheduleForm.controls.days_of_month.setValue([0]); - } - this.editRecurringScheduleForm.controls.days_of_month.setValidators([Validators.required, this.validateRecurringScheduleWeekMonth()]); - this.editRecurringScheduleForm.controls.days_of_week.clearValidators(); - this.editRecurringScheduleForm.controls.days_of_week.setValue(this.editRecurringScheduleForm.get('days_of_week').value); - } - } - - // step4 - initSpecificDateForm() { - this.editSpecificDateForm = this.fb.group({ - instance_min_count: [0], - instance_max_count: [0], - initial_min_instance_count: [0, [this.validateSpecificDateInitialMin()]], - start_date_time: [0, [Validators.required, this.validateSpecificDateStartDateTime()]], - end_date_time: [0, [Validators.required, this.validateSpecificDateEndDateTime()]] - }); - } - addSpecificDate = () => { - const nextStartDateTime = moment().add(1, 'days'); - const nextEndDateTime = moment().add(1, 'days'); - nextStartDateTime.set('hour', 10); - nextStartDateTime.set('minute', 0); - nextEndDateTime.set('hour', 18); - nextEndDateTime.set('minute', 0); - this.currentPolicy.schedules.specific_date.push({ - start_date_time: nextStartDateTime.format(MomentFormateDateTimeT), - end_date_time: nextEndDateTime.format(MomentFormateDateTimeT), - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 - }); - this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); - } - removeSpecificDate(index) { - if (this.editIndex === index) { - this.editIndex = -1; - } - this.currentPolicy.schedules.specific_date.splice(index, 1); - } - editSpecificDate(index) { - this.editIndex = index; - this.editSpecificDateForm.setValue({ - instance_min_count: this.currentPolicy.schedules.specific_date[index].instance_min_count, - instance_max_count: Math.abs(Number(this.currentPolicy.schedules.specific_date[index].instance_max_count)), - initial_min_instance_count: this.currentPolicy.schedules.specific_date[index].initial_min_instance_count, - start_date_time: this.currentPolicy.schedules.specific_date[index].start_date_time, - end_date_time: this.currentPolicy.schedules.specific_date[index].end_date_time, - }); - this.editSpecificDateForm.controls.instance_min_count. - setValidators([Validators.required, this.validateRecurringSpecificMin(this.editSpecificDateForm)]); - this.editSpecificDateForm.controls.instance_max_count. - setValidators([Validators.required, this.validateRecurringSpecificMax(this.editSpecificDateForm)]); - } - finishSpecificDate() { - if (this.editSpecificDateForm.get('initial_min_instance_count').value) { - this.currentPolicy.schedules.specific_date[this.editIndex].initial_min_instance_count = - this.editSpecificDateForm.get('initial_min_instance_count').value; - } else { - delete this.currentPolicy.schedules.specific_date[this.editIndex].initial_min_instance_count; - } - this.currentPolicy.schedules.specific_date[this.editIndex].instance_min_count = - this.editSpecificDateForm.get('instance_min_count').value; - this.currentPolicy.schedules.specific_date[this.editIndex].instance_max_count = - this.editSpecificDateForm.get('instance_max_count').value; - this.currentPolicy.schedules.specific_date[this.editIndex].start_date_time = this.editSpecificDateForm.get('start_date_time').value; - this.currentPolicy.schedules.specific_date[this.editIndex].end_date_time = this.editSpecificDateForm.get('end_date_time').value; - this.editIndex = -1; - } - validateSpecificDateInitialMin(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, - this.editSpecificDateForm.get('instance_min_count').value, this.editSpecificDateForm.get('instance_max_count').value + 1, false); - return invalid ? { alertInvalidPolicyInitialMaximumRange: { value: control.value } } : null; - }; - } - validateSpecificDateStartDateTime(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (!this.editSpecificDateForm) { - return null; - } - const newSchedule = { - start_date_time: control.value, - end_date_time: this.editSpecificDateForm.get('end_date_time').value - }; - const errors: any = {}; - if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { - errors.alertInvalidPolicyScheduleStartDateTimeBeforeNow = { value: control.value }; - } - const lastValid = this.editSpecificDateTimeValid; - this.editSpecificDateTimeValid = !dateTimeIsSameOrAfter(control.value, this.editSpecificDateForm.get('end_date_time').value); - if (!this.editSpecificDateTimeValid) { - errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; - } - if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { - this.editSpecificDateForm.controls.end_date_time.updateValueAndValidity(); - } - if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { - errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; - } - return Object.keys(errors).length === 0 ? null : errors; - }; - } - validateSpecificDateEndDateTime(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } => { - if (!this.editSpecificDateForm) { - return null; - } - const newSchedule = { - start_date_time: this.editSpecificDateForm.get('start_date_time').value, - end_date_time: control.value - }; - const errors: any = {}; - if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { - errors.alertInvalidPolicyScheduleEndDateTimeBeforeNow = { value: control.value }; - } - const lastValid = this.editSpecificDateTimeValid; - this.editSpecificDateTimeValid = !dateTimeIsSameOrAfter(this.editSpecificDateForm.get('start_date_time').value, control.value); - if (!this.editSpecificDateTimeValid) { - errors.alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime = { value: control.value }; - } - if (this.editSpecificDateForm && lastValid !== this.editSpecificDateTimeValid) { - this.editSpecificDateForm.controls.start_date_time.updateValueAndValidity(); - } - if (specificDateRangeOverlapping(newSchedule, this.editIndex, this.currentPolicy.schedules.specific_date)) { - errors.alertInvalidPolicyScheduleSpecificConflict = { value: control.value }; - } - return Object.keys(errors).length === 0 ? null : errors; - }; } } diff --git a/src/frontend/packages/core/test-framework/store-test-helper.ts b/src/frontend/packages/core/test-framework/store-test-helper.ts index 9f37bbb63c..a1f48b6f4d 100644 --- a/src/frontend/packages/core/test-framework/store-test-helper.ts +++ b/src/frontend/packages/core/test-framework/store-test-helper.ts @@ -21853,7 +21853,19 @@ function getDefaultInitialTestStoreState(): AppState { [testSCFGuid]: getDefaultEndpointRoles() }, state: getDefaultRolesRequestState() - } + }, + updateAutoscalerPolicy: { + policy: { + instance_min_count: 1, + instance_max_count: 10, + scaling_rules_form: [], + schedules: { + timezone: '', + recurring_schedule: [], + specific_date: [] + } + } + }, }; } diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts index 40458374c7..d270f5a7dd 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts @@ -1,5 +1,5 @@ import { RequestOptions } from '@angular/http'; - +import { Action } from '@ngrx/store'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, @@ -43,6 +43,8 @@ export const APP_AUTOSCALER_HEALTH = '[New App Autoscaler] Fetch Health'; export const APP_AUTOSCALER_SCALING_HISTORY = '[New App Autoscaler] Fetch Scaling History'; export const FETCH_APP_AUTOSCALER_METRIC = '[New App Autoscaler] Fetch Metric'; +export const UPDATE_APP_AUTOSCALER_POLICY_STEP = '[Edit Autoscaler Polict] Step'; + export class GetAppAutoscalerHealthAction implements IRequestAction { constructor( public appGuid: string, @@ -191,3 +193,10 @@ export class GetAppAutoscalerInsMetricAction extends GetAppAutoscalerMetricActio } entityKey = appAutoscalerInsMetricSchemaKey; } + +export class UpdateAppAutoscalerPolicyStepAction implements Action { + constructor( + public policy: any + ) { } + type = UPDATE_APP_AUTOSCALER_POLICY_STEP; +} diff --git a/src/frontend/packages/store/src/app-state.ts b/src/frontend/packages/store/src/app-state.ts index 290ce61013..b60d7318d4 100644 --- a/src/frontend/packages/store/src/app-state.ts +++ b/src/frontend/packages/store/src/app-state.ts @@ -15,6 +15,7 @@ import { IRecentlyVisitedState } from './types/recently-visited.types'; import { RoutingHistory } from './types/routing.type'; import { UAASetupState } from './types/uaa-setup.types'; import { UsersRolesState } from './types/users-roles.types'; +import { UpdateAutoscalerPolicyState } from './types/app-autoscaler.types'; export interface IRequestTypeState { [entityKey: string]: IRequestEntityTypeState; @@ -41,4 +42,5 @@ export interface AppState { currentUserRoles: ICurrentUserRolesState; userFavoritesGroups: IUserFavoritesGroupsState; recentlyVisited: IRecentlyVisitedState; + updateAutoscalerPolicy: UpdateAutoscalerPolicyState; } diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/src/frontend/packages/store/src/effects/autoscaler.effects.ts index 9a6ac56029..4c67f4bc8e 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/src/frontend/packages/store/src/effects/autoscaler.effects.ts @@ -36,6 +36,7 @@ import { WrapperRequestActionSuccess, } from '../types/request.types'; import { PaginatedAction } from './../types/pagination.types'; +import { UpdateAutoscalerPolicyState } from '../types/app-autoscaler.types'; const { proxyAPIVersion, autoscalerAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; @@ -412,3 +413,5 @@ export class AutoscalerEffects { } } + +export const selectUpdateAutoscalerPolicyState = (state: AppState): UpdateAutoscalerPolicyState => state.updateAutoscalerPolicy; diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts index 345cc45d88..65b7f38d5a 100644 --- a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts +++ b/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts @@ -51,6 +51,34 @@ export const metricMap = { export const S2NS = 1000000000; +export const PolicyAlert = { + alertInvalidPolicyMinimumRange: 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.', + alertInvalidPolicyMaximumRange: 'The Maximum Instance Count must be a integer greater than the Minimum Instance Count.', + alertInvalidPolicyInitialMaximumRange: + 'The Initial Minimum Instance Count must be a integer in the range of Minimum Instance Count to Maximum Instance Count.', + alertInvalidPolicyTriggerUpperThresholdRange: 'The Upper Threshold value must be an integer greater than the Lower Threshold value.', + alertInvalidPolicyTriggerLowerThresholdRange: 'The Lower Threshold value must be an integer in the range of 1 to (Upper Threshold-1).', + alertInvalidPolicyTriggerThreshold100: 'The Lower/Upper Threshold value of memoryutil must be an integer below or equal to 100.', + alertInvalidPolicyTriggerStepPercentageRange: 'The Instance Step Up/Down percentage must be a integer greater than 1.', + alertInvalidPolicyTriggerStepRange: 'The Instance Step Up/Down value must be a integer in the range of 1 to (Maximum Instance-1).', + alertInvalidPolicyTriggerBreachDurationRange: + `The breach duration value must be an integer in the range of ${PolicyDefaultSetting.breach_duration_secs_min} to + ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`, + alertInvalidPolicyTriggerCooldownRange: + `The cooldown period value must be an integer in the range of ${PolicyDefaultSetting.cool_down_secs_min} to + ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`, + alertInvalidPolicyScheduleStartDateBeforeNow: 'Start date should be after or equal to current date.', + alertInvalidPolicyScheduleEndDateBeforeNow: 'End date should be after or equal to current date.', + alertInvalidPolicyScheduleEndDateBeforeStartDate: 'Start date must be earlier than the end date.', + alertInvalidPolicyScheduleEndTimeBeforeStartTime: 'Start time must be earlier than the end time.', + alertInvalidPolicyScheduleRepeatOn: 'Please select at least one "Repeat On" day.', + alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime: 'Start date and time must be earlier than the end date and time.', + alertInvalidPolicyScheduleStartDateTimeBeforeNow: 'Start date and time must be after or equal to current date time.', + alertInvalidPolicyScheduleEndDateTimeBeforeNow: 'End date and time must be after or equal the current date and time.', + alertInvalidPolicyScheduleRecurringConflict: 'Recurring schedule configuration conflict occurs.', + alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.', +}; + export function isEqual(a, b) { if (typeof (a) !== typeof (b)) { return false; diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts index 8c804cc1cb..794712797c 100644 --- a/src/frontend/packages/store/src/reducers.module.ts +++ b/src/frontend/packages/store/src/reducers.module.ts @@ -21,6 +21,7 @@ import { requestPaginationReducer } from './reducers/pagination-reducer.generato import { routingReducer } from './reducers/routing.reducer'; import { uaaSetupReducer } from './reducers/uaa-setup.reducers'; import { UsersRolesReducer } from './reducers/users-roles.reducer'; +import { updateAutoscalerPolicyReducer } from './reducers/edit-autoscaler-policy.reducer'; // NOTE: Revisit when ngrx-store-logger supports Angular 7 (https://github.com/btroncone/ngrx-store-logger) @@ -50,7 +51,8 @@ export const appReducers = { internalEvents: internalEventReducer, currentUserRoles: currentUserRolesReducer, userFavoritesGroups: userFavoriteGroupsReducer, - recentlyVisited: recentlyVisitedReducer + recentlyVisited: recentlyVisitedReducer, + updateAutoscalerPolicy: updateAutoscalerPolicyReducer, } as ActionReducerMap<{}>; const metaReducers = []; diff --git a/src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts b/src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts new file mode 100644 index 0000000000..d8120872ca --- /dev/null +++ b/src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts @@ -0,0 +1,20 @@ +import { UPDATE_APP_AUTOSCALER_POLICY_STEP } from '../actions/app-autoscaler.actions'; +import { UpdateAutoscalerPolicyState } from '../types/app-autoscaler.types'; + +const defaultState: UpdateAutoscalerPolicyState = { + policy: { + instance_min_count: 1, + instance_max_count: 10, + scaling_rules_form: [], + schedules: {} + } +}; + +export function updateAutoscalerPolicyReducer(state: UpdateAutoscalerPolicyState = defaultState, action) { + switch (action.type) { + case UPDATE_APP_AUTOSCALER_POLICY_STEP: + return { ...state, policy: action.policy }; + default: + return state; + } +} diff --git a/src/frontend/packages/store/src/types/app-autoscaler.types.ts b/src/frontend/packages/store/src/types/app-autoscaler.types.ts index 3a97254c74..d333fce221 100644 --- a/src/frontend/packages/store/src/types/app-autoscaler.types.ts +++ b/src/frontend/packages/store/src/types/app-autoscaler.types.ts @@ -1,6 +1,8 @@ export interface AppAutoscalerPolicy { instance_min_count: number; instance_max_count: number; + scaling_rules_form: any; + schedules: any; } export interface AppAutoscalerHealth { @@ -20,3 +22,7 @@ export interface AppAutoscalerAppMetric { export interface AppAutoscalerInsMetric { total_results: number; } + +export interface UpdateAutoscalerPolicyState { + policy: AppAutoscalerPolicy; +} From c87c46a9863037952729aa4acc934d948e4d2358 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 10 Apr 2019 14:17:35 +0800 Subject: [PATCH 24/98] [autoscaler] using class instead of set style --- .../autoscaler-tab-extension.component.html | 20 +++---- .../autoscaler-tab-extension.component.scss | 17 +++--- package.json | 2 +- .../autoscaler-tab.component.html | 2 +- .../autoscaler-tab.component.scss | 17 +++--- ...dit-autoscaler-policy-step1.component.html | 4 +- ...dit-autoscaler-policy-step1.component.scss | 5 +- ...dit-autoscaler-policy-step2.component.html | 6 +-- ...dit-autoscaler-policy-step2.component.scss | 6 +-- ...dit-autoscaler-policy-step3.component.html | 24 ++++----- ...dit-autoscaler-policy-step3.component.scss | 13 ++++- ...dit-autoscaler-policy-step4.component.html | 22 ++++---- ...dit-autoscaler-policy-step4.component.scss | 16 +++++- .../edit-autoscaler-policy.component.html | 54 ++++++++++--------- .../edit-autoscaler-policy.component.scss | 15 ++++++ .../card-autoscaler-default.component.html | 4 +- .../card-autoscaler-default.component.scss | 13 ++--- 17 files changed, 137 insertions(+), 103 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 817aaf48ee..f42209da1e 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -18,8 +18,8 @@

-
--> -
+
--> +
@@ -66,10 +66,10 @@ - + - + Latest Metrics @@ -91,7 +91,7 @@
- + @@ -99,9 +99,9 @@ -
+
- + Scaling Rules @@ -127,7 +127,7 @@
- + @@ -212,7 +212,7 @@
- + @@ -253,7 +253,7 @@
- + diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index 71f22a22b6..d9cd5e5a26 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -1,4 +1,4 @@ -.app-auto-scaler { +.autoscaler-tab { display: flex; position: relative; width: 100%; @@ -40,11 +40,15 @@ table { width: 100%; } -.app-auto-scaler-policy-left { +.autoscaler-tab-policy { + margin-bottom: 24px; +} + +.autoscaler-tab-policy-left { flex: 0 0 40%; } -.app-auto-scaler-tile { +.autoscaler-tab-tile { &-1of2 { flex: 0 0 50%; } @@ -55,10 +59,3 @@ table { flex: 0 0 16.78%; } } - -.app-auto-scaler-limit { - display: inherit; - mat-card { - width: 50%; - } -} diff --git a/package.json b/package.json index a88f9df515..68dca15857 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "karma-jasmine": "~2.0.1", "karma-jasmine-html-reporter": "^1.4.0", "karma-spec-reporter": "0.0.31", - "lodash": "^4.17.11", + "lodash": "^4.17.10", "mem": "4.0.0", "mktemp": "^0.4.0", "ng-packagr": "^4.7.1", diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html index 16f75e9c59..9a0b375eb5 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html @@ -78,7 +78,7 @@ -
+
diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss index 71f22a22b6..d9cd5e5a26 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss @@ -1,4 +1,4 @@ -.app-auto-scaler { +.autoscaler-tab { display: flex; position: relative; width: 100%; @@ -40,11 +40,15 @@ table { width: 100%; } -.app-auto-scaler-policy-left { +.autoscaler-tab-policy { + margin-bottom: 24px; +} + +.autoscaler-tab-policy-left { flex: 0 0 40%; } -.app-auto-scaler-tile { +.autoscaler-tab-tile { &-1of2 { flex: 0 0 50%; } @@ -55,10 +59,3 @@ table { flex: 0 0 16.78%; } } - -.app-auto-scaler-limit { - display: inherit; - mat-card { - width: 50%; - } -} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html index e6b34922ba..eab22c9e5a 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html @@ -1,12 +1,12 @@
-
+ {{policyAlert.alertInvalidPolicyMinimumRange}} - + {{policyAlert.alertInvalidPolicyMaximumRange}} diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss index 3d32b2c376..321b9e4600 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss @@ -1,3 +1,4 @@ -.edit-app { - flex: 1; + +.autoscaler-policy-edit-limit-max { + margin-top: 0.5em } diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index 2795c0a999..e11934ded7 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -8,8 +8,8 @@ Rule {{index+1}}: - -
+ +
If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds.
@@ -89,7 +89,7 @@
- + diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss index e8d2e304f7..db28fbbb06 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss @@ -2,7 +2,7 @@ app-tile-grid { width: 100%; } -.app-auto-scaler { +.autoscaler-policy-edit { display: flex; position: relative; width: 100%; @@ -15,8 +15,8 @@ app-tile-grid { } } -.app-autoscaler-edit-policy-item { - .app-autoscaler-edit-policy-desc { +.autoscaler-policy-edit-trigger-item { + .autoscaler-policy-edit-trigger-item-desc { margin-bottom: .5em; } mat-error { diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index 5bf9285737..cacd96e1b1 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -22,24 +22,22 @@ .
- +
Always + class="form-field-left">Always Custom - + - + @@ -47,7 +45,7 @@ - + Week @@ -72,23 +70,23 @@
- + - + - + - + - + @@ -150,7 +148,7 @@
- +
- +
-
- - +
+ + - + @@ -34,15 +34,15 @@
- + - + - + @@ -88,7 +88,7 @@ -->
- + -
- - - - - - - - - - - - - - - \ No newline at end of file +
+ +

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.entity.name }}

+
+ +
+ + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index e69de29bb2..0ff5ad5899 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -0,0 +1,15 @@ +.autoscaler-policy-edit-steppers { + height: 100%; + app-edit-autoscaler-policy-step1 { + width: 50%; + } + app-edit-autoscaler-policy-step2 { + width: 100%; + } + app-edit-autoscaler-policy-step3 { + width: 100%; + } + app-edit-autoscaler-policy-step4 { + width: 100%; + } +} diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html index 1632e4a08c..e180113e16 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.html @@ -1,5 +1,5 @@ -
+
Instances @@ -14,7 +14,7 @@
-
+
Limits diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss index 62daaf0f0c..9c14b891a3 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss @@ -1,11 +1,13 @@ .card-autoscaler-default { - &__large { - font-size: 16px; + &__left { + display: inline-block; + border-right: 1px solid gray; + padding-right: 1em; } - &__compact { - margin-bottom: 0; - position: absolute; + &__right { + display: inline-block; + padding-left: 1em; } &__actions { @@ -42,7 +44,6 @@ display: inline; margin-right: 10px; } - } .app-metadata { From 207d8e82187ce728ff8bec7dee52a45d33783ff6 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 10 Apr 2019 16:51:58 +0800 Subject: [PATCH 25/98] [autoscaler] fix pr issues --- .../autoscaler-tab-extension.component.html | 88 ++++++++++--------- .../autoscaler-tab-extension.component.scss | 12 +-- .../autoscaler-tab.component.html | 6 +- ...dit-autoscaler-policy-step1.component.scss | 2 +- ...dit-autoscaler-policy-step2.component.scss | 2 +- .../edit-autoscaler-policy-step2.component.ts | 12 +-- ...dit-autoscaler-policy-step3.component.scss | 4 +- .../edit-autoscaler-policy-step3.component.ts | 73 ++++++--------- ...dit-autoscaler-policy-step4.component.scss | 4 +- .../edit-autoscaler-policy-step4.component.ts | 57 +++++------- .../card-autoscaler-default.component.scss | 2 +- .../table-cell/table-cell.component.ts | 16 ---- ...cf-app-autoscaler-events-config.service.ts | 57 ++++++++---- ...cell-autoscaler-event-action-label.pipe.ts | 19 ---- ...ell-autoscaler-event-action.component.html | 2 - ...ell-autoscaler-event-action.component.scss | 0 ...-cell-autoscaler-event-action.component.ts | 10 --- ...cell-autoscaler-event-error.component.html | 1 - ...cell-autoscaler-event-error.component.scss | 0 ...e-cell-autoscaler-event-error.component.ts | 10 --- ...-autoscaler-event-timestamp.component.html | 1 - ...-autoscaler-event-timestamp.component.scss | 0 ...toscaler-event-timestamp.component.spec.ts | 29 ------ ...ll-autoscaler-event-timestamp.component.ts | 10 --- ...-cell-autoscaler-event-type.component.html | 1 - ...-cell-autoscaler-event-type.component.scss | 0 ...ll-autoscaler-event-type.component.spec.ts | 31 ------- ...le-cell-autoscaler-event-type.component.ts | 10 --- .../combo-chart/index.ts | 2 - .../stepper/steppers/steppers.component.html | 6 +- .../stepper/steppers/steppers.component.scss | 5 ++ .../packages/core/src/shared/shared.module.ts | 4 - .../src/helpers/autoscaler/autoscaler-util.ts | 68 ++++++++++---- 33 files changed, 207 insertions(+), 337 deletions(-) delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html index f42209da1e..5372094d61 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -51,11 +51,11 @@
Policy defined + (click)="diableAutoscaler()">Enabled Policy defined + (click)="diableAutoscaler()">Enabled Policy undefined + (click)="updatePolicyPage()">Disabled Policy undefined
@@ -221,45 +221,47 @@
- - - - - Latest Events - - -
- - - - - - - - - - - - - - - - - - - -
Event Instances scaled - {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to - {{element.new_instances}} Trigger {{element.reason}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.message}} {{element.error}}
-
- - - - - - - +
+ + + + + Latest Events + + +
+ + + + + + + + + + + + + + + + + + + +
Event Instances scaled + {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to + {{element.new_instances}} Trigger {{element.reason}} {{element.message}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.error}}
+
+ + + + + + + +
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index d9cd5e5a26..e1f9d95fd3 100644 --- a/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/custom-src/frontend/app/custom/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -3,7 +3,7 @@ position: relative; width: 100%; &__actions { - bottom: 24px; + bottom: 10px; padding-top: 0; position: absolute; right: 24px; @@ -20,13 +20,6 @@ margin-top: 0; } } - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } app-metadata-item { margin-bottom: 0; } @@ -38,6 +31,9 @@ app-tile-grid { table { width: 100%; + td { + padding-left: .5em; + } } .autoscaler-tab-policy { diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html index 9a0b375eb5..88dab098fa 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.html @@ -30,11 +30,11 @@
Policy defined + (click)="diableAutoscaler()">Enabled Policy defined + (click)="diableAutoscaler()">Enabled Policy undefined + (click)="updatePolicyPage()">Disabled Policy undefined
diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss index 321b9e4600..3e0f7a6dc2 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss @@ -1,4 +1,4 @@ .autoscaler-policy-edit-limit-max { - margin-top: 0.5em + margin-top: .5em; } diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss index db28fbbb06..a03ff24c30 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss @@ -7,7 +7,7 @@ app-tile-grid { position: relative; width: 100%; &__actions { - bottom: 24px; + bottom: 10px; padding-top: 0; position: absolute; right: 24px; diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 8301851d82..77b7f49339 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -14,7 +14,8 @@ import { MetricTypes, getScaleType, getAdjustmentType, - PolicyAlert + PolicyAlert, + PolicyDefaultTrigger } from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; import { numberWithFractionOrExceedRange, @@ -78,14 +79,7 @@ export class EditAutoscalerPolicyStep2Component implements OnInit { } addTrigger = () => { - this.currentPolicy.scaling_rules_form.push({ - metric_type: 'memoryused', - breach_duration_secs: PolicyDefaultSetting.breach_duration_secs_default, - threshold: 10, - operator: '<=', - cool_down_secs: PolicyDefaultSetting.cool_down_secs_default, - adjustment: '-1' - }); + this.currentPolicy.scaling_rules_form.push(PolicyDefaultTrigger); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); } diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss index b7aa03e7af..a8bcea035e 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss @@ -13,7 +13,7 @@ app-tile-grid { position: relative; width: 100%; &__actions { - bottom: 24px; + bottom: 10px; padding-top: 0; position: absolute; right: 24px; @@ -36,7 +36,7 @@ app-tile-grid { .autoscaler-policy-edit-recurring { max-width: 100%; .form-field-left { - margin-right: .5em + margin-right: .5em; } .form-field-30 { width: 30%; diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index 1386038d22..9be0c46534 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -10,7 +10,7 @@ import { ApplicationService } from '../../application.service'; import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; import { UpdateAppAutoscalerPolicyStepAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; import { - MomentFormateDate, PolicyAlert + MomentFormateDate, PolicyAlert, shiftArray, PolicyDefaultRecurringSchedule } from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; import { numberWithFractionOrExceedRange, @@ -42,13 +42,13 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { editRecurringScheduleForm: FormGroup; appAutoscalerPolicy$: Observable; + private editLimitValid = true; private editRecurringDateValid = true; private editRecurringTimeValid = true; private currentPolicy: any; private editIndex = -1; private editEffectiveType = 'always'; private editRepeatType = 'week'; - private editLimitValid = true; constructor( public applicationService: ApplicationService, @@ -58,8 +58,8 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { this.editRecurringScheduleForm = this.fb.group({ days_of_week: [0], days_of_month: [0], - instance_min_count: [0], - instance_max_count: [0], + instance_min_count: [0, [Validators.required, this.validateRecurringSpecificMin()]], + instance_max_count: [0, [Validators.required, this.validateRecurringSpecificMax()]], initial_min_instance_count: [0, [this.validateRecurringScheduleInitialMin()]], start_date: [0, [this.validateRecurringScheduleGlobal()]], end_date: [0, [this.validateRecurringScheduleGlobal()]], @@ -81,16 +81,7 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { } addRecurringSchedule = () => { - this.currentPolicy.schedules.recurring_schedule.push({ - start_time: '10:00', - end_time: '18:00', - days_of_week: [ - 1, 2, 3 - ], - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 - }); + this.currentPolicy.schedules.recurring_schedule.push(PolicyDefaultRecurringSchedule); this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); } @@ -106,8 +97,8 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { this.editEffectiveType = this.currentPolicy.schedules.recurring_schedule[index].start_date ? 'custom' : 'always'; this.editRepeatType = this.currentPolicy.schedules.recurring_schedule[index].days_of_week ? 'week' : 'month'; this.editRecurringScheduleForm.setValue({ - days_of_week: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), - days_of_month: this.shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), + days_of_week: shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), + days_of_month: shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), instance_min_count: this.currentPolicy.schedules.recurring_schedule[index].instance_min_count, instance_max_count: Math.abs(Number(this.currentPolicy.schedules.recurring_schedule[index].instance_max_count)), initial_min_instance_count: this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count, @@ -122,10 +113,6 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { } setRecurringScheduleValidator() { - this.editRecurringScheduleForm.controls.instance_min_count. - setValidators([Validators.required, this.validateRecurringSpecificMin(this.editRecurringScheduleForm)]); - this.editRecurringScheduleForm.controls.instance_max_count. - setValidators([Validators.required, this.validateRecurringSpecificMax(this.editRecurringScheduleForm)]); if (this.editEffectiveType === 'custom') { this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, this.validateRecurringScheduleStartDate(), this.validateRecurringScheduleGlobal()]); @@ -151,7 +138,7 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { } delete currentSchedule.days_of_month; delete currentSchedule.days_of_week; - currentSchedule[repeatOn] = this.shiftArray(this.editRecurringScheduleForm.get(repeatOn).value, 1); + currentSchedule[repeatOn] = shiftArray(this.editRecurringScheduleForm.get(repeatOn).value, 1); if (this.editRecurringScheduleForm.get('initial_min_instance_count').value) { currentSchedule.initial_min_instance_count = this.editRecurringScheduleForm.get('initial_min_instance_count').value; } else { @@ -179,33 +166,35 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { }; } - validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { + validateRecurringSpecificMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); + const invalid = this.editRecurringScheduleForm && + numberWithFractionOrExceedRange(control.value, 1, this.editRecurringScheduleForm.get('instance_max_count').value - 1, true); const lastValid = this.editLimitValid; - this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_max_count.updateValueAndValidity(); + this.editLimitValid = this.editRecurringScheduleForm && + control.value < this.editRecurringScheduleForm.get('instance_max_count').value; + if (this.editRecurringScheduleForm && lastValid !== this.editLimitValid) { + this.editRecurringScheduleForm.controls.instance_max_count.updateValueAndValidity(); } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + if (this.editRecurringScheduleForm) { + this.editRecurringScheduleForm.controls.initial_min_instance_count.updateValueAndValidity(); } return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; }; } - validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { + validateRecurringSpecificMax(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, - formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const invalid = this.editRecurringScheduleForm && numberWithFractionOrExceedRange(control.value, + this.editRecurringScheduleForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); const lastValid = this.editLimitValid; this.editLimitValid = - formGroup && formGroup.get('instance_min_count').value < control.value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_min_count.updateValueAndValidity(); + this.editRecurringScheduleForm && this.editRecurringScheduleForm.get('instance_min_count').value < control.value; + if (this.editRecurringScheduleForm && lastValid !== this.editLimitValid) { + this.editRecurringScheduleForm.controls.instance_min_count.updateValueAndValidity(); } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + if (this.editRecurringScheduleForm) { + this.editRecurringScheduleForm.controls.initial_min_instance_count.updateValueAndValidity(); } return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; }; @@ -295,9 +284,9 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { end_time: this.editRecurringScheduleForm.get('end_time').value }; if (this.editRepeatType === 'week') { - newSchedule.days_of_week = this.shiftArray(control.value, 1); + newSchedule.days_of_week = shiftArray(control.value, 1); } else { - newSchedule.days_of_month = this.shiftArray(control.value, 1); + newSchedule.days_of_month = shiftArray(control.value, 1); } if (this.editEffectiveType === 'custom') { newSchedule.start_date = this.editRecurringScheduleForm.get('start_date').value; @@ -309,14 +298,6 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { }; } - shiftArray(daysOfWeek, step) { - const days = []; - for (let i = 0; i < daysOfWeek.length; i++) { - days[i] = daysOfWeek[i] + step; - } - return days; - } - resetEffectiveType(key) { this.editEffectiveType = key; if (key === 'custom') { diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss index c07aafd1c5..152b38e9ed 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss @@ -7,7 +7,7 @@ app-tile-grid { position: relative; width: 100%; &__actions { - bottom: 24px; + bottom: 10px; padding-top: 0; position: absolute; right: 24px; @@ -30,7 +30,7 @@ app-tile-grid { .autoscaler-policy-edit-specific { max-width: 100%; .form-field-left { - margin-right: .5em + margin-right: .5em; } .form-field-30 { width: 30%; diff --git a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index 9001a95d70..b001df11de 100644 --- a/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/core/src/features/applications/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -16,7 +16,7 @@ import { import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; import { - MomentFormateDateTimeT, PolicyAlert + MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate } from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; import { numberWithFractionOrExceedRange, @@ -55,8 +55,8 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { private entityServiceFactory: EntityServiceFactory, ) { this.editSpecificDateForm = this.fb.group({ - instance_min_count: [0], - instance_max_count: [0], + instance_min_count: [0, [Validators.required, this.validateRecurringSpecificMin()]], + instance_max_count: [0, [Validators.required, this.validateRecurringSpecificMax()]], initial_min_instance_count: [0, [this.validateSpecificDateInitialMin()]], start_date_time: [0, [Validators.required, this.validateSpecificDateStartDateTime()]], end_date_time: [0, [Validators.required, this.validateSpecificDateEndDateTime()]] @@ -114,23 +114,11 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { this.submitStatus = false; this.submitMessage = errorMessage; }); - return observableOf({ success: this.submitStatus, message: this.submitMessage }); + return observableOf({ success: this.submitStatus, message: this.submitMessage}); } addSpecificDate = () => { - const nextStartDateTime = moment().add(1, 'days'); - const nextEndDateTime = moment().add(1, 'days'); - nextStartDateTime.set('hour', 10); - nextStartDateTime.set('minute', 0); - nextEndDateTime.set('hour', 18); - nextEndDateTime.set('minute', 0); - this.currentPolicy.schedules.specific_date.push({ - start_date_time: nextStartDateTime.format(MomentFormateDateTimeT), - end_date_time: nextEndDateTime.format(MomentFormateDateTimeT), - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 - }); + this.currentPolicy.schedules.specific_date.push(PolicyDefaultSpecificDate); this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } @@ -150,10 +138,6 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { start_date_time: this.currentPolicy.schedules.specific_date[index].start_date_time, end_date_time: this.currentPolicy.schedules.specific_date[index].end_date_time, }); - this.editSpecificDateForm.controls.instance_min_count. - setValidators([Validators.required, this.validateRecurringSpecificMin(this.editSpecificDateForm)]); - this.editSpecificDateForm.controls.instance_max_count. - setValidators([Validators.required, this.validateRecurringSpecificMax(this.editSpecificDateForm)]); } finishSpecificDate() { @@ -240,33 +224,34 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { }; } - validateRecurringSpecificMin(formGroup: FormGroup): ValidatorFn { + validateRecurringSpecificMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, 1, formGroup.get('instance_max_count').value - 1, true); + const invalid = this.editSpecificDateForm && + numberWithFractionOrExceedRange(control.value, 1, this.editSpecificDateForm.get('instance_max_count').value - 1, true); const lastValid = this.editLimitValid; - this.editLimitValid = formGroup && control.value < formGroup.get('instance_max_count').value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_max_count.updateValueAndValidity(); + this.editLimitValid = this.editSpecificDateForm && control.value < this.editSpecificDateForm.get('instance_max_count').value; + if (this.editSpecificDateForm && lastValid !== this.editLimitValid) { + this.editSpecificDateForm.controls.instance_max_count.updateValueAndValidity(); } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + if (this.editSpecificDateForm) { + this.editSpecificDateForm.controls.initial_min_instance_count.updateValueAndValidity(); } return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; }; } - validateRecurringSpecificMax(formGroup: FormGroup): ValidatorFn { + validateRecurringSpecificMax(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - const invalid = formGroup && numberWithFractionOrExceedRange(control.value, - formGroup.get('instance_min_count').value + 1, Number.MAX_VALUE, true); + const invalid = this.editSpecificDateForm && numberWithFractionOrExceedRange(control.value, + this.editSpecificDateForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); const lastValid = this.editLimitValid; this.editLimitValid = - formGroup && formGroup.get('instance_min_count').value < control.value; - if (formGroup && lastValid !== this.editLimitValid) { - formGroup.controls.instance_min_count.updateValueAndValidity(); + this.editSpecificDateForm && this.editSpecificDateForm.get('instance_min_count').value < control.value; + if (this.editSpecificDateForm && lastValid !== this.editLimitValid) { + this.editSpecificDateForm.controls.instance_min_count.updateValueAndValidity(); } - if (formGroup) { - formGroup.controls.initial_min_instance_count.updateValueAndValidity(); + if (this.editSpecificDateForm) { + this.editSpecificDateForm.controls.initial_min_instance_count.updateValueAndValidity(); } return invalid ? { alertInvalidPolicyMaximumRange: { value: control.value } } : null; }; diff --git a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss index 9c14b891a3..4e25b31838 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss +++ b/src/frontend/packages/core/src/shared/components/cards/card-autoscaler-default/card-autoscaler-default.component.scss @@ -1,7 +1,7 @@ .card-autoscaler-default { &__left { + border-right: 1px solid #808080; display: inline-block; - border-right: 1px solid gray; padding-right: 1em; } diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts index c97a384411..e51796cea3 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts @@ -24,21 +24,9 @@ import { import { TableCellEventTypeComponent, } from '../../list-types/app-event/table-cell-event-type/table-cell-event-type.component'; -import { - TableCellAutoscalerEventActionComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; -import { - TableCellAutoscalerEventTimestampComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component'; -import { - TableCellAutoscalerEventTypeComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; import { TableCellAutoscalerEventChangeComponent, } from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; -import { - TableCellAutoscalerEventErrorComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; import { TableCellAutoscalerEventStatusComponent, } from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; @@ -147,12 +135,8 @@ export const listTableCells = [ TableCellEventTypeComponent, TableCellEventActionComponent, TableCellEventDetailComponent, - TableCellAutoscalerEventTimestampComponent, - TableCellAutoscalerEventTypeComponent, - TableCellAutoscalerEventActionComponent, TableCellAutoscalerEventStatusComponent, TableCellAutoscalerEventChangeComponent, - TableCellAutoscalerEventErrorComponent, TableCellActionsComponent, TableCellAppNameComponent, TableCellEndpointStatusComponent, diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index d260c29af6..bdf3e1b6b8 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; - +import { DatePipe } from '@angular/common'; import { AppState } from '../../../../../../../store/src/app-state'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; @@ -8,47 +8,66 @@ import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metr import { ITableColumn } from '../../list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; -import { - TableCellAutoscalerEventActionComponent, -} from './table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component'; import { TableCellAutoscalerEventChangeComponent, } from './table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; -import { - TableCellAutoscalerEventErrorComponent, -} from './table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component'; import { TableCellAutoscalerEventStatusComponent, } from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; -import { - TableCellAutoscalerEventTimestampComponent, -} from './table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component'; -import { - TableCellAutoscalerEventTypeComponent, -} from './table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component'; @Injectable() export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { autoscalerEventSource: CfAppAutoscalerEventsDataSource; columns: Array> = [ { - columnId: 'timestamp', headerCell: () => - 'Timestamp', cellComponent: TableCellAutoscalerEventTimestampComponent, sort: true, cellFlex: '3' + columnId: 'timestamp', + headerCell: () => 'Timestamp', + cellDefinition: { + getValue: row => this.datePipe.transform(row.entity.timestamp / 1000000, 'medium') + }, + sort: true, + cellFlex: '3' }, { columnId: 'status', headerCell: () => 'Status', cellComponent: TableCellAutoscalerEventStatusComponent, cellFlex: '2' }, { - columnId: 'type', headerCell: () => 'Type', cellComponent: TableCellAutoscalerEventTypeComponent, cellFlex: '2' + columnId: 'type', + headerCell: () => 'Type', + cellDefinition: { + getValue: row => row.entity.scaling_type === 0 ? 'dynamic' : 'schedule' + }, + cellFlex: '2' }, { columnId: 'change', headerCell: () => 'Instance Change', cellComponent: TableCellAutoscalerEventChangeComponent, cellFlex: '2' }, { - columnId: 'action', headerCell: () => 'Action', cellComponent: TableCellAutoscalerEventActionComponent, cellFlex: '4' + columnId: 'action', + headerCell: () => 'Action', + cellDefinition: { + getValue: row => { + if (row.entity.message) { + const change = row.entity.new_instances - row.entity.old_instances; + if (change >= 0) { + return '+' + change + ' instance(s) because ' + row.entity.message; + } else { + return change + ' instance(s) because ' + row.entity.message; + } + } else { + return row.entity.reason; + } + } + }, + cellFlex: '4' }, { - columnId: 'error', headerCell: () => 'Error', cellComponent: TableCellAutoscalerEventErrorComponent, cellFlex: '4' + columnId: 'error', + headerCell: () => 'Error', + cellDefinition: { + getValue: row => row.entity.error + }, + cellFlex: '4' }, ]; viewType = ListViewTypes.TABLE_ONLY; @@ -82,7 +101,7 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig } ]; - constructor(private store: Store, private appService: ApplicationService) { + constructor(private store: Store, private appService: ApplicationService, private datePipe: DatePipe) { super(); this.autoscalerEventSource = new CfAppAutoscalerEventsDataSource( this.store, diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts deleted file mode 100644 index 622fdc0f3e..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action-label.pipe.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; - -@Pipe({ - name: 'tableCellAutoscalerEventActionLabel' -}) -export class TableCellAutoscalerEventActionLabelPipe implements PipeTransform { - transform(value: any): string { - if (value.message) { - const change = value.new_instances - value.old_instances; - if (change >= 0) { - return '+' + change + ' instance(s) because ' + value.message; - } else { - return change + ' instance(s) because ' + value.message; - } - } else { - return value.reason; - } - } -} diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html deleted file mode 100644 index 9fc5f0dd39..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.html +++ /dev/null @@ -1,2 +0,0 @@ - -{{row.entity | tableCellAutoscalerEventActionLabel}} \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts deleted file mode 100644 index 5978175ce5..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-action/table-cell-autoscaler-event-action.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; - -@Component({ - selector: 'app-table-cell-autoscaler-event-action', - templateUrl: './table-cell-autoscaler-event-action.component.html', - styleUrls: ['./table-cell-autoscaler-event-action.component.scss'] -}) -export class TableCellAutoscalerEventActionComponent extends TableCellCustom { } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html deleted file mode 100644 index 6a81045b52..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.entity.error}} \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts deleted file mode 100644 index b387f20f63..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-error/table-cell-autoscaler-event-error.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; - -@Component({ - selector: 'app-table-cell-autoscaler-event-error', - templateUrl: './table-cell-autoscaler-event-error.component.html', - styleUrls: ['./table-cell-autoscaler-event-error.component.scss'] -}) -export class TableCellAutoscalerEventErrorComponent extends TableCellCustom { } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html deleted file mode 100644 index 9acccf82bc..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.entity.timestamp/1000000 | date:'medium'}} diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts deleted file mode 100644 index b0a82bbcbe..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TableCellAutoscalerEventTimestampComponent } from './table-cell-autoscaler-event-timestamp.component'; -import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; - -describe('TableCellAutoscalerEventTimestampComponent', () => { - let component: TableCellAutoscalerEventTimestampComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [TableCellAutoscalerEventTimestampComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent>(TableCellAutoscalerEventTimestampComponent); - component = fixture.componentInstance; - component.row = { - entity: {} - } as EntityInfo; - fixture.detectChanges(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts deleted file mode 100644 index 3dada49709..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-timestamp/table-cell-autoscaler-event-timestamp.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; - -@Component({ - selector: 'app-table-cell-autoscaler-event-timestamp', - templateUrl: './table-cell-autoscaler-event-timestamp.component.html', - styleUrls: ['./table-cell-autoscaler-event-timestamp.component.scss'] -}) -export class TableCellAutoscalerEventTimestampComponent extends TableCellCustom { } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html deleted file mode 100644 index 425feebbb5..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.entity.scaling_type == 0 ? 'dynamic' : 'schedule'}} \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts deleted file mode 100644 index ae4be2d34a..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TableCellAutoscalerEventTypeComponent } from './table-cell-autoscaler-event-type.component'; -import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; - -describe('TableCellAutoscalerEventTypeComponent', () => { - let component: TableCellAutoscalerEventTypeComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [TableCellAutoscalerEventTypeComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent>(TableCellAutoscalerEventTypeComponent); - component = fixture.componentInstance; - component.row = { - entity: { - type: '' - } - } as EntityInfo; - fixture.detectChanges(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts deleted file mode 100644 index 95b9d4344d..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-type/table-cell-autoscaler-event-type.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; - -@Component({ - selector: 'app-table-cell-autoscaler-event-type', - templateUrl: './table-cell-autoscaler-event-type.component.html', - styleUrls: ['./table-cell-autoscaler-event-type.component.scss'] -}) -export class TableCellAutoscalerEventTypeComponent extends TableCellCustom { } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts deleted file mode 100644 index 2a0ab4f222..0000000000 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './combo-chart.component'; -export * from './combo-series-vertical.component'; diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html index 988559c867..12e207292d 100644 --- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html +++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html @@ -28,15 +28,15 @@ +
- - - - - -
- - - - - Scaling Rules - - -
- - - - - - - - - - - - - - - -
Metric {{element.metric_type}} Condition {{element.operator}} {{element.threshold}} for - {{element.breach_duration_secs}} secs. Action {{element.adjustment}} instances
-
- - - - - - - - - - - Scheduled Limit Rules - - in {{policy.schedules.timezone}} - - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
From {{element.start_date_time}} To {{element.end_date_time}} Initial - {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Effective Duration {{ element.start_date? element.start_date + ' ~ ' + - element.end_date : 'Aways'}} Repeats On {{element.days_of_month}} {{element.days_of_week}} of - the - {{element.days_of_week? 'week': 'month'}} From {{element.start_time}} To {{element.end_time}} Initial - {{element.initial_min_instance_count?element.initial_min_instance_count:'-'}} Min {{element.instance_min_count}} Max {{element.instance_max_count}}
-
- - - - - - - -
- - - - - Latest Events - - -
- - - - - - - - - - - - - - - - - - - -
Event Instances scaled - {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to - {{element.new_instances}} Trigger {{element.reason}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.message}} {{element.error}}
-
- - - - - - - - -
\ No newline at end of file diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss deleted file mode 100644 index d9cd5e5a26..0000000000 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.scss +++ /dev/null @@ -1,61 +0,0 @@ -.autoscaler-tab { - display: flex; - position: relative; - width: 100%; - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } -} - -.app-metadata { - display: flex; - flex-direction: row; - &__two-cols { - flex: 1; - app-metadata-item:first-child { - margin-top: 0; - } - } - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } - app-metadata-item { - margin-bottom: 0; - } -} - -app-tile-grid { - width: 100%; -} - -table { - width: 100%; -} - -.autoscaler-tab-policy { - margin-bottom: 24px; -} - -.autoscaler-tab-policy-left { - flex: 0 0 40%; -} - -.autoscaler-tab-tile { - &-1of2 { - flex: 0 0 50%; - } - &-1of3 { - flex: 0 0 30%; - } - &-1of6 { - flex: 0 0 16.78%; - } -} diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts deleted file mode 100644 index 9356670852..0000000000 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.spec.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule } from '@ngrx/store'; - -import { CoreModule } from '../../../../../../core/core.module'; -import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; -import { SharedModule } from '../../../../../../shared/shared.module'; -import { appReducers } from '../../../../../../../../store/src/reducers.module'; -import { AppStoreModule } from '../../../../../../../../store/src/store.module'; -import { endpointStoreNames } from '../../../../../../../../store//src/types/endpoint.types'; -import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper'; -import { getInitialTestStoreState } from '../../../../../../../test-framework/store-test-helper'; -import { ApplicationService } from '../../../../application.service'; -import { AutoscalerTabComponent } from './autoscaler-tab.component'; -import { HttpModule, Http, ConnectionBackend } from '@angular/http'; -import { MockBackend } from '@angular/http/testing'; -import { GITHUB_API_URL, getGitHubAPIURL } from '../../../../../../core/github.helpers'; - -describe('AutoscalerTabComponent', () => { - let component: AutoscalerTabComponent; - let fixture: ComponentFixture; - const initialState = getInitialTestStoreState(); - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - AutoscalerTabComponent, - ], - imports: [ - CoreModule, - SharedModule, - RouterTestingModule, - BrowserAnimationsModule, - StoreModule.forRoot( - appReducers, - { - initialState - } - ), - HttpModule - ], - providers: [ - { provide: ApplicationService, useClass: ApplicationServiceMock }, - AppStoreModule, - ApplicationStateService, - Http, - { - provide: ConnectionBackend, - useClass: MockBackend - }, - { provide: GITHUB_API_URL, useValue: null } - ] - }) - .compileComponents(); - })); - - beforeEach(inject([ApplicationService], (applicationService: ApplicationService) => { - const cfGuid = Object.keys(initialState.requestData[endpointStoreNames.type])[0]; - const appGuid = Object.keys(initialState.requestData.application)[0]; - fixture = TestBed.createComponent(AutoscalerTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - afterEach(() => { - fixture.destroy(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts deleted file mode 100644 index e7b66d9a22..0000000000 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component.ts +++ /dev/null @@ -1,258 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators'; - -import { - DetachAppAutoscalerPolicyAction, - GetAppAutoscalerAppMetricAction, - GetAppAutoscalerPolicyAction, - GetAppAutoscalerScalingHistoryAction, - UpdateAppAutoscalerPolicyAction, -} from '../../../../../../../../store/src/actions/app-autoscaler.actions'; -import { RouterNav } from '../../../../../../../../store/src/actions/router.actions'; -import { AppState } from '../../../../../../../../store/src/app-state'; -import { MetricTypes } from '../../../../../../../../store/src/helpers/autoscaler/autoscaler-util'; -import { - appAutoscalerAppMetricSchemaKey, - appAutoscalerPolicySchemaKey, - appAutoscalerScalingHistorySchemaKey, - entityFactory, -} from '../../../../../../../../store/src/helpers/entity-factory'; -import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types'; -import { - getPaginationObservables, -} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { selectUpdateInfo } from '../../../../../../../../store/src/selectors/api.selectors'; -import { - AppAutoscalerAppMetric, - AppAutoscalerPolicy, - AppAutoscalerScalingHistory, -} from '../../../../../../../../store/src/types/app-autoscaler.types'; -import { EntityService } from '../../../../../../core/entity-service'; -import { EntityServiceFactory } from '../../../../../../core/entity-service-factory.service'; -import { ConfirmationDialogConfig } from '../../../../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; -import { CfOrgSpaceDataService } from '../../../../../../shared/data-services/cf-org-space-service.service'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { ApplicationService } from '../../../../application.service'; - -@Component({ - selector: 'app-autoscaler-tab', - templateUrl: './autoscaler-tab.component.html', - styleUrls: ['./autoscaler-tab.component.scss'], - providers: [ - CfOrgSpaceDataService - ] -}) -export class AutoscalerTabComponent implements OnInit, OnDestroy { - - scalingRuleColumns: string[] = ['metric', 'condition', 'action']; - specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; - recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; - scalingHistoryColumns: string[] = ['event', 'trigger', 'date', 'error']; - metricTypes: string[] = MetricTypes; - - appAutoscalerPolicyService: EntityService; - appAutoscalerScalingHistoryService: EntityService; - appAutoscalerPolicy$: Observable; - appAutoscalerScalingHistory$: Observable; - - private appAutoscalerPolicyErrorSub: Subscription; - private appAutoscalerScalingHistoryErrorSub: Subscription; - private appAutoscalerPolicySnackBarRef: MatSnackBarRef; - private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef; - - private detachConfirmOk = 0; - - appAutoscalerAppMetrics = {}; - appAutoscalerInsMetrics = {}; - appAutoscalerAppMetricNames = []; - - paramsMetrics = { - 'start-time': 0, - 'end-time': (new Date()).getTime().toString() + '000000', - page: '1', - 'results-per-page': '1', - order: 'desc' - }; - paramsHistory = { - 'start-time': 0, - 'end-time': (new Date()).getTime().toString() + '000000', - page: '1', - 'results-per-page': '5', - order: 'desc' - }; - - ngOnDestroy(): void { - if (this.appAutoscalerPolicySnackBarRef) { - this.appAutoscalerPolicySnackBarRef.dismiss(); - } - if (this.appAutoscalerScalingHistorySnackBarRef) { - this.appAutoscalerScalingHistorySnackBarRef.dismiss(); - } - if (this.appAutoscalerPolicyErrorSub) { - this.appAutoscalerPolicyErrorSub.unsubscribe(); - } - if (this.appAutoscalerScalingHistoryErrorSub) { - this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); - } - } - - constructor( - private store: Store, - private applicationService: ApplicationService, - private entityServiceFactory: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory, - private appAutoscalerPolicySnackBar: MatSnackBar, - private appAutoscalerScalingHistorySnackBar: MatSnackBar, - private confirmDialog: ConfirmationDialogService, - ) { - } - - ngOnInit() { - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), - false - ); - this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( - appAutoscalerScalingHistorySchemaKey, - entityFactory(appAutoscalerScalingHistorySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, - this.applicationService.cfGuid, true, this.paramsHistory), - false - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - if (entity && entity.entity) { - this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.loadLatestMetricsUponPolicy(entity.entity); - } - return entity && entity.entity; - }), - publishReplay(1), - refCount() - ); - this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( - map(({ entity }) => entity && entity.entity) - ); - this.initErrorSub(); - } - - getAppMetric(metricName: string, trigger: any, params: any) { - const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, - this.applicationService.cfGuid, metricName, true, trigger, params); - return getPaginationObservables({ - store: this.store, - action, - paginationMonitor: this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(appAutoscalerAppMetricSchemaKey) - ) - }, false).entities$; - } - - loadLatestMetricsUponPolicy(policyEntity) { - if (policyEntity.scaling_rules_map) { - this.appAutoscalerAppMetrics = {}; - Object.keys(policyEntity.scaling_rules_map).map((metricName) => { - this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, policyEntity.scaling_rules_map[metricName], this.paramsMetrics); - }); - } - } - - initErrorSub() { - this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( - filter(request => !!request.error), - map(request => request.message), - distinctUntilChanged(), - ).subscribe(errorMessage => { - if (this.appAutoscalerPolicySnackBarRef) { - this.appAutoscalerPolicySnackBarRef.dismiss(); - } - this.appAutoscalerPolicySnackBarRef = this.appAutoscalerPolicySnackBar.open(errorMessage, 'Dismiss'); - }); - - this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe( - filter(request => !!request.error), - map(request => request.message), - distinctUntilChanged(), - ).subscribe(errorMessage => { - if (this.appAutoscalerScalingHistorySnackBarRef) { - this.appAutoscalerScalingHistorySnackBarRef.dismiss(); - } - this.appAutoscalerScalingHistorySnackBarRef = this.appAutoscalerScalingHistorySnackBar.open(errorMessage, 'Dismiss'); - }); - } - - diableAutoscaler() { - const confirmation = new ConfirmationDialogConfig( - 'Detach And Delete Policy', - 'Are you sure you want to detach and delete the policy?', - 'Detach and Delete', - true - ); - this.detachConfirmOk = this.detachConfirmOk === 1 ? 0 : 1; - this.confirmDialog.open(confirmation, () => { - this.detachConfirmOk = 2; - const doUpdate = () => this.detachPolicy(); - doUpdate().pipe( - first(), - ).subscribe(actionState => { - if (actionState.error) { - this.appAutoscalerPolicySnackBarRef = - this.appAutoscalerPolicySnackBar.open(`Failed to detach policy: ${actionState.message}`, 'Dismiss'); - } - }); - }); - } - - detachPolicy(): Observable { - this.store.dispatch( - new DetachAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) - ); - const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, - this.applicationService.appGuid, - UpdateAppAutoscalerPolicyAction.updateKey); - return this.store.select(actionState).pipe(filter(item => !!item)); - } - - updatePolicyPage = () => { - this.store.dispatch(new RouterNav({ - path: [ - 'applications', - this.applicationService.cfGuid, - this.applicationService.appGuid, - 'edit-autoscaler-policy' - ] - })); - } - - metricChartPage() { - this.store.dispatch(new RouterNav({ - path: [ - 'applications', - this.applicationService.cfGuid, - this.applicationService.appGuid, - 'app-autoscaler-metric-page' - ] - })); - } - - scaleHistoryPage() { - this.store.dispatch(new RouterNav({ - path: [ - 'applications', - this.applicationService.cfGuid, - this.applicationService.appGuid, - 'app-autoscaler-scale-history-page' - ] - })); - } -} diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index f8f9611ddb..9a9c84d3d6 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -18,28 +18,12 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; -import { AutoscalerTabComponent } from './application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; import { VariablesTabComponent } from './application/application-tabs-base/tabs/variables-tab/variables-tab.component'; import { ApplicationsRoutingModule } from './applications.routing'; import { EditApplicationComponent } from './edit-application/edit-application.component'; -import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { - EditAutoscalerPolicyStep1Component -} from './edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component'; -import { - EditAutoscalerPolicyStep2Component -} from './edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component'; -import { - EditAutoscalerPolicyStep3Component -} from './edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component'; -import { - EditAutoscalerPolicyStep4Component -} from './edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; -import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; -import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { AddRoutesComponent } from './routes/add-routes/add-routes.component'; import { MapRoutesComponent } from './routes/map-routes/map-routes.component'; @@ -64,7 +48,6 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new ApplicationBaseComponent, EventsTabComponent, LogStreamTabComponent, - AutoscalerTabComponent, ServicesTabComponent, BuildTabComponent, VariablesTabComponent, @@ -72,13 +55,6 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new ApplicationTabsBaseComponent, SshApplicationComponent, EditApplicationComponent, - EditAutoscalerPolicyComponent, - EditAutoscalerPolicyStep1Component, - EditAutoscalerPolicyStep2Component, - EditAutoscalerPolicyStep3Component, - EditAutoscalerPolicyStep4Component, - AutoscalerMetricPageComponent, - AutoscalerScaleHistoryPageComponent, InstancesTabComponent, AddRoutesComponent, GitSCMTabComponent, diff --git a/src/frontend/packages/core/src/features/applications/applications.routing.ts b/src/frontend/packages/core/src/features/applications/applications.routing.ts index fe4aac715a..ea3522160a 100644 --- a/src/frontend/packages/core/src/features/applications/applications.routing.ts +++ b/src/frontend/packages/core/src/features/applications/applications.routing.ts @@ -19,7 +19,6 @@ import { EventsTabComponent } from './application/application-tabs-base/tabs/eve import { GitSCMTabComponent } from './application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component'; import { InstancesTabComponent } from './application/application-tabs-base/tabs/instances-tab/instances-tab.component'; import { LogStreamTabComponent } from './application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component'; -import { AutoscalerTabComponent } from './application/application-tabs-base/tabs/autoscaler-tab/autoscaler-tab.component'; import { MetricsTabComponent } from './application/application-tabs-base/tabs/metrics-tab/metrics-tab.component'; import { RoutesTabComponent } from './application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component'; import { ServicesTabComponent } from './application/application-tabs-base/tabs/services-tab/services-tab.component'; @@ -30,9 +29,6 @@ import { CreateApplicationModule } from './create-application/create-application import { DeployApplicationComponent } from './deploy-application/deploy-application.component'; import { DeployApplicationModule } from './deploy-application/deploy-application.module'; import { EditApplicationComponent } from './edit-application/edit-application.component'; -import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; -import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; import { AddRouteStepperComponent } from './routes/add-route-stepper/add-route-stepper.component'; import { SshApplicationComponent } from './ssh-application/ssh-application.component'; import { NewApplicationBaseStepComponent } from './new-application-base-step/new-application-base-step.component'; @@ -110,7 +106,6 @@ const applicationsRoutes: Routes = [ { path: 'events', component: EventsTabComponent }, { path: 'gitscm', component: GitSCMTabComponent }, { path: 'metrics', component: MetricsTabComponent }, - { path: 'auto-scaler', component: AutoscalerTabComponent }, { path: '**', component: PageNotFoundComponentComponent, @@ -125,18 +120,6 @@ const applicationsRoutes: Routes = [ path: 'add-route', component: AddRouteStepperComponent, }, - { - path: 'edit-autoscaler-policy', - component: EditAutoscalerPolicyComponent, - }, - { - path: 'app-autoscaler-metric-page', - component: AutoscalerMetricPageComponent, - }, - { - path: 'app-autoscaler-scale-history-page', - component: AutoscalerScaleHistoryPageComponent, - }, { path: '**', component: PageNotFoundComponentComponent, diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index 889c566665..d111411928 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -41,7 +41,6 @@ import { CardAppInstancesComponent } from './components/cards/card-app-instances import { CardAppStatusComponent } from './components/cards/card-app-status/card-app-status.component'; import { CardAppUptimeComponent } from './components/cards/card-app-uptime/card-app-uptime.component'; import { CardAppUsageComponent } from './components/cards/card-app-usage/card-app-usage.component'; -import { CardAutoscalerDefaultComponent } from './components/cards/card-autoscaler-default/card-autoscaler-default.component'; import { CardCfInfoComponent } from './components/cards/card-cf-info/card-cf-info.component'; import { CardCfOrgUserDetailsComponent, @@ -217,7 +216,6 @@ import { UserPermissionDirective } from './user-permission.directive'; CardAppStatusComponent, CardAppInstancesComponent, CardAppUsageComponent, - CardAutoscalerDefaultComponent, RunningInstancesComponent, DialogConfirmComponent, CardAppUptimeComponent, @@ -329,7 +327,6 @@ import { UserPermissionDirective } from './user-permission.directive'; CardAppInstancesComponent, UsageGaugeComponent, CardAppUsageComponent, - CardAutoscalerDefaultComponent, DialogConfirmComponent, CardAppUptimeComponent, ListComponent, @@ -397,7 +394,8 @@ import { UserPermissionDirective } from './user-permission.directive'; MarkdownContentObserverDirective, TileSelectorComponent, AddServiceInstanceBaseStepComponent, - AppNameUniqueDirective + AppNameUniqueDirective, + RunningInstancesComponent ], entryComponents: [ DialogConfirmComponent, From 4e9882d9e3e50202359d4e945bb1b6a633b87839 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 11 Apr 2019 14:12:26 +0800 Subject: [PATCH 27/98] [autoscaler] move autoscaler stores into extension --- .../autoscaler}/app-autoscaler.actions.ts | 6 ++--- .../autoscaler}/app-autoscaler.types.ts | 0 .../autoscaler-transform-metric.spec.ts | 0 .../autoscaler-transform-metric.ts | 0 .../autoscaler-transform-policy.spec.ts | 0 .../autoscaler-transform-policy.ts | 0 .../autoscaler-helpers}/autoscaler-util.ts | 0 .../autoscaler-validation.ts | 0 .../autoscaler-metric-page.component.ts | 2 +- ...autoscaler-scale-history-page.component.ts | 2 +- .../autoscaler-tab-extension.component.ts | 6 ++--- .../custom/autoscaler}/autoscaler.effects.ts | 24 +++++++++---------- .../card-autoscaler-default.component.ts | 4 ++-- .../edit-autoscaler-policy.reducer.ts | 4 ++-- .../edit-autoscaler-policy-step1.component.ts | 10 ++++---- .../edit-autoscaler-policy-step2.component.ts | 8 +++---- .../edit-autoscaler-policy-step3.component.ts | 8 +++---- .../edit-autoscaler-policy-step4.component.ts | 10 ++++---- ...p-autoscaler-events-config.service.spec.ts | 0 ...cf-app-autoscaler-events-config.service.ts | 4 ++-- .../cf-app-autoscaler-events-data-source.ts | 4 ++-- ...-cell-autoscaler-event-change-icon.pipe.ts | 0 ...ell-autoscaler-event-change.component.html | 0 ...ell-autoscaler-event-change.component.scss | 0 ...-cell-autoscaler-event-change.component.ts | 5 ++-- ...-cell-autoscaler-event-status-icon.pipe.ts | 0 ...ell-autoscaler-event-status.component.html | 0 ...ell-autoscaler-event-status.component.scss | 0 ...-autoscaler-event-status.component.spec.ts | 0 ...-cell-autoscaler-event-status.component.ts | 3 +-- ...p-autoscaler-metric-card.component.spec.ts | 10 ++++---- ...utoscaler-metric-chart-card.component.html | 0 ...utoscaler-metric-chart-card.component.scss | 0 ...-autoscaler-metric-chart-card.component.ts | 9 +++---- .../combo-chart/combo-chart.component.scss | 0 .../combo-chart/combo-chart.component.ts | 0 .../combo-series-vertical.component.ts | 0 ...app-autoscaler-metric-chart-data-source.ts | 6 ++--- ...r-metric-chart-list-config.service.spec.ts | 0 ...scaler-metric-chart-list-config.service.ts | 6 ++--- .../applications/application.service.ts | 17 +------------ .../list/list-cards/card/card.component.ts | 13 +++------- .../table-cell/table-cell.component.ts | 5 ++-- .../packages/core/src/shared/shared.module.ts | 8 ++----- .../application-service-helper.ts | 7 ------ src/frontend/packages/store/src/app-state.ts | 2 +- .../packages/store/src/reducers.module.ts | 2 +- .../packages/store/src/store.module.ts | 2 +- 48 files changed, 76 insertions(+), 111 deletions(-) rename {src/frontend/packages/store/src/actions => custom-src/frontend/app/custom/autoscaler}/app-autoscaler.actions.ts (96%) rename {src/frontend/packages/store/src/types => custom-src/frontend/app/custom/autoscaler}/app-autoscaler.types.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-transform-metric.spec.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-transform-metric.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-transform-policy.spec.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-transform-policy.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-util.ts (100%) rename {src/frontend/packages/store/src/helpers/autoscaler => custom-src/frontend/app/custom/autoscaler/autoscaler-helpers}/autoscaler-validation.ts (100%) rename {src/frontend/packages/store/src/effects => custom-src/frontend/app/custom/autoscaler}/autoscaler.effects.ts (94%) rename {src/frontend/packages/store/src/reducers => custom-src/frontend/app/custom/autoscaler}/edit-autoscaler-policy.reducer.ts (72%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts (94%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts (82%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts (59%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts (70%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts (78%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts (89%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts (74%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts (100%) rename {src/frontend/packages/core/src/shared/components => custom-src/frontend/app/custom/autoscaler}/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts (89%) diff --git a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts similarity index 96% rename from src/frontend/packages/store/src/actions/app-autoscaler.actions.ts rename to custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index d270f5a7dd..6f3a3ea0d1 100644 --- a/src/frontend/packages/store/src/actions/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -8,9 +8,9 @@ import { appAutoscalerScalingHistorySchemaKey, appAutoscalerUpdatedPolicySchemaKey, entityFactory, -} from '../helpers/entity-factory'; -import { PaginatedAction } from '../types/pagination.types'; -import { IRequestAction } from '../types/request.types'; +} from '../../../../store/src/helpers/entity-factory'; +import { PaginatedAction } from '../../../../store/src/types/pagination.types'; +import { IRequestAction } from '../../../../store/src/types/request.types'; export const AppAutoscalerPolicyEvents = { GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', diff --git a/src/frontend/packages/store/src/types/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts similarity index 100% rename from src/frontend/packages/store/src/types/app-autoscaler.types.ts rename to custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-metric.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-metric.spec.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-metric.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.spec.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-transform-policy.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-util.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts diff --git a/src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts similarity index 100% rename from src/frontend/packages/store/src/helpers/autoscaler/autoscaler-validation.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts index 114f142ba3..304d5fe179 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts @@ -3,7 +3,7 @@ import { ListConfig } from '../../../shared/components/list/list.component.types import { ApplicationService } from '../../../features/applications/application.service'; import { AppAutoscalerMetricChartListConfigService, -} from '../../../shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service'; +} from '../list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service'; @Component({ selector: 'app-autoscaler-metric-page', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts index 4b194635ef..89adbc80e9 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ApplicationService } from '../../../features/applications/application.service'; import { CfAppAutoscalerEventsConfigService, -} from '../../../shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; +} from '../list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; import { ListConfig } from '../../../shared/components/list/list.component.types'; @Component({ diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index ed9cc28380..31a85f6271 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -12,10 +12,10 @@ import { GetAppAutoscalerHealthAction, GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, -} from '../../../../../store/src/actions/app-autoscaler.actions'; +} from '../app-autoscaler.actions'; import { RouterNav } from '../../../../../store/src/actions/router.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { MetricTypes } from '../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { MetricTypes } from '../autoscaler-helpers/autoscaler-util'; import { appAutoscalerHealthSchemaKey, appAutoscalerAppMetricSchemaKey, @@ -32,7 +32,7 @@ import { AppAutoscalerAppMetric, AppAutoscalerPolicy, AppAutoscalerScalingHistory, -} from '../../../../../store/src/types/app-autoscaler.types'; +} from '../app-autoscaler.types'; import { EntityService } from '../../../core/entity-service'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; diff --git a/src/frontend/packages/store/src/effects/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts similarity index 94% rename from src/frontend/packages/store/src/effects/autoscaler.effects.ts rename to custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index 4c67f4bc8e..a25b4054ff 100644 --- a/src/frontend/packages/store/src/effects/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -3,7 +3,7 @@ import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angula import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; -import { environment } from '../../../core/src/environments/environment.prod'; +import { environment } from '../../environments/environment.prod'; import { APP_AUTOSCALER_HEALTH, APP_AUTOSCALER_POLICY, @@ -18,25 +18,25 @@ import { GetAppAutoscalerScalingHistoryAction, UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, -} from '../actions/app-autoscaler.actions'; -import { AppState } from '../app-state'; -import { buildMetricData } from '../helpers/autoscaler/autoscaler-transform-metric'; +} from './app-autoscaler.actions'; +import { AppState } from '../../../../store/src/app-state'; +import { buildMetricData } from './autoscaler-helpers/autoscaler-transform-metric'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, -} from '../helpers/autoscaler/autoscaler-transform-policy'; -import { resultPerPageParam, resultPerPageParamDefault } from '../reducers/pagination-reducer/pagination-reducer.types'; -import { selectPaginationState } from '../selectors/pagination.selectors'; -import { NormalizedResponse } from '../types/api.types'; -import { PaginationEntityState, PaginationParam } from '../types/pagination.types'; +} from './autoscaler-helpers/autoscaler-transform-policy'; +import { resultPerPageParam, resultPerPageParamDefault } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; +import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors'; +import { NormalizedResponse } from '../../../../store/src/types/api.types'; +import { PaginationEntityState, PaginationParam } from '../../../../store/src/types/pagination.types'; import { ICFAction, StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess, -} from '../types/request.types'; -import { PaginatedAction } from './../types/pagination.types'; -import { UpdateAutoscalerPolicyState } from '../types/app-autoscaler.types'; +} from '../../../../store/src/types/request.types'; +import { PaginatedAction } from '../../../../store/src/types/pagination.types'; +import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; const { proxyAPIVersion, autoscalerAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts index 4d1ad37c67..7295f3c4b3 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts @@ -11,11 +11,11 @@ import { entityFactory, appAutoscalerPolicySchemaKey, } from '../../../../../store/src/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../store/src/actions/app-autoscaler.actions'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; import { CardStatus } from '../../../../../core/src/shared/shared.types'; -import { autoscalerTransformArrayToMap } from '../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; +import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; @Component({ selector: 'app-card-autoscaler-default', diff --git a/src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts similarity index 72% rename from src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts rename to custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts index d8120872ca..43b3d14541 100644 --- a/src/frontend/packages/store/src/reducers/edit-autoscaler-policy.reducer.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts @@ -1,5 +1,5 @@ -import { UPDATE_APP_AUTOSCALER_POLICY_STEP } from '../actions/app-autoscaler.actions'; -import { UpdateAutoscalerPolicyState } from '../types/app-autoscaler.types'; +import { UPDATE_APP_AUTOSCALER_POLICY_STEP } from './app-autoscaler.actions'; +import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; const defaultState: UpdateAutoscalerPolicyState = { policy: { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts index 5c85f33410..44563bd9f8 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -16,11 +16,11 @@ import { import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyStepAction -} from '../../../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; -import { PolicyDefault, PolicyAlert } from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; -import { autoscalerTransformArrayToMap } from '../../../../../../store/src/helpers/autoscaler/autoscaler-transform-policy'; -import { numberWithFractionOrExceedRange } from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +} from '../../app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; +import { PolicyDefault, PolicyAlert } from '../../autoscaler-helpers/autoscaler-util'; +import { autoscalerTransformArrayToMap } from '../../autoscaler-helpers/autoscaler-transform-policy'; +import { numberWithFractionOrExceedRange } from '../../autoscaler-helpers/autoscaler-validation'; import * as moment from 'moment-timezone'; @Component({ diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index f135f3b501..6b4dfe271c 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -16,14 +16,14 @@ import { getAdjustmentType, PolicyAlert, PolicyDefaultTrigger -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +} from '../../autoscaler-helpers/autoscaler-util'; import { numberWithFractionOrExceedRange, getThresholdMin, getThresholdMax -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; -import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; -import { UpdateAppAutoscalerPolicyStepAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; +} from '../../autoscaler-helpers/autoscaler-validation'; +import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; +import { UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.actions'; @Component({ selector: 'app-edit-autoscaler-policy-step2', diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index 62734df07d..31f3dbaa51 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -7,17 +7,17 @@ import { filter, map } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { AppState } from '../../../../../../store/src/app-state'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; -import { UpdateAppAutoscalerPolicyStepAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; +import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; +import { UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.actions'; import { MomentFormateDate, PolicyAlert, shiftArray, PolicyDefaultRecurringSchedule -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +} from '../../autoscaler-helpers/autoscaler-util'; import { numberWithFractionOrExceedRange, dateIsAfter, timeIsSameOrAfter, recurringSchedulesOverlapping, -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +} from '../../autoscaler-helpers/autoscaler-validation'; import * as moment from 'moment-timezone'; @Component({ diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index 873d881e38..a50c439314 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -13,18 +13,18 @@ import { entityFactory, appAutoscalerUpdatedPolicySchemaKey } from '../../../../../../store/src/helpers/entity-factory'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../../../../../store/src/types/app-autoscaler.types'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +} from '../../autoscaler-helpers/autoscaler-util'; import { numberWithFractionOrExceedRange, dateTimeIsSameOrAfter, specificDateRangeOverlapping -} from '../../../../../../store/src/helpers/autoscaler/autoscaler-validation'; +} from '../../autoscaler-helpers/autoscaler-validation'; import * as moment from 'moment-timezone'; -import { selectUpdateAutoscalerPolicyState } from '../../../../../../store/src/effects/autoscaler.effects'; +import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; @Component({ selector: 'app-edit-autoscaler-policy-step4', diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts similarity index 94% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index bdf3e1b6b8..7db45fe818 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -5,8 +5,8 @@ import { AppState } from '../../../../../../../store/src/app-state'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; -import { ITableColumn } from '../../list-table/table.types'; -import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; +import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; +import { IListConfig, ListConfig, ListViewTypes } from '../../../../../shared/components/list/list.component.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; import { TableCellAutoscalerEventChangeComponent, diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts similarity index 82% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 115eadcfe4..fc20791f97 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -1,11 +1,11 @@ import { Store } from '@ngrx/store'; -import { GetAppAutoscalerScalingHistoryAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; +import { GetAppAutoscalerScalingHistoryAction } from '../../../app-autoscaler.actions'; import { AppState } from '../../../../../../../store/src/app-state'; import { appAutoscalerScalingHistorySchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; -import { ListDataSource } from '../../data-sources-controllers/list-data-source'; +import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; export class CfAppAutoscalerEventsDataSource extends ListDataSource { action: any; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts similarity index 59% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts index 128ee130ac..a74a45f3ab 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts @@ -1,6 +1,5 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; +import { Component } from '@angular/core'; +import { TableCellCustom } from '../../../../../../shared/components/list/list.types'; @Component({ selector: 'app-table-cell-autoscaler-event-change', diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts similarity index 70% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts index 8a4bee51e9..9eafa8f0be 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts @@ -1,6 +1,5 @@ -/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/ import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../list.types'; +import { TableCellCustom } from '../../../../../../shared/components/list/list.types'; @Component({ selector: 'app-table-cell-autoscaler-event-status', diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts similarity index 78% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts index 2946bf57ee..8dce887eb2 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts @@ -7,11 +7,11 @@ import { import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper'; import { BaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; import { createBasicStoreModule } from '../../../../../../../test-framework/store-test-helper'; -import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service'; -import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory'; -import { ApplicationStateService } from '../../../../application-state/application-state.service'; -import { ConfirmationDialogService } from '../../../../confirmation-dialog.service'; +import { ServiceActionHelperService } from '../../../../../../shared/data-services/service-action-helper.service'; +import { EntityMonitorFactory } from '../../../../../../shared/monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; +import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; +import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component'; describe('AppServiceBindingCardComponent', () => { diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts similarity index 89% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index a3e99cbb87..b1452225ca 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -3,18 +3,18 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { GetAppAutoscalerAppMetricAction } from '../../../../../../../../store/src/actions/app-autoscaler.actions'; +import { GetAppAutoscalerAppMetricAction } from '../../../../app-autoscaler.actions'; import { AppState } from '../../../../../../../../store/src/app-state'; -import { buildLegendData } from '../../../../../../../../store/src/helpers/autoscaler/autoscaler-util'; +import { buildLegendData } from '../../../../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey, entityFactory } from '../../../../../../../../store/src/helpers/entity-factory'; import { getPaginationObservables, } from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { APIResource } from '../../../../../../../../store/src/types/api.types'; -import { AppAutoscalerAppMetric } from '../../../../../../../../store/src/types/app-autoscaler.types'; +import { AppAutoscalerAppMetric } from '../../../../app-autoscaler.types'; import { ApplicationService } from '../../../../../../features/applications/application.service'; import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { CardCell, IListRowCell } from '../../../list.types'; +import { CardCell, IListRowCell } from '../../../../../../shared/components/list/list.types'; @Component({ selector: 'app-app-autoscaler-metric-chart-card', @@ -92,6 +92,7 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell({ store: this.store, action, diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts similarity index 74% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index be71feac35..01a3227d2d 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -1,11 +1,11 @@ import { Store } from '@ngrx/store'; -import { getRowMetadata } from '../../../../../../../core/src/features/cloud-foundry/cf.helpers'; -import { GetAppAutoscalerPolicyTriggerAction } from '../../../../../../../store/src/actions/app-autoscaler.actions'; +import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; +import { GetAppAutoscalerPolicyTriggerAction } from '../../../app-autoscaler.actions'; import { AppState } from '../../../../../../../store/src/app-state'; import { appAutoscalerPolicySchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { ListDataSource } from '../../data-sources-controllers/list-data-source'; +import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; export class AppAutoscalerMetricChartDataSource extends ListDataSource { action: any; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts similarity index 100% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts similarity index 89% rename from src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts rename to custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index 8b47c85de7..d51f89b431 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -6,9 +6,9 @@ import { AppState } from '../../../../../../../store/src/app-state'; import { APIResource, EntityInfo } from '../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; -import { ITableColumn } from '../../list-table/table.types'; -import { ListViewTypes } from '../../list.component.types'; -import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; +import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; +import { ListViewTypes } from '../../../../../shared/components/list/list.component.types'; +import { BaseCfListConfig } from '../../../../../shared/components/list/list-types/base-cf/base-cf-list-config'; import { AppAutoscalerMetricChartCardComponent, } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; diff --git a/src/frontend/packages/core/src/features/applications/application.service.ts b/src/frontend/packages/core/src/features/applications/application.service.ts index dcc78f03b9..5378547e57 100644 --- a/src/frontend/packages/core/src/features/applications/application.service.ts +++ b/src/frontend/packages/core/src/features/applications/application.service.ts @@ -15,8 +15,6 @@ import { } from '../../../../store/src/actions/application.actions'; import { GetSpace } from '../../../../store/src/actions/space.actions'; import { AppState } from '../../../../store/src/app-state'; -import { GetAppAutoscalerHealthAction } from '../../../../store/src/actions/app-autoscaler.actions'; -import { AppAutoscalerHealth } from '../../../../store/src/types/app-autoscaler.types'; import { appEnvVarsSchemaKey, @@ -30,8 +28,7 @@ import { serviceBindingSchemaKey, spaceSchemaKey, spaceWithOrgKey, - stackSchemaKey, - appAutoscalerHealthSchemaKey, + stackSchemaKey } from '../../../../store/src/helpers/entity-factory'; import { createEntityRelationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; import { ActionState, rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types'; @@ -117,14 +114,6 @@ export class ApplicationService { false ); - this.appAutoscalerHealthService = this.entityServiceFactory.create>( - appAutoscalerHealthSchemaKey, - entityFactory(appAutoscalerHealthSchemaKey), - appGuid, - new GetAppAutoscalerHealthAction(appGuid, cfGuid), - false - ); - this.constructCoreObservables(); this.constructAmalgamatedObservables(); this.constructStatusObservables(); @@ -158,8 +147,6 @@ export class ApplicationService { applicationUrl$: Observable; applicationRunning$: Observable; - waitForAppAutoscalerHealth$: Observable>; - /** * Fetch the current state of the app (given it's instances) as an object ready */ @@ -228,8 +215,6 @@ export class ApplicationService { ); this.appEnvVars = this.appEnvVarsService.createEnvVarsObs(this.appGuid, this.cfGuid); - - this.waitForAppAutoscalerHealth$ = this.appAutoscalerHealthService.waitForEntity$.pipe(publishReplay(1), refCount()); } public getApplicationEnvVarsMonitor() { diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts index cbc8e0796f..9a2d06a82b 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts @@ -23,16 +23,9 @@ import { } from '../../list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component'; import { CardCell } from '../../list.types'; import { CardDynamicComponent, CardMultiActionComponents } from '../card.component.types'; -import { - AppAutoscalerMetricChartCardComponent -} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; -import { - AppAutoscalerComboChartComponent -} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component'; -import { - AppAutoscalerComboSeriesVerticalComponent -} from '../../list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component'; - +import { AppAutoscalerMetricChartCardComponent } from '../../../../../custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; +import { AppAutoscalerComboChartComponent } from '../../../../../custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component'; +import { AppAutoscalerComboSeriesVerticalComponent } from '../../../../../custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component'; export const listCards = [ CardAppComponent, diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts index e51796cea3..3558a33fe2 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts @@ -26,10 +26,10 @@ import { } from '../../list-types/app-event/table-cell-event-type/table-cell-event-type.component'; import { TableCellAutoscalerEventChangeComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; +} from '../../../../../custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; import { TableCellAutoscalerEventStatusComponent, -} from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; +} from '../../../../../custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; import { TableCellCfCellComponent } from '../../list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component'; import { TableCellUsageComponent } from '../../list-types/app-instance/table-cell-usage/table-cell-usage.component'; import { @@ -122,7 +122,6 @@ import { TableCellSelectComponent } from '../table-cell-select/table-cell-select import { TableHeaderSelectComponent } from '../table-header-select/table-header-select.component'; import { ICellDefinition } from '../table.types'; import { MultiActionListEntity } from './../../../../monitors/pagination-monitor'; -import { TableCellAutoscalerEventStatusIconPipe } from '../../list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; /* tslint:enable:max-line-length */ export const listTableCells = [ diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index d111411928..9e92b6f830 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -102,12 +102,8 @@ import { EventTabActorIconPipe, } from './components/list/list-types/app-event/table-cell-event-action/event-tab-actor-icon.pipe'; import { EndpointCardComponent } from './components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; -import { - TableCellAutoscalerEventStatusIconPipe, -} from './components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; -import { - TableCellAutoscalerEventChangeIconPipe, -} from './components/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe'; +import { TableCellAutoscalerEventStatusIconPipe } from '../custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; +import { TableCellAutoscalerEventChangeIconPipe } from '../custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe'; import { ListComponent } from './components/list/list.component'; import { ListConfig } from './components/list/list.component.types'; import { LoadingPageComponent } from './components/loading-page/loading-page.component'; diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts index b796d2798e..afb06d55a5 100644 --- a/src/frontend/packages/core/test-framework/application-service-helper.ts +++ b/src/frontend/packages/core/test-framework/application-service-helper.ts @@ -13,7 +13,6 @@ import { AppState } from '../../store/src/app-state'; import { EntityServiceFactory } from '../src/core/entity-service-factory.service'; import { PaginationMonitorFactory } from '../src/shared/monitors/pagination-monitor.factory'; import { Observable, of as observableOf } from 'rxjs'; -import { AppAutoscalerPolicy, AppAutoscalerHealth } from '../../store/src/types/app-autoscaler.types' function createEntity(entity: T): APIResource { return { @@ -52,12 +51,6 @@ export class ApplicationServiceMock { appSummary$: Observable>> = observableOf({ entityRequestInfo: { fetching: false } } as EntityInfo>); - appAutoscalerPolicy$: Observable> = observableOf(({ - entityRequestInfo: { fetching: false } - } as EntityInfo)); - appAutoscalerHealth$: Observable> = observableOf(({ - entityRequestInfo: { fetching: false } - } as EntityInfo)); appStats$: Observable[]> = observableOf(new Array>()); applicationStratProject$: Observable = observableOf({ deploySource: { type: '', timestamp: 0, commit: '' }, deployOverrides: null }); diff --git a/src/frontend/packages/store/src/app-state.ts b/src/frontend/packages/store/src/app-state.ts index b60d7318d4..db79a98786 100644 --- a/src/frontend/packages/store/src/app-state.ts +++ b/src/frontend/packages/store/src/app-state.ts @@ -15,7 +15,7 @@ import { IRecentlyVisitedState } from './types/recently-visited.types'; import { RoutingHistory } from './types/routing.type'; import { UAASetupState } from './types/uaa-setup.types'; import { UsersRolesState } from './types/users-roles.types'; -import { UpdateAutoscalerPolicyState } from './types/app-autoscaler.types'; +import { UpdateAutoscalerPolicyState } from '../../core/src/custom/autoscaler/app-autoscaler.types'; export interface IRequestTypeState { [entityKey: string]: IRequestEntityTypeState; diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts index 794712797c..f1ff8e6c5e 100644 --- a/src/frontend/packages/store/src/reducers.module.ts +++ b/src/frontend/packages/store/src/reducers.module.ts @@ -21,7 +21,7 @@ import { requestPaginationReducer } from './reducers/pagination-reducer.generato import { routingReducer } from './reducers/routing.reducer'; import { uaaSetupReducer } from './reducers/uaa-setup.reducers'; import { UsersRolesReducer } from './reducers/users-roles.reducer'; -import { updateAutoscalerPolicyReducer } from './reducers/edit-autoscaler-policy.reducer'; +import { updateAutoscalerPolicyReducer } from '../../core/src/custom/autoscaler/edit-autoscaler-policy.reducer'; // NOTE: Revisit when ngrx-store-logger supports Angular 7 (https://github.com/btroncone/ngrx-store-logger) diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts index 79b47f4de5..f1adb53b21 100644 --- a/src/frontend/packages/store/src/store.module.ts +++ b/src/frontend/packages/store/src/store.module.ts @@ -29,7 +29,7 @@ import { UpdateAppEffects } from './effects/update-app-effects'; import { UserFavoritesEffect } from './effects/user-favorites-effect'; import { UserProfileEffect } from './effects/user-profile.effects'; import { UsersRolesEffects } from './effects/users-roles.effects'; -import { AutoscalerEffects} from './effects/autoscaler.effects'; +import { AutoscalerEffects} from '../../core/src/custom/autoscaler/autoscaler.effects'; import { AppReducersModule } from './reducers.module'; import { AppStoreExtensionsModule } from './store.extensions.module'; From d8a87f1c2ab799af355f60a724759ae991ded7ab Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 11 Apr 2019 15:03:33 +0800 Subject: [PATCH 28/98] [autoscaler] revert some useless change in stratos core --- .../custom/autoscaler/autoscaler.effects.ts | 2 +- ...dit-autoscaler-policy-step2.component.html | 1 + ...dit-autoscaler-policy-step3.component.html | 1 + ...dit-autoscaler-policy-step4.component.html | 1 + .../edit-autoscaler-policy.component.html | 9 ++--- .../core/src/environments/environment.prod.ts | 1 - .../core/src/environments/environment.ts | 1 - .../applications/application.service.ts | 4 +- .../application-tabs-base.component.ts | 40 ++++++++----------- .../applications/applications.module.ts | 4 +- .../components/stepper/step/step.component.ts | 12 ------ .../stepper/steppers/steppers.component.html | 3 -- .../stepper/steppers/steppers.component.scss | 5 --- .../stepper/steppers/steppers.component.ts | 4 -- src/frontend/packages/core/src/styles.scss | 13 ------ .../pagination-reducer.types.ts | 2 +- 16 files changed, 27 insertions(+), 76 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index a25b4054ff..f02e7818ca 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -38,7 +38,7 @@ import { import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; -const { proxyAPIVersion, autoscalerAPIVersion } = environment; +const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; // const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; // const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index e11934ded7..a34da8aa81 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -105,4 +105,5 @@ +
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index cacd96e1b1..f17607d6e3 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -165,4 +165,5 @@ +
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index 35dc54517d..792933a37c 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -105,6 +105,7 @@ + {{submitMessage}} diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 2815ca6369..f008a805bb 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -11,17 +11,14 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - - + - diff --git a/src/frontend/packages/core/src/environments/environment.prod.ts b/src/frontend/packages/core/src/environments/environment.prod.ts index 873ddff692..651a68d984 100644 --- a/src/frontend/packages/core/src/environments/environment.prod.ts +++ b/src/frontend/packages/core/src/environments/environment.prod.ts @@ -5,7 +5,6 @@ export const environment = { logLevel: LogLevel.WARN, proxyAPIVersion: 'v1', cfAPIVersion: 'v2', - autoscalerAPIVersion: 'v1', logToConsole: true, logEnableConsoleActions: false, showObsDebug: false, diff --git a/src/frontend/packages/core/src/environments/environment.ts b/src/frontend/packages/core/src/environments/environment.ts index fab48d64b8..bb1db6f839 100644 --- a/src/frontend/packages/core/src/environments/environment.ts +++ b/src/frontend/packages/core/src/environments/environment.ts @@ -9,7 +9,6 @@ export const environment = { production: false, proxyAPIVersion: 'v1', cfAPIVersion: 'v2', - autoscalerAPIVersion: 'v1', logLevel: LogLevel.DEBUG, logToConsole: true, logEnableConsoleActions: false, diff --git a/src/frontend/packages/core/src/features/applications/application.service.ts b/src/frontend/packages/core/src/features/applications/application.service.ts index 5378547e57..0bcf6cd910 100644 --- a/src/frontend/packages/core/src/features/applications/application.service.ts +++ b/src/frontend/packages/core/src/features/applications/application.service.ts @@ -15,7 +15,6 @@ import { } from '../../../../store/src/actions/application.actions'; import { GetSpace } from '../../../../store/src/actions/space.actions'; import { AppState } from '../../../../store/src/app-state'; - import { appEnvVarsSchemaKey, applicationSchemaKey, @@ -28,7 +27,7 @@ import { serviceBindingSchemaKey, spaceSchemaKey, spaceWithOrgKey, - stackSchemaKey + stackSchemaKey, } from '../../../../store/src/helpers/entity-factory'; import { createEntityRelationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; import { ActionState, rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types'; @@ -87,7 +86,6 @@ export class ApplicationService { private appEntityService: EntityService>; private appSummaryEntityService: EntityService>; - private appAutoscalerHealthService: EntityService; constructor( @Inject(CF_GUID) public cfGuid: string, diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index fd69050160..fc6f83326d 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -101,22 +101,6 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { private currentUserPermissionsService: CurrentUserPermissionsService, scmService: GitSCMService ) { - const appDoesNotHaveEnvVars$ = this.applicationService.appSpace$.pipe( - switchMap(space => this.currentUserPermissionsService.can(CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS, - this.applicationService.cfGuid, space.metadata.guid) - ), - map(can => !can) - ); - this.tabLinks = [ - { link: 'summary', label: 'Summary' }, - { link: 'instances', label: 'Instances' }, - { link: 'routes', label: 'Routes' }, - { link: 'log-stream', label: 'Log Stream' }, - { link: 'services', label: 'Services' }, - { link: 'variables', label: 'Variables', hidden: appDoesNotHaveEnvVars$ }, - { link: 'events', label: 'Events' } - ]; - const endpoints$ = store.select(endpointEntitiesSelector); this.breadcrumbs$ = applicationService.waitForAppEntity$.pipe( withLatestFrom( @@ -134,13 +118,23 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { }), first() ); - // this.applicationService.waitForAppAutoscalerHealth$ - // .pipe(first()) - // .subscribe(entity => { - // if (entity && entity.entity && entity.entity.entity && entity.entity.entity.uptime > 0) { - // this.tabLinks.push({ link: 'auto-scaler', label: 'Autoscale' }); - // } - // }); + + const appDoesNotHaveEnvVars$ = this.applicationService.appSpace$.pipe( + switchMap(space => this.currentUserPermissionsService.can(CurrentUserPermissions.APPLICATION_VIEW_ENV_VARS, + this.applicationService.cfGuid, space.metadata.guid) + ), + map(can => !can) + ); + + this.tabLinks = [ + { link: 'summary', label: 'Summary' }, + { link: 'instances', label: 'Instances' }, + { link: 'routes', label: 'Routes' }, + { link: 'log-stream', label: 'Log Stream' }, + { link: 'services', label: 'Services' }, + { link: 'variables', label: 'Variables', hidden: appDoesNotHaveEnvVars$ }, + { link: 'events', label: 'Events' } + ]; this.endpointsService.hasMetrics(applicationService.cfGuid).subscribe(hasMetrics => { if (hasMetrics) { diff --git a/src/frontend/packages/core/src/features/applications/applications.module.ts b/src/frontend/packages/core/src/features/applications/applications.module.ts index 9a9c84d3d6..75db658c1f 100644 --- a/src/frontend/packages/core/src/features/applications/applications.module.ts +++ b/src/frontend/packages/core/src/features/applications/applications.module.ts @@ -1,6 +1,5 @@ import { DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; import { CoreModule } from '../../core/core.module'; import { SharedModule } from '../../shared/shared.module'; @@ -40,8 +39,7 @@ import { NewApplicationBaseStepComponent } from './new-application-base-step/new CoreModule, SharedModule, ApplicationsRoutingModule, - CustomImportModule, - NgxChartsModule + CustomImportModule ], declarations: [ ApplicationWallComponent, diff --git a/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts b/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts index ea3eaf8e6c..00d6457813 100644 --- a/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts +++ b/src/frontend/packages/core/src/shared/components/stepper/step/step.component.ts @@ -75,21 +75,12 @@ export class StepComponent { @Input() cancelButtonText = 'Cancel'; - @Input() - addButtonText = 'Add'; - @Input() disablePrevious = false; @Input() blocked = false; - @Input() - showAdd = false; - - @Input() - disableAdd = false; - @Input() public destructiveStep = false; @@ -108,9 +99,6 @@ export class StepComponent { @Input() onLeave: (isNext?: boolean) => void = () => { } - @Input() - onAdd: () => void = () => { } - constructor() { this.pOnEnter = (data?: any) => { if (this.onEnter) { diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html index 12e207292d..3638baaa8f 100644 --- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html +++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html @@ -28,9 +28,6 @@ -

- - {{submitMessage}} - -
- {{submitMessage}} -
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index a50c439314..f79c1cf257 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; -import { Observable, of as observableOf, Subscription } from 'rxjs'; -import { filter, map, distinctUntilChanged, publishReplay, refCount, first } from 'rxjs/operators'; +import { Observable, Subscription } from 'rxjs'; +import { filter, map, distinctUntilChanged, take } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { AppState } from '../../../../../../store/src/app-state'; import { ApplicationService } from '../../../../features/applications/application.service'; @@ -16,7 +16,7 @@ import { import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate + MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate, cloneObject } from '../../autoscaler-helpers/autoscaler-util'; import { numberWithFractionOrExceedRange, @@ -38,10 +38,9 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { policyAlert = PolicyAlert; editSpecificDateForm: FormGroup; - submitMessage = ''; - submitStatus = true; appAutoscalerPolicy$: Observable; + private updateAppAutoscalerPolicyService: EntityService; private editLimitValid = true; private editSpecificDateTimeValid = true; private appAutoscalerPolicyErrorSub: Subscription; @@ -71,6 +70,13 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { return this.currentPolicy; }) ); + this.updateAppAutoscalerPolicyService = this.entityServiceFactory.create( + appAutoscalerUpdatedPolicySchemaKey, + entityFactory(appAutoscalerUpdatedPolicySchemaKey), + this.applicationService.appGuid, + new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy), + false + ); } ngOnDestroy(): void { @@ -80,45 +86,45 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { } updatePolicy: StepOnNextFunction = () => { - this.submitStatus = true; - this.submitMessage = ''; - let updateAppAutoscalerPolicyService: EntityService; - updateAppAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerUpdatedPolicySchemaKey, - entityFactory(appAutoscalerUpdatedPolicySchemaKey), - this.applicationService.appGuid, - new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy), - false - ); this.store.dispatch( new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) ); - let waitForAppAutoscalerUpdateStatus$: Observable; - waitForAppAutoscalerUpdateStatus$ = updateAppAutoscalerPolicyService.waitForEntity$.pipe(publishReplay(1), refCount()); - waitForAppAutoscalerUpdateStatus$ - .pipe(first()) - .subscribe(entity => { - this.submitStatus = true; - this.submitMessage = 'Policy is saved.'; - this.currentPolicy = entity.entity; - this.store.dispatch( - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) - ); - }); - this.appAutoscalerPolicyErrorSub = updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( - filter(request => !!request.error), - map(request => request.message), + waitForAppAutoscalerUpdateStatus$ = this.updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( + filter(request => !!request.error || !!request.response), + map(request => { + const msg = request.message; + request.error = false; + request.response = null; + request.message = ''; + return msg; + }), distinctUntilChanged(), - ).subscribe(errorMessage => { - this.submitStatus = false; - this.submitMessage = errorMessage; - }); - return observableOf({ success: this.submitStatus, message: this.submitMessage}); + ).pipe(map(errorMessage => { + if (errorMessage) { + return { + success: false, + message: `Could not update policy: ${errorMessage}`, + }; + } else { + return { + success: true, + redirect: true + }; + } + })); + return waitForAppAutoscalerUpdateStatus$.pipe(take(1), map(res => { + this.store.dispatch( + new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) + ); + return { + ...res, + }; + })); } addSpecificDate = () => { - this.currentPolicy.schedules.specific_date.push(PolicyDefaultSpecificDate); + this.currentPolicy.schedules.specific_date.push(cloneObject(PolicyDefaultSpecificDate)); this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } @@ -227,7 +233,7 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { validateRecurringSpecificMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { const invalid = this.editSpecificDateForm && - numberWithFractionOrExceedRange(control.value, 1, this.editSpecificDateForm.get('instance_max_count').value - 1, true); + numberWithFractionOrExceedRange(control.value, 1, this.editSpecificDateForm.get('instance_max_count').value - 1, true); const lastValid = this.editLimitValid; this.editLimitValid = this.editSpecificDateForm && control.value < this.editSpecificDateForm.get('instance_max_count').value; if (this.editSpecificDateForm && lastValid !== this.editLimitValid) { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html index f008a805bb..209dcd621c 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -11,11 +11,10 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + - + Date: Wed, 24 Apr 2019 18:18:31 +0800 Subject: [PATCH 30/98] [autoscaler] fix some of the code climate errors --- .../autoscaler/autoscaler-base.component.ts | 68 +----- .../autoscaler-transform-metric.ts | 5 + .../autoscaler-transform-policy.ts | 40 ++-- .../autoscaler-helpers/autoscaler-util.ts | 11 +- .../autoscaler-tab-extension.component.scss | 15 +- .../edit-autoscaler-policy-step2.component.ts | 3 +- ...dit-autoscaler-policy-step3.component.html | 15 +- .../edit-autoscaler-policy-step3.component.ts | 204 +++++------------- .../edit-autoscaler-policy-step4.component.ts | 107 +++++---- ...-autoscaler-event-status.component.spec.ts | 2 +- 10 files changed, 163 insertions(+), 307 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts index e681eb9e78..3a1de7d8c7 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts @@ -1,59 +1,8 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../store/src/app-state'; -import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpers/entity-factory'; -import { EntityServiceFactory } from '../../core/entity-service-factory.service'; -import { ApplicationStateService } from '../../shared/components/application-state/application-state.service'; -import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../shared/entity.tokens'; -import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory'; -import { ApplicationService, createGetApplicationAction } from '../../features/applications/application.service'; -import { ApplicationEnvVarsHelper } from '../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; - -export function applicationServiceFactory( - cfId: string, - id: string, - store: Store, - entityServiceFactoryInstance: EntityServiceFactory, - appStateService: ApplicationStateService, - appEnvVarsService: ApplicationEnvVarsHelper, - paginationMonitorFactory: PaginationMonitorFactory -) { - return new ApplicationService( - cfId, - id, - store, - entityServiceFactoryInstance, - appStateService, - appEnvVarsService, - paginationMonitorFactory - ); -} - -export function entityServiceFactory( - cfId: string, - id: string, - esf: EntityServiceFactory, -) { - return esf.create( - applicationSchemaKey, - entityFactory(applicationSchemaKey), - id, - createGetApplicationAction(id, cfId), - true - ); -} - -export function getGuids(type?: string) { - return (activatedRoute: ActivatedRoute) => { - const { id, endpointId } = activatedRoute.snapshot.params; - if (type) { - return endpointId; - } - return id; - }; -} +import { APP_GUID, CF_GUID } from '../../shared/entity.tokens'; +import { ApplicationService } from '../../features/applications/application.service'; +import { getGuids } from '../../features/applications/application/application-base.component'; @Component({ selector: 'app-autoscaler-base', @@ -71,17 +20,6 @@ export function getGuids(type?: string) { useFactory: getGuids(), deps: [ActivatedRoute] }, - { - provide: ApplicationService, - useFactory: applicationServiceFactory, - deps: [CF_GUID, APP_GUID, Store, EntityServiceFactory, ApplicationStateService, ApplicationEnvVarsHelper, PaginationMonitorFactory] - }, - { - provide: ENTITY_SERVICE, - useFactory: entityServiceFactory, - deps: [CF_GUID, APP_GUID, EntityServiceFactory] - }, - ] }) export class AutoscalerBaseComponent { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts index 800ccc801b..0c746d4bcd 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts @@ -249,6 +249,11 @@ function getChartMax(trigger, maxValue) { thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); } thresholdmax = Math.max(maxValue, thresholdmax, 10); + thresholdmax = getTrimedInteger(getTrimedInteger); + return thresholdmax; +} + +function getTrimedInteger(thresholdmax) { for (let i = 10; i < Number.MAX_VALUE && i < thresholdmax; i = i * 10) { if (thresholdmax / i >= 1 && thresholdmax / i < 10 && thresholdmax > 100) { thresholdmax = (Math.ceil(thresholdmax / i * 10)) * i / 10; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts index cd5172ad1c..e998c71bd8 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts @@ -11,13 +11,10 @@ export function autoscalerTransformArrayToMap(newPolicy) { newPolicy.enabled = true; newPolicy.scaling_rules_map = {}; newPolicy.scaling_rules_form = []; - if (newPolicy.scaling_rules) { - newPolicy.scaling_rules.map((trigger) => { - initIfUndefined(trigger, 'breach_duration_secs', PolicyDefaultSetting.breach_duration_secs_default); - initIfUndefined(trigger, 'cool_down_secs', PolicyDefaultSetting.cool_down_secs_default); - pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); - }); - } + initIfUndefined(newPolicy, 'scaling_rules', []); + newPolicy.scaling_rules.map((trigger) => { + pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); + }); let maxThreshold = 0; Object.keys(newPolicy.scaling_rules_map).map((metricName) => { if (newPolicy.scaling_rules_map[metricName].upper && newPolicy.scaling_rules_map[metricName].upper.length > 0) { @@ -25,17 +22,10 @@ export function autoscalerTransformArrayToMap(newPolicy) { setUpperColor(newPolicy.scaling_rules_map[metricName].upper); } if (newPolicy.scaling_rules_map[metricName].lower && newPolicy.scaling_rules_map[metricName].lower.length > 0) { - maxThreshold = newPolicy.scaling_rules_map[metricName].lower[0].threshold > maxThreshold ? - newPolicy.scaling_rules_map[metricName].lower[0].threshold : maxThreshold; + maxThreshold = Math.max(newPolicy.scaling_rules_map[metricName].lower[0].threshold, maxThreshold); setLowerColor(newPolicy.scaling_rules_map[metricName].lower); } - ScaleTypes.map((triggerType) => { - if (newPolicy.scaling_rules_map[metricName][triggerType]) { - newPolicy.scaling_rules_map[metricName][triggerType].map((trigger) => { - newPolicy.scaling_rules_form.push(trigger); - }); - } - }); + buildFormUponMap(newPolicy, metricName); }); initIfUndefined(newPolicy, 'schedules', { timezone: moment.tz.guess() }); initIfUndefined(newPolicy.schedules, 'recurring_schedule', []); @@ -101,11 +91,9 @@ export function autoscalerTransformMapToArray(newPolicy) { delete newPolicy.scaling_rules_form; delete newPolicy.scaling_rules_map; if (newPolicy.schedules) { - deleteIf( - newPolicy.schedules, 'recurring_schedule', + deleteIf(newPolicy.schedules, 'recurring_schedule', newPolicy.schedules.recurring_schedule && newPolicy.schedules.recurring_schedule.length === 0); - deleteIf( - newPolicy.schedules, 'specific_date', + deleteIf(newPolicy.schedules, 'specific_date', newPolicy.schedules.specific_date && newPolicy.schedules.specific_date.length === 0); deleteIf(newPolicy, 'schedules', !newPolicy.schedules.recurring_schedule && !newPolicy.schedules.specific_date); } @@ -114,6 +102,8 @@ export function autoscalerTransformMapToArray(newPolicy) { function pushAndSortTrigger(map, metricName, newTrigger) { const scaleType = getScaleType(newTrigger.operator); + initIfUndefined(newTrigger, 'breach_duration_secs', PolicyDefaultSetting.breach_duration_secs_default); + initIfUndefined(newTrigger, 'cool_down_secs', PolicyDefaultSetting.cool_down_secs_default); if (!map[metricName]) { map[metricName] = {}; } @@ -129,6 +119,16 @@ function pushAndSortTrigger(map, metricName, newTrigger) { map[metricName][scaleType].push(newTrigger); } +function buildFormUponMap(newPolicy, metricName) { + ScaleTypes.map((triggerType) => { + if (newPolicy.scaling_rules_map[metricName][triggerType]) { + newPolicy.scaling_rules_map[metricName][triggerType].map((trigger) => { + newPolicy.scaling_rules_form.push(trigger); + }); + } + }); +} + function initIfUndefined(fatherEntity, childName, defaultData) { if (fatherEntity[childName] === undefined || fatherEntity[childName] === '') { fatherEntity[childName] = defaultData; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts index eb585fe785..c8910a6eb1 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts @@ -6,6 +6,14 @@ export const MetricPercentageTypes = ['memoryutil']; export const ScaleTypes = ['upper', 'lower']; export const UpperOperators = ['>', '>=']; export const LowerOperators = ['<', '<=']; +export const WeekdayOptions = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; +export const MonthdayOptions = (() => { + const days = []; + for (let i = 0; i < 31; i++) { + days[i] = i + 1; + } + return days; +})(); export const normalColor = 'rgba(90,167,0,0.6)'; export const MomentFormateDate = 'YYYY-MM-DD'; @@ -98,8 +106,7 @@ export const PolicyAlert = { alertInvalidPolicyTriggerCooldownRange: `The cooldown period value must be an integer in the range of ${PolicyDefaultSetting.cool_down_secs_min} to ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`, - alertInvalidPolicyScheduleStartDateBeforeNow: 'Start date should be after or equal to current date.', - alertInvalidPolicyScheduleEndDateBeforeNow: 'End date should be after or equal to current date.', + alertInvalidPolicyScheduleDateBeforeNow: 'Start/End date should be after or equal to current date.', alertInvalidPolicyScheduleEndDateBeforeStartDate: 'Start date must be earlier than the end date.', alertInvalidPolicyScheduleEndTimeBeforeStartTime: 'Start time must be earlier than the end time.', alertInvalidPolicyScheduleRepeatOn: 'Please select at least one "Repeat On" day.', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index c22f22e2d7..e4f3dc0b9d 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -9,6 +9,12 @@ right: 24px; text-align: right; } + .mat-header-cell:first-of-type { + padding-left: unset; + } + .autoscaler-tab-table-no-record { + margin-top: .5em; + } } .app-metadata { @@ -59,12 +65,3 @@ table { flex: 0 0 16.78%; } } - -.autoscaler-tab { - th.mat-header-cell:first-of-type { - padding-left: unset; - } - .autoscaler-tab-table-no-record { - margin-top: 0.5em; - } -} diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 88dc2914a1..0e8889ec9e 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; import { Observable, of as observableOf } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { AppState } from '../../../../../../store/src/app-state'; import { ApplicationService } from '../../../../features/applications/application.service'; @@ -72,7 +72,6 @@ export class EditAutoscalerPolicyStep2Component implements OnInit { ngOnInit() { this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( - filter(state => true), map(state => { this.currentPolicy = state.policy; return this.currentPolicy; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index f17607d6e3..f80294c91a 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -27,8 +27,8 @@
- Always + + Always @@ -107,17 +107,13 @@ {{policyAlert.alertInvalidPolicyInitialMaximumRange}} - {{policyAlert.alertInvalidPolicyScheduleStartDateBeforeNow}} + *ngIf="editRecurringScheduleForm.get('start_date').hasError('alertInvalidPolicyScheduleDateBeforeNow') || editRecurringScheduleForm.get('end_date').hasError('alertInvalidPolicyScheduleDateBeforeNow')"> + {{policyAlert.alertInvalidPolicyScheduleDateBeforeNow}} {{policyAlert.alertInvalidPolicyScheduleEndDateBeforeStartDate}} - - {{policyAlert.alertInvalidPolicyScheduleEndDateBeforeNow}} - -
- - -
- -
- - -
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss deleted file mode 100644 index a48f93b759..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.scss +++ /dev/null @@ -1,14 +0,0 @@ - -@import '../../theme.scss'; - -.chart-list { - width: 100%; - max-width: $layout-max-width; - margin: auto; - display: flex; - align-items: center; - - app-chart-list { - flex: 1; - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts deleted file mode 100644 index 418098dd09..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.spec.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; -import { Router } from '@angular/router'; - -import { ChartItemComponent } from '../chart-item/chart-item.component'; -import { ChartListComponent } from '../chart-list/chart-list.component'; -import { LoaderComponent } from '../loader/loader.component'; -import { PanelComponent } from '../panel/panel.component'; -import { ChartsService } from '../shared/services/charts.service'; -import { ConfigService } from '../shared/services/config.service'; -import { MenuService } from '../shared/services/menu.service'; -import { ChartIndexComponent } from './chart-index.component'; - -// import { HeaderBarComponent } from '../header-bar/header-bar.component'; -// import { MainHeaderComponent } from '../main-header/main-header.component'; -// import { SeoService } from '../shared/services/seo.service'; - -describe('Component: ChartIndex', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [], - declarations: [ - ChartIndexComponent, - ChartListComponent, - ChartItemComponent, - LoaderComponent, - PanelComponent, - // HeaderBarComponent, - // MainHeaderComponent - ], - providers: [ - ConfigService, - MenuService, - { provide: ChartsService }, - // { provide: SeoService }, - { provide: Router } - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - }); - - it('should create an instance', () => { - const component = TestBed.createComponent(ChartIndexComponent); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts deleted file mode 100644 index 204d6c52b9..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-index/chart-index.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { first } from 'rxjs/operators'; - -import { Chart } from '../shared/models/chart'; -import { ChartsService } from '../shared/services/charts.service'; - -@Component({ - selector: 'app-chart-index', - templateUrl: './chart-index.component.html', - styleUrls: ['./chart-index.component.scss'] -}) -export class ChartIndexComponent implements OnInit { - charts: Chart[]; - loading = true; - totalChartsNumber: number; - - constructor( - private chartsService: ChartsService, - ) { } - - ngOnInit() { - this.loadCharts(); - } - - loadCharts(): void { - this.chartsService.getCharts().pipe(first()).subscribe(charts => { - this.loading = false; - this.charts = charts; - this.totalChartsNumber = charts.length; - }); - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html deleted file mode 100644 index fc0074d65c..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.html +++ /dev/null @@ -1,21 +0,0 @@ - - -
-

- - {{ chart.attributes.name }} -

-

- - {{ chart.relationships.latestChartVersion.data.app_version }} - - - {{ chart.attributes.repo.name }} - -

-
- {{ chart.attributes.description }} -
-
- \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss deleted file mode 100644 index c37186d500..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.scss +++ /dev/null @@ -1,57 +0,0 @@ -// Import your custom theme -@import '../../theme.scss'; - -// Vars -$chart-item-content-height: 150px; -$chart-item-logo-width: 80px; - -.chart-item { - - &-logo { - max-height: 80%; - } - - &-info { - - &__title { - margin: 0; - font-weight: 500; - cursor: pointer; - margin-bottom: 4px; - - a { - color: inherit; - } - } - - p { - margin: 0; - } - - // Remove this when chips are ready: - // https://github.com/angular/material2/issues/120 - &__repo { - color: mat-color($monocular-app-accent); - font-size: .8em; - padding: 2px 4px; - border-radius: 4px; - - &:hover { - background: $background-white; - } - - &.repo-incubator { - color: mat-color($monocular-app-warn, 600); - } - - a { - color: inherit; - } - } - - &__description { - margin: 1em; - } - } - -} diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts deleted file mode 100644 index 96fdb980c6..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; -import { HttpModule } from '@angular/http'; - -import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper'; -import { LoggerService } from '../../../../core/logger.service'; -import { ChartsService } from '../shared/services/charts.service'; -import { ConfigService } from '../shared/services/config.service'; -import { ChartItemComponent } from './chart-item.component'; - - -describe('Component: ChartItem', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - HttpModule, - createBasicStoreModule() - ], - declarations: [ChartItemComponent], - providers: [ - ConfigService, - ChartsService, - LoggerService - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - }); - - it('should create an instance', () => { - const component = TestBed.createComponent(ChartItemComponent); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts deleted file mode 100644 index 890a24d958..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-item/chart-item.component.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -import { Chart } from '../shared/models/chart'; -import { ChartsService } from '../shared/services/charts.service'; - -@Component({ - selector: 'app-chart-item', - templateUrl: './chart-item.component.html', - styleUrls: ['./chart-item.component.scss'], - /* tslint:disable-next-line:use-input-property-decorator */ - inputs: ['chart', 'showVersion', 'showDescription'] -}) -export class ChartItemComponent implements OnInit { - public iconUrl: string; - // Chart to represent - public chart: Chart; - // Show version form by default - public showVersion = true; - // Truncate the description - public showDescription = true; - - constructor(private chartsService: ChartsService) { } - - ngOnInit() { - this.iconUrl = this.chartsService.getChartIconURL(this.chart); - } - - goToDetailUrl(): string { - return `/monocular/charts/${this.chart.attributes.repo.name}/${this.chart.attributes - .name}`; - } - - goToRepoUrl(): string { - return `/monocular/charts/${this.chart.attributes.repo.name}`; - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html b/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html deleted file mode 100644 index 00afaae077..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

There are no charts

- -
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss b/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss deleted file mode 100644 index 5274b4b828..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.scss +++ /dev/null @@ -1,44 +0,0 @@ -// Import your custom theme -@import '../../theme.scss'; - -.chart-list { - flex: 1; - display: flex; - flex-flow: row wrap; - - &__empty { - align-self: center; - margin: auto; - opacity: 0.7; - } - - app-chart-item { - padding-bottom: 1.5em; - width: 100%; - - @include mappy-bp(medium large) { - width: 50%; - padding-right: 1.5em; - &:nth-child(2n) { - padding-right: 0; - } - } - - @include mappy-bp(large xlarge) { - width: 33.3%; - padding-right: 1.5em; - &:nth-child(3n) { - padding-right: 0; - } - } - - @include mappy-bp(xlarge) { - width: 25%; - padding-right: 1.5em; - &:nth-child(4n) { - padding-right: 0; - } - } - - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts deleted file mode 100644 index 71ac617ce4..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ChartListComponent } from './chart-list.component'; - - -describe('Component: ChartList', () => { - it('should create an instance', () => { - const component = new ChartListComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts deleted file mode 100644 index 73db0ddf57..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/chart-list/chart-list.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, Input } from '@angular/core'; - -import { Chart } from '../shared/models/chart'; - -@Component({ - selector: 'app-chart-list', - templateUrl: './chart-list.component.html', - styleUrls: ['./chart-list.component.scss'] -}) -export class ChartListComponent { - @Input() charts: Chart[]; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html deleted file mode 100644 index 742b852181..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
-
-
-

- Charts -
- - - Filters -
-

-
-
-
- - -
-
- - -
- -
-
-
- - diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss deleted file mode 100644 index 6ec9d41b90..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.scss +++ /dev/null @@ -1,112 +0,0 @@ -@import '../../theme.scss'; - -$filters-width: 175px; - -.charts { - max-width: $layout-max-width; - margin: auto; - - &__header { - - &__title { - margin-top: 0; - } - - &__filters { - display: none; - font-size: 0.5em; - - mat-icon { - margin-left: 10px; - top: 6px; - position: relative; - } - } - } - - &__gallery { - width: 100%; - display: flex; - flex-direction: row; - - app-list-filters { - width: $filters-width; - display: flex; - overflow: hidden; - } - - &__content { - flex: 1; - display: flex; - flex-direction: column; - border-left: 1px solid $border-color; - - app-chart-list { - flex: 1; - display: flex; - padding: 1.5em 0 0 1.5em; - } - - &__topbar { - display: flex; - height: 40px; - border-bottom: 1px solid $border-color; - align-items: center; - padding-left: 10px; - - * { - fill: lighten($layout-base, 50%); - } - - input { - width: 100%; - height: 100%; - border: 0; - font-size: 1.1em; - background: none; - outline: none; - margin-left: 5px; - color: $layout-base; - @include placeholder { - color: lighten($layout-base, 50%); - } - } - } - } - } - - @include mappy-bp(max-width small) { - - &__header__filters { - display: inline-block; - } - - &__gallery { - flex-direction: column; - - app-list-filters { - position: relative; - left: -100%; - width: auto; - height: 0; - transition: left .2s ease-out; - &.open { - height: auto; - left: 0; - } - } - - &__content { - border: 0; - - &__topbar { - padding-left: 0; - } - - app-chart-list { - padding: 1.5em 0 0 0; - } - } - } - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts deleted file mode 100644 index f90e98215a..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; -import { HttpModule } from '@angular/http'; -import { ActivatedRoute, Router } from '@angular/router'; - -import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper'; -import { LoggerService } from '../../../../core/logger.service'; -import { ChartItemComponent } from '../chart-item/chart-item.component'; -import { ChartListComponent } from '../chart-list/chart-list.component'; -import { LoaderComponent } from '../loader/loader.component'; -import { PanelComponent } from '../panel/panel.component'; -import { ChartsService } from '../shared/services/charts.service'; -import { ConfigService } from '../shared/services/config.service'; -import { MenuService } from '../shared/services/menu.service'; -import { ReposService } from '../shared/services/repos.service'; -import { ChartsComponent } from './charts.component'; - -// import { HeaderBarComponent } from '../header-bar/header-bar.component'; -// import { SeoService } from '../shared/services/seo.service'; -describe('Component: Charts', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ - HttpModule, - createBasicStoreModule() - ], - declarations: [ - ChartsComponent, - ChartListComponent, - ChartItemComponent, - LoaderComponent, - PanelComponent, - // HeaderBarComponent - ], - providers: [ - ConfigService, - MenuService, - { provide: ChartsService }, - // { provide: SeoService }, - { provide: ActivatedRoute }, - { provide: Router }, - ReposService, - LoggerService - ], - schemas: [NO_ERRORS_SCHEMA] - }).compileComponents(); - }); - - it('should create an instance', () => { - const component = TestBed.createComponent(ChartsComponent); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts deleted file mode 100644 index 711ee0d5ab..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts +++ /dev/null @@ -1,181 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { MatIconRegistry } from '@angular/material'; -import { DomSanitizer } from '@angular/platform-browser'; -import { ActivatedRoute, Params, Router } from '@angular/router'; - -import { Chart } from '../shared/models/chart'; -import { ChartsService } from '../shared/services/charts.service'; -import { ConfigService } from '../shared/services/config.service'; -import { ReposService } from '../shared/services/repos.service'; - -@Component({ - selector: 'app-charts', - templateUrl: './charts.component.html', - styleUrls: ['./charts.component.scss'], - viewProviders: [MatIconRegistry] -}) -export class ChartsComponent implements OnInit { - charts: Chart[] = []; - orderedCharts: Chart[] = []; - loading = true; - searchTerm: string; - searchTimeout: any; - filtersOpen = false; - - // Default filters - filters = [ - { - title: 'Repository', - onSelect: i => this.onSelectRepo(i), - items: [{ title: 'All', value: 'all', selected: true }] - }, - { - title: 'Order By', - onSelect: i => this.onSelectOrderBy(i), - items: [ - { title: 'Name', value: 'name', selected: true }, - { title: 'Created At', value: 'created', selected: false } - ] - } - ]; - - // Order elements - orderBy = 'name'; - - // Repos - repoName: string; - - constructor( - private chartsService: ChartsService, - private reposService: ReposService, - private route: ActivatedRoute, - private router: Router, - private config: ConfigService, - private mdIconRegistry: MatIconRegistry, - private sanitizer: DomSanitizer - ) { } - - ngOnInit() { - this.mdIconRegistry.addSvgIcon( - 'search', - this.sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/search.svg`) - ); - this.mdIconRegistry.addSvgIcon( - 'close', - this.sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/close.svg`) - ); - this.mdIconRegistry.addSvgIcon( - 'menu', - this.sanitizer.bypassSecurityTrustResourceUrl(`/assets/icons/menu.svg`) - ); - this.route.queryParams.forEach((params: Params) => { - this.searchTerm = params.q ? params.q : undefined; - if (this.searchTerm) { - this.searchCharts(); - } - }); - this.route.params.forEach((params: Params) => { - this.repoName = params.repo ? params.repo : undefined; - this.updateMetaTags(); - this.loadCharts(); - this.loadRepos(); - }); - } - - loadCharts(): void { - this.chartsService.getCharts(this.repoName).subscribe(charts => { - this.loading = false; - this.charts = charts; - if (!this.searchTerm) { - this.orderedCharts = this.orderCharts(this.charts); - } - }); - } - - loadRepos(): void { - this.reposService.getRepos().subscribe(repos => { - // Ensure the "all" link is appended to the list of repos - repos = [{ name: 'all', url: '' }, ...repos]; - this.filters[0].items = repos.map(r => ({ - title: r.name, - value: r.name, - selected: this.repoName ? r.name === this.repoName : r.name === 'all' - })); - }); - } - - onSelectRepo(index) { - this.repoName = this.filters[0].items[index].value; - this.filters[0].items = this.filters[0].items.map(r => { - r.selected = r.value === this.repoName; - return r; - }); - this.router.navigate( - ['/charts', this.repoName === 'all' ? '' : this.repoName], - { replaceUrl: true } - ); - } - - onSelectOrderBy(index) { - this.orderBy = this.filters[1].items[index].value; - this.filters[1].items = this.filters[1].items.map(o => { - o.selected = o.value === this.orderBy; - return o; - }); - this.orderedCharts = this.orderCharts(this.orderedCharts); - } - - searchChange(e) { - this.searchTerm = e.target.value; - clearTimeout(this.searchTimeout); - if (!this.searchTerm) { - return (this.orderedCharts = this.orderCharts(this.charts)); - } - this.searchTimeout = setTimeout(() => this.searchCharts(), 1000); - } - - searchCharts() { - if (!this.searchTerm) { - return false; - } - this.loading = true; - this.chartsService - .searchCharts(this.searchTerm, this.repoName) - .subscribe(charts => { - this.loading = false; - this.orderedCharts = this.orderCharts(charts); - }); - } - - // Sort charts - orderCharts(charts): Chart[] { - switch (this.orderBy) { - case 'created': { - return charts.sort(this.sortByCreated).reverse(); - } - default: { - return charts.sort((a, b) => - a.attributes.name.localeCompare(b.attributes.name) - ); - } - } - } - - sortByCreated(a: Chart, b: Chart) { - const aVersion = a.relationships.latestChartVersion.data; - const bVersion = b.relationships.latestChartVersion.data; - if (aVersion.created < bVersion.created) { - return -1; - } else if (aVersion.created > bVersion.created) { - return 1; - } - return 0; - } - - // TODO: See #150 - is this to be implemented? - updateMetaTags(): void { } - - capitalize(input: string) { - return input.charAt(0).toUpperCase() + input.slice(1); - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html deleted file mode 100644 index c8d43b18d8..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
-

{{ filter.title }}

-
- {{ item.title }} -
-
-
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss deleted file mode 100644 index e6aa8db10e..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import '../../theme.scss'; - -.list-filters { - width: 100%; - height: 100%; - flex: 1; - - &_section { - margin-bottom: 40px; - - &_title { - margin-bottom: 10px; - } - - &_link { - cursor: pointer; - font-size: 1.1em; - margin-bottom: 0.3em; - opacity: 0.5; - &.active { - opacity: 1; - color: md-color($monocular-app-primary); - } - } - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts deleted file mode 100644 index fe5419226b..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ListFiltersComponent } from './list-filters.component'; - - -describe('Component: ListFilters', () => { - it('should create an instance', () => { - const component = new ListFiltersComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts b/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts deleted file mode 100644 index 06d9d7658a..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-filters/list-filters.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-list-filters', - templateUrl: './list-filters.component.html', - styleUrls: ['./list-filters.component.scss'], - /* tslint:disable-next-line:use-input-property-decorator */ - inputs: ['filters'] -}) - -export class ListFiltersComponent { - public filters: { title: string, items: Array<{}> }[] = []; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html deleted file mode 100644 index 1e02c4fde2..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
- -
- -
- -
-
- -
diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss deleted file mode 100644 index cebb26fe0a..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.scss +++ /dev/null @@ -1,50 +0,0 @@ -// Import your custom theme -@import '../../theme.scss'; - -// Vars -$list-item-content-height: 200px; - -.list-item { - border-radius: $border-radius; - overflow: hidden; - border: 1px solid $border-color; - transition: transform 0.2s ease; - background-color: $background-light; - - &:hover { - transform: scale(1.02); - } - - &:active { - transform: scale(0.98); - } - - &-content { - width: 100%; - height: $list-item-content-height; - display: flex; - flex-direction: column; - color: $layout-text; - } - - &-logo { - width: 100%; - height: $list-item-content-height/2 + 10px; - background-color: $background-white; - display: flex; - align-items: center; - justify-content: center; - } - - &-info { - position: relative; - flex: 1; - border-top: 1px solid $border-color; - padding: 0 1em; - display: flex; - flex-direction: column; - justify-content: center; - word-wrap: break-word; - text-align: center; - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts deleted file mode 100644 index 41850b0af6..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.spec.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { ListItemComponent } from './list-item.component'; - - -describe('Component: ListItem', () => { - it('should create an instance', () => { - const component = new ListItemComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts b/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts deleted file mode 100644 index 91745aab75..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/list-item/list-item.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-list-item', - templateUrl: './list-item.component.html', - styleUrls: ['./list-item.component.scss'], - /* tslint:disable-next-line:use-input-property-decorator */ - inputs: ['detailUrl'] -}) -export class ListItemComponent { - public detailUrl: string; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html b/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html deleted file mode 100644 index 7ae53d4392..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
- -
- -
diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss b/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss deleted file mode 100644 index ff3c8602d6..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.scss +++ /dev/null @@ -1,10 +0,0 @@ -.loader { - text-align: center; - margin: 2em 0; -} - -mat-spinner { - height: 60px; - width: 60px; - margin: 0 auto; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts deleted file mode 100644 index 0154562121..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CoreModule } from '../../../../core/core.module'; -import { LoaderComponent } from './loader.component'; - -describe('LoaderComponent', () => { - let component: LoaderComponent; - let fixture: ComponentFixture; - - beforeEach( - async(() => { - TestBed.configureTestingModule({ - imports: [CoreModule], - declarations: [LoaderComponent] - }).compileComponents(); - }) - ); - - beforeEach(() => { - fixture = TestBed.createComponent(LoaderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts b/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts deleted file mode 100644 index 21a30ec988..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/loader/loader.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-loader', - templateUrl: './loader.component.html', - styleUrls: ['./loader.component.scss'], - /* tslint:disable-next-line:use-input-property-decorator */ - inputs: ['loading'] -}) -export class LoaderComponent { - // Show the loader or the content - public loading = false; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html b/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html deleted file mode 100644 index 6ad2a66494..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

{{ title }}

- -
diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss b/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss deleted file mode 100644 index 43902a8ea7..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import '../../theme.scss'; - -.panel { - padding: 2em; - - &--container { - width: 80%; - margin-left: auto; - margin-right: auto; - } - - &--background { - background-color: $layout-light; - } - - &--border { - border-radius: $border-radius; - border: 1px solid darken($layout-light, 5); - } - - &__title { - margin-top: 0; - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts deleted file mode 100644 index 7f71affbd2..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.spec.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { PanelComponent } from './panel.component'; - - -describe('Component: Panel', () => { - it('should create an instance', () => { - const component = new PanelComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts b/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts deleted file mode 100644 index debf1260bf..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/panel/panel.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-panel', - templateUrl: './panel.component.html', - styleUrls: ['./panel.component.scss'], - /* tslint:disable-next-line:use-input-property-decorator */ - inputs: ['title', 'background', 'container', 'border'] -}) -export class PanelComponent { - // Title of the panel - public title = ''; - // Display a gray background - public background = false; - // Show a border - public border = false; - // Set the size of the panel to 80% - public container = false; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts b/custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts deleted file mode 100644 index b3e7671f9a..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart-version.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { ChartAttributes } from './chart'; - -export class ChartVersion { - id: string; - type: string; - attributes: ChartVersionAttributes; - relationships: ChartVersionRelationships; -} - -export class ChartVersionAttributes { - created: Date; - digest: string; - icons: ChartVersionIcon[]; - readme: string; - version: string; - /* tslint:disable-next-line:variable-name */ - app_version: string; - urls: string[]; -} - -class ChartVersionIcon { - name: string; - path: string; -} - -class ChartVersionRelationships { - chart: ChartVersionChart; -} - -class ChartVersionChart { - data: ChartAttributes; - links: { - self: string - }; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts b/custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts deleted file mode 100644 index 5c2a35dac3..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/models/chart.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { ChartVersionAttributes } from './chart-version'; -import { Maintainer } from './maintainer'; -import { RepoAttributes } from './repo'; - -export class Chart { - id: string; - type: string; - links: string[]; - attributes: ChartAttributes; - relationships: ChartRelationships; -} - - -export class ChartAttributes { - description: string; - name: string; - icon: string; - repo: RepoAttributes; - home: string; - sources: string[]; - keywords: string[]; - maintainers: Maintainer[]; -} - -class ChartRelationships { - latestChartVersion: ChartVersionRelationship; -} - -class ChartVersionRelationship { - data: ChartVersionAttributes; - links: { - self: string - }; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts b/custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts deleted file mode 100644 index 5d358d8314..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/models/maintainer.ts +++ /dev/null @@ -1,4 +0,0 @@ -export class Maintainer { - name: string; - email: string; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts b/custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts deleted file mode 100644 index 2f4878ca8e..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/models/repo.ts +++ /dev/null @@ -1,10 +0,0 @@ -export class Repo { - id: string; - type: string; - attributes: RepoAttributes; -} - -export class RepoAttributes { - name = ''; - url = ''; -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts b/custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts deleted file mode 100644 index 3ad274e85d..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/seo.data.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This files contains the titles and descriptions for the different sections of the site - */ -export default { - index: { - title: '{ appName }: Discover & launch great Kubernetes-ready apps', - description: - '{ appName } is a platform for discovering & launching great Kubernetes-ready' + - 'apps. Browse the catalog and deploy your applications in your Kubernetes cluster' - }, - charts: { - title: 'Kubernetes-ready applications catalog | { appName }', - description: - 'Browse the { appName } catalog of Kubernetes-ready apps. Deploy all apps you need ' + - 'in your infrastructure or the cloud with a command using Helm Charts' - }, - repoCharts: { - title: '{ repo } repository of Kubernetes-ready applications | { appName }', - description: - 'Browse the { appName } catalog of the { repo } repository of Kubernetes-ready apps. ' + - 'Deploy all apps you need in your infrastructure or the cloud with a command using ' + - 'Helm Charts' - }, - chartDetails: { - title: '{ name } for Kubernetes | { appName }', - description: 'Deploy the latest { name } in Kubernetes. { description }' - }, - chartDetailsWithVersion: { - title: '{ name } { version } for Kubernetes | { appName }', - description: - 'Deploy the { name } { version } in Kubernetes. { description }' - }, -}; diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts deleted file mode 100644 index 93455acca1..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/charts.service.ts +++ /dev/null @@ -1,175 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; -import { Observable, throwError } from 'rxjs'; -import { catchError, map, tap } from 'rxjs/operators'; - -import { LoggerService } from '../../../../../core/logger.service'; -import { Chart } from '../models/chart'; -import { ChartVersion } from '../models/chart-version'; -import { ConfigService } from './config.service'; - - - -/* Most of this code should be in an effect and we should store the data in the app store */ -@Injectable() -export class ChartsService { - hostname: string; - cacheCharts: any; - - constructor( - private http: Http, - config: ConfigService, - private loggerService: LoggerService - ) { - this.hostname = `${config.backendHostname}/chartsvc`; - this.cacheCharts = {}; - this.hostname = '/pp/v1/chartsvc'; - } - - /** - * Get all charts from the API - * - * @return An observable that will an array with all Charts - */ - getCharts(repo: string = 'all'): Observable { - let url: string; - switch (repo) { - case 'all': { - url = `${this.hostname}/v1/charts`; - break; - } - default: { - url = `${this.hostname}/v1/charts/${repo}`; - } - } - - if (this.cacheCharts[repo] && this.cacheCharts[repo].length > 0) { - return Observable.create((observer) => { - observer.next(this.cacheCharts[repo]); - }); - } else { - return this.http.get(url).pipe( - map(r => this.extractData(r)), - tap((data) => this.storeCache(data, repo)), - catchError(this.handleError) - ); - } - } - - /** - * Get a chart using the API - * - * @param repo Repository name - * @param chartName Chart name - * @return An observable that will a chart instance - */ - getChart(repo: string, chartName: string): Observable { - // Transform Observable into Observable[] - return this.http.get(`${this.hostname}/v1/charts/${repo}/${chartName}`).pipe( - map(this.extractData), - catchError(this.handleError) - ); - } - - // TODO: use backend search API endpoint - searchCharts(query, repo?: string): Observable { - const re = new RegExp(query, 'i'); - return this.getCharts(repo).pipe( - map(charts => { - return charts.filter(chart => { - return chart.attributes.name.match(re) || - chart.attributes.description.match(re) || - chart.attributes.repo.name.match(re) || - this.arrayMatch(chart.attributes.keywords, re) || - this.arrayMatch((chart.attributes.maintainers || []).map((m) => m.name), re) || - this.arrayMatch(chart.attributes.sources, re); - }); - }) - ); - } - - arrayMatch(keywords: string[], re): boolean { - if (!keywords) { return false; } - - return keywords.some((keyword) => { - return !!keyword.match(re); - }); - } - - /** - * Get a chart Readme using the API - * - * @param repo Repository name - * @param chartName Chart name - * @param version Chart version - * @return An observable that will be a chartReadme - */ - getChartReadme(chartVersion: ChartVersion): Observable { - return this.http.get(`${this.hostname}${chartVersion.attributes.readme}`); - } - /** - * Get chart versions using the API - * - * @param repo Repository name - * @param chartName Chart name - * @return An observable containing an array of ChartVersions - */ - getVersions(repo: string, chartName: string): Observable { - return this.http.get(`${this.hostname}/v1/charts/${repo}/${chartName}/versions`).pipe( - map(m => this.extractData(m)), - catchError(this.handleError) - ); - } - - /** - * Get chart version using the API - * - * @param repo Repository name - * @param chartName Chart name - * @return An observable containing an array of ChartVersions - */ - getVersion(repo: string, chartName: string, version: string): Observable { - return this.http.get(`${this.hostname}/v1/charts/${repo}/${chartName}/versions/${version}`).pipe( - map(this.extractData), - catchError(this.handleError) - ); - } - - /** - * Get the URL for retrieving the chart's icon - * - * @param chart Chart object - */ - getChartIconURL(chart: Chart): string { - if (chart.attributes.icon) { - return `${this.hostname}${chart.attributes.icon}`; - } else { - return '/core/assets/custom/placeholder.png'; - } - } - - /** - * Store the charts in the cache - * - * @param data Elements in the response - * @return Return the same response - */ - private storeCache(data: Chart[], repo: string): Chart[] { - this.cacheCharts[repo] = data; - return data; - } - - - private extractData(res: Response) { - const body = res.json(); - return body.data || {}; - } - - private handleError(error: any) { - const errMsg = (error.message) ? error.message : - error.status ? `${error.status} - ${error.statusText}` : 'Server error'; - this.loggerService.error(errMsg); - return throwError(errMsg); - } - -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts deleted file mode 100644 index 3d87ef78b4..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/config.service.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable() -export class ConfigService { - // Configurable options - // They can be overriden using assets/js/overrides.js - backendHostname: string; - appName: string; - aboutUrl: string; - // EO configurable options - - constructor() { - let overrides: any = {}; - // Object.keys(window).find(param => param === 'monocular'); - /* tslint:disable-next-line:no-string-literal */ - const monocular = window['monocular']; - if (monocular) { - overrides = monocular.overrides || {}; - } - - this.backendHostname = overrides.backendHostname || '/api'; - this.appName = overrides.appName || 'Monocular'; - this.aboutUrl = overrides.aboutUrl || 'https://github.com/helm/monocular/blob/master/docs/about.md'; - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts deleted file mode 100644 index 20f2a9d292..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/menu.service.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs'; - - -@Injectable() -export class MenuService { - // Emitter - private menuOpenSource = new Subject(); - private open = false; - // Observable boolean streams - public menuOpen$ = this.menuOpenSource.asObservable(); - - showMenu() { - this.open = true; - this.menuOpenSource.next(this.open); - } - - hideMenu() { - this.open = false; - this.menuOpenSource.next(this.open); - } - - // Service message commands - toggleMenu() { - this.open = !this.open; - this.menuOpenSource.next(this.open); - } -} diff --git a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts b/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts deleted file mode 100644 index 3f8c5ddd2c..0000000000 --- a/custom-src/frontend/app/custom/helm/monocular/shared/services/repos.service.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Http, Response } from '@angular/http'; -import { Observable, throwError } from 'rxjs'; -import { catchError, map } from 'rxjs/operators'; - -import { LoggerService } from '../../../../../core/logger.service'; -import { RepoAttributes } from '../models/repo'; -import { ConfigService } from './config.service'; - - - -@Injectable() -export class ReposService { - - hostname: string; - - constructor( - private http: Http, - private config: ConfigService, - private loggerService: LoggerService - ) { - this.hostname = `/pp/v1/chartrepos`; - } - - /** - * Get all repos from the API - * - * @return An observable that will an array with all repos - */ - getRepos(): Observable { - return this.http.get(`${this.hostname}`).pipe( - map(this.extractData), - catchError(this.handleError) - ); - } - - private extractData(res: Response) { - const body = res.json(); - return body.data || {}; - } - - private handleError(error: any) { - const errMsg = (error.json().message) ? error.json().message : - error.status ? `${error.status} - ${error.statusText}` : 'Server error'; - this.loggerService.error(errMsg); // log to console instead - return throwError(errMsg); - } -} diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html deleted file mode 100644 index 84b2bd06a1..0000000000 --- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.html +++ /dev/null @@ -1,4 +0,0 @@ - -

{{ title }}

- - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.scss b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts deleted file mode 100644 index e85413aa0a..0000000000 --- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../../tab-nav.service'; -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../helm-testing.module'; -import { HelmReleaseTabBaseComponent } from './helm-release-tab-base.component'; - - -describe('HelmReleaseTabBaseComponent', () => { - let component: HelmReleaseTabBaseComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [...HelmBaseTestModules], - declarations: [HelmReleaseTabBaseComponent], - providers: [ - ...HelmBaseTestProviders, - TabNavService - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseTabBaseComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts deleted file mode 100644 index 1f62b30a07..0000000000 --- a/custom-src/frontend/app/custom/helm/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs'; - -import { HelmReleaseGuid } from '../../store/helm.types'; -import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service'; - -@Component({ - selector: 'app-helm-release-tab-base', - templateUrl: './helm-release-tab-base.component.html', - styleUrls: ['./helm-release-tab-base.component.scss'], - providers: [ - HelmReleaseHelperService, - { - provide: HelmReleaseGuid, - useFactory: (activatedRoute: ActivatedRoute) => ({ - guid: activatedRoute.snapshot.params.guid - }), - deps: [ - ActivatedRoute - ] - } - ] -}) -export class HelmReleaseTabBaseComponent { - - isFetching$: Observable; - - public breadcrumbs = [{ - breadcrumbs: [ - { value: 'Helm', routerLink: '/monocular' }, - { value: 'Releases', routerLink: '/monocular/releases' } - ] - }]; - - public title = ''; - - tabLinks = [ - { link: 'summary', label: 'Summary', matIcon: 'helm', matIconFont: 'stratos-icons' }, - { link: 'notes', label: 'Notes', matIcon: 'subject' }, - { link: 'values', label: 'Values', matIcon: 'list' }, - { link: 'pods', label: 'Pods', matIcon: 'adjust' }, - { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' } - ]; - constructor( - private helmRelease: HelmReleaseGuid, - ) { - const guid = this.helmRelease.guid; - this.title = guid.split(':')[1]; - } -} diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts deleted file mode 100644 index a478546582..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-helper.service.ts +++ /dev/null @@ -1,165 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; -import { PaginationMonitor } from '../../../../shared/monitors/pagination-monitor'; -import { GetHelmReleases, GetHelmReleaseStatus } from '../../store/helm.actions'; -import { helmReleaseSchemaKey } from '../../store/helm.entities'; -import { HelmRelease, HelmReleaseGuid, HelmReleaseStatus } from '../../store/helm.types'; -import { AppState } from './../../../../../../store/src/app-state'; -import { - getPaginationObservables, -} from './../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; - -@Injectable() -export class HelmReleaseHelperService { - - public isFetching$: Observable; - - public release$: Observable; - - public guid: string; - public endpointGuid: string; - public releaseTitle: string; - - constructor( - helmReleaseGuid: HelmReleaseGuid, - store: Store, - private esf: EntityServiceFactory - ) { - this.guid = helmReleaseGuid.guid; - this.releaseTitle = this.guid.split(':')[1]; - this.endpointGuid = this.guid.split(':')[0]; - - const action = new GetHelmReleases(); - const paginationMonitor = new PaginationMonitor(store, action.paginationKey, entityFactory(helmReleaseSchemaKey)); - const svc = getPaginationObservables({ store, action, paginationMonitor }); - this.isFetching$ = svc.fetchingEntities$; - - this.release$ = svc.entities$.pipe( - map((items: HelmRelease[]) => items.find(item => item.guid === this.guid)) - ); - } - - public fetchReleaseStatus(): Observable { - // Get helm release - const action = new GetHelmReleaseStatus(this.endpointGuid, this.releaseTitle); - - return this.esf.create(action.entityKey, action.entity, action.key, action, false).waitForEntity$.pipe( - map(entity => entity.entity) - ); - } -} - -export const parseHelmReleaseStatus = (res: string): HelmReleaseStatus => { - const lines = res.split('\n'); - const result = { - pods: {}, - fields: [], - data: { - 'v1/Pod': {}, - 'v1/Service': {} - } - }; - - // Process - let i = 0; - while (i < lines.length) { - if (lines[i].indexOf('==>') === 0) { - // Got a resource type - const resType = getResourceName(lines[i].substr(4)); - // Read fields - i++; - i = readFields(result, lines, i); - i = readResType(result, resType, lines, i); - } else { - i++; - } - } - - calculateStats(result); - return result; -}; - -function getResourceName(name: string): string { - const parts = name.trim().split('('); - return parts[0].trim(); -} - -function readFields(result, lines, i): number { - let read = result.fields.length === 0; - if (!read && lines[i].length === 0) { - i++; - read = true; - } - - if (lines[i].indexOf('NAME') === 0) { - read = true; - } - - if (read) { - const params = lines[i].replace(/ +/g, ' '); - result.fields = params.split(' '); - i++; - } - return i; -} - -function readResType(result, resType, lines, i): number { - const data = result.data; - data[resType] = []; - while (i < lines.length) { - if (lines[i].length === 0) { - return i + 1; - } - let values = lines[i]; - values = values.replace(/ +/g, ' '); - const value = {}; - values.split(' ').forEach((v, index) => { - let p = result.fields[index].trim(); - p = p.toLowerCase(); - value[p] = v.trim(); - }); - data[resType].push(value); - i++; - } - - return i; -} - -function calculateStats(res) { - // Calculate Pod Stats - if (!!res.data['v1/Pod']) { - calculatePodStats(res, res.data['v1/Pod']); - } -} - -function calculatePodStats(data, pods) { - data.pods = { - status: {}, - containers: 0, - ready: 0, - }; - - pods.forEach(pod => { - let count = data.pods.status[pod.status]; - if (!count) { - count = 0; - } - data.pods.status[pod.status] = count + 1; - - // Parse the ready state if running - if (pod.status === 'Running') { - const readyParts = pod.ready.split('/'); - if (readyParts.length === 2) { - const ready = parseInt(readyParts[0], 10); - const total = parseInt(readyParts[1], 10); - data.pods.ready += ready; - data.pods.containers += total; - } - } - }); -} diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html deleted file mode 100644 index 6866cf45dd..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
-
- - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss deleted file mode 100644 index d16a37d86c..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.helm-release-notes { - display: block; - font-family: Source Code Pro; - font-size: 14px; - white-space: pre; -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts deleted file mode 100644 index 119f485328..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module'; -import { HelmReleaseNotesTabComponent } from './helm-release-notes-tab.component'; - -describe('HelmReleaseNotesTabComponent', () => { - let component: HelmReleaseNotesTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [ - HelmReleaseNotesTabComponent - ], - providers: [ - ...HelmBaseTestProviders - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseNotesTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts deleted file mode 100644 index 91425115d6..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-notes-tab/helm-release-notes-tab.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { AnsiColors } from '../../../../../shared/components/log-viewer/ansi-colors'; -import { HelmReleaseHelperService } from '../helm-release-helper.service'; - -@Component({ - selector: 'app-helm-release-notes-tab', - templateUrl: './helm-release-notes-tab.component.html', - styleUrls: ['./helm-release-notes-tab.component.scss'] -}) -export class HelmReleaseNotesTabComponent { - - public notes$: Observable; - - private colorizer = new AnsiColors(); - - constructor(public helmReleaseHelper: HelmReleaseHelperService) { - - this.notes$ = helmReleaseHelper.release$.pipe( - map(release => { - if (release.info.status.notes) { - return this.colorizer.ansiColorsToHtml(release.info.status.notes); - } else { - return ''; - } - }) - ); - } -} diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts deleted file mode 100644 index e1fa969f5f..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module'; -import { HelmReleasePodsTabComponent } from './helm-release-pods-tab.component'; - -describe('HelmReleasePodsTabComponent', () => { - let component: HelmReleasePodsTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [HelmReleasePodsTabComponent], - providers: [ - ...HelmBaseTestProviders - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleasePodsTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts deleted file mode 100644 index d0efba1213..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-pods/helm-release-pods-tab.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../../shared/components/list/list.component.types'; -import { HelmReleasePodsListConfig } from '../../../list-types/monocular-release-pods-list-config.service'; - -@Component({ - selector: 'app-helm-release-pods-tab', - templateUrl: './helm-release-pods-tab.component.html', - styleUrls: ['./helm-release-pods-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: HelmReleasePodsListConfig, - }] -}) -export class HelmReleasePodsTabComponent { } diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts deleted file mode 100644 index 1bb2ff267c..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module'; -import { HelmReleaseServicesTabComponent } from './helm-release-services-tab.component'; - - -describe('HelmReleaseServicesTabComponent', () => { - let component: HelmReleaseServicesTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [HelmReleaseServicesTabComponent], - providers: [ - ...HelmBaseTestProviders - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseServicesTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts deleted file mode 100644 index 64d8714419..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-services/helm-release-services-tab.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../../shared/components/list/list.component.types'; -import { HelmReleaseServicesListConfig } from '../../../list-types/monocular-release-services-list-config.service'; - -@Component({ - selector: 'app-helm-release-services-tab', - templateUrl: './helm-release-services-tab.component.html', - styleUrls: ['./helm-release-services-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: HelmReleaseServicesListConfig, - }] -}) -export class HelmReleaseServicesTabComponent { } diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html deleted file mode 100644 index 1a1ef4f001..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - -
-
- {{ release.chart.metadata.version }} - - - {{ release.chart.metadata.appVersion || '-' }} - - {{ release.namespace }} - {{ release.version }} - - {{ release.status }} - - {{ release.firstDeployed | date:'medium' }} - - - {{ release.lastDeployed | date:'medium' }} - -
- - - - - - - - - - - - - - -
- - - - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss deleted file mode 100644 index cb85d21fdb..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.scss +++ /dev/null @@ -1,27 +0,0 @@ - -.app-metadata { - display: flex; - flex-direction: row; - &__two-cols { - flex: 1; - app-metadata-item { - &:first-child { - margin-top: 0; - } - } - } -} -.chart-details { - display: flex; - flex-direction: row; - flex-flow: wrap; - padding: 0 10px 10px; - &__item { - margin-right: 40px; - } -} -.chart-description { - font-size: 15px; - max-width: 800px; - opacity: .6; -} diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts deleted file mode 100644 index 2376c09f73..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module'; -import { HelmReleaseSummaryTabComponent } from './helm-release-summary-tab.component'; - -describe('HelmReleaseSummaryTabComponent', () => { - let component: HelmReleaseSummaryTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [HelmReleaseSummaryTabComponent], - providers: [ - ...HelmBaseTestProviders - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseSummaryTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts deleted file mode 100644 index 9e1bd9e1d0..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts +++ /dev/null @@ -1,138 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Component, OnDestroy } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { combineLatest, Observable, ReplaySubject } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; - -import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions'; -import { RouterNav } from '../../../../../../../store/src/actions/router.actions'; -import { HideSnackBar, ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions'; -import { AppState } from '../../../../../../../store/src/app-state'; -import { LoggerService } from '../../../../../core/logger.service'; -import { ConfirmationDialogConfig } from '../../../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../../../shared/components/confirmation-dialog.service'; -import { helmReleaseSchemaKey } from '../../../store/helm.entities'; -import { HelmReleaseHelperService } from '../helm-release-helper.service'; - -@Component({ - selector: 'app-helm-release-summary-tab', - templateUrl: './helm-release-summary-tab.component.html', - styleUrls: ['./helm-release-summary-tab.component.scss'] -}) -export class HelmReleaseSummaryTabComponent implements OnDestroy { - // Confirmation dialogs - deleteReleaseConfirmation = new ConfirmationDialogConfig( - 'Delete Release', - 'Are you sure you want to delete this Release?', - 'Delete' - ); - - private busyDeletingSubject = new ReplaySubject(); - public isBusy$: Observable; - private readonly DEFAULT_LOADING_MESSAGE = 'Retrieving Release Details'; - public loadingMessage = this.DEFAULT_LOADING_MESSAGE; - - public podsChartData = []; - public containersChartData = []; - - public containersChartColors = [ - { - name: 'Ready', - value: '#4DD3A7' - }, - { - name: 'Not Ready', - value: '#E7727D' - } - ]; - - // Blue: #00B2E2 - // Yellow: #FFC107 - - private deleted = false; - public chartData$: Observable<{ podsChartData: { name: string; value: any; }[]; containersChartData: { name: string; value: any; }[]; }>; - - constructor( - public helmReleaseHelper: HelmReleaseHelperService, - private store: Store, - private confirmDialog: ConfirmationDialogService, - private httpClient: HttpClient, - private logService: LoggerService - ) { - - const releaseStatus$ = this.helmReleaseHelper.fetchReleaseStatus(); - - this.isBusy$ = combineLatest([ - this.helmReleaseHelper.isFetching$, - releaseStatus$, - this.busyDeletingSubject.asObservable().pipe( - startWith(false) - ) - ]).pipe( - map(([isFetching, releaseStatus, isDeleting]) => isFetching || !releaseStatus || isDeleting), - startWith(true) - ); - - // Async fetch release status - this.chartData$ = releaseStatus$.pipe( - map(data => ({ - podsChartData: Object.keys(data.pods.status).map(status => ({ - name: status, - value: data.pods.status[status] - })), - containersChartData: [ - { - name: 'Ready', - value: data.pods.ready - }, - { - name: 'Not Ready', - value: data.pods.containers - data.pods.ready - } - ] - })) - ); - } - - private startDelete() { - this.loadingMessage = 'Deleting Release'; - this.busyDeletingSubject.next(true); - } - - private endDelete() { - this.loadingMessage = this.DEFAULT_LOADING_MESSAGE; - this.busyDeletingSubject.next(false); - } - - private completeDelete() { - this.deleted = true; - this.endDelete(); - } - - - public deleteRelease() { - this.confirmDialog.open(this.deleteReleaseConfirmation, () => { - // Make the http request to delete the release - const endpointAndName = this.helmReleaseHelper.guid.replace(':', '/'); - this.startDelete(); - this.httpClient.delete(`/pp/v1/helm/releases/${endpointAndName}`).subscribe({ - error: (err: any) => { - this.endDelete(); - this.store.dispatch(new ShowSnackBar('Failed to delete release', 'Close')); - this.logService.error('Failed to delete release: ', err); - }, - complete: () => { - this.store.dispatch(new ClearPaginationOfType(helmReleaseSchemaKey)); - this.completeDelete(); - this.store.dispatch(new RouterNav({ path: ['monocular/releases'] })); - } - }); - }); - } - - ngOnDestroy() { - if (this.deleted) { - this.store.dispatch(new HideSnackBar()); - } - } -} diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html deleted file mode 100644 index 370172b3b7..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
- - 
-
- -
- - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts deleted file mode 100644 index 2100c60585..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules, HelmBaseTestProviders } from '../../../helm-testing.module'; -import { HelmReleaseValuesTabComponent } from './helm-release-values-tab.component'; - -describe('HelmReleaseValuesTabComponent', () => { - let component: HelmReleaseValuesTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [ - HelmReleaseValuesTabComponent - ], - providers: [ - ...HelmBaseTestProviders - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseValuesTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts b/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts deleted file mode 100644 index ae015b09a5..0000000000 --- a/custom-src/frontend/app/custom/helm/release/tabs/helm-release-values-tab/helm-release-values-tab.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { HelmReleaseHelperService } from '../helm-release-helper.service'; - -@Component({ - selector: 'app-helm-release-values-tab', - templateUrl: './helm-release-values-tab.component.html', - styleUrls: ['./helm-release-values-tab.component.scss'] -}) -export class HelmReleaseValuesTabComponent { - - public values$: Observable; - - constructor(public helmReleaseHelper: HelmReleaseHelperService) { - - this.values$ = helmReleaseHelper.release$.pipe( - map(release => { - if (release.config.raw) { - return this.hidePasswords(release.config.raw); - } else { - return ''; - } - }) - ); - } - - private hidePasswords(values: string): string { - // TODO: See #150 - It's a PITA but this should be done in the back end - let mask = values.replace(new RegExp('(PASSWORD: [a-zA-Z0-9_\-]*)', 'gm'), 'PASSWORD: **********'); - mask = mask.replace(new RegExp('(password: [a-zA-Z0-9_\-]*)', 'gm'), 'password: **********'); - mask = mask.replace(new RegExp('(SECRET: [a-zA-Z0-9_\-]*)', 'gm'), 'SECRET: **********'); - mask = mask.replace(new RegExp('(secret: [a-zA-Z0-9_\-]*)', 'gm'), 'secret: **********'); - return mask; - } -} diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts deleted file mode 100644 index da4b8c0abe..0000000000 --- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts +++ /dev/null @@ -1,176 +0,0 @@ -import { Action } from '@ngrx/store'; - -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { PaginatedAction } from './../../../../../store/src/types/pagination.types'; -import { IRequestAction } from './../../../../../store/src/types/request.types'; -import { - helmReleasePodKey, - helmReleaseSchemaKey, - helmReleaseServiceKey, - helmReleaseStatusSchemaKey, - helmVersionsSchemaKey, - monocularChartsSchemaKey, -} from './helm.entities'; -import { HelmInstallValues } from './helm.types'; - -export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts'; -export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success'; -export const GET_MONOCULAR_CHARTS_FAILURE = '[Monocular] Get Charts Failure'; - -export const GET_HELM_RELEASES = '[Helm] Get Releases'; -export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success'; -export const GET_HELM_RELEASES_FAILURE = '[Helm] Get Releases Failure'; - -export const GET_HELM_VERSIONS = '[Helm] Get Versions'; -export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success'; -export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure'; - -export const GET_HELM_RELEASE_STATUS = '[Helm] Get Release Status'; -export const GET_HELM_RELEASE_STATUS_SUCCESS = '[Helm] Get Release Status Success'; -export const GET_HELM_RELEASE_STATUS_FAILURE = '[Helm] Get Release Status Failure'; - -export const GET_HELM_RELEASE_PODS = '[Helm] Get Release Pods'; -export const GET_HELM_RELEASE_PODS_SUCCESS = '[Helm] Get Release Pods Success'; -export const GET_HELM_RELEASE_PODS_FAILURE = '[Helm] Get Release Pods Failure'; - -export const GET_HELM_RELEASE_SERVICES = '[Helm] Get Release Services'; -export const GET_HELM_RELEASE_SERVICES_SUCCESS = '[Helm] Get Release Services Success'; -export const GET_HELM_RELEASE_SERVICES_FAILURE = '[Helm] Get Release Services Failure'; - -export const HELM_INSTALL = '[Helm] Install'; -export const HELM_INSTALL_SUCCESS = '[Helm] Install Success'; -export const HELM_INSTALL_FAILURE = '[Helm] Install Failure'; - -export interface MonocularPaginationAction extends PaginatedAction, IRequestAction { } - -export class GetMonocularCharts implements MonocularPaginationAction { - constructor() { - this.paginationKey = 'monocular-charts'; - } - type = GET_MONOCULAR_CHARTS; - entityKey = monocularChartsSchemaKey; - entity = [entityFactory(monocularChartsSchemaKey)]; - actions = [ - GET_MONOCULAR_CHARTS, - GET_MONOCULAR_CHARTS_SUCCESS, - GET_MONOCULAR_CHARTS_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc', - 'order-direction-field': 'name', - }; -} - - -export class GetHelmReleases implements MonocularPaginationAction { - constructor() { - this.paginationKey = 'helm-releases'; - } - type = GET_HELM_RELEASES; - entityKey = helmReleaseSchemaKey; - entity = [entityFactory(helmReleaseSchemaKey)]; - actions = [ - GET_HELM_RELEASES, - GET_HELM_RELEASES_SUCCESS, - GET_HELM_RELEASES_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc', - 'order-direction-field': 'name', - }; -} - -export class GetHelmVersions implements MonocularPaginationAction { - constructor() { - this.paginationKey = 'helm-versions'; - } - type = GET_HELM_VERSIONS; - entityKey = helmVersionsSchemaKey; - entity = [entityFactory(helmVersionsSchemaKey)]; - actions = [ - GET_HELM_VERSIONS, - GET_HELM_VERSIONS_SUCCESS, - GET_HELM_VERSIONS_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'asc', - 'order-direction-field': 'version', - }; -} - -export class GetHelmReleaseStatus implements IRequestAction { - key: string; - constructor( - public endpointGuid: string, - public releaseTitle: string - ) { - this.key = `${endpointGuid}/${releaseTitle}`; - } - type = GET_HELM_RELEASE_STATUS; - entity = entityFactory(helmReleaseStatusSchemaKey); - entityKey = helmReleaseStatusSchemaKey; - actions = [ - GET_HELM_RELEASE_STATUS, - GET_HELM_RELEASE_STATUS_SUCCESS, - GET_HELM_RELEASE_STATUS_FAILURE - ]; -} - -export class GetHelmReleasePods implements MonocularPaginationAction { - constructor( - public endpointGuid: string, - public releaseTitle: string - ) { - this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`; - } - type = GET_HELM_RELEASE_PODS; - entityKey = helmReleasePodKey; - entity = [entityFactory(helmReleasePodKey)]; - actions = [ - GET_HELM_RELEASE_PODS, - GET_HELM_RELEASE_PODS_SUCCESS, - GET_HELM_RELEASE_PODS_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'asc', - 'order-direction-field': 'name', - }; - static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => { - return `${endpointGuid}/${releaseTitle}/${name}`; - } -} - -export class GetHelmReleaseServices implements MonocularPaginationAction { - constructor( - public endpointGuid: string, - public releaseTitle: string - ) { - this.paginationKey = `${endpointGuid}/${releaseTitle}/services`; - } - type = GET_HELM_RELEASE_SERVICES; - entityKey = helmReleaseServiceKey; - entity = [entityFactory(helmReleaseServiceKey)]; - actions = [ - GET_HELM_RELEASE_SERVICES, - GET_HELM_RELEASE_SERVICES_SUCCESS, - GET_HELM_RELEASE_SERVICES_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'asc', - 'order-direction-field': 'name', - }; - static createKey = (endpointGuid: string, releaseTitle: string, name: string): string => { - return `${endpointGuid}/${releaseTitle}/${name}`; - } -} - -export class HelmInstall implements Action { - constructor(public values: HelmInstallValues) { } - type = HELM_INSTALL; - public guid = () => '' + this.values.releaseName; -} diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/custom-src/frontend/app/custom/helm/store/helm.effects.ts deleted file mode 100644 index 3eb7488707..0000000000 --- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts +++ /dev/null @@ -1,317 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { Action, Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { catchError, flatMap, mergeMap } from 'rxjs/operators'; - -import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions'; -import { AppState } from '../../../../../store/src/app-state'; -import { NormalizedResponse } from '../../../../../store/src/types/api.types'; -import { - IRequestAction, - StartRequestAction, - WrapperRequestActionFailed, - WrapperRequestActionSuccess, -} from '../../../../../store/src/types/request.types'; -import { environment } from '../../../environments/environment'; -import { parseHelmReleaseStatus } from '../release/tabs/helm-release-helper.service'; -import { - GET_HELM_RELEASE_PODS, - GET_HELM_RELEASE_SERVICES, - GET_HELM_RELEASE_STATUS, - GET_HELM_RELEASES, - GET_HELM_VERSIONS, - GET_MONOCULAR_CHARTS, - GetHelmReleasePods, - GetHelmReleases, - GetHelmReleaseServices, - GetHelmReleaseStatus, - GetHelmVersions, - GetMonocularCharts, - HELM_INSTALL, - HelmInstall, -} from './helm.actions'; -import { helmReleaseSchemaKey, monocularChartsSchemaKey } from './helm.entities'; -import { - HELM_INSTALLING_KEY, - HelmRelease, - HelmReleasePod, - HelmReleaseService, - HelmReleaseStatus, - HelmStatus, - HelmVersion, -} from './helm.types'; - -@Injectable() -export class HelmEffects { - - constructor( - private httpClient: HttpClient, - private actions$: Actions, - private store: Store - ) { } - - proxyAPIVersion = environment.proxyAPIVersion; - - @Effect() - fetchCharts$ = this.actions$.pipe( - ofType(GET_MONOCULAR_CHARTS), - flatMap(action => { - return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/chartsvc/v1/charts`, (response) => { - const base = { - entities: { [monocularChartsSchemaKey]: {} }, - result: [] - } as NormalizedResponse; - - const items = response.data as Array; - const processedData = items.reduce((res, data) => { - const id = data.id; - res.entities[monocularChartsSchemaKey][id] = data; - // Promote the name to the top-level object for simplicity - data.name = data.attributes.name; - res.result.push(id); - return res; - }, base); - return processedData; - }, []); - }) - ); - - - @Effect() - fetchReleases$ = this.actions$.pipe( - ofType(GET_HELM_RELEASES), - flatMap(action => { - return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/releases`, (response) => { - const processedData = { - entities: { [action.entityKey]: {} }, - result: [] - } as NormalizedResponse; - - // Go through each endpoint ID - Object.keys(response).forEach(endpoint => { - const endpointData = response[endpoint]; - if (!endpointData) { - return; - } - endpointData.releases.forEach((data) => { - const helmRelease: HelmRelease = { - ...data, - endpointId: endpoint - }; - // Release name is unique for an endpoint - const id = endpoint + ':' + data.name; - helmRelease.guid = id; - // Make a note of the guid of the endpoint for the release - helmRelease.status = mapHelmStatus(data.info.status.code); - helmRelease.lastDeployed = mapHelmModifiedDate(data.info.last_deployed); - helmRelease.firstDeployed = mapHelmModifiedDate(data.info.first_deployed); - // data.info = - processedData.entities[helmReleaseSchemaKey][id] = helmRelease; - processedData.result.push(id); - }); - }); - return processedData; - }, []); - }) - ); - - @Effect() - fetchVersions$ = this.actions$.pipe( - ofType(GET_HELM_VERSIONS), - flatMap(action => { - return this.makeRequest(action, `/pp/${this.proxyAPIVersion}/helm/versions`, (response) => { - // const a: HelmVersion = {}; - const processedData = { - entities: { [action.entityKey]: {} }, - result: [] - } as NormalizedResponse; - - // Go through each endpoint ID - Object.keys(response).forEach(endpoint => { - const endpointData = response[endpoint] || {}; - // Maintain typing - const version: HelmVersion = { - endpointId: endpoint, - ...endpointData - }; - processedData.entities[action.entityKey][endpoint] = version; - processedData.result.push(endpoint); - }); - return processedData; - }, []); - }) - ); - - @Effect() - fetchHelmReleaseStatus$ = this.actions$.pipe( - ofType(GET_HELM_RELEASE_STATUS), - flatMap(action => { - return this.makeRequest( - action, - `/pp/${this.proxyAPIVersion}/helm/releases/${action.endpointGuid}/${action.releaseTitle}`, - (response) => { - const processedData = { - entities: { [action.entityKey]: {} }, - result: [] - } as NormalizedResponse; - - const status = parseHelmReleaseStatus(response.info.status.resources); - - this.updateReleasePods(action, status); - - this.updateReleaseServices(action, status); - - // Go through each endpoint ID - const newStatus: HelmReleaseStatus = { - endpointId: action.endpointGuid, - releaseTitle: action.releaseTitle, - ...status - }; - processedData.entities[action.entityKey][action.key] = newStatus; - processedData.result.push(action.key); - return processedData; - }, [action.endpointGuid]); - }) - ); - - @Effect() - fetchHelmReleasePods$ = this.actions$.pipe( - ofType(GET_HELM_RELEASE_PODS), - mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)]) - ); - - @Effect() - fetchHelmReleaseServices$ = this.actions$.pipe( - ofType(GET_HELM_RELEASE_SERVICES), - mergeMap(action => [new GetHelmReleaseStatus(action.endpointGuid, action.releaseTitle)]) - ); - - - @Effect() - helmInstall$ = this.actions$.pipe( - ofType(HELM_INSTALL), - flatMap(action => { - const apiAction = this.getHelmUpdateAction(action.guid(), action.type, HELM_INSTALLING_KEY); - const url = '/pp/v1/helm/install'; - this.store.dispatch(new StartRequestAction(apiAction)); - return this.httpClient.post(url, action.values).pipe( - mergeMap(() => { - return [ - new ClearPaginationOfType(helmReleaseSchemaKey), - new WrapperRequestActionSuccess(null, apiAction) - ]; - }), - catchError(error => { - const errorMessage = `Failed to install helm chart: ${error.message}`; - return [ - new WrapperRequestActionFailed(errorMessage, apiAction, 'create', { - endpointIds: [action.values.endpoint], - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: errorMessage, - error - }) - ]; - }) - ); - - }) - ); - - private getHelmUpdateAction(guid: string, type: string, updatingKey: string) { - return { - entityKey: helmReleaseSchemaKey, - guid, - type, - updatingKey, - } as IRequestAction; - } - - private makeRequest( - action: IRequestAction, - url: string, - mapResult: (response: any) => NormalizedResponse, - endpointIds: string[] - ): Observable { - this.store.dispatch(new StartRequestAction(action)); - const requestArgs = { - headers: null, - params: null - }; - return this.httpClient.get(url, requestArgs).pipe( - mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]), - catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds, - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: 'Monocular API request error', - error - }) - ]) - ); - } - - private updateReleasePods(action: GetHelmReleaseStatus, status: HelmReleaseStatus) { - const releasePodsAction = new GetHelmReleasePods(action.endpointGuid, action.releaseTitle); - const pods = Object.values(status.data['v1/Pod']).reduce((res, pod) => { - const newPod: HelmReleasePod = { - endpointId: action.endpointGuid, - releaseTitle: action.releaseTitle, - ...pod - }; - res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, pod.name)] = newPod; - return res; - }, {}); - const keys = Object.keys(pods); - const releasePods = { - entities: { [releasePodsAction.entityKey]: pods }, - result: keys - } as NormalizedResponse; - this.store.dispatch(new WrapperRequestActionSuccess( - releasePods, - releasePodsAction, - 'fetch', - keys.length, - 1) - ); - } - - private updateReleaseServices(action: GetHelmReleaseStatus, status: HelmReleaseStatus) { - const releaseServiceAction = new GetHelmReleaseServices(action.endpointGuid, action.releaseTitle); - const services = Object.values(status.data['v1/Service']).reduce((res, service) => { - const newService: HelmReleaseService = { - endpointId: action.endpointGuid, - releaseTitle: action.releaseTitle, - ...service - }; - res[GetHelmReleasePods.createKey(action.endpointGuid, action.releaseTitle, service.name)] = newService; - return res; - }, {}); - const keys = Object.keys(services); - const releaseServices = { - entities: { [releaseServiceAction.entityKey]: services }, - result: keys - } as NormalizedResponse; - this.store.dispatch(new WrapperRequestActionSuccess( - releaseServices, - releaseServiceAction, - 'fetch', - keys.length, - 1) - ); - } -} - -function mapHelmStatus(status: number) { - return HelmStatus[status].replace('_', ' '); -} - -function mapHelmModifiedDate(date: any) { - let unix = date.seconds * 1000 + date.nanos / 1000; - unix = Math.floor(unix); - return new Date(unix); -} - diff --git a/custom-src/frontend/app/custom/helm/store/helm.entities.ts b/custom-src/frontend/app/custom/helm/store/helm.entities.ts deleted file mode 100644 index ed0e1e2640..0000000000 --- a/custom-src/frontend/app/custom/helm/store/helm.entities.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { ExtensionEntitySchema } from '../../../core/extension/extension-types'; -import { - HelmRelease, - HelmReleasePod, - HelmReleaseService, - HelmReleaseStatus, - HelmVersion, - MonocularChart, -} from './helm.types'; - -export const monocularChartsSchemaKey = 'monocularCharts'; - -export const helmReleaseSchemaKey = 'helmReleases'; -export const helmVersionsSchemaKey = 'helmVersions'; -export const helmReleaseStatusSchemaKey = 'helmReleaseStatus'; -export const helmReleasePodKey = 'helmReleasePod'; -export const helmReleaseServiceKey = 'helmReleaseService'; - -export const getMonocularChartId = (entity: MonocularChart) => entity.id; -export const getHelmReleaseId = (entity: HelmRelease) => entity.endpointId; -export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId; -export const getHelmReleaseStatusId = (entity: HelmReleaseStatus) => entity.endpointId; -export const getHelmReleasePodId = (entity: HelmReleasePod) => entity.name; -export const getHelmReleaseServiceId = (entity: HelmReleaseService) => entity.name; - -export const monocularEntities: ExtensionEntitySchema[] = [ - { - entityKey: monocularChartsSchemaKey, - definition: {}, - options: { idAttribute: getMonocularChartId } - }, - { - entityKey: helmReleaseSchemaKey, - definition: {}, - options: { idAttribute: getHelmReleaseId } - }, - { - entityKey: helmVersionsSchemaKey, - definition: {}, - options: { idAttribute: getHelmVersionId } - }, - { - entityKey: helmReleaseStatusSchemaKey, - definition: {}, - options: { idAttribute: getHelmReleaseStatusId } - }, - { - entityKey: helmReleasePodKey, - definition: {}, - options: { idAttribute: getHelmReleasePodId } - }, - { - entityKey: helmReleaseServiceKey, - definition: {}, - options: { idAttribute: getHelmReleaseServiceId } - } -]; - -export const monocularEntityKeys: string[] = [ - monocularChartsSchemaKey, - helmReleaseSchemaKey, - helmVersionsSchemaKey, - helmReleaseStatusSchemaKey, - helmReleasePodKey, - helmReleaseServiceKey -]; diff --git a/custom-src/frontend/app/custom/helm/store/helm.types.ts b/custom-src/frontend/app/custom/helm/store/helm.types.ts deleted file mode 100644 index c082044078..0000000000 --- a/custom-src/frontend/app/custom/helm/store/helm.types.ts +++ /dev/null @@ -1,138 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import { KubeService } from '../../kubernetes/store/kube.types'; - -export interface MonocularRepository { - name: string; - url: string; - created: string; - syncInterval: number; - lastSync: number; - status: string; -} - -export interface MonocularChart { - id: string; - name: string; - attributes: { - description: string; - home: string; - icon: string; - keywords: string[]; - repo: { - name: string; - url: string; - }; - }; - relationships: { - latestChartVersion: { - data: { - version: string - } - } - }; -} - -export interface HelmRelease { - endpointId: string; - guid: string; - name: string; - namespace: string; - version: string; - status: string; - lastDeployed: Date; - firstDeployed: Date; - info: { - status: { - notes: string; - } - }; - config: { - raw: string; - }; -} - -export interface HelmReleaseStatus { - endpointId?: string; - releaseTitle?: string; - data: { - 'v1/Pod': { - [key: string]: { - age: string; - name: string; - ready: string; - restarts: string; - status: string; - } - } - 'v1/Service': { - [key: string]: { - name: string; - } - }, - [dataKey: string]: any - }; - fields: string[]; - pods: any; -} - -export interface HelmReleasePod { - endpointId: string; - releaseTitle: string; - name: string; - ready: string; - status: string; - restarts: string; - age: string; -} - -export interface HelmReleaseService { - endpointId: string; - releaseTitle: string; - name: string; - kubeService$?: Observable; -} - -export function isHelmReleaseService(obj: any): HelmReleaseService { - if (obj && obj.kubeService$) { - return obj as HelmReleaseService; - } -} - -export interface HelmVersion { - endpointId: string; - Version?: { - git_commit: string; - git_tree_state: string; - sem_ver: string; - }; -} - -export enum HelmStatus { - Unknown = 0, - Deployed = 1, - Deleted = 2, - Superseded = 3, - Failed = 4, - Deleting = 5, - Pending_Install = 6, - Pending_Upgrade = 7, - Pending_Rollback = 8 -} - -@Injectable() -export class HelmReleaseGuid { - guid: string; -} - -export interface HelmInstallValues { - endpoint: string; - releaseName: string; - releaseNamespace: string; - values: string; - chart: string; -} - -export const HELM_INSTALLING_KEY = 'installing'; - diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html b/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss b/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts deleted file mode 100644 index ae3ab61f3f..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules } from '../../helm-testing.module'; -import { CatalogTabComponent } from './catalog-tab.component'; - -describe('CatalogTabComponent', () => { - let component: CatalogTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [CatalogTabComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CatalogTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts b/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts deleted file mode 100644 index 8df3ae4dad..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/catalog-tab/catalog-tab.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { MonocularChartsListConfig } from './../../list-types/monocular-charts-list-config.service'; - -@Component({ - selector: 'app-catalog-tab', - templateUrl: './catalog-tab.component.html', - styleUrls: ['./catalog-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: MonocularChartsListConfig, - }] - -}) -export class CatalogTabComponent { } - diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts deleted file mode 100644 index 5c82b66529..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules } from '../../helm-testing.module'; -import { HelmConfigurationComponent } from './helm-configuration.component'; - -describe('HelmConfigurationComponent', () => { - let component: HelmConfigurationComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [HelmConfigurationComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmConfigurationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts b/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts deleted file mode 100644 index c6c3d58357..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/configuration-tab/helm-configuration.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { HelmVersionsListConfig } from '../../list-types/monocular-versions-list-config.service'; - -@Component({ - selector: 'app-helm-configuration', - templateUrl: './helm-configuration.component.html', - styleUrls: ['./helm-configuration.component.scss'], - providers: [{ - provide: ListConfig, - useClass: HelmVersionsListConfig, - }] -}) -export class HelmConfigurationComponent { } - diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html b/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.scss b/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts deleted file mode 100644 index be394b5f5b..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { DatePipe } from '@angular/common'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules } from '../../helm-testing.module'; -import { HelmReleasesTabComponent } from './releases-tab.component'; - -describe('ReleasesTabComponent', () => { - let component: HelmReleasesTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [HelmReleasesTabComponent], - providers: [DatePipe] - - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleasesTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts b/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts deleted file mode 100644 index 0bf44db786..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/releases-tab/releases-tab.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { HelmReleasesListConfig } from '../../list-types/monocular-releases-list-config.service'; - -@Component({ - selector: 'app-releases-tab', - templateUrl: './releases-tab.component.html', - styleUrls: ['./releases-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: HelmReleasesListConfig, - }] -}) -export class HelmReleasesTabComponent { } - diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html b/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss b/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts b/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts deleted file mode 100644 index 57e2407ba1..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { HelmBaseTestModules } from '../../helm-testing.module'; -import { RepositoryTabComponent } from './repository-tab.component'; - -describe('RepositoryTabComponent', () => { - let component: RepositoryTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ...HelmBaseTestModules - ], - declarations: [RepositoryTabComponent] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(RepositoryTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts b/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts deleted file mode 100644 index 620c2e36a9..0000000000 --- a/custom-src/frontend/app/custom/helm/tabs/repository-tab/repository-tab.component.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Component } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { MonocularRepositoryListConfig } from '../../list-types/monocular-repository-list-config.service'; - -@Component({ - selector: 'app-repository-tab', - templateUrl: './repository-tab.component.html', - styleUrls: ['./repository-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: MonocularRepositoryListConfig, - }] -}) -export class RepositoryTabComponent { - -} diff --git a/custom-src/frontend/app/custom/helm/theme.scss b/custom-src/frontend/app/custom/helm/theme.scss deleted file mode 100644 index 68f87746aa..0000000000 --- a/custom-src/frontend/app/custom/helm/theme.scss +++ /dev/null @@ -1,128 +0,0 @@ -@import '~@angular/material/_theming'; -// Plus imports for other components in your app. - -// Include the base styles for Angular Material core. We include this here so that you only -// have to load a single css file for Angular Material in your app. -@include mat-core(); - -// Custom palette for monocular. -$color-base: #3371e3; - -$mat-monocular: ( - 50: #bdd1f6, // #e3f2fd, - 100: #adc6f4, // #bbdefb, - 200: #8fb1f0, // #90caf9, - 300: #709ceb, // #64b5f6, - 400: #5286e7, // #42a5f5, - 500: #3371e3, // #2196f3, - 600: #2b60c1, // #1e88e5, - 700: #244f9f, // #1976d2, - 800: #1c3e7d, // #1565c0, - 900: #142d5b, // #0d47a1, - A100: #adc6f4, // #82b1ff, - A200: #8fb1f0, // #448aff, - A400: #5286e7, // #2979ff, - A700: #244f9f, // #2962ff, - contrast: ( - 50: $black-87-opacity, - 100: $black-87-opacity, - 200: $black-87-opacity, - 300: $black-87-opacity, - 400: white, - 500: white, - 600: white, - 700: white, - 800: white, - 900: white, - A100: $black-87-opacity, - A200: $black-87-opacity, - A400: white, - A700: white, - ) -); - -// Define the palettes for your theme using the Material Design palettes available in palette.scss -// (imported above). For each palette, you can optionally specify a default, lighter, and darker -// hue. -$monocular-app-primary: mat-palette($mat-monocular); -$monocular-app-accent: mat-palette($mat-light-blue); - -// The warn palette is optional (defaults to red). -$monocular-app-warn: mat-palette($mat-red); - -// Create the theme object (a Sass map containing all of the palettes). -$monocular-app-theme: mat-light-theme($monocular-app-primary, $monocular-app-accent, $monocular-app-warn); - -// Include theme styles for core and each component used in your app. -// Alternatively, you can import and @include the theme mixins for each component -// that you are using. -// @include angular-material-theme($monocular-app-theme); - -// Base palette for the project -$layout-dark: #333239; -$layout-base: #303030; -$layout-light: #f8f8f8; -$layout-text: #38383F; -$text-white: white; -$background-light: #EAEDEF; -$background-white: white; -$header-backgound-gradient: linear-gradient(to left, $layout-base, mat-color($monocular-app-primary, 900)); -$border-color: #D7D9DD; - -// Other common sizes -$border-radius: 8px; -$layout-max-width: 1280px; -$header-bar-height: 70px; - -// Responsive. They represents the min width of every display. -$breakpoints: ( - small: 480px, - medium: 840px, - large: 1024px, - xlarge: 1280px -); - -$mappy-queries: ( - phone: mappy-bp(max-width small), - tablet: mappy-bp(small medium), - desktop: mappy-bp(medium xlarge), - wide: mappy-bp(xlarge) -); - -// Import the library. I need to import it after the breakpoints definition -@import '~mappy-breakpoints/mappy-breakpoints'; - -// Add more classes to Material2 components -mat-form-field { - &.mat-input--full { - width: 100%; - } - - .mat-input-infix { - border-top: 0; - } - - &.mat-input--reverse { - .mat-input-underline { - background-color: $layout-light; - } - .mat-input-element { - color: $layout-light; - } - } - - &:not(.mat-focused) .mat-input-placeholder { - color: darken($layout_light, 25); - } - - &.mat-input--big { - font-size: 1.5em; - } -} - -@mixin placeholder { - &::-webkit-input-placeholder {@content;} - &:-moz-placeholder {@content;} - &::-moz-placeholder {@content;} - &:-ms-input-placeholder {@content;} -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html deleted file mode 100644 index aea61924f0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
-
- - - - - - - - - -
-
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss deleted file mode 100644 index dfaf0f5222..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.kube-aws-auth { - &__form { - display: flex; - flex-direction: column; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts deleted file mode 100644 index 3ae8789096..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { KubernetesAWSAuthFormComponent } from './kubernetes-aws-auth-form.component'; -import { FormBuilder } from '@angular/forms'; -import { SharedModule } from '../../../../shared/shared.module'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MDAppModule } from '../../../../core/md.module'; - -describe('KubernetesAWSAuthFormComponent', () => { - let component: KubernetesAWSAuthFormComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ KubernetesAWSAuthFormComponent ], - imports: [ - MDAppModule, - SharedModule, - NoopAnimationsModule - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesAWSAuthFormComponent); - component = fixture.componentInstance; - const fb = new FormBuilder(); - const form = fb.group({ - authValues: fb.group({ - cluster: '', - access_key: '', - secret_key: '' - }), - }); - component.formGroup = form; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts deleted file mode 100644 index 1291fb9240..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { IAuthForm } from '../../../../core/extension/extension-types'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'app-kubernetes-aws-auth-form', - templateUrl: './kubernetes-aws-auth-form.component.html', - styleUrls: ['./kubernetes-aws-auth-form.component.scss'] -}) -export class KubernetesAWSAuthFormComponent implements IAuthForm { - @Input() formGroup: FormGroup; -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html deleted file mode 100644 index fe2a325d20..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- Specify Certificate file: - - - Specify Certificate key file: - - - - -
-
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss deleted file mode 100644 index 4918206b4d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.kube-certs-auth { - &__form { - display: flex; - flex-direction: column; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts deleted file mode 100644 index f9c259e7f6..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.spec.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormBuilder } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { SharedModule } from '../../../../shared/shared.module'; -import { KubernetesCertsAuthFormComponent } from './kubernetes-certs-auth-form.component'; - -describe('KubernetesCertsAuthFormComponent', () => { - let component: KubernetesCertsAuthFormComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesCertsAuthFormComponent], - imports: [ - SharedModule, - NoopAnimationsModule - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesCertsAuthFormComponent); - component = fixture.componentInstance; - const fb = new FormBuilder(); - const form = fb.group({ - authValues: fb.group({ - cert: '', - certKey: '' - }), - }); - component.formGroup = form; - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts deleted file mode 100644 index 6eba924c06..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -import { EndpointAuthValues, IEndpointAuthComponent } from '../../../../core/extension/extension-types'; - -@Component({ - selector: 'app-kubernetes-certs-auth-form', - templateUrl: './kubernetes-certs-auth-form.component.html', - styleUrls: ['./kubernetes-certs-auth-form.component.scss'] -}) -export class KubernetesCertsAuthFormComponent implements IEndpointAuthComponent { - @Input() formGroup: FormGroup; - - - public getValues(values: EndpointAuthValues): EndpointAuthValues { - return {}; - } - - public getBody(): string { - /** Body content is in the following encoding: - * base64encoded:base64encoded - */ - const certBase64 = btoa(this.formGroup.value.authValues.cert); - const certKeyBase64 = btoa(this.formGroup.value.authValues.certKey); - return `${certBase64}:${certKeyBase64}`; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html deleted file mode 100644 index 9d85e61578..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
- Specify `kubeconfig` file: - - - -
-
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss deleted file mode 100644 index 7b53acf245..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.kube-config-auth { - &__form { - display: flex; - flex-direction: column; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts deleted file mode 100644 index 0fd0b060d0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormBuilder } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { SharedModule } from '../../../../shared/shared.module'; -import { KubernetesConfigAuthFormComponent } from './kubernetes-config-auth-form.component'; - -describe('KubernetesConfigAuthFormComponent', () => { - let component: KubernetesConfigAuthFormComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesConfigAuthFormComponent], - imports: [ - SharedModule, - NoopAnimationsModule - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesConfigAuthFormComponent); - component = fixture.componentInstance; - const fb = new FormBuilder(); - const form = fb.group({ - authValues: fb.group({ - kubeconfig: '' - }), - }); - component.formGroup = form; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts deleted file mode 100644 index f79f554af0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types'; -import { Component, OnInit, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'app-kubernetes-config-auth-form', - templateUrl: './kubernetes-config-auth-form.component.html', - styleUrls: ['./kubernetes-config-auth-form.component.scss'] -}) -export class KubernetesConfigAuthFormComponent implements IEndpointAuthComponent { - @Input() formGroup: FormGroup; - - public getValues(values: EndpointAuthValues): EndpointAuthValues { - return {}; - } - - public getBody(): string { - return this.formGroup.value.authValues.kubeconfig; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html deleted file mode 100644 index ba7671b329..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
- Select an `Application Default Credentails' file: - - - -
-
diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss deleted file mode 100644 index 2910cc4365..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.kube-gke-auth { - &__form { - display: flex; - flex-direction: column; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts deleted file mode 100644 index 1327730757..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormBuilder } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -import { SharedModule } from '../../../../shared/shared.module'; -import { KubernetesGKEAuthFormComponent } from './kubernetes-gke-auth-form.component'; - -describe('KubernetesGKEAuthFormComponent', () => { - let component: KubernetesGKEAuthFormComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesGKEAuthFormComponent], - imports: [ - SharedModule, - NoopAnimationsModule - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesGKEAuthFormComponent); - component = fixture.componentInstance; - const fb = new FormBuilder(); - const form = fb.group({ - authValues: fb.group({ - gkeconfig: '' - }), - }); - component.formGroup = form; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts deleted file mode 100644 index afaeffe204..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { EndpointAuthValues, IEndpointAuthComponent } from './../../../../core/extension/extension-types'; -import { Component, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'app-kubernetes-gke-auth-form', - templateUrl: './kubernetes-gke-auth-form.component.html', - styleUrls: ['./kubernetes-gke-auth-form.component.scss'] -}) -export class KubernetesGKEAuthFormComponent implements IEndpointAuthComponent { - @Input() formGroup: FormGroup; - - public getValues(values: EndpointAuthValues): EndpointAuthValues { - return {}; - } - - public getBody(): string { - return this.formGroup.value.authValues.gkeconfig; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html deleted file mode 100644 index f2d54fe259..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts deleted file mode 100644 index c7b9b05e93..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-pods-tab/helm-release-pods-tab.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { - KubernetesReleasePodsListConfigService, -} from '../../list-types/helm-release-pods/helm-release-pods-list-config.service'; - -@Component({ - selector: 'app-helm-release-pods-tab', - templateUrl: './helm-release-pods-tab.component.html', - styleUrls: ['./helm-release-pods-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesReleasePodsListConfigService, - }] -}) -export class KubernetesReleasePodsTabComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html deleted file mode 100644 index f2d54fe259..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts deleted file mode 100644 index fed24d27c5..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-services/helm-release-services.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { - KubernetesReleaseServicesListConfig, -} from '../../list-types/kubernetes-release-services/kubernetes-release-services-list-config.service'; - -@Component({ - selector: 'app-helm-release-services', - templateUrl: './helm-release-services.component.html', - styleUrls: ['./helm-release-services.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesReleaseServicesListConfig, - }] -}) -export class HelmReleaseServicesComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html deleted file mode 100644 index c24a1922a0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - - Summary - - -
- {{ (chartName$ | async) }} - {{ (helmReleaseService.helmRelease$ | async)?.status }} - {{ (helmReleaseService.helmRelease$ | async)?.version }} - {{ (helmReleaseService.helmRelease$ | async)?.createdAt - | date:'medium' }} -
- - -
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts deleted file mode 100644 index d8e3071e3e..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; -import { HelmReleaseService } from '../../../services/helm-release.service'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { HelmReleaseSummaryCardComponent } from './helm-release-summary-card.component'; - -describe('HelmReleaseSummaryCardComponent', () => { - let component: HelmReleaseSummaryCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [HelmReleaseSummaryCardComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseSummaryCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts deleted file mode 100644 index bf5d72c0f5..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component } from '@angular/core'; -import { combineLatest, Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { HelmReleaseService } from '../../../services/helm-release.service'; - -@Component({ - selector: 'app-helm-release-summary-card', - templateUrl: './helm-release-summary-card.component.html', - styleUrls: ['./helm-release-summary-card.component.scss'] -}) -export class HelmReleaseSummaryCardComponent { - chartName$: Observable; - - constructor( - public helmReleaseService: HelmReleaseService - ) { - // get chart name - this.chartName$ = combineLatest(this.helmReleaseService.deployments$, this.helmReleaseService.statefulSets$).pipe( - map(([deployments, statefulsets]) => { - if (deployments.length !== 0) { - return deployments[0].metadata.labels.chart; - } - if (statefulsets.length !== 0) { - return statefulsets[0].metadata.labels.chart; - } - }) - ); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html deleted file mode 100644 index 6311a46921..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.html +++ /dev/null @@ -1,7 +0,0 @@ -
- - - - - -
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss deleted file mode 100644 index 783faa0cf1..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.scss +++ /dev/null @@ -1,4 +0,0 @@ -.helm-release-summary { - padding-left: 20px; - padding-top: 20px; -} diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts deleted file mode 100644 index f7c78bf281..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; -import { HelmReleaseService } from '../../services/helm-release.service'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { HelmReleaseSummaryCardComponent } from './helm-release-summary-card/helm-release-summary-card.component'; -import { HelmReleaseSummaryComponent } from './helm-release-summary.component'; - -describe('HelmReleaseSummaryComponent', () => { - let component: HelmReleaseSummaryComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ - HelmReleaseSummaryComponent, - HelmReleaseSummaryCardComponent - ], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HelmReleaseSummaryComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - afterEach(() => { - fixture.destroy(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts deleted file mode 100644 index fd855cfb99..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release-summary/helm-release-summary.component.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-helm-release-summary', - templateUrl: './helm-release-summary.component.html', - styleUrls: ['./helm-release-summary.component.scss'] -}) -export class HelmReleaseSummaryComponent {} diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html deleted file mode 100644 index 92c1400e76..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.html +++ /dev/null @@ -1,8 +0,0 @@ - -

{{ helmReleaseService.helmReleaseName }}

-
-
- - - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.scss b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts b/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts deleted file mode 100644 index d7a20e8472..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/helm-release/helm-release.component.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { Component, OnInit } from '@angular/core'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { ActivatedRoute } from '@angular/router'; -import { KubernetesService } from '../services/kubernetes.service'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { Observable, of as ObservableOf } from 'rxjs'; -import { HelmReleaseService } from '../services/helm-release.service'; -import { map } from 'rxjs/operators'; - -@Component({ - selector: 'app-helm-release', - templateUrl: './helm-release.component.html', - styleUrls: ['./helm-release.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - HelmReleaseService, - KubernetesEndpointService - ] -}) -export class HelmReleaseComponent implements OnInit { - - public tabLinks = [ - { link: 'pods', label: 'Pods', matIcon: 'adjust' }, - { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' }, - ]; - - public breadcrumbs$: Observable; - - isFetching$: Observable; - constructor(public kubeEndpointService: KubernetesEndpointService, public helmReleaseService: HelmReleaseService) { - this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe( - map(endpoint => ([{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/apps` }, - ] - }]) - ) - ); - } - - - ngOnInit() { - this.isFetching$ = ObservableOf(false); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html deleted file mode 100644 index bd35902725..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.html +++ /dev/null @@ -1,18 +0,0 @@ - -

Dashboard

-
- - - - -
- - - - - - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss deleted file mode 100644 index ff32c05101..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.scss +++ /dev/null @@ -1,15 +0,0 @@ -.kube-dashboard { - border: 0; - display: flex; - height: 100%; - width: 100%; -} - -.kube-dashboard__hidden { - visibility: hidden; -} - -.kube-dashboard__search { - display: inline; - font-size: 16px; -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts deleted file mode 100644 index 971bc1bbef..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../tab-nav.service'; -import { KubernetesBaseTestModules } from '../kubernetes.testing.module'; -import { KubernetesDashboardTabComponent } from './kubernetes-dashboard.component'; - -describe('KubernetesDashboardTabComponent', () => { - let component: KubernetesDashboardTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesDashboardTabComponent], - imports: [...KubernetesBaseTestModules], - providers: [TabNavService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesDashboardTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts deleted file mode 100644 index c6a9049a49..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubernetes-dashboard.component.ts +++ /dev/null @@ -1,157 +0,0 @@ -import { Component, ElementRef, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; -import { ActivatedRoute } from '@angular/router'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { KubernetesService } from '../services/kubernetes.service'; - -@Component({ - selector: 'app-kubernetes-dashboard', - templateUrl: './kubernetes-dashboard.component.html', - styleUrls: ['./kubernetes-dashboard.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - KubernetesEndpointService, - ] -}) -export class KubernetesDashboardTabComponent implements OnInit { - - private pKubeDash: ElementRef; - @ViewChild('kubeDash', { read: ElementRef }) set kubeDash(kubeDash: ElementRef) { - if (!this.pKubeDash) { - this.pKubeDash = kubeDash; - // Need to look at this process again. In tests this is never hit, leading to null references to kubeDash - this.setupEventListener(); - } - } - get kubeDash(): ElementRef { - return this.pKubeDash; - } - - source: SafeResourceUrl; - isLoading$ = new BehaviorSubject(true); - expanded = false; - - searchTerms: any; - - href = ''; - - private haveSetupEventLister = false; - private hasIframeLoaded = false; - - public breadcrumbs$: Observable; - - constructor(public kubeEndpointService: KubernetesEndpointService, private sanitizer: DomSanitizer, public renderer: Renderer2) { } - - ngOnInit() { - const guid = this.kubeEndpointService.baseKube.guid; - - let href = window.location.href; - const index = href.indexOf('dashboard'); - href = href.substr(index + 9); - // console.log(href); - this.href = href; - this.source = this.sanitizer.bypassSecurityTrustResourceUrl(`/pp/v1/kubedash/ui/${guid}/`); - // console.log(window.location); - - this.breadcrumbs$ = this.kubeEndpointService.endpoint$.pipe( - map(endpoint => ([{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` }, - ] - }]) - ) - ); - } - - iframeLoaded() { - const kdToolbar = this.getKubeDashToolbar(); - if (!!kdToolbar) { - this.isLoading$.next(false); - this.toggle(false); - } - this.hasIframeLoaded = true; - this.setupEventListener(); - } - - setupEventListener() { - if (this.haveSetupEventLister || !this.kubeDash || !this.hasIframeLoaded) { - return; - } - - this.haveSetupEventLister = true; - - const iframeWindow = this.kubeDash.nativeElement.contentWindow; - // console.log('iframe loaded'); - - iframeWindow.addEventListener('hashchange', () => { - // Object.defineProperty( event, "oldURL", { enumerable: true, configurable: true, value: lastURL } ); - // Object.defineProperty( event, "newURL", { enumerable: true, configurable: true, value: document.URL } ); - // lastURL = document.URL; - // console.log('iframe hashchange'); - // console.log(event); - - // console.log(iframeWindow.location); - - // console.log(this.href); - - if (this.href) { - let h2 = decodeURI(this.href); - h2 = decodeURI(h2); - - h2 = h2.replace('%3F', '?'); - h2 = h2.replace('%3D', '='); - // console.log(h2); - h2 = '#!' + h2; - // console.log('Changing location hash'); - iframeWindow.location.hash = h2; - this.href = ''; - } - }); - } - - toggle(val: boolean) { - if (val !== undefined) { - this.expanded = val; - } else { - this.expanded = !this.expanded; - } - - const height = this.expanded ? '48px' : '0px'; - const kdToolbar = this.getKubeDashToolbar(); - if (!!kdToolbar) { - this.renderer.setStyle(kdToolbar, 'height', height); - this.renderer.setStyle(kdToolbar, 'minHeight', height); - } - } - - private getKubeDashToolbar() { - if (this.kubeDash && - this.kubeDash.nativeElement && - this.kubeDash.nativeElement.contentDocument && - this.kubeDash.nativeElement.contentDocument.getElementsByTagName) { - const kdChrome = this.kubeDash.nativeElement.contentDocument.getElementsByTagName('kd-chrome')[0]; - if (kdChrome) { - const kdToolbar = kdChrome.getElementsByTagName('md-toolbar')[0]; - return kdToolbar; - } - } - return null; - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts deleted file mode 100644 index aa5c59a608..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { - KubernetesNamespacePodsListConfigService, -} from '../../list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service'; - -@Component({ - selector: 'app-kubernetes-namespace-pods', - templateUrl: './kubernetes-namespace-pods.component.html', - styleUrls: ['./kubernetes-namespace-pods.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNamespacePodsListConfigService, - }] -}) -export class KubernetesNamespacePodsComponent {} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts deleted file mode 100644 index 8733dc7999..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.spec.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../../tab-nav.service'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service'; -import { KubernetesNamespaceServicesComponent } from './kubernetes-namespace-services.component'; - -describe('KubernetesNamespaceServicesComponent', () => { - let component: KubernetesNamespaceServicesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNamespaceServicesComponent], - imports: [...KubernetesBaseTestModules], - providers: [ - TabNavService, - BaseKubeGuid, - KubernetesNamespaceService, - KubernetesEndpointService - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNamespaceServicesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts deleted file mode 100644 index 09a772cfd7..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { - KubernetesNamespaceServicesListConfig, -} from '../../list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service'; - -@Component({ - selector: 'app-kubernetes-namespace-services', - templateUrl: './kubernetes-namespace-services.component.html', - styleUrls: ['./kubernetes-namespace-services.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNamespaceServicesListConfig, - }] -}) -export class KubernetesNamespaceServicesComponent { - - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html deleted file mode 100644 index 8a042faa2a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.html +++ /dev/null @@ -1,6 +0,0 @@ - -

{{ kubeNamespaceService.namespaceName }}

-
-
- - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts deleted file mode 100644 index c5556dd390..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-namespace/kubernetes-namespace.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { KubernetesNamespaceService } from '../services/kubernetes-namespace.service'; -import { KubernetesService } from '../services/kubernetes.service'; - -@Component({ - selector: 'app-kubernetes-namespace', - templateUrl: './kubernetes-namespace.component.html', - styleUrls: ['./kubernetes-namespace.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - KubernetesEndpointService, - KubernetesNamespaceService - ] -}) -export class KubernetesNamespaceComponent { - - tabLinks = [ - { link: 'pods', label: 'Pods', matIcon: 'adjust' }, - { link: 'services', label: 'Services', matIcon: 'service', matIconFont: 'stratos-icons' } - ]; - - public breadcrumbs$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public kubeNamespaceService: KubernetesNamespaceService - ) { - this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe( - map(endpoint => ([{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/namespaces` }, - ] - }]) - ) - ); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html deleted file mode 100644 index a81d3b07a6..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.html +++ /dev/null @@ -1,19 +0,0 @@ -
- - - Summary of {{title}} Usage for Last {{period}} - - -
- - -
- - -
- - -
- - -
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss deleted file mode 100644 index 6d0f144251..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -.kubernetes-node-metric-stats-card__metadata { - > * { - display: block; - - &:not(:last-child) { - margin-bottom: 6px; - } - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts deleted file mode 100644 index f9ab58d0a9..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.spec.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeMetricStatsCardComponent } from './kubernetes-node-metric-stats-card.component'; -import { KubernetesNodeSimpleMetricComponent } from '../kubernetes-node-simple-metric/kubernetes-node-simple-metric.component'; -import { KubernetesNodeService } from '../../../services/kubernetes-node.service'; -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubernetesNodeMetricStatsCardComponent', () => { - let component: KubernetesNodeMetricStatsCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeMetricStatsCardComponent, KubernetesNodeSimpleMetricComponent], - imports: KubernetesBaseTestModules, - providers: [KubernetesNodeService, KubernetesEndpointService, BaseKubeGuid] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeMetricStatsCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - afterEach(() => { - // Ensure we destroy the component and clean up the polling subscription - fixture.destroy(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts deleted file mode 100644 index 5e5f3aab43..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; -import { Observable, of as observableOf, Subscription, observable } from 'rxjs'; -import { KubernetesNodeService, KubeNodeMetric } from '../../../services/kubernetes-node.service'; -import { MetricStatistic } from '../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-node-metric-stats-card', - templateUrl: './kubernetes-node-metric-stats-card.component.html', - styleUrls: ['./kubernetes-node-metric-stats-card.component.scss'] -}) -export class KubernetesNodeMetricStatsCardComponent implements OnInit, OnDestroy { - - @Input() - title = 'Memory'; - - @Input() - metric: KubeNodeMetric; - - @Input() - period = 'Hour'; - - @Input() - unit: string; - - max$: Observable; - mean$: Observable; - subscriptions: Subscription[] = []; - constructor( - public kubeNodeService: KubernetesNodeService - ) {} - - ngOnInit() { - const maxMetric = this.kubeNodeService.setupMetricObservable(this.metric, MetricStatistic.MAXIMUM); - this.subscriptions.push(maxMetric.pollerSub); - this.max$ = maxMetric.entity$; - - const meanMetric = this.kubeNodeService.setupMetricObservable(this.metric, MetricStatistic.AVERAGE); - this.subscriptions.push(meanMetric.pollerSub); - this.mean$ = meanMetric.entity$; - } - - - ngOnDestroy() { - this.subscriptions.forEach(s => s.unsubscribe()); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html deleted file mode 100644 index fc9dce0d55..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.html +++ /dev/null @@ -1,10 +0,0 @@ -
- - - - - - - -
- \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss deleted file mode 100644 index 6f307dd37a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -.kubernetes-node-metrics-chart{ - padding-top: 40px; - width: 100%; - &__content{ - width: 100%; - height: 300px; - } -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts deleted file mode 100644 index ab800afd4d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeMetricsChartComponent } from './kubernetes-node-metrics-chart.component'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubernetesNodeMetricsChartComponent', () => { - let component: KubernetesNodeMetricsChartComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeMetricsChartComponent], - imports: KubernetesBaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeMetricsChartComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - afterEach(() => { - fixture.destroy(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts deleted file mode 100644 index e48a279224..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; - -import { MetricsConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.component'; -import { MetricsLineChartConfig } from '../../../../../shared/components/metrics-chart/metrics-chart.types'; -import { IMetricMatrixResult } from '../../../../../../../store/src/types/base-metric.types'; -import { IMetricApplication } from '../../../../../../../store/src/types/metric.types'; -import { MetricsChartHelpers } from '../../../../../shared/components/metrics-chart/metrics.component.helpers'; -import { FetchKubernetesMetricsAction } from '../../../store/kubernetes.actions'; - -@Component({ - selector: 'app-kubernetes-node-metrics-chart', - templateUrl: './kubernetes-node-metrics-chart.component.html', - styleUrls: ['./kubernetes-node-metrics-chart.component.scss'] -}) -export class KubernetesNodeMetricsChartComponent implements OnInit { - - @Input() - private nodeName: string; - @Input() - private endpointGuid: string; - @Input() - private yAxisLabel: string; - @Input() - private metricName: string; - @Input() - private seriesTranslation: string; - @Input() - public title: string; - - public instanceChartConfig: MetricsLineChartConfig; - public instanceMetricConfig: MetricsConfig>; - constructor() { } - - ngOnInit() { - this.instanceChartConfig = MetricsChartHelpers.buildChartConfig(this.yAxisLabel); - const query = `${this.metricName}{instance="${this.nodeName}"}[1h]&time=${(new Date()).getTime() / 1000}`; - this.instanceMetricConfig = { - getSeriesName: result => result.metric.name ? result.metric.name : result.metric.id, - mapSeriesItemName: MetricsChartHelpers.getDateSeriesName, - sort: MetricsChartHelpers.sortBySeriesName, - mapSeriesItemValue: this.getmapSeriesItemValue(), - metricsAction: new FetchKubernetesMetricsAction( - this.nodeName, - this.endpointGuid, - query, - ), - }; - } - - private getmapSeriesItemValue() { - switch (this.seriesTranslation) { - case 'mb': - return (bytes) => bytes / 1000000; - default: - return undefined; - } - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html deleted file mode 100644 index 07776ce427..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - - - - - - - - - - - - - -
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss deleted file mode 100644 index 71be1de298..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.kubernetes-node-metrics { - &__charts { - display: block; - margin-top: 20px; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts deleted file mode 100644 index 5a5624b412..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeMetricsComponent } from './kubernetes-node-metrics.component'; -import { KubernetesNodeMetricStatsCardComponent } from './kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component'; -import { KubernetesNodeSimpleMetricComponent } from './kubernetes-node-simple-metric/kubernetes-node-simple-metric.component'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNodeService } from '../../services/kubernetes-node.service'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; - -describe('KubernetesNodeMetricsComponent', () => { - let component: KubernetesNodeMetricsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeMetricsComponent, KubernetesNodeMetricStatsCardComponent, KubernetesNodeSimpleMetricComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeMetricsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts deleted file mode 100644 index 847acb8af8..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component.ts +++ /dev/null @@ -1,82 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { KubernetesNodeService, KubeNodeMetric } from '../../services/kubernetes-node.service'; -import { MetricsLineChartConfig } from '../../../../shared/components/metrics-chart/metrics-chart.types'; -import { MetricsConfig } from '../../../../shared/components/metrics-chart/metrics-chart.component'; -import { IMetricMatrixResult, ChartSeries } from '../../../../../../store/src/types/base-metric.types'; -import { IMetricApplication } from '../../../../../../store/src/types/metric.types'; -import { FetchKubernetesChartMetricsAction } from '../../store/kubernetes.actions'; -import { ChartDataTypes, getMetricsChartConfigBuilder } from '../../../../shared/components/metrics-chart/metrics.component.helpers'; - -@Component({ - selector: 'app-kubernetes-node-metrics', - templateUrl: './kubernetes-node-metrics.component.html', - styleUrls: ['./kubernetes-node-metrics.component.scss'] -}) -export class KubernetesNodeMetricsComponent implements OnInit { - memoryMetric: KubeNodeMetric; - cpuMetric: KubeNodeMetric; - memoryUnit: string; - cpuUnit: string; - - public instanceMetricConfigs: [ - MetricsConfig>, - MetricsLineChartConfig - ][]; - - constructor( - public kubeNodeService: KubernetesNodeService - ) { - this.memoryMetric = KubeNodeMetric.MEMORY; - this.cpuMetric = KubeNodeMetric.CPU; - } - - ngOnInit() { - const chartConfigBuilder = getMetricsChartConfigBuilder( - result => { - const metric = result.metric; - if (!!metric.pod_name && !!metric.namespace) { - const containerName = `${metric.namespace}:${metric.pod_name}:${metric.container_name}`; - if (!!metric.cpu) { - return `${containerName}:${metric.cpu}`; - } - return containerName; - } - - if (metric.name) { - return metric.name; - } - - return result.metric.id; - - }, - ); - - this.instanceMetricConfigs = [ - chartConfigBuilder( - new FetchKubernetesChartMetricsAction( - this.kubeNodeService.nodeName, - this.kubeNodeService.kubeGuid, - `${KubeNodeMetric.MEMORY}{instance="${this.kubeNodeService.nodeName}"}` - ), - 'Memory Usage (MB)', - ChartDataTypes.BYTES, - (series: ChartSeries[]) => { - return series.filter(s => !(s.name.indexOf('/') === 0) && !s.name.endsWith('POD')); - } - ), - chartConfigBuilder( - new FetchKubernetesChartMetricsAction( - this.kubeNodeService.nodeName, - this.kubeNodeService.kubeGuid, - `${KubeNodeMetric.CPU}{instance="${this.kubeNodeService.nodeName}"}` - ), - 'CPU Usage (secs)', - null, - (series: ChartSeries[]) => { - return series.filter(s => !(s.name.indexOf('/') === 0) && s.name.indexOf('POD') === -1); - } - ) - ]; - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html deleted file mode 100644 index f52186b904..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.html +++ /dev/null @@ -1,8 +0,0 @@ -
-
- {{ key }} -
-
- {{ value }} {{unit}} -
-
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss deleted file mode 100644 index d8df959cd7..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -.kube-node-metric { - display: flex; - flex-direction: row; - justify-content: space-between; -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts deleted file mode 100644 index 86c56f3d38..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeSimpleMetricComponent } from './kubernetes-node-simple-metric.component'; - -describe('KubernetesNodeSimpleMetricComponent', () => { - let component: KubernetesNodeSimpleMetricComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ KubernetesNodeSimpleMetricComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeSimpleMetricComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts deleted file mode 100644 index 0c2135f903..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component({ - selector: 'app-kubernetes-node-simple-metric', - templateUrl: './kubernetes-node-simple-metric.component.html', - styleUrls: ['./kubernetes-node-simple-metric.component.scss'] -}) -export class KubernetesNodeSimpleMetricComponent { - - @Input() - key: string; - - @Input() - value: number; - - @Input() - unit: string; -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts deleted file mode 100644 index 15b1a83cb8..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodePodsComponent } from './kubernetes-node-pods.component'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNodeService } from '../../services/kubernetes-node.service'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; - -describe('KubernetesNodePodsComponent', () => { - let component: KubernetesNodePodsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodePodsComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodePodsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts deleted file mode 100644 index d4b5478234..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { KubernetesNodePodsListConfigService } from '../../list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service'; - -@Component({ - selector: 'app-kubernetes-node-pods', - templateUrl: './kubernetes-node-pods.component.html', - styleUrls: ['./kubernetes-node-pods.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNodePodsListConfigService, - }] -}) -export class KubernetesNodePodsComponent {} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html deleted file mode 100644 index 1fe49080bf..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.html +++ /dev/null @@ -1,6 +0,0 @@ - -

{{ kubeNodeService.nodeName }}

-
-
- - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts deleted file mode 100644 index ee709c0ca1..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../tab-nav.service'; -import { KubernetesBaseTestModules } from '../kubernetes.testing.module'; -import { KubernetesNodeComponent } from './kubernetes-node.component'; - -describe('KubernetesNodeComponent', () => { - let component: KubernetesNodeComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeComponent], - imports: KubernetesBaseTestModules, - providers: [TabNavService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts deleted file mode 100644 index 46fa48f6fa..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-node/kubernetes-node.component.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs'; -import { first, map, tap } from 'rxjs/operators'; - -import { EndpointsService } from '../../../core/endpoints.service'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../services/kubernetes-node.service'; -import { KubernetesService } from '../services/kubernetes.service'; - -@Component({ - selector: 'app-kubernetes-node', - templateUrl: './kubernetes-node.component.html', - styleUrls: ['./kubernetes-node.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - KubernetesEndpointService, - KubernetesNodeService - ] -}) -export class KubernetesNodeComponent { - - tabLinks = [ - { link: 'summary', label: 'Summary', matIcon: 'kubernetes', matIconFont: 'stratos-icons' }, - { link: 'metrics', label: 'Metrics', matIcon: 'equalizer' }, - { link: 'pods', label: 'Pods', matIcon: 'adjust' }, - ]; - - public breadcrumbs$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public kubeNodeService: KubernetesNodeService, - public endpointsService: EndpointsService - ) { - this.endpointsService.hasMetrics(this.kubeEndpointService.kubeGuid).pipe( - first(), - tap(haveMetrics => { - if (!haveMetrics) { - // Remove metrics tab - this.tabLinks = this.tabLinks.filter(tab => tab.link !== 'metrics'); - } - }) - ).subscribe(); - - this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe( - map(endpoint => ([{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}` }, - ] - }]) - ) - ); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts deleted file mode 100644 index 88d24b610f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-page.types.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable() -export class BaseKubeGuid { - guid: string; -} - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html deleted file mode 100644 index 566dd06b5a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.html +++ /dev/null @@ -1,8 +0,0 @@ - -

{{ (kubeEndpointService.endpoint$ | async)?.entity.name }}

-
-
- - - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts deleted file mode 100644 index f783def07d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../tab-nav.service'; -import { KubernetesBaseTestModules } from '../kubernetes.testing.module'; -import { KubernetesTabBaseComponent } from './kubernetes-tab-base.component'; - -describe('KubernetesTabBaseComponent', () => { - let component: KubernetesTabBaseComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesTabBaseComponent], - imports: KubernetesBaseTestModules, - providers: [TabNavService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesTabBaseComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts deleted file mode 100644 index fc2bb549de..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-tab-base/kubernetes-tab-base.component.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { Component, OnInit, Injectable } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Observable, of as ObservableOf } from 'rxjs'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { KubernetesService } from '../services/kubernetes.service'; -import { first, map } from 'rxjs/operators'; -import { UserFavoriteEndpoint } from '../../../../../store/src/types/user-favorites.types'; - -@Component({ - selector: 'app-kubernetes-tab-base', - templateUrl: './kubernetes-tab-base.component.html', - styleUrls: ['./kubernetes-tab-base.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - KubernetesEndpointService, - ] -}) -export class KubernetesTabBaseComponent implements OnInit { - - tabLinks = [ - { link: 'summary', label: 'Summary', matIcon: 'kubernetes', matIconFont: 'stratos-icons' }, - { link: 'nodes', label: 'Nodes', matIcon: 'developer_board' }, - { link: 'namespaces', label: 'Namespaces', matIcon: 'language' }, - { link: 'pods', label: 'Pods', matIcon: 'adjust' }, - { link: 'apps', label: 'Applications', matIcon: 'apps' } - ]; - - isFetching$: Observable; - public favorite$: Observable; - - constructor(public kubeEndpointService: KubernetesEndpointService) { } - - ngOnInit() { - this.isFetching$ = ObservableOf(false); - this.favorite$ = this.kubeEndpointService.endpoint$.pipe( - first(), - map(endpoint => new UserFavoriteEndpoint( - endpoint.entity - )) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts deleted file mode 100644 index 195a892ec0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.module.ts +++ /dev/null @@ -1,174 +0,0 @@ -/* tslint:disable:max-line-length */ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; - -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; -import { - KubernetesServicePortsComponent, -} from './list-types/kubernetes-service-ports/kubernetes-service-ports.component'; -import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component'; -import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component'; -import { - HelmReleaseSummaryCardComponent, -} from './helm-release/helm-release-summary/helm-release-summary-card/helm-release-summary-card.component'; -import { HelmReleaseSummaryComponent } from './helm-release/helm-release-summary/helm-release-summary.component'; -import { HelmReleaseComponent } from './helm-release/helm-release.component'; -import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component'; -import { - KubernetesNamespacePodsComponent, -} from './kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component'; -import { - KubernetesNamespaceServicesComponent, -} from './kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component'; -import { KubernetesNamespaceComponent } from './kubernetes-namespace/kubernetes-namespace.component'; -import { - KubernetesNodeMetricStatsCardComponent, -} from './kubernetes-node/kubernetes-node-metrics/kubernetes-node-metric-stats-card/kubernetes-node-metric-stats-card.component'; -import { - KubernetesNodeMetricsChartComponent, -} from './kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics-chart/kubernetes-node-metrics-chart.component'; -import { KubernetesNodeMetricsComponent } from './kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component'; -import { - KubernetesNodeSimpleMetricComponent, -} from './kubernetes-node/kubernetes-node-metrics/kubernetes-node-simple-metric/kubernetes-node-simple-metric.component'; -import { KubernetesNodePodsComponent } from './kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component'; -import { KubernetesNodeComponent } from './kubernetes-node/kubernetes-node.component'; -import { BaseKubeGuid } from './kubernetes-page.types'; -import { KubernetesTabBaseComponent } from './kubernetes-tab-base/kubernetes-tab-base.component'; -import { KubernetesRoutingModule } from './kubernetes.routing'; -import { KubernetesComponent } from './kubernetes/kubernetes.component'; -import { AppLinkComponent } from './list-types/kubernetes-apps/app-link/app-link.component'; -import { - KubeAppcreatedDateComponent, -} from './list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component'; -import { - KubeNamespacePodCountComponent, -} from './list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component'; -import { - KubernetesNamespaceLinkComponent, -} from './list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component'; -import { - ConditionCellComponent, - InverseConditionCellComponent, -} from './list-types/kubernetes-nodes/condition-cell/condition-cell.component'; -import { - KubernetesNodeCapacityComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component'; -import { - KubernetesNodeLinkComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component'; -import { - KubernetesNodeConditionCardComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component'; -import { - KubernetesNodeConditionComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component'; -import { - KubernetesNodeInfoCardComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component'; -import { - KubernetesNodeSummaryCardComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component'; -import { - KubernetesNodeSummaryComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component'; -import { - KubernetesNodeTagsCardComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component'; -import { NodePodCountComponent } from './list-types/kubernetes-nodes/node-pod-count/node-pod-count.component'; -import { KubernetesPodTagsComponent } from './list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component'; -import { PodNameLinkComponent } from './list-types/kubernetes-pods/pod-name-link/pod-name-link.component'; -import { PodMetricsComponent } from './pod-metrics/pod-metrics.component'; -import { HelmReleaseService } from './services/helm-release.service'; -import { KubernetesEndpointService } from './services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from './services/kubernetes-node.service'; -import { KubernetesService } from './services/kubernetes.service'; -import { KubernetesAppsTabComponent } from './tabs/kubernetes-apps-tab/kubernetes-apps-tab.component'; -import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component'; -import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component'; -import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component'; -import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component'; - - -/* tslint:enable */ -@NgModule({ - imports: [ - CoreModule, - CommonModule, - SharedModule, - NgxChartsModule, - KubernetesRoutingModule, - ], - declarations: [ - KubernetesComponent, - KubernetesNodesTabComponent, - KubernetesTabBaseComponent, - KubernetesNodeCapacityComponent, - KubernetesPodsTabComponent, - KubernetesPodTagsComponent, - KubernetesNamespacesTabComponent, - KubernetesDashboardTabComponent, - KubernetesSummaryTabComponent, - KubernetesAppsTabComponent, - HelmReleaseComponent, - AppLinkComponent, - KubernetesReleasePodsTabComponent, - HelmReleaseSummaryComponent, - HelmReleaseServicesComponent, - HelmReleaseSummaryCardComponent, - PodMetricsComponent, - KubernetesNodeLinkComponent, - KubernetesNodeComponent, - KubernetesNodeSummaryComponent, - KubernetesNodePodsComponent, - KubernetesNodeSummaryCardComponent, - KubernetesNodeConditionCardComponent, - KubernetesNodeTagsCardComponent, - KubernetesNodePodsComponent, - KubernetesNodeInfoCardComponent, - KubernetesNodeMetricsComponent, - KubernetesNodeConditionComponent, - KubernetesNodeMetricsChartComponent, - KubernetesNodeMetricStatsCardComponent, - KubernetesNodeSimpleMetricComponent, - ConditionCellComponent, - InverseConditionCellComponent, - KubernetesNamespaceLinkComponent, - KubernetesNamespaceComponent, - KubernetesNamespacePodsComponent, - KubernetesNamespaceServicesComponent, - KubeAppcreatedDateComponent, - KubeNamespacePodCountComponent, - PodNameLinkComponent, - NodePodCountComponent, - KubernetesServicePortsComponent - ], - exports: [ - KubernetesServicePortsComponent - ], - providers: [ - KubernetesService, - BaseKubeGuid, - KubernetesEndpointService, - HelmReleaseService, - KubernetesNodeService - ], - entryComponents: [ - KubernetesNodeCapacityComponent, - KubernetesPodTagsComponent, - AppLinkComponent, - KubernetesNodeLinkComponent, - ConditionCellComponent, - InverseConditionCellComponent, - KubernetesNamespaceLinkComponent, - KubeAppcreatedDateComponent, - KubeNamespacePodCountComponent, - PodNameLinkComponent, - NodePodCountComponent, - KubernetesServicePortsComponent - ] -}) -export class KubernetesModule { } - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts deleted file mode 100644 index f2d3839458..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.routing.ts +++ /dev/null @@ -1,164 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { KubernetesReleasePodsTabComponent } from './helm-release/helm-release-pods-tab/helm-release-pods-tab.component'; -import { HelmReleaseServicesComponent } from './helm-release/helm-release-services/helm-release-services.component'; -import { HelmReleaseComponent } from './helm-release/helm-release.component'; -import { KubernetesDashboardTabComponent } from './kubernetes-dashboard/kubernetes-dashboard.component'; -import { - KubernetesNamespacePodsComponent, -} from './kubernetes-namespace/kubernetes-namespace-pods/kubernetes-namespace-pods.component'; -import { - KubernetesNamespaceServicesComponent, -} from './kubernetes-namespace/kubernetes-namespace-services/kubernetes-namespace-services.component'; -import { KubernetesNamespaceComponent } from './kubernetes-namespace/kubernetes-namespace.component'; -import { KubernetesNodeMetricsComponent } from './kubernetes-node/kubernetes-node-metrics/kubernetes-node-metrics.component'; -import { KubernetesNodePodsComponent } from './kubernetes-node/kubernetes-node-pods/kubernetes-node-pods.component'; -import { KubernetesNodeComponent } from './kubernetes-node/kubernetes-node.component'; -import { KubernetesTabBaseComponent } from './kubernetes-tab-base/kubernetes-tab-base.component'; -import { KubernetesComponent } from './kubernetes/kubernetes.component'; -import { - KubernetesNodeSummaryComponent, -} from './list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component'; -import { PodMetricsComponent } from './pod-metrics/pod-metrics.component'; -import { KubernetesAppsTabComponent } from './tabs/kubernetes-apps-tab/kubernetes-apps-tab.component'; -import { KubernetesNamespacesTabComponent } from './tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component'; -import { KubernetesNodesTabComponent } from './tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component'; -import { KubernetesPodsTabComponent } from './tabs/kubernetes-pods-tab/kubernetes-pods-tab.component'; -import { KubernetesSummaryTabComponent } from './tabs/kubernetes-summary-tab/kubernetes-summary.component'; - -const kubernetes: Routes = [{ - path: '', - component: KubernetesComponent -}, -{ - path: ':endpointId/apps/:releaseName/pods/:namespace/:podName', - component: PodMetricsComponent, -}, -{ - path: ':endpointId/nodes/:nodeName/pods/:namespace/:podName', - component: PodMetricsComponent, -}, -{ - path: ':endpointId/pods/:namespace/:podName', - component: PodMetricsComponent, -}, -{ - path: ':endpointId/namespaces/:namespaceName/pods/:podName', - component: PodMetricsComponent -}, -{ - path: ':endpointId/nodes/:nodeName', - component: KubernetesNodeComponent, - children: [ - { - path: '', - redirectTo: 'summary', - pathMatch: 'full' - }, - { - path: 'summary', - component: KubernetesNodeSummaryComponent - }, - { - path: 'pods', - component: KubernetesNodePodsComponent - }, - { - path: 'metrics', - component: KubernetesNodeMetricsComponent - } - ] -}, -{ - path: ':endpointId/namespaces/:namespaceName', - component: KubernetesNamespaceComponent, - children: [ - { - path: '', - redirectTo: 'pods', - pathMatch: 'full' - }, - { - path: 'pods', - component: KubernetesNamespacePodsComponent - }, - { - path: 'services', - component: KubernetesNamespaceServicesComponent - }, - - ] -}, -{ - path: ':endpointId/apps/:releaseName', - component: HelmReleaseComponent, - children: [ - { - path: '', - redirectTo: 'pods', - pathMatch: 'full' - }, - { - path: 'pods', - component: KubernetesReleasePodsTabComponent - }, - { - path: 'services', - component: HelmReleaseServicesComponent - } - ] -}, -{ - path: ':endpointId', - component: KubernetesTabBaseComponent, - children: [ - { - path: '', - redirectTo: 'summary', - pathMatch: 'full' - }, - { - path: 'summary', - component: KubernetesSummaryTabComponent - }, - { - path: 'nodes', - component: KubernetesNodesTabComponent - }, - { - path: 'namespaces', - component: KubernetesNamespacesTabComponent - }, - { - path: 'pods', - component: KubernetesPodsTabComponent - }, - { - path: 'apps', - component: KubernetesAppsTabComponent, - }, - ] -}, -{ - path: ':endpointId/dashboard', - component: KubernetesDashboardTabComponent, - data: { - uiNoMargin: true - }, - children: [ - { - path: '**', - component: KubernetesDashboardTabComponent, - data: { - uiNoMargin: true - } - } - ] -} -]; - -@NgModule({ - imports: [RouterModule.forChild(kubernetes)] -}) -export class KubernetesRoutingModule { } diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts deleted file mode 100644 index 3c71951b2e..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { favoritesConfigMapper, FavoriteConfig } from './../../shared/components/favorites-meta-card/favorite-config-mapper'; -import { NgModule } from '@angular/core'; - -import { CoreModule } from '../../core/core.module'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '../../shared/shared.module'; -import { KubernetesCertsAuthFormComponent } from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component'; -import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component'; -import { KubernetesConfigAuthFormComponent } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component'; -import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component'; -import { EffectsModule } from '@ngrx/effects'; -import { KubernetesEffects } from './store/kubernetes.effects'; -import { KubernetesStoreModule } from './kubernetes.store.module'; -import { EndpointModel } from '../../../../store/src/types/endpoint.types'; -import { IEndpointFavMetadata, IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; -import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory'; -import { getFullEndpointApiUrl } from '../../features/endpoints/endpoint-helpers'; - -export interface IK8FavMetadata extends IFavoriteMetadata { - guid: string; - name: string; - address: string; -} - -@NgModule({ - imports: [ - CoreModule, - CommonModule, - SharedModule, - KubernetesStoreModule, - EffectsModule.forFeature([ - KubernetesEffects - ]) - ], - declarations: [ - KubernetesCertsAuthFormComponent, - KubernetesAWSAuthFormComponent, - KubernetesConfigAuthFormComponent, - KubernetesGKEAuthFormComponent, - ], - entryComponents: [ - KubernetesCertsAuthFormComponent, - KubernetesAWSAuthFormComponent, - KubernetesConfigAuthFormComponent, - KubernetesGKEAuthFormComponent, - ] -}) -export class KubernetesSetupModule { - constructor() { - const endpointType = 'k8s'; - favoritesConfigMapper.registerFavoriteConfig( - new FavoriteConfig({ - endpointType, - entityType: endpointSchemaKey - }, - 'Kubernetes', - (endpoint: IK8FavMetadata) => ({ - type: endpointType, - routerLink: `/kubernetes/${endpoint.guid}`, - lines: [ - ['Address', endpoint.address] - ], - name: endpoint.name, - }), - endpoint => ({ - guid: endpoint.guid, - name: endpoint.name, - address: getFullEndpointApiUrl(endpoint), - }) - ) - ); - } - - - -} diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts deleted file mode 100644 index 2b8b07f2f4..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.store.module.ts +++ /dev/null @@ -1,120 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Validators } from '@angular/forms'; - -import { CoreModule } from '../../core/core.module'; -import { StratosExtension } from '../../core/extension/extension-service'; -import { EndpointAuthTypeConfig, EndpointType, EndpointTypeExtensionConfig } from '../../core/extension/extension-types'; -import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component'; -import { - KubernetesCertsAuthFormComponent, -} from './auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component'; -import { - KubernetesConfigAuthFormComponent, -} from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component'; -import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component'; -import { kubernetesEntities, kubernetesEntityKeys } from './store/kubernetes.entities'; - -const enum KubeEndpointAuthTypes { - CERT_AUTH = 'kube-cert-auth', - CONFIG = 'kubeconfig', - CONFIG_AZ = 'kubeconfig-az', - AWS_IAM = 'aws-iam', - GKE = 'gke-auth' -} - -const kubernetesEndpointTypes: EndpointTypeExtensionConfig[] = [{ - type: 'k8s', - label: 'Kubernetes', - subTypes: [{ - subType: 'caasp', - label: 'SUSE CaaS Platform', - authTypes: [KubeEndpointAuthTypes.CONFIG], - imagePath: '/core/assets/custom/caasp.png' - }, { - subType: 'aks', - label: 'Azure AKS', - authTypes: [KubeEndpointAuthTypes.CONFIG_AZ], - imagePath: '/core/assets/custom/aks.svg' - }, { - subType: 'eks', - label: 'Amazon EKS', - authTypes: [KubeEndpointAuthTypes.AWS_IAM], - imagePath: '/core/assets/custom/eks.svg' - }, { - subType: 'gke', - label: 'Google Kubernetes Engine', - authTypes: [KubeEndpointAuthTypes.GKE], - imagePath: '/core/assets/custom/gke.svg' - }], - authTypes: [KubeEndpointAuthTypes.CERT_AUTH], - icon: 'kubernetes', - iconFont: 'stratos-icons', - imagePath: '/core/assets/custom/kubernetes.svg', - homeLink: (guid) => ['/kubernetes', guid], - entitySchemaKeys: kubernetesEntityKeys, - order: 4 -}]; - - -const kubernetesAuthTypes: EndpointAuthTypeConfig[] = [{ - value: KubeEndpointAuthTypes.CONFIG, - name: 'CAASP (OIDC)', - form: { - kubeconfig: ['', Validators.required], - }, - types: new Array(), - component: KubernetesConfigAuthFormComponent -}, -{ - value: KubeEndpointAuthTypes.CONFIG_AZ, - name: 'Azure AKS', - form: { - kubeconfig: ['', Validators.required], - }, - types: new Array(), - component: KubernetesConfigAuthFormComponent -}, -{ - value: KubeEndpointAuthTypes.AWS_IAM, - name: 'AWS IAM (EKS)', - form: { - cluster: ['', Validators.required], - access_key: ['', Validators.required], - secret_key: ['', Validators.required], - }, - types: new Array(), - component: KubernetesAWSAuthFormComponent -}, -{ - value: KubeEndpointAuthTypes.CERT_AUTH, - name: 'Kubernetes Cert Auth', - form: { - cert: ['', Validators.required], - certKey: ['', Validators.required], - }, - types: new Array(), - component: KubernetesCertsAuthFormComponent -}, -{ - value: KubeEndpointAuthTypes.GKE, - name: 'GKE', - form: { - gkeconfig: ['', Validators.required], - }, - types: new Array(), - component: KubernetesGKEAuthFormComponent, - help: '/core/assets/custom/help/en/connecting_gke.md' -} -]; - -@StratosExtension({ - endpointTypes: kubernetesEndpointTypes, - authTypes: kubernetesAuthTypes, - entities: kubernetesEntities, -}) -@NgModule({ - imports: [ - CoreModule - ] -}) -export class KubernetesStoreModule { } diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts deleted file mode 100644 index e71dff13bf..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { KubernetesStoreModule } from './kubernetes.store.module'; -import { NgModule } from '@angular/core'; -import { kubernetesEntities } from './store/kubernetes.entities'; -import { registerEntitiesForTesting, createBasicStoreModule } from '../../../test-framework/store-test-helper'; -import { RouterTestingModule } from '@angular/router/testing'; -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; -import { HttpModule } from '@angular/http'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -@NgModule({ - imports: [ - KubernetesStoreModule - ] -}) -export class KubernetesTestingModule { - - constructor() { - registerEntitiesForTesting(kubernetesEntities); - } -} - -export const KubernetesBaseTestModules = [ - KubernetesTestingModule, - RouterTestingModule, - CoreModule, - createBasicStoreModule(), - NoopAnimationsModule, - HttpModule, - SharedModule, -]; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html deleted file mode 100644 index 9dd3facb7c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.html +++ /dev/null @@ -1,5 +0,0 @@ - -

Kubernetes

- - - diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts deleted file mode 100644 index 99112c8c5c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../tab-nav.service'; -import { KubernetesBaseTestModules } from '../kubernetes.testing.module'; -import { KubernetesComponent } from './kubernetes.component'; - -describe('KubernetesComponent', () => { - let component: KubernetesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesComponent], - imports: KubernetesBaseTestModules, - providers: [TabNavService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts deleted file mode 100644 index 449bcc9a12..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes/kubernetes.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { Component } from '@angular/core'; -import { KubernetesService } from '../services/kubernetes.service'; -import { Store } from '@ngrx/store'; -import { map, filter, first } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { AppState } from '../../../../../store/src/app-state'; -import { RouterNav } from '../../../../../store/src/actions/router.actions'; -import { ListConfig } from '../../../shared/components/list/list.component.types'; -import {KubernetesEndpointsListConfigService} from '../list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service'; -import { EndpointListHelper } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers'; - -@Component({ - selector: 'app-kubernetes', - templateUrl: './kubernetes.component.html', - styleUrls: ['./kubernetes.component.scss'], - providers: [ - { - provide: ListConfig, - useClass: KubernetesEndpointsListConfigService, - }, - EndpointListHelper, - KubernetesService - ] -}) -export class KubernetesComponent { - - connectedEndpoints$: Observable; - constructor( - private store: Store, - private kubeService: KubernetesService - ) { - this.connectedEndpoints$ = kubeService.kubeEndpoints$.pipe( - map(kubeEndpoints => { - const connectedEndpoints = kubeEndpoints.filter( - c => c.connectionStatus === 'connected' - ); - const hasOne = connectedEndpoints.length === 1; - if (hasOne) { - this.store.dispatch(new RouterNav({ - path: ['kubernetes', connectedEndpoints[0].guid] - })); - } - return connectedEndpoints.length; - }), - filter(connectedEndpointsCount => connectedEndpointsCount > 1), - first() - ); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts deleted file mode 100644 index 815fff05f7..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-data-source.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { entityFactory } from '../../../../../../store/src//helpers/entity-factory'; -import { AppState } from '../../../../../../store/src/app-state'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { getHelmReleaseServiceId } from '../../../helm/store/helm.entities'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { HelmReleaseService } from '../../services/helm-release.service'; -import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesReleasePods } from '../../store/kubernetes.actions'; -import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities'; - - - -export class KubernetesReleasePodsDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig, - helmReleaseService: HelmReleaseService, - ) { - const action = new GetKubernetesReleasePods(kubeGuid.guid, helmReleaseService.helmReleaseName); - super({ - store, - action, - schema: entityFactory(kubernetesPodsSchemaKey), - getRowUniqueId: getHelmReleaseServiceId, - paginationKey: action.paginationKey, - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts deleted file mode 100644 index c11bb47ca8..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/helm-release-pods/helm-release-pods-list-config.service.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src//app-state'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { HelmReleaseService } from '../../services/helm-release.service'; -import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service'; -import { KubernetesReleasePodsDataSource } from './helm-release-pods-data-source'; - - -@Injectable() -export class KubernetesReleasePodsListConfigService extends KubernetesPodsListConfigService { - constructor( - store: Store, - kubeId: BaseKubeGuid, - public helmReleaseService: HelmReleaseService, - ) { - super(store, kubeId); - this.podsDataSource = new KubernetesReleasePodsDataSource(store, kubeId, this, helmReleaseService); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts deleted file mode 100644 index f4e0553692..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kube-helm-list-types.ts +++ /dev/null @@ -1 +0,0 @@ -export const defaultHelmKubeListPageSize = [9, 45, 90]; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts deleted file mode 100644 index 97db07b968..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kube-sort.helper.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { DataFunction } from '../../../shared/components/list/data-sources-controllers/list-data-source'; -import { ConditionType, KubernetesNode } from '../store/kube.types'; - -export function getConditionSort(condition: ConditionType): DataFunction { - return (entities, paginationState) => { - const orderDirection = paginationState.params['order-direction'] || 'asc'; - return entities.sort((a, b) => { - - const aConditionValue = a.status.conditions.find(c => c.type === condition); - const bConditionValue = b.status.conditions.find(c => c.type === condition); - if (aConditionValue > bConditionValue) { - return orderDirection === 'desc' ? 1 : -1; - } - if (bConditionValue < aConditionValue) { - return orderDirection === 'desc' ? -1 : 1; - } - return 0; - }); - }; -} -export function getContainerLengthSort(entities, paginationState) { - const orderDirection = paginationState.params['order-direction'] || 'asc'; - return entities.sort((a, b) => { - - const aConditionValue = a.spec.containers.length; - const bConditionValue = b.spec.containers.length; - if (orderDirection === 'desc') { - return aConditionValue - bConditionValue; - } else { - return bConditionValue - aConditionValue; - } - }); -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html deleted file mode 100644 index ae67f78d1d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.name}} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts deleted file mode 100644 index 41b4ab9c37..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AppLinkComponent } from './app-link.component'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('AppLinkComponent', () => { - let component: AppLinkComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [AppLinkComponent], - imports: KubernetesBaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AppLinkComponent); - component = fixture.componentInstance; - const testString = 'test'; - component.row = { - kubeId: testString, - name: testString, - pods: [], - createdAt: (new Date()), - status: testString, - version: testString, - chartName: testString, - appVersion: testString, - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts deleted file mode 100644 index af6a93df0c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/app-link/app-link.component.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesApp } from '../../../../../custom/kubernetes/store/kube.types'; - -@Component({ - selector: 'app-app-link', - templateUrl: './app-link.component.html', - styleUrls: ['./app-link.component.scss'] -}) -export class AppLinkComponent extends TableCellCustom implements OnInit { - routerLink: string; - - constructor() { - super(); - } - - ngOnInit(): void { - this.routerLink = `${this.row.name}`; - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html deleted file mode 100644 index a5511d63f9..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.html +++ /dev/null @@ -1 +0,0 @@ -{{ row.createdAt | date:'medium'}} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts deleted file mode 100644 index c44b47fd3d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubeAppcreatedDateComponent } from './kube-appcreated-date.component'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubeAppcreatedDateComponent', () => { - let component: KubeAppcreatedDateComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubeAppcreatedDateComponent], - imports: KubernetesBaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubeAppcreatedDateComponent); - component = fixture.componentInstance; - const testString = 'test'; - component.row = { - kubeId: testString, - name: testString, - pods: [], - createdAt: (new Date()), - status: testString, - version: testString, - chartName: testString, - appVersion: testString, - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts deleted file mode 100644 index 2fe3dc5fff..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kube-appcreated-date/kube-appcreated-date.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; -import { KubernetesApp } from '../../../store/kube.types'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; - -@Component({ - selector: 'app-kube-appcreated-date', - templateUrl: './kube-appcreated-date.component.html', - styleUrls: ['./kube-appcreated-date.component.scss'] -}) -export class KubeAppcreatedDateComponent extends TableCellCustom { - - constructor() { - super(); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts deleted file mode 100644 index 80973983a4..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-data-source.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesApp } from '../../store/kube.types'; -import { GetKubernetesApps } from '../../store/kubernetes.actions'; -import { getKubeAppId, kubernetesAppsSchemaKey } from '../../store/kubernetes.entities'; - - -export class KubernetesAppsDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig - ) { - super({ - store, - action: new GetKubernetesApps(kubeGuid.guid), - schema: entityFactory(kubernetesAppsSchemaKey), - getRowUniqueId: getKubeAppId, - paginationKey: getPaginationKey(kubernetesAppsSchemaKey, kubeGuid.guid), - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts deleted file mode 100644 index e984169e53..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-apps/kubernetes-apps-list-config.service.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesApp } from '../../store/kube.types'; -import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; -import { AppLinkComponent } from './app-link/app-link.component'; -import { KubeAppcreatedDateComponent } from './kube-appcreated-date/kube-appcreated-date.component'; -import { KubernetesAppsDataSource } from './kubernetes-apps-data-source'; - -@Injectable() -export class KubernetesAppsListConfigService implements IListConfig { - AppsDataSource: KubernetesAppsDataSource; - - columns: Array> = [ - { - columnId: 'name', headerCell: () => 'Release Name', - cellComponent: AppLinkComponent, - sort: { - type: 'sort', - orderKey: 'name', - field: 'name' - }, - cellFlex: '5', - }, - { - columnId: 'chartName', headerCell: () => 'Chart Name', - cellDefinition: { - getValue: (a) => a.chartName - }, - sort: { - type: 'sort', - orderKey: 'chartName', - field: 'chartName' - }, - cellFlex: '5', - }, - { - columnId: 'status', headerCell: () => 'Status', - cellDefinition: { - getValue: (a) => a.status - }, - sort: { - type: 'sort', - orderKey: 'status', - field: 'status' - }, - cellFlex: '5', - }, - { - columnId: 'appVersion', headerCell: () => 'App Version', - cellDefinition: { - getValue: (a) => a.appVersion, - }, - sort: { - type: 'sort', - orderKey: 'appVersion', - field: 'appVersion' - }, - cellFlex: '5', - }, - { - columnId: 'createdAt', headerCell: () => 'Created At', - cellComponent: KubeAppcreatedDateComponent, - sort: { - type: 'sort', - orderKey: 'createdAt', - field: 'createdAt' - }, - cellFlex: '5', - }, - ]; - - pageSizeOptions = defaultHelmKubeListPageSize; - viewType = ListViewTypes.TABLE_ONLY; - - enableTextFilter = true; - text = { - filter: 'Filter by Name', - noEntries: 'There are no applications' - }; - - getGlobalActions = () => null; - getMultiActions = () => []; - getSingleActions = () => []; - getColumns = () => this.columns; - getDataSource = () => this.AppsDataSource; - getMultiFiltersConfigs = () => []; - - constructor( - store: Store, - kubeId: BaseKubeGuid, - ) { - this.AppsDataSource = new KubernetesAppsDataSource(store, kubeId, this); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts deleted file mode 100644 index 925b330268..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-data-source.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions'; -import { AppState } from '../../../../../../store/src/app-state'; -import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'; -import { - BaseEndpointsDataSource, - syncPaginationSection, -} from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { EntityMonitorFactory } from '../../../../shared/monitors/entity-monitor.factory.service'; -import { InternalEventMonitorFactory } from '../../../../shared/monitors/internal-event-monitor.factory'; -import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory'; - -export class KubernetesEndpointsDataSource extends BaseEndpointsDataSource { - - constructor( - store: Store, - listConfig: IListConfig, - paginationMonitorFactory: PaginationMonitorFactory, - entityMonitorFactory: EntityMonitorFactory, - internalEventMonitorFactory: InternalEventMonitorFactory, - ) { - const action = new GetAllEndpoints(); - const paginationKey = 'kube-endpoints'; - // We do this here to ensure we sync up with main endpoint table data. - syncPaginationSection(store, action, paginationKey); - action.paginationKey = paginationKey; - super( - store, - listConfig, - action, - 'k8s', - paginationMonitorFactory, - entityMonitorFactory, - internalEventMonitorFactory - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts deleted file mode 100644 index 73f0cdd19f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-endpoints/kubernetes-endpoints-list-config.service.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { BaseEndpointsDataSource } from '../../../../shared/components/list/list-types/endpoint/base-endpoints-data-source'; -import { - EndpointCardComponent, -} from '../../../../shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component'; -import { endpointColumns } from '../../../../shared/components/list/list-types/endpoint/endpoints-list-config.service'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { EntityMonitorFactory } from '../../../../shared/monitors/entity-monitor.factory.service'; -import { InternalEventMonitorFactory } from '../../../../shared/monitors/internal-event-monitor.factory'; -import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory'; -import { KubernetesEndpointsDataSource } from './kubernetes-endpoints-data-source'; - -@Injectable() -export class KubernetesEndpointsListConfigService implements IListConfig { - columns: ITableColumn[]; - isLocal = true; - dataSource: BaseEndpointsDataSource; - viewType = ListViewTypes.CARD_ONLY; - cardComponent = EndpointCardComponent; - text = { - title: '', - filter: 'Filter Endpoints', - noEntries: 'There are no endpoints' - }; - enableTextFilter = true; - tableFixedRowHeight = true; - - - constructor( - private store: Store, - paginationMonitorFactory: PaginationMonitorFactory, - entityMonitorFactory: EntityMonitorFactory, - internalEventMonitorFactory: InternalEventMonitorFactory, - ) { - this.columns = endpointColumns.filter(column => { - return column.columnId !== 'type'; - }); - this.dataSource = new KubernetesEndpointsDataSource( - this.store, - this, - paginationMonitorFactory, - entityMonitorFactory, - internalEventMonitorFactory - ); - } - public getColumns = () => this.columns; - public getGlobalActions = () => []; - public getMultiActions = () => []; - public getSingleActions = () => []; - public getMultiFiltersConfigs = () => []; - public getDataSource = () => this.dataSource; -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts deleted file mode 100644 index 76d5d10dfc..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service'; -import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPodsInNamespace } from '../../store/kubernetes.actions'; -import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities'; - -export class KubernetesNamespacePodsDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig, - kubeNamespaceService: KubernetesNamespaceService, - ) { - const action = new GetKubernetesPodsInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName); - super({ - store, - action, - schema: entityFactory(kubernetesPodsSchemaKey), - getRowUniqueId: (object: KubernetesPod) => object.metadata.name, - paginationKey: action.paginationKey, - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts deleted file mode 100644 index bf39118edb..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-list-config.service.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service'; -import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service'; -import { KubernetesNamespacePodsDataSource } from './kubernetes-namespace-pods-data-source'; - -@Injectable() -export class KubernetesNamespacePodsListConfigService extends KubernetesPodsListConfigService { - constructor( - store: Store, - kubeId: BaseKubeGuid, - public kubeNamespaceService: KubernetesNamespaceService, - ) { - super(store, kubeId); - this.podsDataSource = new KubernetesNamespacePodsDataSource(store, kubeId, this, kubeNamespaceService); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts deleted file mode 100644 index bf1be7755f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubeService } from '../../store/kube.types'; -import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions'; -import { BaseKubernetesServicesDataSource } from '../kubernetes-services-data-source'; - - -export class KubernetesNamespaceServicesDataSource extends BaseKubernetesServicesDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig, - namespace: string, - ) { - const action = new GetKubernetesServicesInNamespace(kubeGuid.guid, namespace); - super( - store, - action, - listConfig - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts deleted file mode 100644 index 74c2fd5cdf..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-list-config.service.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service'; -import { BaseKubernetesServicesListConfig } from '../kubernetes-service-list-config.service'; -import { KubernetesNamespaceServicesDataSource } from './kubernetes-namespace-services-data-source'; - -@Injectable() -export class KubernetesNamespaceServicesListConfig extends BaseKubernetesServicesListConfig { - dataSource: KubernetesNamespaceServicesDataSource; - - constructor( - store: Store, - kubeId: BaseKubeGuid, - kubeNamespaceService: KubernetesNamespaceService - ) { - super(); - this.dataSource = new KubernetesNamespaceServicesDataSource(store, kubeId, this, kubeNamespaceService.namespaceName); - } - getDataSource = () => this.dataSource; - - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html deleted file mode 100644 index a36794a85b..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.html +++ /dev/null @@ -1 +0,0 @@ -{{ podCount$ | async }} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts deleted file mode 100644 index 7bd74b006e..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count.component'; -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { HelmReleaseService } from '../../../services/helm-release.service'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubeNamespacePodCountComponent', () => { - let component: KubeNamespacePodCountComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubeNamespacePodCountComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubeNamespacePodCountComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts deleted file mode 100644 index 2d9c5c125f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kube-namespace-pod-count/kube-namespace-pod-count.component.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { map } from 'rxjs/operators'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesNamespace } from '../../../store/kube.types'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'app-kube-namespace-pod-count', - templateUrl: './kube-namespace-pod-count.component.html', - styleUrls: ['./kube-namespace-pod-count.component.scss'] -}) -export class KubeNamespacePodCountComponent extends TableCellCustom implements OnInit { - podCount$: Observable; - - constructor( - private kubeEndpointService: KubernetesEndpointService - ) { - super(); - } - - ngOnInit() { - - this.podCount$ = this.kubeEndpointService.pods$.pipe( - map(pods => pods.filter(p => p.metadata.namespace === this.row.metadata.name)), - map(p => p.length) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html deleted file mode 100644 index e8bdc39357..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.metadata.name}} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts deleted file mode 100644 index 83363482ad..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.spec.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesStatus } from '../../../store/kube.types'; -import { KubernetesNamespaceLinkComponent } from './kubernetes-namespace-link.component'; - -describe('KubernetesNamespaceLinkComponent', () => { - let component: KubernetesNamespaceLinkComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNamespaceLinkComponent], - imports: KubernetesBaseTestModules, - providers: [KubernetesEndpointService, BaseKubeGuid] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNamespaceLinkComponent); - component = fixture.componentInstance; - component.row = { - spec: { - finalizers: [] - }, - status: { - phase: KubernetesStatus.RUNNING - }, - metadata: { - namespace: 'test', - name: 'test', - uid: 'test', - labels: {} - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts deleted file mode 100644 index 56a6ff0900..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespace-link/kubernetes-namespace-link.component.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesNamespace } from '../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-namespace-link', - templateUrl: './kubernetes-namespace-link.component.html', - styleUrls: ['./kubernetes-namespace-link.component.scss'] -}) -export class KubernetesNamespaceLinkComponent extends TableCellCustom implements OnInit { - routerLink: string; - dashboardLink: string; - constructor(public kubeEndpointService: KubernetesEndpointService) { - super(); - } - - ngOnInit() { - this.routerLink = `${this.row.metadata.name}`; - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts deleted file mode 100644 index 82ea2b2d36..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; -import { KubernetesNamespace } from '../../store/kube.types'; -import { GetKubernetesNamespaces } from '../../store/kubernetes.actions'; -import { kubernetesNamespacesSchemaKey } from '../../store/kubernetes.entities'; - - -export class KubernetesNamespacesDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig - ) { - super({ - store, - action: new GetKubernetesNamespaces(kubeGuid.guid), - schema: entityFactory(kubernetesNamespacesSchemaKey), - getRowUniqueId: getKubeAPIResourceGuid, - paginationKey: getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid.guid), - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts deleted file mode 100644 index f4093d2b7c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service.ts +++ /dev/null @@ -1,99 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { filter, first, map, tap } from 'rxjs/operators'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { KubernetesNamespace } from '../../../kubernetes/store/kube.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; -import { KubeNamespacePodCountComponent } from './kube-namespace-pod-count/kube-namespace-pod-count.component'; -import { KubernetesNamespaceLinkComponent } from './kubernetes-namespace-link/kubernetes-namespace-link.component'; -import { KubernetesNamespacesDataSource } from './kubernetes-namespaces-data-source'; - - -@Injectable() -export class KubernetesNamespacesListConfigService implements IListConfig { - podsDataSource: KubernetesNamespacesDataSource; - - columns: Array> = [ - { - columnId: 'name', headerCell: () => 'Name', - cellComponent: KubernetesNamespaceLinkComponent, - sort: { - type: 'sort', - orderKey: 'name', - field: 'metadata.name' - }, - cellFlex: '5', - }, - { - columnId: 'view', headerCell: () => 'Dashboard', - cellDefinition: { - getValue: () => 'View', - getLink: (row: KubernetesNamespace) => { - return `/kubernetes/${this.kubeId.guid}/dashboard/overview?namespace=${row.metadata.name}`; - }, - }, - cellFlex: '3', - }, - { - columnId: 'pods', headerCell: () => 'No. of Pods', - cellComponent: KubeNamespacePodCountComponent, - cellFlex: '5', - }, - { - columnId: 'status', headerCell: () => 'Status', - cellDefinition: { - getValue: (row) => `${row.status.phase}` - }, - sort: { - type: 'sort', - orderKey: 'status', - field: 'status.phase' - }, - cellFlex: '5', - }, - ]; - - pageSizeOptions = defaultHelmKubeListPageSize; - viewType = ListViewTypes.TABLE_ONLY; - enableTextFilter = true; - text = { - filter: 'Filter by Name', - noEntries: 'There are no namespaces' - }; - private initialised$: Observable; - - getGlobalActions = () => null; - getMultiActions = () => []; - getSingleActions = () => []; - getColumns = () => this.columns; - getDataSource = () => this.podsDataSource; - getMultiFiltersConfigs = () => []; - getInitialised = () => this.initialised$; - - constructor( - store: Store, - private kubeId: BaseKubeGuid, - kubeService: KubernetesEndpointService - ) { - this.podsDataSource = new KubernetesNamespacesDataSource(store, this.kubeId, this); - - const hasDashboard = kubeService.kubeDashboardEnabled$.pipe( - first(), - tap((enabled) => { - if (!enabled) { - this.columns = this.columns.filter(column => column.columnId !== 'view'); - } - }) - ); - this.initialised$ = hasDashboard.pipe( - map(() => true) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts deleted file mode 100644 index 3ae663f15b..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesNodeService } from '../../services/kubernetes-node.service'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; -import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions'; -import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities'; - -export class KubernetesNodePodsDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig, - kubeNodeService: KubernetesNodeService, - ) { - const action = new GetKubernetesPodsOnNode(kubeGuid.guid, kubeNodeService.nodeName); - super({ - store, - action, - schema: entityFactory(kubernetesPodsSchemaKey), - getRowUniqueId: getKubeAPIResourceGuid, - paginationKey: action.paginationKey, - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts deleted file mode 100644 index 72c2a85043..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-list-config.service.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../store/src/app-state'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesPodsListConfigService } from '../kubernetes-pods/kubernetes-pods-list-config.service'; -import { KubernetesNodePodsDataSource } from './kubernetes-node-pods-data-source'; -import { KubernetesNodeService } from '../../services/kubernetes-node.service'; - -@Injectable() -export class KubernetesNodePodsListConfigService extends KubernetesPodsListConfigService { - constructor( - store: Store, - kubeId: BaseKubeGuid, - public kubeNodeService: KubernetesNodeService, - ) { - super(store, kubeId); - this.podsDataSource = new KubernetesNodePodsDataSource(store, kubeId, this, kubeNodeService); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html deleted file mode 100644 index 5c49b16a66..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts deleted file mode 100644 index f628082325..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.spec.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ConditionCellComponent } from './condition-cell.component'; -import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; - -describe('ConditionCellComponent', () => { - let component: ConditionCellComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ConditionCellComponent], - imports: BaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ConditionCellComponent); - component = fixture.componentInstance; - component.row = { - metadata: { - namespace: 'test', - name: 'test', - uid: 'test' - }, - status: { - conditions: [], - addresses: [], - images: [] - }, - spec: { - containers: [], - nodeName: 'test', - schedulerName: 'test', - initContainers: [] - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts deleted file mode 100644 index 6c488247da..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/condition-cell/condition-cell.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesNode } from '../../../store/kube.types'; - -@Component({ - selector: 'app-condition-cell', - templateUrl: './condition-cell.component.html', - styleUrls: ['./condition-cell.component.scss'] -}) -export class ConditionCellComponent extends TableCellCustom implements OnInit { - condition: string; - - inverse = false; - - constructor() { - super(); - } - - ngOnInit() { - - const condition = this.row.status.conditions.filter(c => c.type === this.config.conditionType); - if (condition && condition.length === 1) { - this.condition = condition[0].status; - } - } - -} - - -export class InverseConditionCellComponent extends ConditionCellComponent { - - constructor() { - super(); - this.inverse = true; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html deleted file mode 100644 index 4e8dd0b6ae..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
-
-
{{ row.status.capacity.pods }}
-
Pods
-
-
-
- -
-
-
-
{{ getMemory(row.status.capacity.memory) | bytesToHumanSize }}
-
Memory
-
-
-
- -
-
-
-
{{ row.status.capacity.cpu }}
-
CPU
-
-
-
-
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss deleted file mode 100644 index adb0a416a4..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.scss +++ /dev/null @@ -1,22 +0,0 @@ -.kube-node-capacity { - display: flex; - - .legend-items-container { - width: 100%; - - .legend-items { - white-space: nowrap; - overflow: auto; - } - - .item-value { - font-size: 18px; - } - - .item-label { - font-size: 14px; - opacity: 0.7; - } - } - -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts deleted file mode 100644 index 71250c4c10..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.spec.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity.component'; -import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; - -describe('KubernetesNodeCapacityComponent', () => { - let component: KubernetesNodeCapacityComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeCapacityComponent], - imports: BaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeCapacityComponent); - component = fixture.componentInstance; - component.row = { - metadata: { - namespace: 'test', - name: 'test', - uid: 'test' - }, - status: { - conditions: [], - addresses: [], - images: [], - capacity: { - pods: 100, - memory: '100Ki', - cpu: 100 - } - }, - spec: { - containers: [], - nodeName: 'test', - schedulerName: 'test', - initContainers: [] - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts deleted file mode 100644 index bd000ef84d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-capacity/kubernetes-node-capacity.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; - -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; - -@Component({ - selector: 'app-kubernetes-node-capacity', - templateUrl: './kubernetes-node-capacity.component.html', - styleUrls: ['./kubernetes-node-capacity.component.scss'], - encapsulation: ViewEncapsulation.None, -}) -export class KubernetesNodeCapacityComponent extends TableCellCustom { - - constructor() { - super(); - } - - public getMemory(memoryCapacity: string) { - if (memoryCapacity.endsWith('Ki')) { - const value = parseInt(memoryCapacity, 10); - return (value * 1024); - - } - return memoryCapacity; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html deleted file mode 100644 index 99161c715c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.html +++ /dev/null @@ -1 +0,0 @@ -{{row.metadata.name}} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts deleted file mode 100644 index d84951cb45..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.spec.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeLinkComponent } from './kubernetes-node-link.component'; -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubernetesNodeLinkComponent', () => { - let component: KubernetesNodeLinkComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeLinkComponent], - imports: KubernetesBaseTestModules, - providers: [KubernetesEndpointService, BaseKubeGuid] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeLinkComponent); - component = fixture.componentInstance; - component.row = { - metadata: { - namespace: 'test', - name: 'test', - uid: 'test' - }, - status: { - conditions: [], - addresses: [], - images: [] - }, - spec: { - containers: [], - nodeName: 'test', - schedulerName: 'test', - initContainers: [] - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts deleted file mode 100644 index 2d6f5059ca..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesNode } from '../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-node-link', - templateUrl: './kubernetes-node-link.component.html', - styleUrls: ['./kubernetes-node-link.component.scss'] -}) -export class KubernetesNodeLinkComponent extends TableCellCustom implements OnInit { - - public nodeLink; - constructor( - private kubeEndpointService: KubernetesEndpointService - ) { - super(); - } - - ngOnInit() { - this.nodeLink = `/kubernetes/${this.kubeEndpointService.kubeGuid}/nodes/${this.row.metadata.name}`; - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html deleted file mode 100644 index 8b8e62ef45..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.html +++ /dev/null @@ -1,16 +0,0 @@ -
- - - Condition - - -
- - - - -
- - - -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss deleted file mode 100644 index 4e825883e2..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.kubernetes-node-condition-card { - height: 100% -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts deleted file mode 100644 index eddc56d10f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeConditionCardComponent } from './kubernetes-node-condition-card.component'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { BaseKubeGuid } from '../../../../kubernetes-page.types'; -import { KubernetesNodeConditionComponent } from './kubernetes-node-condition/kubernetes-node-condition.component'; -import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module'; - -xdescribe('KubernetesNodeConditionCardComponent', () => { - let component: KubernetesNodeConditionCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeConditionCardComponent, KubernetesNodeConditionComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeConditionCardComponent); - component = fixture.componentInstance; - - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts deleted file mode 100644 index b5b23e91d4..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition-card.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { map } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { KubernetesNode, Condition } from '../../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-node-condition-card', - templateUrl: './kubernetes-node-condition-card.component.html', - styleUrls: ['./kubernetes-node-condition-card.component.scss'] -}) -export class KubernetesNodeConditionCardComponent implements OnInit { - node$: Observable; - condition$: Observable; - outOfDisk$: Observable; - diskPressure$: Observable; - memoryPressure$: Observable; - ready$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public kubeNodeService: KubernetesNodeService - ) { } - - ngOnInit() { - - this.node$ = this.kubeNodeService.node$.pipe( - map(p => p.entity) - ); - this.condition$ = this.node$.pipe( - map(node => node.status.conditions) - ); - - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html deleted file mode 100644 index ba3e2e2109..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
- {{ icons[condition][0] }} -
- {{ titles[condition] }} -
-
- -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss deleted file mode 100644 index f9bec88545..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.scss +++ /dev/null @@ -1,21 +0,0 @@ -.kube-node-condition { - align-items: center; - display: flex; - flex-direction: row; - justify-content: space-between; - margin-right: 20px; - padding-top: 20px; - - &__title { - align-items: center; - display: flex; - justify-content: center; - - &__span { - margin-left: 10px; - } - } - &__indicator { - min-width: 50px; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts deleted file mode 100644 index 42a5df256f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component.ts +++ /dev/null @@ -1,65 +0,0 @@ -import { Component, Input, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; - -import { KubernetesNodeService } from '../../../../../services/kubernetes-node.service'; -import { Condition, ConditionType } from '../../../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-node-condition', - templateUrl: './kubernetes-node-condition.component.html', - styleUrls: ['./kubernetes-node-condition.component.scss'] -}) -export class KubernetesNodeConditionComponent implements OnInit { - - - @Input() - condition: ConditionType; - condition$: Observable; - - @Input() - inverse = false; - - public titles = { - Ready: 'Ready', - OutOfDisk: 'Out of Disk', - MemoryPressure: 'Memory Pressure', - DiskPressure: 'Disk Pressure' - }; - - public icons = { - Ready: ['done_outline', 'material-icons'], - OutOfDisk: ['storage', 'material-icons'], - MemoryPressure: ['memory', 'material-icons'], - DiskPressure: ['storage', 'material-icons'], - }; - - constructor( - public kubeNodeService: KubernetesNodeService - ) { } - - ngOnInit() { - this.condition$ = this.kubeNodeService.node$.pipe( - filter(p => !!p && !!p.entity), - map(p => p.entity.status.conditions), - map(conditions => conditions.filter(o => o.type === this.condition)[0]) - ); - } - - shouldBeGreen(condition: Condition) { - if (!condition) { - return false; - } - if (condition.status === 'True') { - if (condition.type === ConditionType.Ready) { - return true; - } - return false; - } else if (condition.status === 'False') { - if (condition.type === ConditionType.Ready) { - return false; - } - return true; - } - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html deleted file mode 100644 index 1876674daa..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.html +++ /dev/null @@ -1,19 +0,0 @@ -
- - - Node Information - - -
- {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.operatingSystem }} - {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.architecture }} - {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.osImage }} - {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.kernelVersion }} - {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.kubeletVersion }} - {{ (kubeNodeService.nodeEntity$ | async)?.status.nodeInfo.kubeProxyVersion }} -
- - - -
- \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss deleted file mode 100644 index eddb307ce7..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.app-kubernetes-node-info-card{ - height: 100%; -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts deleted file mode 100644 index e90484e382..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeInfoCardComponent } from './kubernetes-node-info-card.component'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { BaseKubeGuid } from '../../../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module'; - -describe('KubernetesNodeInfoCardComponent', () => { - let component: KubernetesNodeInfoCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeInfoCardComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesNodeService, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeInfoCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts deleted file mode 100644 index c4e39b6576..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-info-card/kubernetes-node-info-card.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; - -@Component({ - selector: 'app-kubernetes-node-info-card', - templateUrl: './kubernetes-node-info-card.component.html', - styleUrls: ['./kubernetes-node-info-card.component.scss'] -}) -export class KubernetesNodeInfoCardComponent { - constructor( public kubeNodeService: KubernetesNodeService ) {} -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html deleted file mode 100644 index d5347278d9..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - Summary - - -
- {{ (kubeNodeService.nodeEntity$ | async)?.metadata.name }} - {{ (kubeNodeService.nodeEntity$ | async)?.metadata.creationTimestamp | date:'medium' }} -
- - - -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss deleted file mode 100644 index 42591c3cc6..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.kubernetes-node-summary-card { - height: 100% -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts deleted file mode 100644 index a44786721a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { KubernetesBaseTestModules } from './../../../../kubernetes.testing.module'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card.component'; -import { BaseKubeGuid } from '../../../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; - -describe('KubernetesNodeSummaryCardComponent', () => { - let component: KubernetesNodeSummaryCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeSummaryCardComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeSummaryCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts deleted file mode 100644 index f50366727d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary-card/kubernetes-node-summary-card.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component } from '@angular/core'; -import { Observable } from 'rxjs'; -import { KubernetesNode } from '../../../../store/kube.types'; -import { AppChip } from '../../../../../../shared/components/chips/chips.component'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; - -@Component({ - selector: 'app-kubernetes-node-summary-card', - templateUrl: './kubernetes-node-summary-card.component.html', - styleUrls: ['./kubernetes-node-summary-card.component.scss'] -}) -export class KubernetesNodeSummaryCardComponent { - node$: Observable; - labels$: Observable; - annotations$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public kubeNodeService: KubernetesNodeService - ) { } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html deleted file mode 100644 index 271d010719..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.html +++ /dev/null @@ -1,29 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts deleted file mode 100644 index ee97b1cac5..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../../../services/kubernetes-node.service'; -import { - KubernetesNodeConditionCardComponent, -} from './kubernetes-node-condition-card/kubernetes-node-condition-card.component'; -import { - KubernetesNodeConditionComponent, -} from './kubernetes-node-condition-card/kubernetes-node-condition/kubernetes-node-condition.component'; -import { KubernetesNodeInfoCardComponent } from './kubernetes-node-info-card/kubernetes-node-info-card.component'; -import { KubernetesNodeSummaryCardComponent } from './kubernetes-node-summary-card/kubernetes-node-summary-card.component'; -import { KubernetesNodeSummaryComponent } from './kubernetes-node-summary.component'; -import { KubernetesNodeTagsCardComponent } from './kubernetes-node-tags-card/kubernetes-node-tags-card.component'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubernetesNodeSummaryComponent', () => { - let component: KubernetesNodeSummaryComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeSummaryComponent, - KubernetesNodeConditionComponent, - KubernetesNodeConditionCardComponent, - KubernetesNodeSummaryCardComponent, - KubernetesNodeInfoCardComponent, - KubernetesNodeTagsCardComponent, - ], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeSummaryComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts deleted file mode 100644 index 3405e304ce..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-summary.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import { KubernetesNodeService } from '../../../services/kubernetes-node.service'; - -@Component({ - selector: 'app-kubernetes-node-summary', - templateUrl: './kubernetes-node-summary.component.html', - styleUrls: ['./kubernetes-node-summary.component.scss'] -}) -export class KubernetesNodeSummaryComponent { - constructor( - public kubeNodeService: KubernetesNodeService - ) { } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html deleted file mode 100644 index f327c96f5d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.html +++ /dev/null @@ -1,13 +0,0 @@ -
- - - {{ title }} - - -
- -
- - - -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts deleted file mode 100644 index 1606d9d782..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.spec.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodeTagsCardComponent } from './kubernetes-node-tags-card.component'; -import { BaseKubeGuid } from '../../../../kubernetes-page.types'; -import { KubernetesEndpointService } from '../../../../services/kubernetes-endpoint.service'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { KubernetesBaseTestModules } from '../../../../kubernetes.testing.module'; - -describe('KubernetesNodeTagsCardComponent', () => { - let component: KubernetesNodeTagsCardComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodeTagsCardComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService, KubernetesNodeService], - - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodeTagsCardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts deleted file mode 100644 index 4239df39d0..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-node-summary/kubernetes-node-tags-card/kubernetes-node-tags-card.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { Observable } from 'rxjs'; -import { AppChip } from '../../../../../../shared/components/chips/chips.component'; -import { KubernetesNodeService } from '../../../../services/kubernetes-node.service'; -import { map, tap } from 'rxjs/operators'; - -@Component({ - selector: 'app-kubernetes-node-tags-card', - templateUrl: './kubernetes-node-tags-card.component.html', - styleUrls: ['./kubernetes-node-tags-card.component.scss'] -}) -export class KubernetesNodeTagsCardComponent implements OnInit { - - - @Input() - mode: string; - - @Input() - title: string; - - chipTags$: Observable; - - constructor( - public kubeNodeService: KubernetesNodeService - ) { } - - ngOnInit() { - this.chipTags$ = this.kubeNodeService.nodeEntity$.pipe( - map(node => this.getTags(node.metadata[this.mode])), - ); - } - - - private getTags(tags: {}) { - const labelEntries = Object.entries(tags); - return labelEntries.map(t => ({ - value: `${t[0]}:${t[1]}` - })); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts deleted file mode 100644 index a64f8b5d5a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { getPaginationKey } from '../../../../../../store/src/actions/pagination.actions'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; -import { KubernetesNode } from '../../store/kube.types'; -import { GetKubernetesNodes } from '../../store/kubernetes.actions'; -import { kubernetesNodesSchemaKey } from '../../store/kubernetes.entities'; - -export class KubernetesNodesDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig - ) { - super({ - store, - action: new GetKubernetesNodes(kubeGuid.guid), - schema: entityFactory(kubernetesNodesSchemaKey), - getRowUniqueId: getKubeAPIResourceGuid, - paginationKey: getPaginationKey(kubernetesNodesSchemaKey, kubeGuid.guid), - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts deleted file mode 100644 index cac6ca083e..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-list-config.service.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { ConditionType, KubernetesNode } from '../../store/kube.types'; -import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; -import { getConditionSort } from '../kube-sort.helper'; -import { ConditionCellComponent, InverseConditionCellComponent } from './condition-cell/condition-cell.component'; -import { KubernetesNodeCapacityComponent } from './kubernetes-node-capacity/kubernetes-node-capacity.component'; -import { KubernetesNodeLinkComponent } from './kubernetes-node-link/kubernetes-node-link.component'; -import { KubernetesNodesDataSource } from './kubernetes-nodes-data-source'; -import { NodePodCountComponent } from './node-pod-count/node-pod-count.component'; - -@Injectable() -export class KubernetesNodesListConfigService implements IListConfig { - nodesDataSource: KubernetesNodesDataSource; - - columns: Array> = [ - { - columnId: 'name', headerCell: () => 'Name', - cellComponent: KubernetesNodeLinkComponent, - sort: { - type: 'sort', - orderKey: 'name', - field: 'metadata.name' - }, - cellFlex: '5', - }, - { - columnId: 'ready', headerCell: () => 'Ready', - cellConfig: { - conditionType: ConditionType.Ready - }, - cellComponent: ConditionCellComponent, - - sort: getConditionSort(ConditionType.Ready), - cellFlex: '2', - }, - { - columnId: 'diskPressure', headerCell: () => 'Disk Pressure', - cellComponent: InverseConditionCellComponent, - cellConfig: { - conditionType: ConditionType.DiskPressure - }, - sort: getConditionSort(ConditionType.DiskPressure), - cellFlex: '2', - }, - { - columnId: 'memPressure', headerCell: () => 'Memory Pressure', - cellComponent: InverseConditionCellComponent, - cellConfig: { - conditionType: ConditionType.MemoryPressure - }, - sort: getConditionSort(ConditionType.MemoryPressure), - cellFlex: '2', - }, - { - columnId: 'numPods', headerCell: () => 'No. of Pods', - cellComponent: NodePodCountComponent, - cellFlex: '2', - }, - { - columnId: 'capacity', headerCell: () => 'Capacity', - cellComponent: KubernetesNodeCapacityComponent, - cellFlex: '5', - }, - ]; - - pageSizeOptions = defaultHelmKubeListPageSize; - viewType = ListViewTypes.TABLE_ONLY; - - enableTextFilter = true; - text = { - filter: 'Filter by Name', - noEntries: 'There are no nodes' - }; - - getGlobalActions = () => null; - getMultiActions = () => []; - getSingleActions = () => []; - getColumns = () => this.columns; - getDataSource = () => this.nodesDataSource; - getMultiFiltersConfigs = () => []; - - constructor( - store: Store, - kubeId: BaseKubeGuid, - ) { - this.nodesDataSource = new KubernetesNodesDataSource(store, kubeId, this); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html deleted file mode 100644 index b39b6b7527..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
- {{ podCount$ | async }} -
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss deleted file mode 100644 index d82f191cdb..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.node-pod-count { - font-size: 18px; -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts deleted file mode 100644 index d77863ac9e..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NodePodCountComponent } from './node-pod-count.component'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('NodePodCountComponent', () => { - let component: NodePodCountComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [NodePodCountComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(NodePodCountComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts deleted file mode 100644 index 870883c356..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/node-pod-count/node-pod-count.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesNode } from '../../../store/kube.types'; - -@Component({ - selector: 'app-node-pod-count', - templateUrl: './node-pod-count.component.html', - styleUrls: ['./node-pod-count.component.scss'] -}) -export class NodePodCountComponent extends TableCellCustom implements OnInit { - podCount$: Observable; - - constructor( - private kubeEndpointService: KubernetesEndpointService - ) { - super(); - } - - ngOnInit() { - - this.podCount$ = this.kubeEndpointService.pods$.pipe( - map(pods => pods.filter(p => p.spec.nodeName === this.row.metadata.name)), - map(p => `${p.length} / ${this.row.status.capacity.pods}`) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html deleted file mode 100644 index 45d06ab580..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts deleted file mode 100644 index cd0aaead9c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesPodTagsComponent } from './kubernetes-pod-tags.component'; -import { KubernetesStatus } from '../../../store/kube.types'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('KubernetesPodTagsComponent', () => { - let component: KubernetesPodTagsComponent; - let fixture: ComponentFixture>; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesPodTagsComponent], - imports: KubernetesBaseTestModules - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesPodTagsComponent); - component = fixture.componentInstance; - component.row = { - spec: {}, - status: { - phase: KubernetesStatus.RUNNING - }, - metadata: { - namespace: 'test', - name: 'test', - uid: 'test', - labels: {} - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts deleted file mode 100644 index 7d1eef9952..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-tags/kubernetes-pod-tags.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { AppChip } from '../../../../../shared/components/chips/chips.component'; -import { PodLabel, KubeAPIResource } from '../../../store/kube.types'; - -@Component({ - selector: 'app-kubernetes-pod-tags', - templateUrl: './kubernetes-pod-tags.component.html', - styleUrls: ['./kubernetes-pod-tags.component.scss'] -}) -export class KubernetesPodTagsComponent extends TableCellCustom implements OnInit { - - tags: AppChip[] = []; - - constructor() { - super(); - } - - ngOnInit() { - const labels = this.row.metadata.labels; - for (const label in labels) { - if (labels.hasOwnProperty(label)) { - this.tags.push({ - value: `${label}:${labels[label]}`, - key: { - key: label, - value: labels[label] - } - }); - } - } - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts deleted file mode 100644 index dd0d9a350c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; -import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPods } from '../../store/kubernetes.actions'; -import { kubernetesPodsSchemaKey } from '../../store/kubernetes.entities'; - -export class KubernetesPodsDataSource extends ListDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig - ) { - const action = new GetKubernetesPods(kubeGuid.guid); - super({ - store, - action, - schema: entityFactory(kubernetesPodsSchemaKey), - getRowUniqueId: getKubeAPIResourceGuid, - paginationKey: action.paginationKey, - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts deleted file mode 100644 index 3c097b2cbd..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-list-config.service.ts +++ /dev/null @@ -1,114 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { ITableColumn } from '../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesPod } from '../../store/kube.types'; -import { defaultHelmKubeListPageSize } from '../kube-helm-list-types'; -import { getContainerLengthSort } from '../kube-sort.helper'; -import { KubernetesPodsDataSource } from './kubernetes-pods-data-source'; -import { PodNameLinkComponent } from './pod-name-link/pod-name-link.component'; - -@Injectable() -export class KubernetesPodsListConfigService implements IListConfig { - podsDataSource: KubernetesPodsDataSource; - - columns: Array> = [ - { - columnId: 'name', headerCell: () => 'Name', - cellComponent: PodNameLinkComponent, - sort: { - type: 'sort', - orderKey: 'name', - field: 'metadata.name' - }, - cellFlex: '5', - }, - // TODO: See #150 - keep out RC bring back after demo - // { - // columnId: 'tags', headerCell: () => 'Tags', - // cellComponent: KubernetesPodTagsComponent, - // cellFlex: '5', - // }, - { - columnId: 'containers', headerCell: () => 'No. of Containers', - cellDefinition: { - valuePath: 'spec.containers.length' - }, - sort: getContainerLengthSort, - cellFlex: '2', - }, - { - columnId: 'namespace', headerCell: () => 'Namespace', - cellDefinition: { - valuePath: 'metadata.namespace' - }, - sort: { - type: 'sort', - orderKey: 'namespace', - field: 'metadata.namespace' - }, - cellFlex: '5', - }, - { - columnId: 'node', headerCell: () => 'Node', - cellDefinition: { - valuePath: 'spec.nodeName' - }, - sort: { - type: 'sort', - orderKey: 'node', - field: 'spec.nodeName' - }, - cellFlex: '5', - }, - { - columnId: 'status', headerCell: () => 'Status', - cellDefinition: { - valuePath: 'status.phase' - }, - sort: { - type: 'sort', - orderKey: 'status', - field: 'status.phase' - }, - cellFlex: '5', - }, - { - columnId: 'container-status', headerCell: () => `Ready Containers`, - cellDefinition: { - getValue: (row) => { - const readyPods = row.status.containerStatuses.filter(status => status.ready).length; - const allContainers = row.status.containerStatuses.length; - return `${readyPods} / ${allContainers}`; - } - }, - cellFlex: '5', - }, - ]; - - pageSizeOptions = defaultHelmKubeListPageSize; - viewType = ListViewTypes.TABLE_ONLY; - enableTextFilter = true; - text = { - filter: 'Filter by Name', - noEntries: 'There are no pods' - }; - - getGlobalActions = () => null; - getMultiActions = () => []; - getSingleActions = () => []; - getColumns = () => this.columns; - getDataSource = () => this.podsDataSource; - getMultiFiltersConfigs = () => []; - - constructor( - store: Store, - kubeId: BaseKubeGuid, - ) { - this.podsDataSource = new KubernetesPodsDataSource(store, kubeId, this); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html deleted file mode 100644 index c035910aa9..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.html +++ /dev/null @@ -1,2 +0,0 @@ -{{row.metadata.name}} -{{row.metadata.name}} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts deleted file mode 100644 index 1e84e7ab51..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.spec.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PodNameLinkComponent } from './pod-name-link.component'; -import { BaseKubeGuid } from '../../../kubernetes-page.types'; -import { HelmReleaseService } from '../../../services/helm-release.service'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { KubernetesStatus } from '../../../store/kube.types'; -import { KubernetesBaseTestModules } from '../../../kubernetes.testing.module'; - -describe('PodNameLinkComponent', () => { - let component: PodNameLinkComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [PodNameLinkComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, HelmReleaseService, KubernetesEndpointService] - - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PodNameLinkComponent); - component = fixture.componentInstance; - component.row = { - metadata: { - namespace: 'test', - name: 'test', - uid: 'test' - }, - status: { - phase: KubernetesStatus.ACTIVE - }, - spec: { - containers: [], - nodeName: 'test', - schedulerName: 'test', - initContainers: [], - } - }; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts deleted file mode 100644 index 636b87ed1a..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/pod-name-link/pod-name-link.component.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { KubernetesPod } from '../../../store/kube.types'; -import { TableCellCustom } from '../../../../../shared/components/list/list.types'; -import { ActivatedRoute } from '@angular/router'; -import { getIdFromRoute } from '../../../../../features/cloud-foundry/cf.helpers'; -import { EndpointsService } from '../../../../../core/endpoints.service'; -import { KubernetesEndpointService } from '../../../services/kubernetes-endpoint.service'; -import { first } from 'rxjs/operators'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'app-pod-name-link', - templateUrl: './pod-name-link.component.html', - styleUrls: ['./pod-name-link.component.scss'] -}) -export class PodNameLinkComponent extends TableCellCustom implements OnInit { - routerLink: string[]; - hasMetrics$: Observable; - constructor( - private activatedRoute: ActivatedRoute, - private endpointsService: EndpointsService, - private kubeEndpointService: KubernetesEndpointService - ) { - super(); - } - - ngOnInit() { - this.hasMetrics$ = this.endpointsService.hasMetrics(this.kubeEndpointService.kubeGuid).pipe( - first() - ); - const namespace = getIdFromRoute(this.activatedRoute, 'namespaceName'); - if (!namespace) { - this.routerLink = [this.row.metadata.namespace, this.row.metadata.name]; - } else { - this.routerLink = [this.row.metadata.name]; - } - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts deleted file mode 100644 index 48eb2035dc..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-data-source.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Store } from '@ngrx/store'; -import { map } from 'rxjs/operators'; - -import { AppState } from '../../../../../../store/src//app-state'; -import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { HelmReleaseService } from '../../services/helm-release.service'; -import { KubeService } from '../../store/kube.types'; -import { GetKubernetesServices } from '../../store/kubernetes.actions'; -import { BaseKubernetesServicesDataSource } from '../kubernetes-services-data-source'; - - -export class KubernetesHelmReleaseServicesDataSource extends BaseKubernetesServicesDataSource { - - constructor( - store: Store, - kubeGuid: BaseKubeGuid, - listConfig: IListConfig, - helmReleaseService: HelmReleaseService, - ) { - const action = new GetKubernetesServices(kubeGuid.guid); - super( - store, - action, - listConfig, - map((services: KubeService[]) => services.filter(svc => - svc.metadata.labels && - svc.metadata.labels['app.kubernetes.io/instance'] === helmReleaseService.helmReleaseName - )) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts deleted file mode 100644 index 5cd42f0c72..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-release-services/kubernetes-release-services-list-config.service.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { HelmReleaseService } from '../../services/helm-release.service'; -import { BaseKubernetesServicesListConfig } from '../kubernetes-service-list-config.service'; -import { KubernetesHelmReleaseServicesDataSource } from './kubernetes-release-services-data-source'; - -@Injectable() -export class KubernetesReleaseServicesListConfig extends BaseKubernetesServicesListConfig { - podsDataSource: KubernetesHelmReleaseServicesDataSource; - - constructor( - store: Store, - kubeId: BaseKubeGuid, - helmReleaseService: HelmReleaseService - ) { - super(); - this.podsDataSource = new KubernetesHelmReleaseServicesDataSource(store, kubeId, this, helmReleaseService); - } - getDataSource = () => this.podsDataSource; - - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts deleted file mode 100644 index b2dc99e0a6..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-list-config.service.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source'; -import { ITableColumn } from '../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListViewTypes } from '../../../shared/components/list/list.component.types'; -import { - KubernetesServicePortsComponent, -} from './kubernetes-service-ports/kubernetes-service-ports.component'; -import { KubeService } from '../store/kube.types'; -import { defaultHelmKubeListPageSize } from './kube-helm-list-types'; - - -export abstract class BaseKubernetesServicesListConfig implements IListConfig { - columns: Array> = [ - { - columnId: 'name', headerCell: () => 'Name', - cellDefinition: { - valuePath: 'metadata.name' - }, - sort: { - type: 'sort', - orderKey: 'name', - field: 'metadata.name' - }, - cellFlex: '4', - }, - { - columnId: 'clusterIp', - headerCell: () => 'Cluster IP', - cellDefinition: { - valuePath: 'spec.clusterIP' - }, - cellFlex: '2' - }, - { - columnId: 'portType', - headerCell: () => 'Port Type', - cellDefinition: { - valuePath: 'spec.type' - }, - cellFlex: '2' - }, - { - columnId: 'Ports', - headerCell: () => 'Ports', - cellComponent: KubernetesServicePortsComponent, - cellFlex: '4' - }, - ]; - - pageSizeOptions = defaultHelmKubeListPageSize; - viewType = ListViewTypes.TABLE_ONLY; - enableTextFilter = true; - text = { - filter: 'Filter by Name', - noEntries: 'There are no services' - }; - getDataSource: () => ListDataSource; - - getGlobalActions = () => null; - getMultiActions = () => []; - getSingleActions = () => []; - getColumns = () => this.columns; - getMultiFiltersConfigs = () => []; - -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html deleted file mode 100644 index 35187acf75..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - -
NameProtocolPortTarget Port
- - {{ port.name}} - - {{port.name}} - {{port.protocol}}{{port.port}}{{port.targetPort}}
- -- \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss deleted file mode 100644 index 2aa856a7c5..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.scss +++ /dev/null @@ -1,11 +0,0 @@ -th { - font-style: italic; - font-weight: 400; -} - -th, -td { - padding-right: 15px; - text-align: left; -} - diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts deleted file mode 100644 index e04276cd96..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesServicePortsComponent } from './kubernetes-service-ports.component'; - -describe('KubernetesServicePortsComponent', () => { - let component: KubernetesServicePortsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ KubernetesServicePortsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesServicePortsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts deleted file mode 100644 index b2fb434d33..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-service-ports/kubernetes-service-ports.component.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Observable, of } from 'rxjs'; - -import { CardCell } from '../../../../shared/components/list/list.types'; -import { KubeService } from '../../../kubernetes/store/kube.types'; - -@Component({ - selector: 'app-kubernetes-service-ports', - templateUrl: './kubernetes-service-ports.component.html', - styleUrls: ['./kubernetes-service-ports.component.scss'] -}) -export class KubernetesServicePortsComponent extends CardCell { - private pRow: KubeService; - public kubeService$: Observable; - // Used when extending this class - public endpointId: string; - - @Input() set row(row: KubeService) { - if (!row) { - return; - } - this.pRow = row; - this.kubeService$ = of(row as KubeService); - } - get row(): KubeService { - return this.pRow; - } - - - getServiceLink(service: KubeService, port: { name: string }): string { - return `/kubernetes/svcproxy/${this.endpointId}/${service.metadata.namespace}/${service.metadata.name}/${port.name}`; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts deleted file mode 100644 index 34f82af00d..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services-data-source.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Store } from '@ngrx/store'; -import { OperatorFunction } from 'rxjs'; - -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { PaginatedAction } from '../../../../../store/src/types/pagination.types'; -import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../shared/components/list/list.component.types'; -import { getKubeAPIResourceGuid } from '../store/kube.selectors'; -import { KubeService } from '../store/kube.types'; -import { kubernetesServicesSchemaKey } from '../store/kubernetes.entities'; - -export class BaseKubernetesServicesDataSource extends ListDataSource { - - constructor( - store: Store, - action: PaginatedAction, - listConfig: IListConfig, - transformEntity: OperatorFunction = null - ) { - super({ - store, - action, - schema: entityFactory(kubernetesServicesSchemaKey), - getRowUniqueId: getKubeAPIResourceGuid, - paginationKey: action.paginationKey, - transformEntity, - isLocal: true, - listConfig, - transformEntities: [{ type: 'filter', field: 'metadata.name' }] - }); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html deleted file mode 100644 index 261e2aa33c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.html +++ /dev/null @@ -1,10 +0,0 @@ - -

{{ podName }}

-
-
- - - - - - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss deleted file mode 100644 index 882d178c00..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -.helm-release-pod { - display: flex; - flex-direction: column; - justify-content: space-around; -} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts deleted file mode 100644 index eba50aaea2..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../tab-nav.service'; -import { KubernetesBaseTestModules } from '../kubernetes.testing.module'; -import { PodMetricsComponent } from './pod-metrics.component'; - - -describe('PodMetricsComponent', () => { - let component: PodMetricsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [PodMetricsComponent], - imports: KubernetesBaseTestModules, - providers: [TabNavService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(PodMetricsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts deleted file mode 100644 index 7712fb4e15..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; -import * as moment from 'moment'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types'; -import { IMetricApplication } from '../../../../../store/src/types/metric.types'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers'; -import { MetricsConfig } from '../../../shared/components/metrics-chart/metrics-chart.component'; -import { MetricsLineChartConfig } from '../../../shared/components/metrics-chart/metrics-chart.types'; -import { - ChartDataTypes, - getMetricsChartConfigBuilder, -} from '../../../shared/components/metrics-chart/metrics.component.helpers'; -import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { HelmReleaseService } from '../services/helm-release.service'; -import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; -import { KubernetesService } from '../services/kubernetes.service'; -import { KubernetesPod } from '../store/kube.types'; -import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions'; -import { kubernetesPodsSchemaKey } from '../store/kubernetes.entities'; - -@Component({ - selector: 'app-pod-metrics', - templateUrl: './pod-metrics.component.html', - styleUrls: ['./pod-metrics.component.scss'], - providers: [ - { - provide: BaseKubeGuid, - useFactory: (activatedRoute: ActivatedRoute) => { - return { - guid: activatedRoute.snapshot.params.endpointId - }; - }, - deps: [ - ActivatedRoute - ] - }, - KubernetesService, - HelmReleaseService, - KubernetesEndpointService - ] -}) -export class PodMetricsComponent { - podName: string; - podEntity$: Observable>; - namespaceName: any; - public breadcrumbs$: Observable; - - public instanceMetricConfigs: [ - MetricsConfig>, - MetricsLineChartConfig - ][]; - - constructor( - public helmReleaseService: HelmReleaseService, - public activatedRoute: ActivatedRoute, - public store: Store, - public entityServiceFactory: EntityServiceFactory, - public kubeEndpointService: KubernetesEndpointService - ) { - this.podName = activatedRoute.snapshot.params.podName; - this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName'); - const namespace = getIdFromRoute(activatedRoute, 'namespace') ? getIdFromRoute(activatedRoute, 'namespace') : this.namespaceName; - const chartConfigBuilder = getMetricsChartConfigBuilder(result => `${result.metric.container_name}`); - const cpuChartConfigBuilder = getMetricsChartConfigBuilder - (result => !!result.metric.cpu ? `${result.metric.container_name}:${result.metric.cpu}` : `${result.metric.container_name}`); - const networkChartConfigBuilder = getMetricsChartConfigBuilder - (result => `Network Interface: ${result.metric.interface}`); - this.instanceMetricConfigs = [ - chartConfigBuilder( - new FetchKubernetesMetricsAction( - this.podName, - helmReleaseService.kubeGuid, - `container_memory_usage_bytes{pod_name="${this.podName}",namespace="${namespace}"}` - ), - 'Memory Usage (MB)', - ChartDataTypes.BYTES, - (series: ChartSeries[]) => { - return series.filter(s => !s.name.endsWith('POD')); - } - ), - cpuChartConfigBuilder( - new FetchKubernetesMetricsAction( - this.podName, - helmReleaseService.kubeGuid, - `container_cpu_usage_seconds_total{pod_name="${this.podName}",namespace="${namespace}"}` - ), - 'CPU Usage', - null, - (series: ChartSeries[]) => { - return series.filter(s => s.name.indexOf('POD') === -1); - }, - (tick: string) => { - const duration = moment.duration(parseFloat(tick) * 1000); - if (duration.asDays() >= 1) { - return `${duration.asDays().toPrecision(2)} d`; - } - if (duration.asHours() >= 1) { - return `${duration.asHours().toPrecision(2)} hrs`; - } - if (duration.asMinutes() >= 1) { - return `${duration.asMinutes().toPrecision(2)} min`; - } - if (duration.asSeconds() >= 1) { - return `${duration.asSeconds().toPrecision(2)} sec`; - } - if (duration.asMilliseconds() >= 1) { - return `${duration.asSeconds().toPrecision(2)} msec`; - } - return tick; - } - ), - networkChartConfigBuilder( - new FetchKubernetesMetricsAction( - this.podName, - helmReleaseService.kubeGuid, - `container_network_transmit_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}` - ), - 'Cumulative Data transmitted (MB)', - ChartDataTypes.BYTES - ), - networkChartConfigBuilder( - new FetchKubernetesMetricsAction( - this.podName, - helmReleaseService.kubeGuid, - `container_network_receive_bytes_total{pod_name="${this.podName}",namespace="${namespace}"}` - ), - 'Cumulative Data received (MB)', - ChartDataTypes.BYTES - ) - ]; - - - this.breadcrumbs$ = kubeEndpointService.endpoint$.pipe( - map(endpoint => { - - // check if this is being invoked from the node path - const nodeName = getIdFromRoute(activatedRoute, 'nodeName'); - if (!!nodeName) { - return [{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/nodes` }, - { value: nodeName, routerLink: `/kubernetes/${endpoint.entity.guid}/nodes/${nodeName}/pods` }, - ] - }]; - } - // check if this is being invoked from the namespace path - if (!!this.namespaceName) { - return [{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/namespaces` }, - { value: this.namespaceName, routerLink: `/kubernetes/${endpoint.entity.guid}/namespaces/${this.namespaceName}/pods` }, - ] - }]; - } - // Finally, check if this is being invoked from the helm-release path - const releaseName = getIdFromRoute(activatedRoute, 'releaseName'); - if (!!releaseName) { - return [{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/apps` }, - { value: releaseName, routerLink: `/kubernetes/${endpoint.entity.guid}/apps/${releaseName}/pods` }, - ] - }]; - } - return [{ - breadcrumbs: [ - { value: endpoint.entity.name, routerLink: `/kubernetes/${endpoint.entity.guid}/pods` }, - ] - }]; - }) - ); - this.podEntity$ = this.entityServiceFactory.create( - kubernetesPodsSchemaKey, - entityFactory(kubernetesPodsSchemaKey), - this.podName, - new GetKubernetesPod(this.podName, this.namespaceName, this.helmReleaseService.kubeGuid), - false - ).entityObs$; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts b/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts deleted file mode 100644 index a40b7a9944..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/services/helm-release.service.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; -import { combineLatest, Observable } from 'rxjs'; -import { filter, first, map, share } from 'rxjs/operators'; - -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { KubernetesApp, KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types'; -import { GetKubernetesApps, GetKubernetesServices } from '../store/kubernetes.actions'; -import { kubernetesAppsSchemaKey, kubernetesServicesSchemaKey } from '../store/kubernetes.entities'; -import { KubernetesEndpointService } from './kubernetes-endpoint.service'; - -@Injectable() -export class HelmReleaseService { - kubeGuid: string; - helmReleaseName: string; - helmRelease$: Observable; - deployments$: Observable; - statefulSets$: Observable; - services$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public activatedRoute: ActivatedRoute, - public store: Store, - public paginationMonitorFactory: PaginationMonitorFactory - ) { - - this.kubeGuid = kubeEndpointService.kubeGuid; - this.helmReleaseName = getIdFromRoute(activatedRoute, 'releaseName'); - - const action = new GetKubernetesApps(this.kubeGuid); - - this.helmRelease$ = getPaginationObservables({ - store: this.store, - action, - paginationMonitor: this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(kubernetesAppsSchemaKey) - ) - }, true).entities$.pipe( - filter(p => !!p), - map(p => p.filter(r => r.name === this.helmReleaseName)[0]), - share() - ); - - this.statefulSets$ = kubeEndpointService.statefulSets$.pipe( - map(p => p.filter(r => r.metadata.labels['app.kubernetes.io/instance'] === this.helmReleaseName)), - first(), - ); - - this.deployments$ = kubeEndpointService.deployments$.pipe( - map(p => p.filter(r => r.metadata.labels['app.kubernetes.io/instance'] === this.helmReleaseName)), - first() - ); - - const servicesAction = new GetKubernetesServices(this.kubeGuid); - - this.services$ = getPaginationObservables({ - store: this.store, - action: servicesAction, - paginationMonitor: this.paginationMonitorFactory.create( - servicesAction.paginationKey, - entityFactory(kubernetesServicesSchemaKey) - ) - }, true).entities$.pipe( - filter(p => !!p), - map(p => { - return p.filter(r => { - return r.metadata.labels.release === this.helmReleaseName; - }); - - }), - first() - ); - } - - public getReleasePods(pods: Observable): Observable { - return combineLatest(this.deployments$, this.statefulSets$, pods).pipe( - map(([deployments, statefulSets, allPods]) => { - return allPods.filter(p => { - const podName = p.metadata.name; - const filteredDeployments = deployments.filter(d => podName.startsWith(d.metadata.name)); - const filteredStatefulSets = statefulSets.filter(d => podName.startsWith(d.metadata.name)); - return filteredDeployments.length !== 0 || filteredStatefulSets.length !== 0; - }); - }) - ); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts deleted file mode 100644 index ef3390f4fb..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { filter, first, map, shareReplay, startWith, switchMap } from 'rxjs/operators'; - -import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions'; -import { AppState } from '../../../../../store/src/app-state'; -import { endpointSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { BaseKubeGuid } from '../kubernetes-page.types'; -import { KubernetesDeployment, KubernetesPod, KubernetesStatefulSet, KubeService } from '../store/kube.types'; -import { - GeKubernetesDeployments, - GetKubernetesDashboard, - GetKubernetesPods, - GetKubernetesServices, - GetKubernetesStatefulSets, - KubePaginationAction, -} from '../store/kubernetes.actions'; -import { KubeDashboardStatus } from '../store/kubernetes.effects'; -import { - kubernetesDashboardSchemaKey, - kubernetesDeploymentsSchemaKey, - kubernetesPodsSchemaKey, - kubernetesServicesSchemaKey, - kubernetesStatefulSetsSchemaKey, -} from '../store/kubernetes.entities'; - -@Injectable() -export class KubernetesEndpointService { - info$: Observable>; - cfInfoEntityService: EntityService; - endpoint$: Observable>; - kubeEndpointEntityService: EntityService; - connected$: Observable; - currentUser$: Observable; - kubeGuid: string; - deployments$: Observable; - statefulSets$: Observable; - services$: Observable; - pods$: Observable; - kubeDashboardEnabled$: Observable; - - constructor( - public baseKube: BaseKubeGuid, - private store: Store, - private entityServiceFactory: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory - ) { - this.kubeGuid = baseKube.guid; - this.kubeEndpointEntityService = this.entityServiceFactory.create( - endpointSchemaKey, - entityFactory(endpointSchemaKey), - this.kubeGuid, - new GetAllEndpoints(), - false - ); - - this.constructCoreObservables(); - } - - constructCoreObservables() { - this.endpoint$ = this.kubeEndpointEntityService.waitForEntity$; - - this.connected$ = this.endpoint$.pipe( - map(p => p.entity.connectionStatus === 'connected') - ); - - this.currentUser$ = this.endpoint$.pipe(map(e => e.entity.user), shareReplay(1)); - - this.deployments$ = this.getObservable( - new GeKubernetesDeployments(this.kubeGuid), - kubernetesDeploymentsSchemaKey - ); - - this.pods$ = this.getObservable( - new GetKubernetesPods(this.kubeGuid), - kubernetesPodsSchemaKey - ); - - this.statefulSets$ = this.getObservable( - new GetKubernetesStatefulSets(this.kubeGuid), - kubernetesStatefulSetsSchemaKey - ); - - this.services$ = this.getObservable( - new GetKubernetesServices(this.kubeGuid), - kubernetesServicesSchemaKey - ); - - const kubeDashboardEnabled$ = this.store.select('auth').pipe( - filter(auth => !!auth.sessionData['plugin-config']), - map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true'), - first(), - ); - - this.kubeDashboardEnabled$ = kubeDashboardEnabled$.pipe( - filter(enabled => enabled), - switchMap(() => this.entityServiceFactory.create( - kubernetesDashboardSchemaKey, - entityFactory(kubernetesDashboardSchemaKey), - this.kubeGuid, - new GetKubernetesDashboard(this.kubeGuid), - false - ).waitForEntity$.pipe(map(status => status.entity.installed)) - ), - startWith(false), - ); - } - - private getObservable(paginationAction: KubePaginationAction, schemaKey: string): Observable { - return getPaginationObservables({ - store: this.store, - action: paginationAction, - paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, entityFactory(schemaKey)) - }, true).entities$.pipe(filter(p => !!p), first()); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts deleted file mode 100644 index d027bd0215..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { filter, first, map, publishReplay } from 'rxjs/operators'; - -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { KubernetesNamespace } from '../store/kube.types'; -import { GetKubernetesNamespace } from '../store/kubernetes.actions'; -import { KubernetesEndpointService } from './kubernetes-endpoint.service'; -import { kubernetesNamespacesSchemaKey } from '../store/kubernetes.entities'; - -@Injectable() -export class KubernetesNamespaceService { - namespaceName: string; - kubeGuid: string; - namespace$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public activatedRoute: ActivatedRoute, - public store: Store, - public paginationMonitorFactory: PaginationMonitorFactory, - public entityServiceFactory: EntityServiceFactory, - ) { - - this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName'); - this.kubeGuid = kubeEndpointService.kubeGuid; - - const namespaceEntity = this.entityServiceFactory.create( - kubernetesNamespacesSchemaKey, - entityFactory(kubernetesNamespacesSchemaKey), - this.namespaceName, - new GetKubernetesNamespace(this.namespaceName, this.kubeGuid), - false - ); - - this.namespace$ = namespaceEntity.entityObs$.pipe( - filter(p => !!p), - map(p => p.entity ), - publishReplay(1), - first() - ); - - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts deleted file mode 100644 index 1ee52988e1..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { filter, first, map, shareReplay } from 'rxjs/operators'; - -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { getIdFromRoute } from '../../../features/cloud-foundry/cf.helpers'; -import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions'; -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory, metricSchemaKey } from '../../../../../store/src/helpers/entity-factory'; -import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { KubernetesNode, MetricStatistic } from '../store/kube.types'; -import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions'; -import { KubernetesEndpointService } from './kubernetes-endpoint.service'; -import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types'; -import { kubernetesNodesSchemaKey } from '../store/kubernetes.entities'; - - -export enum KubeNodeMetric { - CPU = 'container_cpu_usage_seconds_total', - MEMORY = 'container_memory_usage_bytes' -} - -@Injectable() -export class KubernetesNodeService { - public nodeName: string; - public kubeGuid: string; - public node$: Observable>; - nodeEntity$: Observable; - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public activatedRoute: ActivatedRoute, - public store: Store, - public paginationMonitorFactory: PaginationMonitorFactory, - public entityServiceFactory: EntityServiceFactory, - public entityMonitorFactory: EntityMonitorFactory - ) { - this.nodeName = getIdFromRoute(activatedRoute, 'nodeName'); - this.kubeGuid = kubeEndpointService.kubeGuid; - - const nodeEntityService = this.entityServiceFactory.create( - kubernetesNodesSchemaKey, - entityFactory(kubernetesNodesSchemaKey), - this.nodeName, - new GetKubernetesNode(this.nodeName, this.kubeGuid), - false - ); - - this.node$ = nodeEntityService.entityObs$.pipe( - filter(p => !!p && !!p.entity), - first(), - shareReplay(1), - ); - - this.nodeEntity$ = this.node$.pipe( - map(p => p.entity) - ); - } - - - - public setupMetricObservable(metric: KubeNodeMetric, metricStatistic: MetricStatistic) { - - const query = `${metricStatistic}(${metricStatistic}_over_time(${metric}{kubernetes_io_hostname="${this.nodeName}"}[1h]))`; - const metricsAction = new FetchKubernetesMetricsAction(this.nodeName, this.kubeGuid, query); - const metricsId = MetricsAction.buildMetricKey(this.nodeName, new MetricQueryConfig(query), true, MetricQueryType.QUERY); - const metricsMonitor = this.entityMonitorFactory.create(metricsId, metricSchemaKey, entityFactory(metricSchemaKey)); - this.store.dispatch(metricsAction); - const pollSub = metricsMonitor.poll(30000, () => this.store.dispatch(metricsAction), - request => ({ busy: request.fetching, error: request.error, message: request.message })) - .subscribe(); - return { - entity$: metricsMonitor.entity$.pipe(filter(metrics => !!metrics), map(metrics => { - const result = metrics.data && metrics.data.result; - if (!!result && result.length === 1) { - return result[0].value[1]; - } else { - return 0; - } - })), - pollerSub: pollSub - }; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts deleted file mode 100644 index 25226f09c8..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes.service.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { Injectable } from '@angular/core'; - -import { Store } from '@ngrx/store'; - -import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; -import { AppState } from '../../../../../store/src/app-state'; -import { endpointSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types'; -import { EndpointModel } from '../../../../../store/src/types/endpoint.types'; - -import { map, shareReplay, tap } from 'rxjs/operators'; -import { Observable } from 'rxjs'; - -@Injectable() -export class KubernetesService { - kubeEndpoints$: Observable; - kubeEndpointsMonitor: PaginationMonitor; - waitForAppEntity$: Observable>; - - constructor( - private store: Store, - private paginationMonitorFactory: PaginationMonitorFactory - ) { - this.kubeEndpointsMonitor = this.paginationMonitorFactory.create( - 'endpoint-list', - entityFactory(endpointSchemaKey) - ); - - this.kubeEndpoints$ = this.kubeEndpointsMonitor.currentPage$.pipe( - map(endpoints => endpoints.filter(e => e.cnsi_type === 'k8s')), - shareReplay(1) - ); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts deleted file mode 100644 index dd88469ca2..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { compose } from '@ngrx/store'; - -import { BasicKubeAPIResource, Metadata } from './kube.types'; - - -const getValueOrNull = (object, key) => - object ? (object[key] ? object[key] : null) : null; -export const getMetadataGuid = (metadata: Metadata): string => - getValueOrNull(metadata, 'uid'); - -export const getKubeAPIMetadata = ( - resource: BasicKubeAPIResource -): Metadata => getValueOrNull(resource, 'metadata'); - -export const getKubeAPIResourceGuid = compose( - getMetadataGuid, - getKubeAPIMetadata -); - - diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts deleted file mode 100644 index 4b4463ea13..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.types.ts +++ /dev/null @@ -1,456 +0,0 @@ -export interface KubernetesInfo { - nodes: {}; - pods: {}; -} - -export const KubernetesDefaultState = { - pods: {}, - namespaces: {}, - nodes: {} -}; - -export interface BasicKubeAPIResource { - metadata: { - uid: string - }; - status: any; - spec: any; -} - -export interface KubeAPIResource extends BasicKubeAPIResource { - metadata: Metadata; - status: BaseStatus; - spec: any; -} - -export interface KubeService extends BasicKubeAPIResource { - metadata: KubeServiceMetadata; - status: ServiceStatus; - spec: DeploymentSpec; -} - -export interface KubernetesStatefulSet extends BasicKubeAPIResource { - metadata: KubeServiceMetadata; - status: ServiceStatus; - spec: ServiceSpec; -} - -export interface DeploymentSpec { - replicas: number; - selector?: any; - template?: any; - strategy?: any; - revisionHistoryLimit: number; - progressDeadlineSeconds: number; - type?: string; -} - -export interface KubernetesDeployment extends BasicKubeAPIResource { - metadata: KubeServiceMetadata; - status: ServiceStatus; - spec: ServiceSpec; -} - -export interface ServiceStatus { - loadBalancer: LoadBalancerStatus; -} - -export interface LoadBalancerStatus { - ingress: LoadBalancerIngress[]; -} - -export interface LoadBalancerIngress { - hostname: string; - ip: string; -} -export interface ServiceSpec { - ports: Port[]; - clusterIP: string; - type: string; - sessionAffinity: string; - sessionAffinityConfig: GenericMap; - selector: GenericMap; - externalTrafficPolicy: string; -} - -export interface GenericMap { - [key: string]: string; -} - - -export interface KubernetesNode extends BasicKubeAPIResource { - metadata: Metadata; - status: NodeStatus; - spec: PodSpec; -} - -export interface KubernetesApp { - kubeId: string; - name: string; - pods: KubernetesPod[]; - namespace?: string; - createdAt: Date; - status: string; - version: string; - chartName: string; - appVersion: string; -} -export interface NodeStatus { - capacity?: Capacity; - allocatable?: Allocatable; - conditions: Condition[]; - addresses: Address[]; - daemonEndpoints?: DaemonEndpoints; - nodeInfo?: NodeInfo; - images: Image[]; -} - - -export interface Taint { - key: string; - effect: string; -} - -export interface Spec { - podCIDR: string; - externalID: string; - taints: Taint[]; -} - -export interface Capacity { - cpu: string; - memory: string; - pods: string; -} - -export interface Allocatable { - cpu: string; - memory: string; - pods: string; -} - -export enum ConditionType { - OutOfDisk = 'OutOfDisk', - MemoryPressure = 'MemoryPressure', - DiskPressure = 'DiskPressure', - Ready = 'Ready' -} - -export enum ConditionStatus { - False = 'False', - True = 'True' -} - -export interface Condition { - type: ConditionType; - status: ConditionStatus; - lastHeartbeatTime: Date; - lastTransitionTime: Date; - reason: string; - message: string; -} - -export interface Address { - type: string; - address: string; -} - -export interface KubeletEndpoint { - Port: number; -} - -export interface DaemonEndpoints { - kubeletEndpoint: KubeletEndpoint; -} - -export interface NodeInfo { - machineID: string; - systemUUID: string; - bootID: string; - kernelVersion: string; - osImage: string; - containerRuntimeVersion: string; - kubeletVersion: string; - kubeProxyVersion: string; - operatingSystem: string; - architecture: string; -} - -export interface Image { - names: string[]; - sizeBytes: number; -} - - -export interface KubernetesPod extends BasicKubeAPIResource { - metadata: Metadata; - status: PodStatus; - spec: PodSpec; -} - -export enum KubernetesStatus { - ACTIVE = 'Active', - RUNNING = 'Running', -} -export interface KubernetesNamespace extends BasicKubeAPIResource { - metadata: Metadata; - spec: { - finalizers: string[]; - }; - status: BaseStatus; -} - -export interface BaseStatus { - phase: KubernetesStatus; -} - -export interface PodStatus { - phase: KubernetesStatus; - conditions?: Condition[]; - message?: string; - reason?: string; - hostIP?: string; - podIP?: string; - startTime?: Date; - containerStatuses?: ContainerStatus[]; - qosClass?: string; - initContainerStatuses?: ContainerStatus[]; -} -export interface Condition { - type: ConditionType; - status: ConditionStatus; - lastProbeTime?: any; - lastTransitionTime: Date; -} - -export interface ContainerStatus { - name: string; - state: State; - lastState: State; - ready: boolean; - restartCount: number; - image: string; - imageID: string; - containerID: string; -} - -export interface State { - [key: string]: { - startedAt: Date; - }; -} - -export interface PodSpec { - volumes?: Volume[]; - containers: Container[]; - restartPolicy?: string; - terminationGracePeriodSeconds?: number; - dnsPolicy?: string; - serviceAccountName?: string; - serviceAccount?: string; - nodeName: string; - securityContext?: SecurityContext; - affinity?: Affinity; - schedulerName: string; - tolerations?: Toleration[]; - hostNetwork?: boolean; - initContainers: InitContainer[]; - nodeSelector?: NodeSelector; -} -export interface InitContainer { - name: string; - image: string; - command: string[]; - resources: Resources; - volumeMounts: VolumeMount[]; - terminationMessagePath: string; - terminationMessagePolicy: string; - imagePullPolicy: string; - securityContext: SecurityContext; -} - -export interface KubernetesConfigMap { - data: { - apiVersion: string, - binaryData: { - [key: string]: any, - }, - data: { - [key: string]: any, - }, - kind: string - }; - metadata: KubeServiceMetadata; -} -export interface Resources { - limits?: Limits; - requests?: Requests; -} - -export interface Limits { - memory: string; -} - -export interface Requests { - memory: string; - cpu: string; -} -export enum MetricStatistic { - AVERAGE = 'avg', - MAXIMUM = 'max', - MINOMUM = 'min' -} - -export interface VolumeMount { - name: string; - mountPath: string; - readOnly?: boolean; -} - -export interface BaseMetadata { - namespace: string; - name: string; - uid: string; -} - -export interface Metadata extends BaseMetadata { - resourceVersion?: string; - creationTimestamp?: Date; - deletionTimestamp?: Date; - labels?: Labels; - annotations?: Annotations; - kubeId?: string; - generation?: number; -} - -export interface KubeServiceMetadata extends Metadata { - selfLink: string; -} - -export interface Container { - name: string; - image: string; - command: string[]; - ports: Port[]; - resources: Resources; - volumeMounts: VolumeMount[]; - livenessProbe: Probe; - readinessProbe: Probe; - terminationMessagePath: string; - terminationMessagePolicy: string; - imagePullPolicy: string; - securityContext: SecurityContext; - args: string[]; - env: Env[]; -} - -export interface Probe { - httpGet: HttpGet; - initialDelaySeconds: number; - timeoutSeconds: number; - periodSeconds: number; - successThreshold: number; - failureThreshold: number; -} -export interface Env { - name: string; - value: string; - valueFrom?: any; -} - -export interface HttpGet { - path: string; - port: any; - scheme: string; -} - -export interface Port { - name: string; - containerPort: number; - protocol: string; - hostPort?: number; -} - -export interface MatchExpression { - key: string; - operator: string; - values: string[]; -} - -export interface LabelSelector { - matchExpressions: MatchExpression[]; -} - -export interface SecurityContext { - allowPrivilegeEscalation?: boolean; - privileged?: boolean; -} - - -export interface PodAffinityTerm { - labelSelector: LabelSelector; - topologyKey: string; -} - -export interface PreferredDuringSchedulingIgnoredDuringExecution { - weight: number; - podAffinityTerm: PodAffinityTerm; -} - -export interface PodAntiAffinity { - preferredDuringSchedulingIgnoredDuringExecution: PreferredDuringSchedulingIgnoredDuringExecution[]; -} - -export interface Affinity { - podAntiAffinity: PodAntiAffinity; -} - -export interface Toleration { - key: string; - operator: string; - effect: string; - tolerationSeconds?: number; -} - -export interface Labels { - [key: string]: string; -} - -export interface PodLabel { - key: string; - value: string; -} - -export interface Annotations { - [key: string]: string; -} -export interface OwnerReference { - [key: string]: string; -} - -export interface Volume { - name: string; - configMap: ConfigMap; - secret: Secret; - hostPath: HostPath; -} - - -export interface ConfigMap { - name: string; - items: Item[]; - defaultMode: number; -} - -export interface Secret { - secretName: string; - defaultMode: number; -} - -export interface HostPath { - path: string; - type: string; -} -export interface Item { - key: string; -} diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts deleted file mode 100644 index 128792277c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ /dev/null @@ -1,379 +0,0 @@ -import { SortDirection } from '@angular/material'; - -import { MetricQueryConfig, MetricsAction, MetricsChartAction } from '../../../../../store/src/actions/metrics.actions'; -import { getPaginationKey } from '../../../../../store/src/actions/pagination.actions'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { PaginatedAction, PaginationParam } from '../../../../../store/src/types/pagination.types'; -import { IRequestAction } from '../../../../../store/src/types/request.types'; -import { - kubernetesAppsSchemaKey, - kubernetesDashboardSchemaKey, - kubernetesDeploymentsSchemaKey, - kubernetesNamespacesSchemaKey, - kubernetesNodesSchemaKey, - kubernetesPodsSchemaKey, - kubernetesServicesSchemaKey, - kubernetesStatefulSetsSchemaKey, -} from './kubernetes.entities'; - -export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info'; -export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success'; -export const GET_RELEASE_POD_INFO_FAILURE = '[KUBERNETES Endpoint] Get Release Pods Info Failure'; - -export const GET_NODES_INFO = '[KUBERNETES Endpoint] Get Nodes Info'; -export const GET_NODES_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Nodes Info Success'; -export const GET_NODES_INFO_FAILURE = '[KUBERNETES Endpoint] Get Nodes Info Failure'; - -export const GET_NODE_INFO = '[KUBERNETES Endpoint] Get Node Info'; -export const GET_NODE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Node Info Success'; -export const GET_NODE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Node Info Failure'; - -export const GET_POD_INFO = '[KUBERNETES Endpoint] Get Pod Info'; -export const GET_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Pod Info Success'; -export const GET_POD_INFO_FAILURE = '[KUBERNETES Endpoint] Get Pod Info Failure'; - -export const GET_PODS_ON_NODE_INFO = '[KUBERNETES Endpoint] Get Pods on Node Info'; -export const GET_PODS_ON_NODE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Pods on Node Success'; -export const GET_PODS_ON_NODE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Pods on Node Failure'; - -export const GET_PODS_IN_NAMESPACE_INFO = '[KUBERNETES Endpoint] Get Pods in Namespace Info'; -export const GET_PODS_IN_NAMEPSACE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Pods in Namespace Success'; -export const GET_PODS_IN_NAMEPSACE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Pods in Namespace Failure'; - -export const GET_SERVICES_IN_NAMESPACE_INFO = '[KUBERNETES Endpoint] Get Services in Namespace Info'; -export const GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Services in Namespace Success'; -export const GET_SERVICES_IN_NAMESPACE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Services in Namespace Failure'; - -export const GET_NAMESPACES_INFO = '[KUBERNETES Endpoint] Get Namespaces Info'; -export const GET_NAMESPACES_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Namespaces Info Success'; -export const GET_NAMESPACES_INFO_FAILURE = '[KUBERNETES Endpoint] Get Namespaces Info Failure'; - -export const GET_NAMESPACE_INFO = '[KUBERNETES Endpoint] Get Namespace Info'; -export const GET_NAMESPACE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Namespace Info Success'; -export const GET_NAMESPACE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Namespace Info Failure'; - -export const GET_KUBERNETES_APP_INFO = '[KUBERNETES Endpoint] Get Kubernetes App Info'; -export const GET_KUBERNETES_APP_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Kubernetes App Info Success'; -export const GET_KUBERNETES_APP_INFO_FAILURE = '[KUBERNETES Endpoint] Get Kubernetes App Info Failure'; - -export const GET_SERVICE_INFO = '[KUBERNETES Endpoint] Get Services Info'; -export const GET_SERVICE_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Services Info Success'; -export const GET_SERVICE_INFO_FAILURE = '[KUBERNETES Endpoint] Get Services Info Failure'; - -export const GET_KUBE_POD = '[KUBERNETES Endpoint] Get K8S Pod Info'; -export const GET_KUBE_POD_SUCCESS = '[KUBERNETES Endpoint] Get K8S Pod Success'; -export const GET_KUBE_POD_FAILURE = '[KUBERNETES Endpoint] Get K8S Pod Failure'; - -export const GET_KUBE_STATEFULSETS = '[KUBERNETES Endpoint] Get K8S Stateful Sets Info'; -export const GET_KUBE_STATEFULSETS_SUCCESS = '[KUBERNETES Endpoint] Get Stateful Sets Success'; -export const GET_KUBE_STATEFULSETS_FAILURE = '[KUBERNETES Endpoint] Get Stateful Sets Failure'; - -export const GET_KUBE_DEPLOYMENT = '[KUBERNETES Endpoint] Get K8S Deployments Info'; -export const GET_KUBE_DEPLOYMENT_SUCCESS = '[KUBERNETES Endpoint] Get Deployments Success'; -export const GET_KUBE_DEPLOYMENT_FAILURE = '[KUBERNETES Endpoint] Get Deployments Failure'; - -export const GET_KUBE_DASHBOARD = '[KUBERNETES Endpoint] Get K8S Dashboard Info'; -export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard Success'; -export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure'; - - -const sortPodsByName = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' -}; - -export interface KubeAction extends IRequestAction { - kubeGuid: string; -} -export interface KubePaginationAction extends PaginatedAction, KubeAction { } - -export class GetKubernetesReleasePods implements KubePaginationAction { - - constructor(public kubeGuid: string, releaseName: string) { - this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `release-${releaseName}`, kubeGuid); - this.initialParams = { - labelSelector: `app.kubernetes.io/instance=${releaseName}`, - ...sortPodsByName - }; - } - initialParams: PaginationParam; - type = GET_RELEASE_POD_INFO; - entityKey = kubernetesPodsSchemaKey; - entity = [entityFactory(kubernetesPodsSchemaKey)]; - params: { labelSelector: string; }; - actions = [ - GET_RELEASE_POD_INFO, - GET_RELEASE_POD_INFO_SUCCESS, - GET_RELEASE_POD_INFO_FAILURE - ]; - paginationKey: string; -} - -export class KubeHealthCheck implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = kubeGuid + '-health-check'; - } - initialParams = { - limit: 1 - }; - type = GET_NODES_INFO; - entityKey = kubernetesNodesSchemaKey; - entity = [entityFactory(kubernetesNodesSchemaKey)]; - actions = [ - GET_NODES_INFO, - GET_NODES_INFO_SUCCESS, - GET_NODES_INFO_FAILURE - ]; - paginationKey: string; -} - -export class GetKubernetesNodes implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesNodesSchemaKey, kubeGuid); - } - type = GET_NODES_INFO; - entityKey = kubernetesNodesSchemaKey; - entity = [entityFactory(kubernetesNodesSchemaKey)]; - actions = [ - GET_NODES_INFO, - GET_NODES_INFO_SUCCESS, - GET_NODES_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' - }; -} - -export class GetKubernetesNode implements KubeAction { - constructor(public nodeName: string, public kubeGuid: string) { - } - type = GET_NODE_INFO; - entityKey = kubernetesNodesSchemaKey; - entity = [entityFactory(kubernetesNodesSchemaKey)]; - - actions = [ - GET_NODE_INFO, - GET_NODE_INFO_SUCCESS, - GET_NODE_INFO_FAILURE - ]; -} - -export class GetKubernetesNamespace implements KubeAction { - constructor(public namespaceName: string, public kubeGuid: string) { - } - type = GET_NAMESPACE_INFO; - entityKey = kubernetesNamespacesSchemaKey; - entity = [entityFactory(kubernetesNamespacesSchemaKey)]; - - actions = [ - GET_NAMESPACE_INFO, - GET_NAMESPACE_INFO_SUCCESS, - GET_NAMESPACE_INFO_FAILURE - ]; -} - -export class GetKubernetesPods implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, 'k8', kubeGuid); - } - type = GET_POD_INFO; - entityKey = kubernetesPodsSchemaKey; - entity = [entityFactory(kubernetesPodsSchemaKey)]; - actions = [ - GET_POD_INFO, - GET_POD_INFO_SUCCESS, - GET_POD_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - ...sortPodsByName - }; -} - -export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction { - constructor(public kubeGuid: string, public nodeName: string) { - this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `node-${nodeName}`, kubeGuid); - this.initialParams = { - fieldSelector: `spec.nodeName=${nodeName}`, - ...sortPodsByName - }; - } - type = GET_PODS_ON_NODE_INFO; - entityKey = kubernetesPodsSchemaKey; - entity = [entityFactory(kubernetesPodsSchemaKey)]; - actions = [ - GET_PODS_ON_NODE_INFO, - GET_PODS_ON_NODE_INFO_SUCCESS, - GET_PODS_ON_NODE_INFO_FAILURE - ]; - paginationKey: string; - initialParams: PaginationParam; -} - -export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAction { - constructor(public kubeGuid: string, public namespaceName: string) { - this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid); - } - type = GET_SERVICES_IN_NAMESPACE_INFO; - entityKey = kubernetesServicesSchemaKey; - entity = [entityFactory(kubernetesServicesSchemaKey)]; - actions = [ - GET_SERVICES_IN_NAMESPACE_INFO, - GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS, - GET_SERVICES_IN_NAMESPACE_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - ...sortPodsByName - }; -} - -export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction { - constructor(public kubeGuid: string, public namespaceName: string) { - this.paginationKey = getPaginationKey(kubernetesPodsSchemaKey, `ns-${namespaceName}`, kubeGuid); - } - type = GET_PODS_IN_NAMESPACE_INFO; - entityKey = kubernetesPodsSchemaKey; - entity = [entityFactory(kubernetesPodsSchemaKey)]; - actions = [ - GET_PODS_IN_NAMESPACE_INFO, - GET_PODS_IN_NAMEPSACE_INFO_SUCCESS, - GET_PODS_IN_NAMEPSACE_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - ...sortPodsByName - }; -} - -export class GetKubernetesNamespaces implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesNamespacesSchemaKey, kubeGuid); - } - type = GET_NAMESPACES_INFO; - entityKey = kubernetesNamespacesSchemaKey; - entity = [entityFactory(kubernetesNamespacesSchemaKey)]; - actions = [ - GET_NAMESPACES_INFO, - GET_NAMESPACES_INFO_SUCCESS, - GET_NAMESPACES_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' - }; -} - -export class GetKubernetesApps implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesAppsSchemaKey, kubeGuid); - } - type = GET_KUBERNETES_APP_INFO; - entityKey = kubernetesAppsSchemaKey; - entity = [entityFactory(kubernetesAppsSchemaKey)]; - actions = [ - GET_KUBERNETES_APP_INFO, - GET_KUBERNETES_APP_INFO_SUCCESS, - GET_KUBERNETES_APP_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' - }; -} - -export class GetKubernetesServices implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesServicesSchemaKey, kubeGuid); - } - type = GET_SERVICE_INFO; - entityKey = kubernetesServicesSchemaKey; - entity = [entityFactory(kubernetesServicesSchemaKey)]; - actions = [ - GET_SERVICE_INFO, - GET_SERVICE_INFO_SUCCESS, - GET_SERVICE_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' - }; -} - -export class GetKubernetesPod implements KubeAction { - constructor(public podName, public namespaceName, public kubeGuid) { - } - type = GET_KUBE_POD; - entityKey = kubernetesPodsSchemaKey; - entity = [entityFactory(kubernetesPodsSchemaKey)]; - actions = [ - GET_KUBE_POD, - GET_KUBE_POD_SUCCESS, - GET_KUBE_POD_FAILURE - ]; -} - -export class GetKubernetesStatefulSets implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesStatefulSetsSchemaKey, kubeGuid); - } - type = GET_KUBE_STATEFULSETS; - entityKey = kubernetesStatefulSetsSchemaKey; - entity = [entityFactory(kubernetesStatefulSetsSchemaKey)]; - actions = [ - GET_KUBE_STATEFULSETS, - GET_KUBE_STATEFULSETS_SUCCESS, - GET_KUBE_STATEFULSETS_FAILURE - ]; - paginationKey: string; -} - -export class GeKubernetesDeployments implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = getPaginationKey(kubernetesDeploymentsSchemaKey, kubeGuid); - } - type = GET_KUBE_DEPLOYMENT; - entityKey = kubernetesDeploymentsSchemaKey; - entity = [entityFactory(kubernetesDeploymentsSchemaKey)]; - actions = [ - GET_KUBE_DEPLOYMENT, - GET_KUBE_DEPLOYMENT_SUCCESS, - GET_KUBE_DEPLOYMENT_FAILURE - ]; - paginationKey: string; -} - -export class GetKubernetesDashboard implements KubeAction { - constructor(public kubeGuid: string) { - } - type = GET_KUBE_DASHBOARD; - entityKey = kubernetesDashboardSchemaKey; - entity = [entityFactory(kubernetesDashboardSchemaKey)]; - - actions = [ - GET_KUBE_DASHBOARD, - GET_KUBE_DASHBOARD_SUCCESS, - GET_KUBE_DASHBOARD_FAILURE - ]; -} - -function getKubeMetricsAction(guid: string) { - return `${MetricsAction.getBaseMetricsURL()}/kubernetes/${guid}`; -} - -export class FetchKubernetesMetricsAction extends MetricsAction { - constructor(guid: string, cfGuid: string, metricQuery: string) { - super(guid, cfGuid, new MetricQueryConfig(metricQuery), getKubeMetricsAction(guid)); - } -} - -export class FetchKubernetesChartMetricsAction extends MetricsChartAction { - constructor(guid: string, cfGuid: string, metricQuery: string) { - super(guid, cfGuid, new MetricQueryConfig(metricQuery), getKubeMetricsAction(guid)); - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts deleted file mode 100644 index 4e31071404..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ /dev/null @@ -1,431 +0,0 @@ -import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Actions, Effect, ofType } from '@ngrx/effects'; -import { Store } from '@ngrx/store'; -import { catchError, combineLatest, flatMap, mergeMap } from 'rxjs/operators'; - -import { AppState } from '../../../../../store/src/app-state'; -import { NormalizedResponse } from '../../../../../store/src/types/api.types'; -import { - StartRequestAction, - WrapperRequestActionFailed, - WrapperRequestActionSuccess, -} from '../../../../../store/src/types/request.types'; -import { environment } from '../../../environments/environment'; -import { getKubeAPIResourceGuid } from './kube.selectors'; -import { - ConfigMap, - KubernetesConfigMap, - KubernetesDeployment, - KubernetesNamespace, - KubernetesNode, - KubernetesPod, - KubernetesStatefulSet, - KubeService, -} from './kube.types'; -import { - GeKubernetesDeployments, - GET_KUBE_DASHBOARD, - GET_KUBE_DEPLOYMENT, - GET_KUBE_POD, - GET_KUBE_STATEFULSETS, - GET_KUBERNETES_APP_INFO, - GET_NAMESPACE_INFO, - GET_NAMESPACES_INFO, - GET_NODE_INFO, - GET_NODES_INFO, - GET_POD_INFO, - GET_PODS_IN_NAMESPACE_INFO, - GET_PODS_ON_NODE_INFO, - GET_RELEASE_POD_INFO, - GET_SERVICE_INFO, - GET_SERVICES_IN_NAMESPACE_INFO, - GetKubernetesApps, - GetKubernetesDashboard, - GetKubernetesNamespace, - GetKubernetesNamespaces, - GetKubernetesNode, - GetKubernetesNodes, - GetKubernetesPod, - GetKubernetesPods, - GetKubernetesPodsInNamespace, - GetKubernetesPodsOnNode, - GetKubernetesReleasePods, - GetKubernetesServices, - GetKubernetesServicesInNamespace, - GetKubernetesStatefulSets, - KubeAction, - KubePaginationAction, -} from './kubernetes.actions'; -import { - kubernetesAppsSchemaKey, - kubernetesDashboardSchemaKey, - kubernetesDeploymentsSchemaKey, - kubernetesNamespacesSchemaKey, - kubernetesNodesSchemaKey, - kubernetesPodsSchemaKey, - kubernetesServicesSchemaKey, - kubernetesStatefulSetsSchemaKey, -} from './kubernetes.entities'; - -export interface KubeDashboardStatus { - guid: string; - installed: boolean; -} - -export type GetID = (p: T) => string; -export type Filter = (p: T) => boolean; - -@Injectable() -export class KubernetesEffects { - proxyAPIVersion = environment.proxyAPIVersion; - constructor( - private http: HttpClient, - private actions$: Actions, - private store: Store - ) { } - - @Effect() - fetchDashboardInfo$ = this.actions$.pipe( - ofType(GET_KUBE_DASHBOARD), - flatMap(action => { - this.store.dispatch(new StartRequestAction(action)); - const headers = new HttpHeaders({}); - const requestArgs = { - headers - }; - const url = `/pp/${this.proxyAPIVersion}/kubedash/${action.kubeGuid}/status`; - return this.http - .get(url, requestArgs) - .pipe(mergeMap(response => { - const result = { - entities: { [kubernetesDashboardSchemaKey]: {} }, - result: [] - } as NormalizedResponse; - const status = response as KubeDashboardStatus; - const id = status.guid; - result.entities[kubernetesDashboardSchemaKey][id] = status; - result.result.push(id); - return [ - new WrapperRequestActionSuccess(result, action) - ]; - }), catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds: [action.kubeGuid], - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: 'Kubernetes API request error', - error - }) - ])); - }) - ); - - @Effect() - fetchReleasePodsInfo$ = this.actions$.pipe( - ofType(GET_RELEASE_POD_INFO), - flatMap(action => { - return this.processListAction( - action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`, - kubernetesNodesSchemaKey, - getKubeAPIResourceGuid - ); - }) - ); - - @Effect() - fetchNodesInfo$ = this.actions$.pipe( - ofType(GET_NODES_INFO), - flatMap(action => this.processNodeAction(action)) - ); - - @Effect() - fetchNodeInfo$ = this.actions$.pipe( - ofType(GET_NODE_INFO), - flatMap(action => { - return this.processSingleItemAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`, - kubernetesNodesSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchNamespaceInfo$ = this.actions$.pipe( - ofType(GET_NAMESPACE_INFO), - flatMap(action => { - return this.processSingleItemAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`, - kubernetesNamespacesSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchPodsInfo$ = this.actions$.pipe( - ofType(GET_POD_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`, - kubernetesPodsSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchPodsOnNodeInfo$ = this.actions$.pipe( - ofType(GET_PODS_ON_NODE_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`, - kubernetesPodsSchemaKey, - getKubeAPIResourceGuid - ); - }) - ); - - @Effect() - fetchPodsInNamespaceInfo$ = this.actions$.pipe( - ofType(GET_PODS_IN_NAMESPACE_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`, - kubernetesPodsSchemaKey, - getKubeAPIResourceGuid - ); - }) - ); - - @Effect() - fetchServicesInNamespaceInfo$ = this.actions$.pipe( - ofType(GET_SERVICES_IN_NAMESPACE_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`, - kubernetesServicesSchemaKey, - getKubeAPIResourceGuid - ); - }) - ); - - @Effect() - fetchPodInfo$ = this.actions$.pipe( - ofType(GET_KUBE_POD), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`, - kubernetesPodsSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchServicesInfo$ = this.actions$.pipe( - ofType(GET_SERVICE_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`, - kubernetesServicesSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchNamespacesInfo$ = this.actions$.pipe( - ofType(GET_NAMESPACES_INFO), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`, - kubernetesNamespacesSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchStatefulSets$ = this.actions$.pipe( - ofType(GET_KUBE_STATEFULSETS), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`, - kubernetesStatefulSetsSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchDeployments$ = this.actions$.pipe( - ofType(GET_KUBE_DEPLOYMENT), - flatMap(action => { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`, - kubernetesDeploymentsSchemaKey, - getKubeAPIResourceGuid); - }) - ); - - @Effect() - fetchKubernetesAppsInfo$ = this.actions$.pipe( - ofType(GET_KUBERNETES_APP_INFO), - flatMap(action => { - this.store.dispatch(new StartRequestAction(action)); - const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid }); - const requestArgs = { - headers - }; - return this.http - .get(`/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, requestArgs) - .pipe( - combineLatest( - this.http.get(`/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`, requestArgs), - this.http.get(`/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`, requestArgs)), - mergeMap(([configMapsResponse, deploymentsResponse, statefulesetResponse]) => { - const { kubeGuid: kubeId } = action; - const items = configMapsResponse[kubeId].items as Array; - const deployments = deploymentsResponse[kubeId].items as Array; - const statefulSets = statefulesetResponse[kubeId].items as Array; - - const getChartName = (name: string, labelName: string): string => { - const releaseDeployment = deployments.filter(d => d.metadata.labels['app.kubernetes.io/instance'] === name); - const releaseStatefulSets = statefulSets.filter(d => d.metadata.labels['app.kubernetes.io/instance'] === name); - - if (releaseDeployment.length !== 0) { - return releaseDeployment[0].metadata.labels[labelName]; - } - if (releaseStatefulSets.length !== 0) { - return releaseStatefulSets[0].metadata.labels[labelName]; - } - }; - const releases = items - .filter((configMap) => !!configMap.metadata.labels && - !!configMap.metadata.labels.NAME && - configMap.metadata.labels.OWNER === 'TILLER' - ) - .map((configMap: KubernetesConfigMap) => ({ - name: configMap.metadata.labels.NAME, - kubeId, - createdAt: configMap.metadata.creationTimestamp, - status: configMap.metadata.labels.STATUS, - version: configMap.metadata.labels.VERSION, - chartName: getChartName(configMap.metadata.labels.NAME, 'helm.sh/chart'), - appVersion: getChartName(configMap.metadata.labels.NAME, 'app.kubernetes.io/version') - }) - ).reduce((res, app) => { - const id = `${app.kubeId}-${app.name}`; - res.entities[kubernetesAppsSchemaKey][id] = app; - if (res.result.indexOf(id) === -1) { - res.result.push(id); - } - return res; - }, { - entities: { [kubernetesAppsSchemaKey]: {} }, - result: [] - } as NormalizedResponse); - - return [ - new WrapperRequestActionSuccess(releases, action) - ]; - }), - catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds: [action.kubeGuid], - url: error.url || `/pp/${this.proxyAPIVersion}/proxy/api/v1/configmaps`, - eventCode: error.status ? error.status + '' : '500', - message: 'Kubernetes API request error', - error - }) - ]) - ); - }) - ); - - - private processNodeAction(action: GetKubernetesReleasePods | GetKubernetesNodes) { - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`, - kubernetesNodesSchemaKey, - getKubeAPIResourceGuid); - } - - - private processListAction( - action: KubePaginationAction | KubeAction, - url: string, schemaKey: string, - getId: GetID, - filterResults?: Filter) { - this.store.dispatch(new StartRequestAction(action)); - const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid }); - const requestArgs = { - headers, - params: null - }; - const paginationAction = action as KubePaginationAction; - if (paginationAction.initialParams) { - requestArgs.params = Object.keys(paginationAction.initialParams).reduce((httpParams, initialKey: string) => { - return httpParams.set(initialKey, paginationAction.initialParams[initialKey]); - }, new HttpParams()); - } - return this.http - .get(url, requestArgs) - .pipe(mergeMap(response => { - const base = { - entities: { [schemaKey]: {} }, - result: [] - } as NormalizedResponse; - const items = response[action.kubeGuid].items as Array; - const processesData = items.filter((res) => !!filterResults ? filterResults(res) : true) - .reduce((res, data) => { - const id = getId(data); - res.entities[schemaKey][id] = data; - res.result.push(id); - return res; - }, base); - return [ - new WrapperRequestActionSuccess(processesData, action) - ]; - }), catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds: [action.kubeGuid], - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: 'Kubernetes API request error', - error - }) - ])); - } - - private processSingleItemAction(action: KubeAction, url: string, schemaKey: string, getId: GetID) { - this.store.dispatch(new StartRequestAction(action)); - const headers = new HttpHeaders({ 'x-cap-cnsi-list': action.kubeGuid }); - const requestArgs = { - headers - }; - return this.http - .get(url, requestArgs) - .pipe(mergeMap(response => { - const base = { - entities: { [schemaKey]: {} }, - result: [] - } as NormalizedResponse; - const items = [response[action.kubeGuid]]; - const processesData = items.reduce((res, data) => { - const id = getId(data); - res.entities[schemaKey][id] = data; - res.result.push(id); - return res; - }, base); - return [ - new WrapperRequestActionSuccess(processesData, action) - ]; - }), catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds: [action.kubeGuid], - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: 'Kubernetes API request error', - error - }) - ])); - } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts deleted file mode 100644 index b6424b6dea..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.entities.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { getAPIResourceGuid } from '../../../../../store/src/selectors/api.selectors'; -import { ExtensionEntitySchema } from '../../../core/extension/extension-types'; -import { getKubeAPIResourceGuid } from './kube.selectors'; -import { KubernetesApp } from './kube.types'; - -export const kubernetesSchemaKey = 'kubernetesInfo'; -export const kubernetesNodesSchemaKey = 'kubernetesNode'; -export const kubernetesPodsSchemaKey = 'kubernetesPod'; -export const kubernetesNamespacesSchemaKey = 'kubernetesNamespace'; -export const kubernetesServicesSchemaKey = 'kubernetesService'; -export const kubernetesStatefulSetsSchemaKey = 'kubernetesStatefulSet'; -export const kubernetesDeploymentsSchemaKey = 'kubernetesDeployment'; -export const kubernetesAppsSchemaKey = 'kubernetesApp'; -export const kubernetesDashboardSchemaKey = 'kubernetesDashboard'; - -export const getKubeAppId = (object: KubernetesApp) => object.name; - -export const kubernetesEntities: ExtensionEntitySchema[] = [ - { - entityKey: kubernetesSchemaKey, - definition: {}, - options: { idAttribute: getAPIResourceGuid } - }, - { - entityKey: kubernetesAppsSchemaKey, - definition: {}, - options: { idAttribute: getKubeAppId } - }, - { - entityKey: kubernetesStatefulSetsSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesPodsSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesDeploymentsSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesNodesSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesNamespacesSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesServicesSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - }, - { - entityKey: kubernetesDashboardSchemaKey, - definition: {}, - options: { idAttribute: getKubeAPIResourceGuid } - } -]; - -export const kubernetesEntityKeys: string[] = [ - kubernetesSchemaKey, - kubernetesAppsSchemaKey, - kubernetesStatefulSetsSchemaKey, - kubernetesPodsSchemaKey, - kubernetesDeploymentsSchemaKey, - kubernetesNodesSchemaKey, - kubernetesNamespacesSchemaKey, - kubernetesServicesSchemaKey, - kubernetesDashboardSchemaKey, -]; diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html deleted file mode 100644 index f2d54fe259..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts deleted file mode 100644 index 86b1ad0612..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesAppsTabComponent } from './kubernetes-apps-tab.component'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; - -describe('KubernetesAppsTabComponent', () => { - let component: KubernetesAppsTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesAppsTabComponent], - imports: [KubernetesBaseTestModules], - providers: [BaseKubeGuid] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesAppsTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts deleted file mode 100644 index 86c3c08d87..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-apps-tab/kubernetes-apps-tab.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { KubernetesAppsListConfigService } from '../../list-types/kubernetes-apps/kubernetes-apps-list-config.service'; - -@Component({ - selector: 'app-kubernetes-apps-tab', - templateUrl: './kubernetes-apps-tab.component.html', - styleUrls: ['./kubernetes-apps-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesAppsListConfigService, - }] -}) -export class KubernetesAppsTabComponent { } diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts deleted file mode 100644 index 6251e638fb..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-namespaces-tab/kubernetes-namespaces-tab.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; - -import { KubernetesNamespacesListConfigService } from '../../list-types/kubernetes-namespaces/kubernetes-namespaces-list-config.service'; -import { ListConfig } from '../../../../shared/components/list/list.component.types'; - -@Component({ - selector: 'app-kubernetes-namespaces-tab', - templateUrl: './kubernetes-namespaces-tab.component.html', - styleUrls: ['./kubernetes-namespaces-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNamespacesListConfigService, - }] -}) -export class KubernetesNamespacesTabComponent { - - constructor(private activatedRoute: ActivatedRoute) {} -} diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts deleted file mode 100644 index 6287f2de49..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.spec.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { KubernetesNodesTabComponent } from './kubernetes-nodes-tab.component'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; - -describe('KubernetesNodesTabComponent', () => { - let component: KubernetesNodesTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesNodesTabComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesNodesTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts deleted file mode 100644 index 091908c2fe..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-nodes-tab/kubernetes-nodes-tab.component.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { KubernetesNodesListConfigService } from '../../list-types/kubernetes-nodes/kubernetes-nodes-list-config.service'; - -@Component({ - selector: 'app-kubernetes-nodes-tab', - templateUrl: './kubernetes-nodes-tab.component.html', - styleUrls: ['./kubernetes-nodes-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesNodesListConfigService, - }] -}) -export class KubernetesNodesTabComponent { - - constructor() { } - -} diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html deleted file mode 100644 index dd2b6cb351..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts deleted file mode 100644 index b046e6a850..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.spec.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { KubernetesPodsTabComponent } from './kubernetes-pods-tab.component'; - -describe('KubernetesPodsTabComponent', () => { - let component: KubernetesPodsTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesPodsTabComponent], - imports: KubernetesBaseTestModules, - providers: [BaseKubeGuid, KubernetesEndpointService] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesPodsTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts deleted file mode 100644 index e2a64d7e59..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-pods-tab/kubernetes-pods-tab.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component } from '@angular/core'; - -import { ListConfig } from '../../../../shared/components/list/list.component.types'; -import { KubernetesPodsListConfigService } from '../../list-types/kubernetes-pods/kubernetes-pods-list-config.service'; - -@Component({ - selector: 'app-kubernetes-pods-tab', - templateUrl: './kubernetes-pods-tab.component.html', - styleUrls: ['./kubernetes-pods-tab.component.scss'], - providers: [{ - provide: ListConfig, - useClass: KubernetesPodsListConfigService, - }] -}) -export class KubernetesPodsTabComponent {} diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html deleted file mode 100644 index 841fd53ef5..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.html +++ /dev/null @@ -1,79 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
-
- - -
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss deleted file mode 100644 index b453016970..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.scss +++ /dev/null @@ -1,33 +0,0 @@ -.kube-details { - margin-bottom: 0; - margin-left: 20px; - margin-top: 10px; - - &__metrics { - max-width: 350px; - } - - &__header { - margin: 0; - } - - &__graphs { - margin: 10px; - } - &__graph { - display: inline-block; - padding: 10px; - width: 33%; - } - &__dashboard { - font-size: 14px; - margin: -24px 20px 24px 24px; - } - &__spacing { - font-size: 14px; - margin: 12px 0; - } - &__button { - margin-left: 4px; - } -} diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts deleted file mode 100644 index 7c7ac7079f..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { HttpClient, HttpHandler } from '@angular/common/http'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TabNavService } from '../../../../../tab-nav.service'; -import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { KubernetesBaseTestModules } from '../../kubernetes.testing.module'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { KubernetesSummaryTabComponent } from './kubernetes-summary.component'; - -describe('KubernetesSummaryTabComponent', () => { - let component: KubernetesSummaryTabComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [KubernetesSummaryTabComponent], - imports: [...KubernetesBaseTestModules], - providers: [ - KubernetesEndpointService, - BaseKubeGuid, - HttpClient, - HttpHandler, - TabNavService - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(KubernetesSummaryTabComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss deleted file mode 100644 index 93ed3f107c..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.theme.scss +++ /dev/null @@ -1,10 +0,0 @@ - -// Not currently used but should be - NJ -@mixin kube-summary-theme($theme, $app-theme) { - $backgrounds: map-get($theme, background); - $background: mat-color($backgrounds, card); - .kube-details__graphs { - background: linear-gradient(to bottom, $background 0%, $background 40%, transparent 70%); - } -} - diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts deleted file mode 100644 index 4fbdfece26..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts +++ /dev/null @@ -1,226 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; -import { SafeResourceUrl } from '@angular/platform-browser'; -import { Store } from '@ngrx/store'; -import { combineLatest, interval, Observable, Subscription } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; - -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; -import { safeUnsubscribe } from '../../../../core/utils.service'; -import { getEndpointType } from '../../../../features/endpoints/endpoint-helpers'; -import { - IChartThresholds, - ISimpleUsageChartData, -} from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types'; -import { PaginationMonitorFactory } from '../../../../shared/monitors/pagination-monitor.factory'; -import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions'; -import { KubernetesNode } from './../../../../../../../../../custom-src/frontend/app/custom/kubernetes/store/kube.types'; -import { KubernetesPod } from './../../store/kube.types'; -import { GetKubernetesApps } from './../../store/kubernetes.actions'; - -interface IEndpointDetails { - imagePath: string; - label: string; - name: string; -} -@Component({ - selector: 'app-kubernetes-summary', - templateUrl: './kubernetes-summary.component.html', - styleUrls: ['./kubernetes-summary.component.scss'] -}) -export class KubernetesSummaryTabComponent implements OnInit, OnDestroy { - public podCount$: Observable; - public nodeCount$: Observable; - public appCount$: Observable; - public highUsageColors = { - domain: ['#00000026', '#00af00'] - }; - public normalUsageColors = { - domain: ['#00af00', '#00af002e'] - }; - public endpointDetails$: Observable = this.kubeEndpointService.endpoint$.pipe( - map(endpoint => { - const { imagePath, label } = getEndpointType(endpoint.entity.cnsi_type, endpoint.entity.sub_type); - return { - imagePath, - label, - name: endpoint.entity.name, - }; - }) - ); - source: SafeResourceUrl; - - dashboardLink: string; - public podCapacity$: Observable; - public diskPressure$: Observable; - public memoryPressure$: Observable; - public outOfDisk$: Observable; - public nodesReady$: Observable; - public networkUnavailable$: Observable; - public kubeNodeVersions$: Observable; - - public pressureChartThresholds: IChartThresholds = { - danger: 90, - warning: 0, - }; - - public nominalPressureChartThresholds: IChartThresholds = { - warning: 100, - inverted: true - }; - - public criticalPressureChartThresholds: IChartThresholds = { - danger: 0 - }; - - public criticalPressureChartThresholdsInverted: IChartThresholds = { - danger: 100, - inverted: true - }; - - private polls: Subscription[] = []; - - public isLoading$: Observable; - - - constructor( - public kubeEndpointService: KubernetesEndpointService, - public httpClient: HttpClient, - public paginationMonitorFactory: PaginationMonitorFactory, - private store: Store, - private ngZone: NgZone - ) { - } - - private getPaginationObservable(action: PaginatedAction) { - const paginationMonitor = this.paginationMonitorFactory.create( - action.paginationKey, - entityFactory(action.entityKey) - ); - - this.ngZone.runOutsideAngular(() => { - this.polls.push( - interval(10000).subscribe(() => { - this.ngZone.run(() => { - this.store.dispatch(action); - }); - }) - ); - }); - - return getPaginationObservables({ - store: this.store, - action, - paginationMonitor - }).entities$; - } - - private getCountObservable(entities$: Observable) { - return entities$.pipe( - map(entities => entities.length), - startWith(null) - ); - } - private getPodCapacity(nodes$: Observable, pods$: Observable) { - return combineLatest(nodes$, pods$).pipe( - map(([nodes, pods]) => ({ - total: nodes.reduce((cap, node) => { - return cap + parseInt(node.status.capacity.pods, 10); - }, 0), - used: pods.length - })) - ); - } - - private getNodeStatusCount(nodes$: Observable, conditionType: string, countStatus = 'False') { - return nodes$.pipe( - map(nodes => { - const result = { - total: nodes.length, - supported: true, - // Depends on K8S version as to what is supported - unavailable: nodes.reduce((cap, node) => { - const conditionStatus = node.status.conditions.find(con => con.type === conditionType); - return !conditionStatus ? ++cap : cap; - }, 0), - used: nodes.reduce((cap, node) => { - const conditionStatus = node.status.conditions.find(con => con.type === conditionType); - if (!conditionStatus || !conditionStatus.status || conditionStatus.status === countStatus) { - return cap; - } - return ++cap; - }, 0) - }; - result.supported = result.total !== result.unavailable; - return result; - }) - ); - } - - private getNodeKubeVersions(nodes$: Observable) { - return nodes$.pipe( - map(nodes => { - const versions = {}; - nodes.forEach(node => { - const v = node.status.nodeInfo.kubeletVersion; - if (!versions[v]) { - versions[v] = v; - } - }); - return Object.keys(versions).join(','); - }) - ); - } - - - ngOnInit() { - const guid = this.kubeEndpointService.baseKube.guid; - - const podCountAction = new GetKubernetesPods(guid); - const nodeCountAction = new GetKubernetesNodes(guid); - const appCountAction = new GetKubernetesApps(guid); - const applications$ = this.getPaginationObservable(appCountAction); - const pods$ = this.getPaginationObservable(podCountAction); - const nodes$ = this.getPaginationObservable(nodeCountAction); - - this.podCount$ = this.getCountObservable(pods$); - this.nodeCount$ = this.getCountObservable(nodes$); - this.appCount$ = this.getCountObservable(applications$); - - this.podCapacity$ = this.getPodCapacity(nodes$, pods$); - this.diskPressure$ = this.getNodeStatusCount(nodes$, 'DiskPressure'); - this.memoryPressure$ = this.getNodeStatusCount(nodes$, 'MemoryPressure'); - this.outOfDisk$ = this.getNodeStatusCount(nodes$, 'OutOfDisk'); - this.networkUnavailable$ = this.getNodeStatusCount(nodes$, 'NetworkUnavailable', 'True'); - this.nodesReady$ = this.getNodeStatusCount(nodes$, 'Ready'); - - this.dashboardLink = `/kubernetes/${guid}/dashboard`; - - this.kubeNodeVersions$ = this.getNodeKubeVersions(nodes$).pipe(startWith('-')); - - this.isLoading$ = combineLatest([ - this.endpointDetails$, - this.podCount$, - this.nodeCount$, - this.appCount$, - this.podCapacity$, - this.diskPressure$, - this.memoryPressure$, - this.outOfDisk$, - this.nodesReady$, - this.networkUnavailable$, - ]).pipe( - map(() => false), - startWith(true), - ); - } - - ngOnDestroy() { - safeUnsubscribe(...(this.polls || [])); - } - -} diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html b/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html deleted file mode 100644 index 65c2e980f1..0000000000 --- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
-
{{ (versionNumber$ | async) }}
-
SUSE Cloud Application Platform Console provides an easy-to-use web-based UI that allows developers and administrators to - manage and monitor Cloud Foundry and Kubernetes systems and workloads.
-
- diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss b/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss deleted file mode 100644 index fdc07f95c4..0000000000 --- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.scss +++ /dev/null @@ -1,26 +0,0 @@ -.suse-about-info { - align-items: center; - display: flex; - flex-direction: column; - justify-content: center; - padding: 24px 0; - &__title { - font-size: 16px; - font-weight: 400; - line-height: 24px; - max-width: 640px; - text-align: left; - } - &__version { - font-size: 24px; - font-weight: 600; - margin-bottom: 24px; - text-align: center; - } -} - -// Cards on the about page should have spacing below each card -.mat-card { - margin-bottom: 24px; - z-index: 1; -} diff --git a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts b/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts deleted file mode 100644 index d332fed1be..0000000000 --- a/custom-src/frontend/app/custom/suse-about-info/suse-about-info.component.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { Component } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; - -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-suse-about-info', - templateUrl: './suse-about-info.component.html', - styleUrls: ['./suse-about-info.component.scss'], -}) -export class SuseAboutInfoComponent { - - versionNumber$: Observable; - - constructor( - store: Store - ) { - this.versionNumber$ = store.select(s => s.auth).pipe( - filter(auth => !!(auth && auth.sessionData)), - map((auth: AuthState) => auth.sessionData), - map((sessionData: SessionData) => { - const versionNumber = sessionData.version.proxy_version; - return versionNumber.split('-')[0]; - }) - ); - } - -} diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.html b/custom-src/frontend/app/custom/suse-login/suse-login.component.html deleted file mode 100644 index fd794c1b33..0000000000 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.html +++ /dev/null @@ -1,43 +0,0 @@ - \ No newline at end of file diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss b/custom-src/frontend/app/custom/suse-login/suse-login.component.scss deleted file mode 100644 index f08c6bd2be..0000000000 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.scss +++ /dev/null @@ -1,163 +0,0 @@ -@import '../../../sass/custom/suse-colors'; -.suse-login { - align-items: center; - background-color: $suse-blue; - border-bottom: 10px solid $suse-primary; - display: flex; - flex-direction: column; - width: 100%; - height: 100%; - &__header, - &__content, - &__footer { - align-items: center; - display: flex; - flex-direction: row; - } - &__header { - background-color: $suse-secondary; - color: $suse-text; - flex: 0 0 60px; - font-size: 24px; - font-weight: 500; - justify-content: center; - width: 100%; - } - &__content { - align-items: flex-start; - color: $suse-text; - flex: 1; - margin-top: 100px; - overflow-y: auto; - width: 90%; - } - &__footer { - flex: 0 0 auto; - width: 90%; - padding: 20px 0; - } - &__title { - width: 90%; - } - &__copyright { - color: $suse-text-gray; - flex: 1; - } - &__logo { - img { - width: 79px; - } - } - &__intro { - flex: 1; - margin-right: 24px; - } - &__box { - display: flex; - flex: 1; - flex-direction: column; - justify-content: center; - margin-left: 24px; - } - &__form { - display: flex; - flex-direction: column; - .mat-form-field:not(.mat-form-field-invalid).mat-form-field-appearance-legacy { - .mat-form-field-label { - color: $suse-text-gray; - } - .mat-form-field-underline { - background-color: $suse-text-gray; - } - } - } - &__submit.mat-raised-button { - &.mat-primary[disabled] { - color: $suse-button-gray; - } - margin-top: 24px; - } - &__headline { - color: $suse-primary; - font-size: 52px; - font-weight: 300; - margin: 0; - } - &__tagline { - color: $suse-text-gray; - font-size: 18px; - font-weight: 300; - line-height: 1.5; - margin: 24px 0; - } - &__form-outer { - max-width: 400px; - opacity: 1; - transition: opacity 250ms linear; - } - &__form-title { - color: $suse-text; - font-size: 30px; - font-weight: 300; - margin-bottom: 24px; - transition: opacity 250ms linear; - } - &__loading { - display: none; - margin-top: 24px; - max-width: 400px; - opacity: 0; - transition: opacity 250ms linear; - } - &__busy { - .suse-login__form-title { - opacity: 0.5; - } - .suse-login__form-outer { - opacity: 0.5; - } - .suse-login__loading { - display: block; - opacity: 1; - } - } - &__message { - font-size: 18px; - font-weight: 300; - height: 20px; - max-width: 400px; - padding-top: 20px; - } -} - -// If SSO Login, move the form underneath the intro -.suse-login-sso { - &.suse-login__content { - flex-direction: column; - .suse-login__intro { - flex: 0; - } - .suse-login__box { - justify-content: flex-start; - margin-left: 0; - } - } -} - -// On small screens, hide the intro and just show the login box -@media(max-width: 768px) { - .suse-login:not(.suse-login-sso) { - .suse-login { - &__intro { - display: none; - } - &__box { - margin: 0; - } - &__content { - max-width: 400px; - width: 80%; - } - } - } -} diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts b/custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts deleted file mode 100644 index 1906b66ac5..0000000000 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule } from '@ngrx/store'; - -import { CoreModule } from '../../core/core.module'; -import { SharedModule } from '../../shared/shared.module'; -import { appReducers } from '../../../../store/src/reducers.module'; -import { SuseLoginComponent } from './suse-login.component'; - -describe('SuseLoginComponent', () => { - let component: SuseLoginComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SuseLoginComponent ], - imports: [ - CommonModule, - CoreModule, - SharedModule, - RouterTestingModule, - BrowserAnimationsModule, - StoreModule.forRoot(appReducers) - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SuseLoginComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts b/custom-src/frontend/app/custom/suse-login/suse-login.component.ts deleted file mode 100644 index a94ef21177..0000000000 --- a/custom-src/frontend/app/custom/suse-login/suse-login.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component, Inject, ViewEncapsulation } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import { Customizations, 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({ - selector: 'app-suse-login', - templateUrl: './suse-login.component.html', - styleUrls: ['./suse-login.component.scss'], - encapsulation: ViewEncapsulation.None -}) -export class SuseLoginComponent extends LoginPageComponent { - - constructor( - store: Store, - @Inject(Customizations) public config: CustomizationsMetadata - ) { - super(store); - } -} diff --git a/custom-src/frontend/assets/custom/aks.svg b/custom-src/frontend/assets/custom/aks.svg deleted file mode 100644 index b54c47bfe8..0000000000 --- a/custom-src/frontend/assets/custom/aks.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - background - - - - Layer 1 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/caasp.png b/custom-src/frontend/assets/custom/caasp.png deleted file mode 100644 index 5a57afdc7db00d8ff89f78356e91e4c7ea70ec5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4372 zcmZ8l2UJtrwoT}S&?CKs7El2x7MgUfp-Yh#=|M&5ML<9ZMS2J6Ei@@nk=`TsQUpY4 zK|n$f1R)T@r7G>^{(tX#|G#m@KKraS_Sj>sdDfg~ot<#k% zIt;W#Q_`U2AqnWCF1ca$rP@80rnY7S0s}>Wx_|R?tay3K_}LRp=5pgOZrs$$G(=t9 z++QEShIub~ZeC_I_mp3wO1ixBnFN>$r9Otg>lB_*2m{UU9DmYrA}Wa^qUYAjeTrnu(ymLz4S%mX5z!~1Ax?9 zX6+oucbv?#1lJ&h8W^aQjwMTq1F7UPMnOW!M`NR)2DT=KRfK`OfiMFIqe38(bwJ-tO0t3xb-9hSQL&aRSsMYTHZ9672_feVb<1pT92liT7pb5uF zdTa#s&?7bLWZ_`qxCNcNn!XoZZ{+I@>u4dT@-|ZSgHc#@Ld=hgJtSwWch;7&gmRsZ zD%l$bauf-1s(0VyoRW3{#N|nyI%Y019DUBiF#5xVe)h2DiD+%=Brh64@HEoEb0gPg zStX#2E1Jx~8OzD1T#-k|RWYEu{1Zz@FyzY$v|Vsu49J&Kv(tMPD4|Rf47|-g2k&MQ z*uo$xz~&uPVJ{N;Qv*~al=+hEQ8SccCXT^J+>357Cv^vM>!(j7`Er$cJ}JnO z5%0pBHaP5*(gaHBUf7d$PWgisWL*6`RtWHBG(I~ zPGx+=>=I>LAFvWcIAcu#O^+oKYcqJJj3KfnN#wH|Tz{|$&~|&Feb_%-6)I?hn=T=C z-3X5lx_Crt02;NpCymh{CM~nZ18(s`NhW!_PShN}bB4K4D{(assK#`P`gJc^eiX$T zLIkDQL>pZ$q|oxMbm`p-9OYkV>0jNS9!~O-2CgVB}&m4^0az1b2BK>4NZ=3 z9)Dy}n!wjcbzIa&ifxqo_E9SK$Ay1&LjNqPhO&ixQ{=iaL|wa6^8F)HDNRL&m`wi; zeX4a|yvp}y-i!Tq$n+;hkV80&*?QQF?(#Fv*qSu)!fYA%M8KxS#-S|tBNYk07;u^%gR238V+xsF%i7mf9#Zie zK}vKIW>&Nks7~Po{Q-;X$|oU22f?j(K61KrzF6MG;$a5v5F%I3jRAwU)NBD!!}}D< z&wCOxo!FFR>3hqA6O#S9+ej!aT6wc}{ts3q+Q=NL&m;_S;c;S4ug99iz#U`}7h!E% z0sgDm@z(sL1q1vL9^BUs@6+;QkjFaXJCTVwCU3^AjAD2Q-@fr7-+dGL!%6@lJ#3N~ z$A)l4zin}3!;D;V35D?tXvPaxg!|CHANuKGDnr$C8xaMD(UrJL+P+@e+cz3o9yvJL z6Xq}N|4|pg0pyH50laa$%_D;3fgjSh(}K_ZRG1cx zyz+;y9r6CsU;A`U3YGqZsk*`Q$-k-ZHgX{g-(E5sIy=FYygtX_xsK_~S?{#|%+GDp zx)d~%z)|_GVGPrs$2hicFR>syig9)=PqIhAay(A#yaWY1W}0(-B|}4Y?4B1QEUXr8 z{mK7h7&AB&zNu#1_&?FHiHOIuap*EIivAt+f0_TA!#}J3PU&wm{+Zs1OA1Zt5dF&V z&&d;`gJU)I@vN&Wn0p=VtitOXmscdgHJ;w{T&31a`spK0`;j|S+SvB8D&&HM|2eO4 zsL@>&TaEUk*!{t98n^Dbjpd$evR&JYp~Z%6I}*6TT8>ISfiE|kwp#t|j-?nr+hqP zsProQ%@#|1SuA(gOIPuD8eYrHve;bzdd27Hbb$gFMoMyz$d|2*jJ86d<75?)sTXta zJ7pbzz^1O1-o)fN-G54(-!+Aj#-C8lj|3y0H2E#6vidF;bhVwF{0eNFr z0v}#PTW^1}#ztNC?W0c?iZb-r{zdf<_>~&ZgCHP~^;4(Po<)&jjnF+@;&&KEOHH+q zvET=l7Mq6{!?Dfi)M!Yhre5d&dnsC*(Z#B3iY=}{nQI?ciu>0@7D&zeTd3BZmybfn z5_c4;Rs`mAO9nDaZoTk0`Pic2Y%rv3w3+wm+qi^I>segO5x6=0k-z1{7n%uPqiq{( zOqFBh!V$~dVOp-^;B+eOUuze_cUb2R$J)GH9}iK%g2EDJpUpDQJ;m1{CR^9vD)c!I zw_1A#N7f25<;^!nx^>(L)HvjGY5caP%?gtXUNXM_ZSrC6PPHUYZnMm8kG=1;;$Hfl z(97A!`1@aTn^TxpT{VykLZ!lw7Oc_RuXYzbKw$OpTs8d1-ZDUw)~mZTcL2EdaGsh5dYD9e9GT^t=xh=6>PDpS$#Q8q!K& zgpy=<3ypgp5`unao+MQbX(nH5Y_qm5ItgFk=qn#upK87PYQMzURTJQZ_7Ntu)TNy$ zefsn4jq4I_Q8A*r;A}*%;fK9r_B=IC*hkF54n`s?%KOe;%S|{@?Rw#PCyXm%gQ?0i zImbD%+J5=DpcFNkZh->Bb9%w^P>;}@YCh{Y-C`z}C|_w(nEYPx zXa1u`l|ElpXVT*S{WaI7D;EwJ+1=_IpT|MMm8A*Qm$K&O9E^gBmX?j15~`WAChl`^ zW+mVb}g{^zzgsW~D18NMn#fn5;OMlvqM zsoX_O!2~QYd7(jVAZO!T5_KEIF5AHXJV)9m67Oj}qCYwWaG7?F-vo=?Je_C#L0LPC#k09g)j+f3bxUs=KKaAgndQ_@Dt&v-y-51=~avNkW653k)j(YoKeuuH*2^#TJ0 zn4hJ1G&s{th<2@xRgd-utrr<*uVlqru^CmFX+-5f`{0%70MG6d0=(=Ehl{0RG&qm) ziS;2^ZzAMDII4(E48k@gqG8kUHzNq0c-j%Zte5Ne)jfP?Xq}3~6QA_PHqr@J7MnJ` zjt0Np#nH~Ztbj#9K60z}1lD9qBSLIlHNpK^Sd%loV3}7x>%O8d{Vquz1oY(N&VMLI zX7slI*oLnAiSO1MwITtZ(w*zCh)orNj1F+O9qSv+ta*|2wr)WL6M|Ao?wHRdvY@y9 z!zz;dbtK&!kk}nKM12Qfc>QTX!B8ZnWqLzhyf9rm0(Ew*#k>4WNDZE$aA2v#&`K0zH@3yyH{tWK_uieVwNSW$LzU}j#qEG z!{RZ34C<8r%FqoG_>KwfDygwB7K3L<0p-$Ge{z~d1OO$U5rsUbsUIb7hfdD)TbEla zO>^dk5M_5h9j9d9;A^Ghjrxf1+(YGKr}zqQe0MHuaZGJ~>hU$pTX7$5M&GcD6J!bF z>#=%0-_2-rgcD?1E&N_q;1&0WXNiU_!~Ob3gl{VKbBAUR2F6J!I!~$yphVc?8*&}5 z!isv^_qq?6H3`{F*fuO6f2I*S5KU3OBcL@Pb#e>K3 zHgp2pm=o~Z>Io*Yk!j;dUX+Yzhjhb%ebpS?Z|?BLgL-*!xVxDH6-y>{v^n7U7DiR3 z9{4#_ohSHwRl=zgEsq_IJiuL2xP9|F3l`DF@YC%%n@y&jF^b4%ZD(${=9 zzn=&eI;U_3!$&&;)nN}M_UgQ2S{36}UhA6l3>1%37=EibQjY!PKJIDZ2Je{i`To@4(x&EeN^yzB!&A&S2j5+Gh*|> zUs=MuzzJ!wfxvCupZWIC<>W2gi=$L8JH=GBqtGXu@PvO0C)MP1!^ nkTPhzG2LK2!J$1ZaltzHW!7be^{wn*hZFjGCc3Y+oud8)IY<>? diff --git a/custom-src/frontend/assets/custom/eks.svg b/custom-src/frontend/assets/custom/eks.svg deleted file mode 100644 index 4ef2b4478c..0000000000 --- a/custom-src/frontend/assets/custom/eks.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - providers-resize - - background - - - - Layer 1 - - - - - - - \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/gke.svg b/custom-src/frontend/assets/custom/gke.svg deleted file mode 100644 index 9750cceb23..0000000000 --- a/custom-src/frontend/assets/custom/gke.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - background - - - - Layer 1 - - - - - - - \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/helm.svg b/custom-src/frontend/assets/custom/helm.svg deleted file mode 100644 index 45f2c2f862..0000000000 --- a/custom-src/frontend/assets/custom/helm.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - -logo -Created with Sketch. - - - - - - diff --git a/custom-src/frontend/assets/custom/help/en/connecting_gke.md b/custom-src/frontend/assets/custom/help/en/connecting_gke.md deleted file mode 100644 index dcdffdcf78..0000000000 --- a/custom-src/frontend/assets/custom/help/en/connecting_gke.md +++ /dev/null @@ -1,21 +0,0 @@ -# Connecting to Google Kubernetes Engine - -You can connect a Google Kubernetes Engine (GKE Cluster) using Application Default Credentials. - -To obtain a credentials file to upload, you should: - -1. Install the **gcloud** Command Line Interface -1. Run the command: `gcloud auth application-default login` -1. Authenticate with Google in the opened web browser to obtain credentials - -A credentials file will be written to: - -``` -~/.config/gcloud/application_default_credentials.json -``` - -This is the file that you should use when connecting in the endpoint connection dialog. - -> Note: You may need to copy this file to a non-hidden folder in order to be able to browse to it in the UI (or enable hidden files in your OS's file browser) - -> Note: For more information on obtaining Application Default Credentails, refer to https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/kubernetes.svg b/custom-src/frontend/assets/custom/kubernetes.svg deleted file mode 100644 index bd6b1464fe..0000000000 --- a/custom-src/frontend/assets/custom/kubernetes.svg +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - \ No newline at end of file diff --git a/custom-src/frontend/assets/custom/placeholder.png b/custom-src/frontend/assets/custom/placeholder.png deleted file mode 100644 index 6ef0a4f5f21a544d53345ea8331a9680626468d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7897 zcmV;~9wy<5P)z1^@s6d~9+a00004XF*Lt006O% z3;baP00174Nkl_#Oj*cCKHG4_THVu_yxK@^ax2-2&x@BH>--nVbx?v%Z=_wIX-N#5JLyHn20 z{O6oAXU@#lD{K$p7O3~hC!f@B+_-VWRjXE2@S;(pMw{ibsek|eo5B(6`tN#my#ZAH z1uzXJPoCU$;lhP2)wA$*-+lL8Jbd`@x%KMR+ZujeSAW-e;EWqLuGKHU{L*Rp^5so8 zZQ2xYnItg4ecH5XvwEL>_L+ayS!bZzyNPn|loOQ`@8 z?brql8f+5rHCL4ArO|h_;l9=Z=Yaz6+qZKPwwE5wOA9nH8FuwCq9B8MVc3N2*jEOZGIHK@2T)TE{mzgtXw)5T5 zS>;zzQL*)a0}lAJMT-`TM2umTu92Ze0!OCQjo~hT{`qICEnBwK$U0z5++~+tmIll2xvO^X#+Fwv}apot7+F(ma#e=P=XFn>TM2 z0I?pnKmfElha?6h1!n?=f#fw|~`|rQ?^VSK_BgVMGop;_@5W`#*@;?3a)57!5 zKVN9tG@sT0bf8Y1I<36!y6a|FAw0vI%z=ZISEkhMr%jvIA;Wrj$y%oUg_mD`xmsRu zn;}Dn6yQdA4;T~s^y#zYpo0$Dm?f>50SCZ*_uY59rghECveHR;!*QN_?zw8O(RBt5 z8dM{Iqln*ax844cKioPpSr7B>dLX+6cKGO{kM?-?-FKVjP3cvQnsfyqaRE-$uwlcv zSGj$Lw<9yvyY9Mc^@tH8X3FjiuK@DGaZq^Qdh4wwB91!EojbQpZd=np7#!#R`|q#D zS-$-8%fd6yJd;};$55@{HO}?o(y>H1kQd+RqJe`*5-abXwZY1ZE_43*=NFDT>ZmGx z@yaW&6i|?B8rP{(iETF>I&@ee%NetZ6=B+aL~#X&pUF(A)%)+i-=j8whI#>vfByL= zT*crwoTxT{hRUFGPMI=ge^iQU6?J%!8aM))CZB!w+1|Bjc>r+4*=qn!Z3kJ$=xvgHk+ROIYy!9RW z&4C9VSdA>1h2(Cbvl@{pA1qt8EY&)SGjL>QWQ&?+*t2a@rs2`4IBCy5`|JWM=Cv`% z1|i&sPhnXLUP-s(j4V2{_`uSRo6RHPSMyI+=w^M9=>F?;k6cV%jKpbixTI zRC$G1`}*sz3qSw-b3t}q1k?DM3Lx3}ichx_aGWg1%=^cV9eY5P7R>n#(`z^hA_#Yh zELOMyt4!t1ZU9)KvXE*Np$B^+mqY@Pm(tY=vtlHkN~WCNVHDY)VQRK)j4 zC2u+o&H|^1`q#uYUNO(0pECFZpl~9VC=hMX;)IQ^0;OmcGzLT=zQm$cf8G75Fy7Ndu-wK(@*!>VTyK}>mi36Qs58Z;HJUV2Y6^V z1_SLz_~3&NyyZQA{(P81Hoy_ZxLH7Pk^c}KmtA&QWiE_TSUe4pmc;`YIx9~zAUM!X zH{BF;?!EWkTNL*ZZeI``GtkXc!%<%mF@cVyo~6CY8eJ1fYke%8lM82$9zBZQx`J=Z z?YG}vs9*p8Me`eF71KV7X84_{AsB@_?zm&&+;h(@oP6@hg&lVA!W2!#I=yG+hR78A zSD*{YOvWiak;SK`ASZrROGjRa#$q`d$HItswLVR(q8cR$4>0_ZdBSU_$4QlhTfl~+ zay%(>;=#ReE@$-RJy1Vrb>XVi@uG_^3Pe;~{e0P%TzAX<;^$W z4Ctb>Tsl8oCL9sbEZ%vAKmPbb%PE)fi%w z4kCUWUiNR(;3&h0rliqw_0?Aw9)0xDz(x|soyY@EJ@M>!ZX*B(2)_UR`#`56e+7b* zPC6+uKSn+?CE~N=fh(dBWffgU<&l^{=mlxf@fbklnH1nOfGjDfdL+GfeJ)_eJigo} zoi)c1uldf>c-BDE6~1A^hJq~V7i3>_qFn{iBm0I5;*MH{^Uy(~MvY1YT~fJhti$~i zC0rKvf>BCdZ~!^RI6lhVi0h0a17prb?sgGXn{ zhWk+;pFyVO1@W=6(sQhVAf4^ahNCLWjDQgfJC5TXbfg@GUtmT-$IwYP-gslsX(|uX z70d1$Z@dw38RF96NkR8cjAXINR2pSP20U;R^*lCF=ppq7B+R}pzx?tb9ULsKJxB(J zlKu5To7k2SDo*=z{rdIEjT1>}WjTJ~g%?_8>A0n2IrbM{je$r)q#%-#L}H{Z0`Zqr zKKb2z^UYTD5m)&xyNIwTJ>h%W2;XM_>MPH1{`_WV=tB=Z^u3J**=klLL}$7*Ovl1{ z=@=Tl*nmBVybvX}pfQ!11gN-l=q~7SH{5VTz!~D=xIBZ?k{8@FE6_j>3!bteaYq~4 zjKE>*i&z!C%%*e%(J>hD*ry#Q^L1&%?+}0JF)kfVdOAdxM)xjUe)PBOYYOOzKDWI` zk5S6FZJJ`@iGpm^*GAxoOs!w)T@38sW)|ZT;8cuCl;AX-Y)Zp>Q=BAv#XU3VeAhZL zfY52umYYP6?zzmKTi^wui^Dr(1o15{xwjvz-i7PHsQ?YvG>uG$Hfe&zT_4iqO^$Fg z>Vt{FB_Nu7iCWuoML}+K;)y33XWK^LY+J*yE!Rst8X9q98;H-Wgy1@=RT<==3xFmq zZ~!#3Efi+kfQ`mw@Yv>S6L0$T>BdoH1dgz-l6(Bo&^p6cT;=JQM;>`3Ff674j|n)G zX%i<(8?<0nV9E_AwGB+knW~o~2+jIYBt#j3BhE=yTDH#$(!e?^uC6R>A&hKS@YsL? zapsaQ912c|i$|J(J;=u_)3t1w3>jz9THqABP1KcO;?psh+KUM+l-_gCJpqTX?Pwd| z*orDRCfouV;2dcKG!@$xY05@HHl@=7N4&yzGG*ZVJ<6aD7EL~MoN{_H(P^U`o4^G~ z0T-5VWd$~sYkJSJgDv*&$~N2cP9bcubxV|~WtSHlv5tA&|-Sr{en zB+%JRdy{~pmQ2uRYyha*jad^0Pi9cM00&DdTbHhwcd`XYYlcY#4i;lE{Am*xLs(o| zW=5ufErii`%{A8;8$6sB9SZkRoe&--+%wTWI7JBhg)vBrHTthv`(1bStZ8}0`~>haOk)s zr?6;x?r~#4@4;D&vv6?nxbVUY3pjC^Li_gZ16Pk9fBZ3s3RteZ@=B*^HVNfBTZIol z{IDS3tP1kMsSBJilI(qpb*;x8lSkV zl*frRn>>8R0myK{BojciEaK_trj3%gZZt1n_o9@?+VWz7Bg7k5M|}~-2s2HE+05_K zU`jOTI>8tHN%^1vrxBgHK>~1G7D|(7b9pYnX%rVf7C19z%qS^OGy#X%RGLt%H({DG zNrM|K_9hpwlaBZRP8Vn^ojB8_P4iCHtzwrRssV=suhSHeHVutsGW?kuGpTGEnAw&~ zLsJ&^q41wczY3R+c*5f^Z7})Zm?jZv%S}orHm2C6hiY~lQRYhOMgee4BNNf1(}9vI z&2!Sy88(ZZO1wnN0(h)J=@fWH1Ar?g$Vs5u*M=s3l;hgC&Fk;Ffz z8rP`?9I@ZTYSE#5y#6#b0%F1xCypQ`p3n(Q?47t+bafpD9X3WrEWBz>i+mLwaWuv~ zqpoqE1yFI*w1rBW_A1PznrXe7sB+oOmzEHhbR5)Z+gPfTnBHS7dIMlnAdE{x*_4w8 z=+KME5$H(3lO<@NgEBa*i4LSJ)j^aGH+tfUCo-pja-l=V z^-Qi8)Fq36xDpSAN{m#BDw%SXY<((PF{Z&uBRv{7%X`G4It>*EF=$G=zbh*`IbaiD znFd@I<;&~};A|l8N{%DmUL`gB!IqKpjPg8yCfd;WC+7_`(8%%(ZHDNk4NDvu= zTaFd$Dt@MwKq`hHMgvEqDgRhT2tL991o@4BFYI5m^kRx}N()Vj9;bv3k)!o?Na`Gw zB@{#(ZQ8hTUVbVi6KgN_6P7KYi>WYx%_3k`#zsSDQh)w17o@Q(+0v)mzlHc$vo+elM+h%? z21mI){`livrcRxzH-}o346!T*nk=gpSy@FvQDhp6Erhc9!_ur+IA9?t&~lGe7X{R3 zU^Sf6H2@7kmCJ9+<~aih?x6k{Sb(Y&fq^6D7B9X$M;vj)bdeOR1CHZseG0uGE6@NE z8i464SDd>Ds zaaoK7Sc-nQBwUj}fMXMI-5?L*M?spD9?|IoID(bHBQW4NvKCP^aHs%{ryI?H3ta%2 zOM@{ANvEvCh`FS|h~!U=+N5~8=YTW|9q0Jtj}IKbbY+{~Q8xvqq`0Do262=vhx(8P zP_XA-ao@P~a9STh`J-1%oH((m>=E~(7{d_&PdES$h{lz2(4axV$fDwaNR1Zm`7@0O z7Ba~%ZJ>cwnQ8NgOGoF?@o58t$h4slJ&HCXE_L9Kd)f_dHDt(;z%_)n4!03;cwel8 znW~%Q-H3g64Fo~n{BJ-!e!l2Aa31s!bP@s;g|j3D(o#7cyJiZCs{)PX8fZ)#FF^8z zBhpdO%t+SJt>|C|NjlQF2DqSUIRilG@`gsr$FGRMJ*E$y0Ui@Kv!$6Go})*PZcrh_ z#O@8Y%_tg=%F(e*O#uz}x(bKWt4fBSMSr7!(-5u!FzZ06@`GctI|2O*4#+@Yl$%0Y zVJf2gvGAmL~T=K*Y~OdF6n4Qlb0RhhCkN^ zF`c`k=u`@Ln0|IG*aTPbPzSh;NzBnEuJwgp+W~7+Hx);WjhkgUzPUm^?y*r$qq6>_ zp2{GLD-}gtnMODV2H1#?FpVZrKwR7^;*?09GkQ${QRvda)IqI{CFKpbq3kR`kW{Ab zd9!BCg3l5KOAM`Bw_c}RnuA@e^O~bQyJ8ouzeqgiZMa^(*zys|j z&`?ikvZ0;0r3f85bXY|>0dV^E?fXY53bieR^J5TOx`6V{!HT9%0thxD1Wp&75r)f0 z$FR{e&N$-?V@E?XpfQOkz$M>S2$NCP-{OtAY3R_Q3m_r@PXGS>H}&b$=l8Nw6)GGS zZgUE`+EJhb4+cNei~^7<-6ljvm7k1y0Ie&F1n6HnF-m%rbekhfC{LGH6#`3ebM(44$!^gbf74WaKkuy zc!sWJBcjl&lqn;ce>v`DjcV4wfdebWKqYV>Mvf($F9=^<4#J{ksu6Bdlu4%pk8TB- zw1A6|Z4;o$h7+<19|aEg0E%O5O#uv*h>ZN z9WeB$NaecHaGbYi!`2Ty^w8k*%y25@cY^|LT0a9coC9bZ@N<#%ngSo4)dlg*t<;GC z4RyHWl1p?+D&JwmbD^m+VFo{B7PU@nS(PG66;Xxb@DOKYLDw`Dq1;y#R$Gq1NN1`J zmr`OuM?WLmM)ZX90L(VCzJm`wIG_Pqpb6S+0vs(bA_`?#bhc`sp&r#Z4iBGx`sq#A zUVH7DIdkTeeY*_YgHt*2a>E6|6vV1o7%*T!Fk;0+OExu)Kg`btCM zC}pE8LmN|Y(+EeT!Ew@b5@|5X>89_{f$kM&7vfzsprB)+PD4*LFCX_kdh}Q*v+cmx z7nffw$59dGW9Z97lWw+V%^GhDp(=0JE1ZYVKHG90Q~q*>Z{VM6ikI{rdc>(o%XN~{ zMxVoJ#*ZJL8_;y`-hGj>*FkSbV+nD<%W*5>67wJ`y6Fh&H?(5O?oTfkkNz*6I#pG zh`nqwEkztUkr_PAh4I2$MAlsQ%G<{b0D8s{t51;3fzq8IFBm4J8 zjT*VT;JHxc7?+NqLu{w(j@f&Ojsl!V(1=UT8Uc+_8ICrBGjN2RZ5B6-8CiG@Mu~H| zX9e75LDMBqpK(#7^Tugpm0+_-km*uSXAe+k;Lw-?o^|0RcApKLHZQ~#)8o7bxS>+G z^Frfkr=2!Uz~c-W=+_zmbrqDU?#wAuro`^1z%R)3br_#CneviF;hEy#mf91-SvigpB&=@lq+{Eo zakIK-BqOGxpIT$4`%>GN*^ITf9ha^Xd0D1dIgXpM~6^8jeL4?h*x4n3m`};=@Jaf{LrIadE=W$cN>Kuzd** zgpUvlwzm0%^DOo^mSGW5URYi#jI!T zj4~QnqEOr{`Yy|R0nL{4&O2`^{^dT(@d6wOk(t(NWTy|JZ1bRlqvC+Hh=e50VVifc z@t_TT1}+v3JQqG+z=5z{y?V`;>29pom`}p#l%)MqlO|2_SyWMZC0Vo4 zb##h*QH6#Q3rJUAdg-O!cdvK{4l-19j;XRNu{lJ)_n$O;TtG~jJoDnxW%W#Fl(gN? zo|ZNSu(+;HPiy4UmFpci6t-VsW|!(omhmx_*`2qrXTSWDXkI zxg@}$Ae^8@%b&~d?ZJNw$l(gVW~mHEDJ~gsC|HiG{hN~yqC{-JFRlf|-+E#6yWqv; zXii;H;6ToZ5hG@?>B~&o_82xTz!Hy~alFtbuFp6n2M)x`=$OH3thi{HCSjphD~i!R^UL~#TQ?^5Ls;^bo=}NwE#ZD z;s{?7pC?_Lm&9_cBS5_qC9jv9hT+8rTIE^Wu5#ePdO1bRe8hVRDqePuqw1Kq4StHQ zJYB`emmBMQZh(VjS-_K7--=L5?_wyKI)bm;82-UPd#;csU6;ZG-B3y$Qsma z+jDEOrbXqSE8svBCnu;6O(-Jk@|A&f!37t1bu{c2wWTDu*7Uz-H+yX~67T-jlHf>tRJe>5dXv*@6MOe7ZLcAxlET`DKa}OLU zIBwjy`eJ3SF9&wl2zt|YiX7IxRhAJpm1`Nnh3@|X>_DfFO~)>E00000NkvXXu0mjf DZHoaH diff --git a/custom-src/frontend/assets/custom/suse_logo.png b/custom-src/frontend/assets/custom/suse_logo.png deleted file mode 100644 index d4dfe1e1145b8120839b7f8bf2a94f462551211e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1504 zcmV<61t0o}P)cZh&k2wvhkwqY_FBNO}$tXmJYks7{Uo{SD4F?!)L>`^d| zVlWE8ALpR-1xGOwMe(z{55OD6u@jC?hc9M^w+Bt}ySojd6fQw4eZ*nhfeyXk8`X!9 z9($mrmLn0WAtx#z5Tm2&5PrmHghNZ+Ml!s`Cp^XgbVev*N3}tu#8qgqvFMM;s^Jg3 zLSjVLKPnBP1U^HnO+_a}7J(oHlcJ)CN zM+mf7K~%&wM0OOZkQD!-8zP|8(v=611UhK7t0)0q)WC7!SrP)J_vi>eR~>{8j>8qY zjAr-~iO~pSFcMYp4;mxAs}7?XjP(-7a02(Cm4dMm?NJdeu>fxnguh*J5CM1!xpl~F z;Q0U07WbgVZljp1J}YWKu8lOT49JJL!tFm`fJQzLe#J&qf{!b|aj$^bY~g}n59lCv z0p+AKu&=OpOOY3uQ4$T%6(cbmeNZ1c5D-;9SKNitSNx^FeF981R9K^knP%h;itdd7uO&+)`C53g4h{%9mZ!U?G`SHC=G%i;=x<*9Fz(OYgK|=Z4360 z03lF{KwNhm#t|re!f*Ij8d3xz8>PR`Q2DZh@a%XFv6>d{V+O<~y5lg~L9CN-${P%^ z*#?HuR$8w&E(n@ixQ}=^FWm18V!7Ke{={o21tO<#y=pLKpfP?z0B%F6n3pHJ4x}l> z0?`G(NXPwyrBHeff9aUtkQN23@T2~|X{6iJSonTZK#;@8alav*ihUVc%O5F_*UI(& zwR9lUAQyzA*norh3bBU5{ZnHDLSStP^lNOe_7s<620-kA^zUh~1)*y9B|R7?K?gOJ zwB|=}`XdaMG*0|xP#lz2hQXgpBhbcuiO;|Xu%$R^eiCFgLSU%ds3sgA3m-w+7=~~{ z@YzoL^1*4?(i~gfNB%%Dv_c2eK{|L#$BluZbXJJxfMHCuv5&tY7F*j>a?xv%jM3qv6-o{2p)^mNp~FkV7zh7J2#4Y4a)JuN;9u@}go zfni*R*i)pp)4ncfbr_>zsK?lg8R(31NPz$+4P!hE^$2@09UW0t#l9{Gr@9F&;OFJ& zRGzhj<2uG8kpqX32w$z-*AJCHs1i%Y%Or0!@e3rE(c~oOou diff --git a/custom-src/frontend/assets/custom/susecon-logo.svg b/custom-src/frontend/assets/custom/susecon-logo.svg deleted file mode 100644 index 056b4ead7d..0000000000 --- a/custom-src/frontend/assets/custom/susecon-logo.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/custom-src/frontend/assets/eula.html b/custom-src/frontend/assets/eula.html deleted file mode 100644 index b2fbd96f07..0000000000 --- a/custom-src/frontend/assets/eula.html +++ /dev/null @@ -1,61 +0,0 @@ -

SUSE® Cloud Application Platform

- -

SUSE End User License Agreement

- -

PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING, DOWNLOADING OR OTHERWISE USING THE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE WITH THESE TERMS, YOU ARE NOT PERMITTED TO DOWNLOAD, INSTALL OR USE THE SOFTWARE AND YOU SHOULD NOTIFY THE PARTY FROM WHICH YOU PURCHASED THE SOFTWARE TO OBTAIN A REFUND. AN INDIVIDUAL ACTING ON BEHALF OF AN ENTITY REPRESENTS THAT HE OR SHE HAS THE AUTHORITY TO ENTER INTO THIS AGREEMENT ON BEHALF OF THAT ENTITY.

- -

This End User License Agreement (“Agreement”) is a legal agreement between You (an entity or a person) and SUSE LLC (“Licensor”). The software product identified in the title of this Agreement for which You have acquired licenses, any media or reproductions (physical or virtual) and accompanying documentation (collectively the “Software”) is protected by the copyright laws and treaties of the United States (“U.S.”) and other countries and is subject to the terms of this Agreement. If the laws of Your principal place of business require contracts to be in the local language to be enforceable, such local language version may be obtained from Licensor upon written request and shall be deemed to govern Your purchase of licenses to the Software. Any add-on, update, mobile application, module, adapter or support release to the Software that You may download or receive that is not accompanied by a license agreement is Software and governed by this Agreement. If the Software is an update or support release, then You must have validly licensed the version and quantity of the Software being updated or supported in order to install or use the update or support release.

- -

LICENSED USE

- -

LICENSES. The Software and each of its components are owned by Licensor or other licensors and are protected under copyright laws and other applicable laws. Subject to compliance with the terms and conditions of this Agreement, Licensor grants to You a perpetual, non-exclusive, non-transferable, worldwide license to reproduce and use copies of the Software within Your Organization (as defined below).

- -

"Organization" means a legal entity, excluding subsidiaries and affiliates with a separate existence for tax purposes or for legal personality purposes. An example of an Organization in the private sector would be a corporation, partnership, or trust, excluding any subsidiaries or affiliates of the organization with a separate tax identification number or company registration number. A public sector example of an Organization would be a specific government body or local government authority.

- -

THIRD PARTY/OPEN SOURCE. Nothing in this Agreement shall restrict, limit or otherwise affect any rights or obligations You may have, or conditions to which You may be subject, under any applicable open source licenses to any open source code contained in the Software. The Software may include or be bundled with other software programs licensed under different terms and/or licensed by a third party other than Licensor. Use of any software programs accompanied by a separate license agreement is governed by that separate license agreement.

- -

SUBSCRIPTION SERVICES. Licensor has no obligation to provide maintenance or support unless You purchase a subscription offering that expressly includes such services. Licensor sells subscription offerings for the Software that entitles You to fee based technical support and/or internal use of Software updates provided on a specified annual period (“Subscription Offering”) and are subject to the terms of the Subscription Offering Terms and Conditions available https://www.suse.com/products/terms_and_conditions.pdf.

- -

MARKS. No right or license, express or implied, is granted under this Agreement with respect to any trademark, trade name or service mark of Licensor or its affiliates or licensors (“Mark”). This Agreement does not permit you to distribute the Software or its components using Licensor's trademarks, regardless of whether the copy has been modified. You may make a commercial redistribution of the Programs only if (a) permitted under a separate written agreement with Licensor authorizing such commercial redistribution, or (b) you remove and replace all occurrences of any Mark.

- -

RESTRICTIONS

- -

License Restrictions. The Software and each of its components are owned by Licensor and/or its licensors and are protected under copyright law and under other laws as applicable. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with Licensor and other licensors, subject to the applicable license. Licensor reserves all rights not expressly granted to You. The Software is licensed for Your internal use only. Except as this Agreement expressly allows and without limiting any rights or obligations set forth in the “Third Party/Open Source” section above, You may not (1) remove any patent, trademark, copyright, trade secret or other proprietary notices or labels on the Software or its documentation; (2) modify, alter, create derivative works, reverse engineer, decompile, or disassemble the Software except and only to the extent expressly permitted by applicable law; (3) transfer, assign, pledge, rent, timeshare, host or lease the Software, or sublicense any of Your license grants or rights under this Agreement; in whole or in part, without prior written permission of Licensor, (4) disclose the results of any performance, functional or other evaluation or benchmarking of the Software to any third party without the prior written permission of Licensor.

- -

Outsourcing Requirements. Your license to use the Software may be used under the terms of this Agreement by a third party acting on Your behalf, such as a third party cloud provider or outsourcing vendor who manages or hosts (either remotely or virtually) the Software for You, subject to and conditioned upon Your adherence to the following: (1) You remain responsible for all of Your obligations under this Agreement and enter into an enforceable agreement with the third party that contains terms and conditions to protect Licensor's rights in the Software that are no less restrictive than those contained in this Agreement, including without limitation the Verification section below; (2) You prohibit use of the Software by the third party for any purpose other than Your sole benefit; (3) You are solely responsible to Licensor for any and all breaches of this Agreement by the third party; and (4) You are and will remain current on subscription purchases that cover all installations and deployments of the Software by the third party on Your behalf.

- -

Appliance License. If, either directly from Licensor or from a third party, you have received a hardware, software or other appliance that uses the Software, You acknowledge and agree to use the Software solely for the purpose of running the appliance and not as a general purpose operating system.

- -

OWNERSHIP

- -

No title to or ownership of the Software is transferred to You. Licensor and/or its third party licensors retain all right, title and interest in and to all intellectual property rights in the Software and Services, including any adaptations or copies thereof. The Software is not sold to You, You acquire only a conditional license to use the Software. Title, ownership rights and intellectual property rights in and to the content accessed through the Software are the property of the applicable content owner and may be protected by applicable copyright or other law. This Agreement gives You no rights to such content.

- -

LIMITED WARRANTY

- -

Licensor warrants that the media that the Software is delivered on will be free from defects in materials and manufacture under normal use for a period of sixty (60) days from the date of delivery to you. THE FOREGOING WARRANTY IS YOUR SOLE AND EXCLUSIVE REMEDY AND IS IN LIEU OF ALL OTHER WARRANTIES, EXPRESS OR IMPLIED. SAVE FOR THE FOREGOING WARRANTY, THE SOFTWARE IS PROVIDED “AS IS” WITHOUT ANY WARRANTIES OF ANY KIND.

- -

Services. Licensor warrants that any Services purchased will be supplied in a professional manner in accordance with generally accepted industry standards. This warranty will be effective for thirty (30) days following delivery of the Services. Upon any breach of this warranty, Licensor’s only obligation is to either correct the Services so that they comply with this warranty or at its option refund the amount You paid to Licensor for the portion of the Services that fail to comply with this warranty. You agree to take appropriate measures to isolate and back up Your systems.

- -

THE SOFTWARE IS NOT DESIGNED, MANUFACTURED OR INTENDED FOR USE OR DISTRIBUTION WITH ON-LINE CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION, COMMUNICATION, OR CONTROL SYSTEMS, DIRECT LIFE SUPPORT MACHINES, WEAPONS SYSTEMS, OR OTHER USES IN WHICH FAILURE OF THE SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE.

- -

Non-Licensor Products. The Software may include or be bundled with hardware or other software programs or services licensed or sold by an entity other than Licensor. LICENSOR DOES NOT WARRANT NON-LICENSOR PRODUCTS OR SERVICES. ANY SUCH PRODUCTS OR SERVICES ARE PROVIDED ON AN “AS IS” BASIS. WARRANTY SERVICE IF ANY FOR NONLICENSOR PRODUCTS IS PROVIDED BY THE PRODUCT LICENSOR IN ACCORDANCE WITH THEIR APPLICABLE WARRANTY.

- -

EXCEPT AS OTHERWISE RESTRICTED BY LAW, LICENSOR DISCLAIMS AND EXCLUDES ANY AND ALL IMPLIED WARRANTIES INCLUDING ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT NOR ARE THERE ANY WARRANTIES CREATED BY COURSE OF DEALING, COURSE OF PERFORMANCE OR TRADE USAGE. LICENSOR MAKES NO WARRANTY, REPRESENTATION OR PROMISE NOT EXPRESSLY SET FORTH IN THIS LIMITED WARRANTY. LICENSOR DOES NOT WARRANT THAT THE SOFTWARE OR SERVICES WILL SATISFY YOUR REQUIREMENTS, BE COMPATIBLE WITH ALL OPERATING SYSTEMS, OR THAT THE OPERATION OF THE SOFTWARE OR SERVICES WILL BE UNINTERRUPTED OR ERROR-FREE. THE FOREGOING EXCLUSIONS AND DISCLAIMERS ARE AN ESSENTIAL PART OF THIS AGREEMENT AND FORMED THE BASIS FOR DETERMINING THE PRICE CHARGED FOR THE PRODUCTS. Some jurisdictions do not allow certain disclaimers and limitations of warranties, so portions of the above limitations may not apply to You. This limited warranty gives You specific rights and You may also have other rights which vary by state or jurisdiction.

- -

LIMITATION OF LIABILITY

- -

Consequential Losses. NEITHER LICENSOR NOR ANY OF ITS THIRD PARTY LICENSORS, SUBSIDIARIES, OR EMPLOYEES WILL IN ANY CASE BE LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, TORT, ECONOMIC OR PUNITIVE DAMAGES, WHETHER BASED ON CONTRACT, NEGLIGENCE, STRICT LIABILITY OR OTHER TORT, BREACH OF ANY STATUTORY DUTY, INDEMNITY OR CONTRIBUTION, INCLUDING WITHOUT LIMITATION LOSS OF PROFITS, BUSINESS OR DATA, EVEN IF ADVISED OF THE POSSIBILITY OF THOSE DAMAGES.

- -

Direct Damages. IN NO EVENT WILL LICENSOR'S AGGREGATE LIABILITY FOR DIRECT DAMAGES TO PROPERTY OR PERSON (WHETHER IN ONE INSTANCE OR A SERIES OF INSTANCES) EXCEED 1.25 TIMES THE AMOUNT PAID BY YOU FOR THE SOFTWARE OR SERVICES OUT OF WHICH SUCH CLAIM AROSE (OR $50 (U.S.) IF YOU RECEIVED THE SOFTWARE FREE OF CHARGE). The above exclusions and limitations will not apply to claims relating to death or personal injury caused by the negligence of Licensor or its employees, agents or contractors. In those jurisdictions that do not allow the exclusion or limitation of damages, including, without limitation, damages for breach of any implied terms as to title or quiet enjoyment of any Software obtained pursuant to this Agreement or for fraudulent misrepresentation, Licensor's liability shall be limited or excluded to the maximum extent allowed within those jurisdictions.

- -

GENERAL TERMS

-

Term. This Agreement becomes effective on the date You legally acquire the Software and will automatically terminate if You breach any of its terms.

-

Verification. Licensor has the right to verify Your compliance with this Agreement. You agree to: (1) Implement internal safeguards to prevent any unauthorized copying, distribution, installation, use of, or access to, the Software or Subscription Offerings; (2) Keep records sufficient to certify Your compliance with this Agreement, and, upon request of Licensor, provide and certify metrics and/or reports based upon such records and account for both numbers of copies (by product and version) and network architectures as they may reasonably relate to Your licensing and deployment of the Software or Subscription Offerings; and (3) Allow a Licensor representative or an independent auditor ("Auditor") to inspect and audit Your (including any subsidiaries or affiliates or contractors with access), computers and records, during Your normal business hours, for compliance with the licensing terms for Licensor’s software products and/or Subscription Offerings. Upon Licensor’s and Auditor’s presentation of their signed written confidentiality statement form to safeguard Your confidential information, You shall fully cooperate with such audit and provide any necessary assistance and access to records and computers. If an audit reveals that You have or at any time have had unlicensed installation, use of, or access to the Software or Subscription Offerings, You will, within 30 days, purchase sufficient licenses or Subscription Offerings to cover any shortfall without benefit of any otherwise applicable discount and subject to fees reflecting the duration of the shortfall. If a shortfall of 5% or more is found, You must reimburse Licensor for the costs incurred in the audit.

-

Transfer. This Agreement and the associated licenses purchased for use of the Software may not be transferred or assigned without the prior written approval of Licensor. Any such attempted transfer or assignment shall be void and of no effect. Please contact CRC@suse.com to request the transfer of licenses and assignment of this Agreement.

-

Law. All matters arising out of or relating to this Agreement will be governed by the substantive laws of the United States and the State of Utah without regard to its choice of law provisions. Any suit, action or proceeding arising out of or relating to this Agreement may only be brought before a federal or state court of appropriate jurisdiction in Utah. If a party initiates Agreement-related legal proceedings, the prevailing party will be entitled to recover reasonable attorneys' fees. If, however, Your principal place of business is a member state of the European Union or the European Free Trade Association, (1) the courts of Ireland shall have exclusive jurisdiction over any action of law relating to this Agreement; and (2) where the laws of such country of Your principal place of business are required to be applied to any such action of law the laws of that country shall apply. The application of the United Nations Convention of Contracts for the International Sale of Goods is expressly excluded.

-

Entire Agreement. This Agreement, together with any other purchase documents or other agreement between You and Licensor, sets forth the entire understanding and agreement between You and Licensor and may be amended or modified only by a written agreement agreed to by You and an authorized representative of Licensor. NO THIRD PARTY LICENSOR, DISTRIBUTOR, DEALER, RETAILER, RESELLER, SALES PERSON, OR EMPLOYEE IS AUTHORIZED TO MODIFY THIS AGREEMENT OR TO MAKE ANY REPRESENTATION OR PROMISE THAT IS DIFFERENT FROM, OR IN ADDITION TO, THE TERMS OF THIS AGREEMENT.

-

Waiver. No waiver of any right under this Agreement will be effective unless in writing, signed by a duly authorized representative of the party to be bound. No waiver of any past or present right arising from any breach or failure to perform will be deemed to be a waiver of any future right arising under this Agreement.

-

Severability. If any provision in this Agreement is invalid or unenforceable, that provision will be construed, limited, modified or, if necessary, severed, to the extent necessary, to eliminate its invalidity or unenforceability, and the other provisions of this Agreement will remain unaffected.

-

Export Compliance. You acknowledge that Licensor’s products and/or technology are subject to the U.S. Export Administration Regulations (the “EAR”) and You agree to comply with the EAR. You will not export or re-export Licensor’s products, directly or indirectly, to: (1) any countries that are subject to US export restrictions; (2) any end user who You know or have reason to know will utilize Licensor’s products in the design, development or production of nuclear, chemical or biological weapons, or rocket systems, space launch vehicles, and sounding rockets, or unmanned air vehicle systems, except as authorized by the relevant government agency by regulation or specific license; or (3) any end user who has been prohibited from participating in the US export transactions by any federal agency of the US government. By downloading or using the Software, You are agreeing to the foregoing and You are representing and warranting that You are not located in, under the control of, or a national or resident of any such country or on any such list. In addition, You are responsible for complying with any local laws in Your jurisdiction which may impact Your right to import, export or use Licensor’s products. Please consult the Bureau of Industry and Security web page www.bis.doc.gov before exporting items subject to the EAR. For more information on exporting Software, including the applicable Export Control Classification Number (ECCN) and associated license exception (as applicable), see www.suse.com/company/legal/. Upon request, Licensor's International Trade Services Department can provide information regarding applicable export restrictions for Licensor products. Licensor assumes no responsibility for Your failure to obtain any necessary export approvals.

-

U.S. Government Restricted Rights. Use, duplication, or disclosure of any Deliverables by the U.S. Government is subject to the restrictions in FAR 52.227-14 (Dec 2007) Alternate III (Dec 2007), FAR 52.227-19 (Dec 2007), or DFARS 252.227-7013(b)(3) (Nov 1995), or applicable successor clauses. [011918]

- diff --git a/custom-src/frontend/assets/logo.png b/custom-src/frontend/assets/logo.png deleted file mode 100644 index 7aa8caef5347fa596bd3563e05d0fb0cc65aba66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6902 zcmX9?byQT{*G7b)yM`WM=o-3X7-EKQWKa~OyCjAlLO>do6zNn_5Tu9hMj9kUkaz(p zLHOpkzJK=GXP+I<^PF?T8h^GZEw9;E*BU>c%)Yk5aLIE8%0T6>G}=f`juI z$57W)1G@yXgT}hXRF#yt*x4T*e#wYSg4ozNI5@c2L1MxpPc1FO!@~nR)#^vGWF@3p zmMi$VdGh-rg1XeAFnVAP&M1rl*5?9o1a+$Aj(dPX9Q-`I*a)gy-OkP~9D|6!=*UP) zA(2R4E^tV$z7QY3054xy4_r%KO9KW& zz_n5bZF{=9csRKP`S^wS1%w3z!!f!sy+*OUCQnQ)xH-A7RalE{j&&k>w6S;+1}xIk z(@jiFuvL6u?$91BECxw&aRoWKm_C#EKGTe$m$`l3!QJXXU9fPBHbh8R0s@f`6MNlj zYM`fw3JSvF5AA_VLd2BhppX10|V?NrlG#89Qp{gg}V0FO8dBNP<+uNbR!A1rKt-T+yHwv5izpK&(dw6(2 zb*Tk*L4&%XoNVl#l7AFop+dP?FJ{q0b?<$*%Jh|G>n)J*Va~$5S$81$re~&Ak4LQF#n%HY?UCXOm zO8GGDw|lnSxRSB|XJc@uMnpj9LtfsCXVw#>_S))lLselsI$Tv&QV2*nH&|1e>8`E0 zIN96Po{r*L9&BrQ@2pDs4^ts~u+?Sr+}Z#l2%_8DwY$IfqcKK}c;n#EFCf&Rrh&_c ztD`zrIxGbLE!jDOfp9p8Lj;|*DA?jvs@6TI*#msV@k^76Y9GU?Y)JJqkj@l|{7V1r zuxRR@AVw!3Q#2#HS1#x#tgGq7-`l{J+BY3|badgP|EE#hW9~-oJoje&gvIAI@n;EG zKaJ;d=1>3c(lS)M9v+{Ljwg~Xo7z~S#>w6+sGV)r?7w&A5nOLx`i7t8OCD>Q=tG4y|pX@i_*- zSAMPW7LA}Dn@HeY|K$24iVs2Cylk;;A`Cd&bO@Jh(@ew-W2Os6{jL&xwf_i;yL-IP zV`51a3uPTxpaJ2xx?|94|vcv;vL{Nn_(Tr3ECIxHS<|ydn&*vx|{feJl?q5+UTVjKpjE2 z!q#OOIK;0mGw0a*Q0zM#v-;;aAxC8>RNC-x&iC#)IDr|jVrtns+;cB}^2bj@_Tsjx zZDpPtY718&=>Zq+z+l;}w4Qbq3a^5J;n3jNL^{ZHp2&<^9fww2e(BRW3rd`-4inuA}XXiv+La?i9(D^qsrwan-%(xQ9k4Z$r9K7L-!zTdtw#a~AW z-u`}pQ_UGP`od+~MKJ(p=KJS373yUbdd6}}X=Tr0U$7rY&A}QRR27c=U?sRTU}VSr z<*$YvB~TVrbEJXp*NX1>N-TL{@zs=IUySXQ`W~f(EYY(Y z!*yJCxDb805&%>?gKD(;pw(mg8XB~t(HCu?9D3{R#rH_|y(|9)Zk*5F=zN?925@mJ zkaFh_M39Oxa0Ct8#uZ6{MQL04Bwqw*)Uo0@(8c z+9xU2$$8txLCULj7W(HnUsM%IG&xs(k35$S;mBmpIFFU085cBiuisgE$w%-222ih0EpmbuFh{D*5C3Ag}qi{!YiiuRf3bb7KLO%Z44Ng6P!fro#@E+QGGNkR@9pyzgn?yFq`=n zfu30L&}4Z{U0&2^-8M?cUtxF@WEf8{cC=m{S(E37OeK5ea$AU(A#WAXDADQENgQ8T zJW}Z>shXzFz2el=?8@_QcPbr+m7fh{fdmY?jK?*8>0tT<_Wrkgi2g2Id54o8-#q^= zl@_ppY2O}a9#r=oonNgp&lZfMr*n1gN!YFvl43|>LFSC~=&45m4yX76GV(SXXQaO5 zGFDh-FmLd=qY119$_XOs-eECgPKI}0g z_Vl%J&(meAA3p8j51o}&znj*^)aU0d_#COf9W|O|L}esj?w6w`fO~P&?%e9Z@`)|6 zrv?^D^Qtw#Ph{I22kvo>FGwq&uukWr1BPOYR?RdU>LcC4Sw0#4t2)pKdA|2oFU0Sl69O{=Y;t4boO zWu0@7CG_T)g%hdNBK6yF@V*2AJEPv80qXpu|7U&L*&RRmIfg+3e~@*IoL~ zJ6v8`+@E3TJ52;$WC41}H`0SghE+2D0nACLXm2iL&G_y2jZFy{w1Nv!Hc=Ph8uxdA za~DQRD?>dk_q*cw;lH!pQ3_#LSs8=7CKLH4>aSvu-8n;GTjAzqS~P$}Lxd}Zma4K} zucVx2|MqKk84}Ouj*#rD**~3gT-v8#n|cqcXv-YbwyE|-;Xv6suvGQb>~k*U+Q zmlR=&@)Y;f_g#$;q!1d{+?n~=A(BM*l~aLVbR*!M6}vG}FSsyk+o2-?ZNxfGm%^jy3)3V1LC0^S5Okc2AE@gJzI%bve@zhud3?tQw^2ynclt zO900%M_M(lEWLqyeB-f0=^V53`SHYltz$uqWcpjZ6P+$1@2{KSXoLFD^j81Zo6a4j z=DNk+n#h@qq>nScP&r&%a;1S{zkNPZoQ@5o#!1c3^&zX9&5775K39C9lDepHpV!uK z6ULV+xG2~%(s1i&3M??#iY%xAC4eeUI>$tNJ#=w{&MBybmkvE;^my7hTxKU-`41-o z_GB8{GM31eRguHG)&7qiQk~ZD<=)8@B{%qyDhdi2f*$X)uU|#1lT(ywgcj^(OvA%) zaP?7XTRw=8Emc0s@bm?6l>yYuE$ze8J@+EI(TaTElKatDGYfYt+^Jd1kMC50vBdm@ z$S_ImV>~LIV@|O$>0c5uM;9UpDOX&R9Pt|bfiE~ta^i~ihbUaNzp}=3r2&rDNNCa% z7aUJ`3J1&|;_@@cyfJcN9Pgkh5~yXy5+6vZt*7ALsSKRvv`O$IPehIw_Pg%8IrATo zMHK*KsE4ijr1tFRHaUPc)vE92o)X|_E!>3UvZVUZnI*8tH4@EU(Ij(}$m@9IH^C-W z{T|I#EU^;?oU6|$mH5YQ@1!XiJ#&z!%!-#EH?*x%s^BIo^B@K@5+#dg?zRaJoa72l zM#yJCtQxuz&+$|GkN)_2k#e1i%!?}#mHblovzLe8NEtq^@MVa;&@lQPz7aMSO-Y?3 z0-XNQuj|6{pH{0(TK?-tX5W)c9a-b5s#U8#%~>1c8)<0$;u*8+O=T{Bf}7WV$V$s5D*p^vy{Ndvq&Pn$N@FtzdS;6At(9^8_xO&njrl zP)Skp;S_Q%?^$rXL*c_xf`uh>C_mTPs(E!a>I1*^SgJk4{*$QnB}P-Fxa!{@3Vms` zM?*{Umq4X9R4zlq2`|dRnR?m1?gXU~EKT1+3Vc`%v^b^yj!3L`UfVo{KGWd*!5Sgy zSl8(|Ju@)d(FtX)$SJNc24MHr(hYUYN0=gfaLiU1Ve^ZB|6AzlUSQLxa>HrxPF1Eu zd*e5k0Qirc{q2bit?IUp$$`AxTVZds19=lMOJL_lk`#+in8qgGx$}kEXx*w?`-ZA| zJO)nMp0wEt-j|jYy+rc6dsfc=X8JGN8NRYwoge%jAPTx6<*!XXc#vkq3;9@Zg)3gA zShx2hul705&K^qZ|Td6fT)j6{q z@}>;t&)Qoba%Q;vA=SJ!CtffNbh$Q0{1TLF(MZ_nFyb>*c$dhm!M}Js#kRr1Q*#}; zxFIf>7&#W&E7XS9dgHpq2ma~dfA!r z`l$jg-H_Zsdc_veag9q&Q{+Vd#s3C~y9;6m7`Mh)Nd z`US+{NKz(1^B1R==Y^Vz1CBgrD*(6cOB<=AHSgL#K3?k0<<_Vag{jt|xjS zq*1DUAbw3l6U%hJ(~%3$Nze86o1^h4zE_z-P)#T38KD~KmOLSvv9yhc-!%4Z9r}+I zHq?-)8q3U(UNR^7EzY2H;@U^gjFR~oa6i-WE}l3*r1E0<7Gdm8hwEVnN2i0%Dc$E0 z)=Wj3v0uCu06i<`C3=+JUH`#VhTGfFlz&cD9+@I?L1rW$Y<+3F)tNu!2{`XC z;nB_T4rR%9%Mou00$GhqGDs*TrHC7Fd*t!ONP1jnhUEx7oN4XY(bF005ntiF&q1^*js9&2YVRpuOM^JU0GSD{S2h(nJB4n! z+9Z3tIlQsmo?ZEuj5^y&JEUtTUaxArSEkt09rZ=!Eojd6+Md>er153h6=<96Frty^v)Gpg)u|e~n>-fSdhtt>IG2)c{b^`IQ-gm~U!7kWqyPt^iu&RFI!gDBmLUzgb`wVw-?5JjmcNjlUpU;rZYOfqUIk{Wz5lx@Kl zJ?5h(k60#Sv*UmjzDfR>kZL>kj({Vf9d(CmEK4UzSU&j6)b!}4Is=gPD3&5V4h`ZA z2oe(mMtMf1pz+0s5%Nm&@k!b?EA^XE^`H3S_;NZAB{$#HDw9<|BVv`Sw z@TOB0Yp`dHowUID3W)|wF*jqM%OZ03di2xrq;g1`G^JMVwApSduSKq6AP-w_=U}Tb zT=xAVO^a5pD9EzY14#rGJN$4F8ESq#zqZ!SM;GJG@<3&|);=fc^#hGA5N}Dq<7Q=u zuQ8n})XIusQJ2)N7!n||3RW1Fbb2-gwSubq{FjmB#C zBm^cp3)a4w5`(rQ{xoa3wFBDzsJ#&y8$#EuiZ_4D$;3NUlt1g!X`7z?q{(9N_%fyj zLd}wi?<`e!@qsY?MeRlVx8~UVzE^ZCQRsSkBIvnnEcXiPkmeVam z@p7t@_h2{;*NG)LU&?kX4;;tN1x-2CiB?KW(gjaF; z%O`w&LuzKPi8FVVFT?hawKDAQYH|12-A;y|lcvYyRsUvtYA1x(9be;Q7s=Y|&~)^8 z*dTfsZT_C!O8V3`SY@G@<4&V#JCjuN6R)jZY23#V%La@siIJOlz)b3DC)>94kPVB% zYlhgnLJiHi4F%WzcNpM(a(5M!IIB7F`Ef?{O<pG#{5 zv*>mCCHXQlTL_7dOb9%F3?sDdj3`*(G(*y|9?4II{kiFAPUZ%@ zUIlZv5|)&a9a#NkiKPO+Vx(k}5Y5kLQY6u|MVa#`;wDAD$65JVI2 zT2hph+#nY7fhNm+ax6&OYapoM%^F|pw8>5bLJ9navHJ#8PLKNw)8rqW7CKpPGxFyp zY$yLanWG{%GqCtcs$+=kg zZxS7t&)T9`&!+Y;;%Jb;T^3VL@i-YEc6F5eQ7#ku{7>5~(MfL53N#`+Fd@-vn5_J8 zNxC2^7$W-}DdtAWdmAW#&c9??l}`O9oveQyw=QxQcG2wZhRF6c5&X&?%E@`TZ}e|u g{vs{w>iS49ElRFnUz@TO`|}H{mw1NAp`WM2~eG9&P< zI!_(fZA_CoNnNP!&c?5)H@QLK5!Jud_5!+ZsaHeypgN#lB#(!YAJqQpMs=k+vr7FT z>bAi6xgG@9XZvfaIzTeBL$dkxqITm~)xdw^+Sb9pxIYoIy$YVzcF1-~ z&ssfMaUMWB&>8I!>e`f2E3gXq3>XA_1Ux=&CaBL>170o3%N6?DfHzZ0?*OBt@>!;y z2X4j^p91on-3k03-~FnvQE|C9R~az7)VZNEMO~fcdDScGSL(E^0C_3;Hr7gVNx|s8 zsV-7S^nlf>u23&T?td?I=GRK{l`3n-o>Jl;aflyN&#CvK@58{}71-m;$U0{%NA{?1 zXQi9!p|W!Ki!~6t7DYy$4xh^kjG@o6-CXr$D5byDFMy@MePB#PZVNCxe#3x)Ko@Wa zxDH%QDc$M;@_XO~V0B9Azp`t}V=?;!>hNCZ4^?*t#@>2W<}DEjMn-wJfbQ&Adewbu z|9anb)@6I{u)0+3$cx*k++S4}tNXL@ANS>rag=(Zz?Jrw-c;dbJr2AKOpnKb*MU*l o7{yUi8k5lDIwg}*DQVK8iBeiByNG30uDMl;xRl~p?v$t8VgdpcHA`V~ zIpi`}NoM1cj+t3xZn@@4WVjWHro(?QPjk^kVy7*0Kk?40@~TjyLCPURItqn43w4~_3NGxX??r{}wQ+kegxY>0WP*(8FlEri}jn3Q) zeLFF~=TstkVn+572n}h|!SW%rRtG7K4x}=jDrplmTTU#dVIQXtfrvnI`v%GdkMFjJ zd(#jp&dx_+wd<@EUY!D9w(1~-^zH@JOhtR6PD$^?bBlM$e>mxv*y@0!0HvXk$r*Ye zs};}dh>isP053Af~HAG*KG0phm=; zTg@iMW#jo5l{acvFhGt4ckkm7G!G~|3q`{2;e!!S(@O`rPP@MjgNtV*ZJLKP)O6`f zRV%e{iZ(;+U!6J6Kjz!-Hl|PA_t6X0qL~3w+>f;Na$^5^6QU>OZDTWoH7RQiE6v@E zX<`pt{*V{lQxY-65TvAT(ZV4E`o}N9+z(j=*;61ig&K@ku~N`tE^*ramwd6_7vzMZ z6n~t1zl^VhWESA%ubvZ}`3GbzH&)r-ofl!lzq<08rwAqf+Qop&pE6=|1@-Bn6?*PM zXm8XXSAiZm)7W4#iiS`_B?~E7Dleay*SaPH7Q&xoiE@019;-2Qdp6=n!&H}c962B( z*xN6{QdZQ((hM&@GKR}Myh!znnu`UK2w_&&H8(41`0^FI(y!N2b4mRng}Pv@)EhOv zvr|^4{XnwlulxpjEa-Jnr<&9#wIXa}aORZ*m3KS2ye62CkGiE{>25YCnrW9Hus|BC zT8{$dPot4n39kFC$aalU7Ef}sR`yllgWx643x6&g<(myGLc_$2xozKy@UAbI7$nGL z3>nA|8(y{{EyzqYZp}X0w590K#uybTsuxc+b}bz9AALHS?{U#&XO%S(f@OwOwfY%6 zJUEE*qYAn`jn_k97s#A1ipG9a7F`6F0XX@0Z5*h13qzAM!*nQm?=S_1-^s_6UZ+4cWeeFKf6L&pDJ&Iv&XWujklvpJ%ppJ0QU)bUu7WhmU z7khsV@58HG0DHw$Nwv{KtNM+)T{ww)UgR8i?qQYm44_8GPb<(OhB<1&m{PEsSfU3H zx)#}pU;Y`vxsnr?_%?{`%)Xv7rK9A&y)-FaKBq6F38%Npd=M$4`%pZ)!NWgzH6&*p2%CFuIUFr4Lw diff --git a/custom-src/frontend/favicon.ico b/custom-src/frontend/favicon.ico deleted file mode 100644 index 60f452c054d1f20e09e6134830fa80a90dec97f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmah}Ye1m+)!km!eWQQD97M~f_57b)t84e|nGO)W9aIk7Oqv<4|| zZG+4(TNj&w!w=APL%S7{S{dej9?}SB6``ef$lL26)t$$VYq{8XaUZtVo`k07F3LKt2WKv-Fe<@+d#2en9O%*L*!GyFXL!TK%tfWqVVLD5!+SKl0z7xR8E zdR=dDZrFenvm9&NPC(Rh1naqe#PyLV!Twp+Q}3Jm9CjQxlp|G>3sHR*5^hQ%(jSA! zm;;gSDAMo9G4kURX~X(AB!^;R+U?a1Jw{j{pDw diff --git a/custom-src/frontend/sass/custom.scss b/custom-src/frontend/sass/custom.scss deleted file mode 100644 index 84a04680fe..0000000000 --- a/custom-src/frontend/sass/custom.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Custom SUSE Theme - - - -// SUSE Primary Material Design pallette -// From http://mcg.mbitson.com/#!?mcgpalette0=%233f51b5 -$suse-primary: (50: #e0f7f0, 100: #b3ecd9, 200: #80e0c0, 300: #4dd3a7, 400: #26c994, 500: #00c081, 600: #00ba79, 700: #00b26e, 800: #00aa64, 900: #009c51, A100: #c7ffe0, A200: #94ffc4, A400: #61ffa8, A700: #47ff9a, contrast: (50: #000, 100: #000, 200: #000, 300: #000, 400: #000, 500: #fff, 600: #fff, 700: #fff, 800: #fff, 900: #fff, A100: #000, A200: #000, A400: #000, A700: #000)); -$mat-red: ( 50: #ffebee, 100: #ffcdd2, 200: #ef9a9a, 300: #e57373, 400: #ef5350, 500: #f44336, 600: #e53935, 700: #d32f2f, 800: #c62828, 900: #b71c1c, A100: #ff8a80, A200: #ff5252, A400: #ff1744, A700: #d50000, contrast: ( 50: $black-87-opacity, 100: $black-87-opacity, 200: $black-87-opacity, 300: $black-87-opacity, 400: $black-87-opacity, 500: white, 600: white, 700: white, 800: $white-87-opacity, 900: $white-87-opacity, A100: $black-87-opacity, A200: white, A400: white, A700: white, )); - -$suse-theme-primary: mat-palette($suse-primary); -$suse-theme-warn: mat-palette($mat-red); -$stratos-theme: mat-light-theme($suse-theme-primary, $suse-theme-primary, $suse-theme-warn); - -@import "custom/suse" \ No newline at end of file diff --git a/custom-src/frontend/sass/custom/suse-colors.scss b/custom-src/frontend/sass/custom/suse-colors.scss deleted file mode 100644 index b444c572fd..0000000000 --- a/custom-src/frontend/sass/custom/suse-colors.scss +++ /dev/null @@ -1,7 +0,0 @@ -$suse-primary: #00c081; -$suse-secondary: #00243e; -$suse-text: #fff; -$suse-text-gray: #ccc; -$suse-button-gray: #888; -$suse-dark-blue: #06253A; -$suse-blue: #073155; \ No newline at end of file diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss deleted file mode 100644 index fc6d4ed923..0000000000 --- a/custom-src/frontend/sass/custom/suse.scss +++ /dev/null @@ -1,99 +0,0 @@ -// ***** -// NOTE -// ***** -// Having this "theme" file bad practice. We need to work out if we can do without this. -// Having this file completely sidesteps our theming and angular's component styles, potentially resulting -// in inconsistent and unexpected styling. -// This should only be used as a last resort - NJ. - -// Style overrides -// SUSE Brand primary colour -$suse-primary-color: #00c081; -// Secondary blue colour -$suse-secondary: #00243e; -$suse-text: #fff; -$suse-text-gray: #ccc; -$suse-dark-blue: #06253A; -$suse-blue: #073155; -$suse-side-nav: $suse-secondary; -$suse-side-nav-active: #003358; - -.stratos .page-content > .page-header { - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - // Ensure kube icons don't appear above sub header - background-color: #f5f5f5; -} - -.stratos img.stratos-title__logo { - width: 160px; -} - -.stratos h1.stratos-title__header { - display: initial; -} - -.stratos .page-header .mat-toolbar.mat-primary { - background-color: #fff; - color: #333; -} - -.stratos app-page-subheader { - .page-subheader { - background-color: #fff; - color: #333; - } - - .mat-tab-nav-bar.mat-background-primary { - .mat-tab-links { - background-color: #fff; - color: #333; - } - - .mat-tab-link { - color: #333; - } - - .mat-ink-bar { - background-color: $suse-primary-color; - } - } -} - -// Use SUSE Blue Side Navigation -.stratos { - - .side-nav__inner, - .side-nav__top, - .side-nav__item--active:hover { - background-color: $suse-side-nav; - } - - .side-nav__item--active, - .side-nav__item:hover { - background-color: $suse-side-nav-active; - } - - .side-nav__bottom { - color: $suse-text-gray; - } - - // Remove green page underflow run on about page - app-about-page .page-header__underflow { - background-color: transparent; - } -} - -// Remove background image from setup screen (e.g. upgrade screen) -.stratos app-intro-screen > .intro { - background-color: $suse-blue; - background-image: none; -} - -.stratos .page-header__divider { - color: #333; -} - -.stratos .page-header__menu-button-icon { - background-color: $suse-primary-color; - color: $suse-text; -} diff --git a/custom-src/stratos.yaml b/custom-src/stratos.yaml deleted file mode 100644 index 7bd90a7fce..0000000000 --- a/custom-src/stratos.yaml +++ /dev/null @@ -1 +0,0 @@ -title: SUSE CAP \ No newline at end of file From 0363a505f94690b0aad87fd71f8e92eb589d8c65 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 24 Apr 2019 11:59:19 +0100 Subject: [PATCH 32/98] Remove kube/helm from backend & docs --- deploy/tools/populate-cf/susecon-2019.sh | 320 -------- docs/connecting-k8s.md | 79 -- docs/eksdeployment.md | 154 ---- docs/suse/deploy.md | 175 ---- src/jetstream/load_plugins.go | 4 - .../plugins/kubernetes/awsiam_requests.go | 137 ---- .../plugins/kubernetes/cert_requests.go | 167 ---- .../plugins/kubernetes/cert_requests_test.go | 55 -- .../plugins/kubernetes/endpoint_config.go | 94 --- src/jetstream/plugins/kubernetes/gke_auth.go | 166 ---- src/jetstream/plugins/kubernetes/go.mod | 93 --- src/jetstream/plugins/kubernetes/go.sum | 259 ------ .../plugins/kubernetes/helm_client.go | 137 ---- .../plugins/kubernetes/helm_versions.go | 55 -- .../plugins/kubernetes/install_release.go | 173 ---- .../plugins/kubernetes/kube_config.go | 323 -------- .../plugins/kubernetes/kube_dashboard.go | 365 --------- .../plugins/kubernetes/list_releases.go | 146 ---- src/jetstream/plugins/kubernetes/main.go | 188 ----- .../monocular/20190307115300_ChartStore.go | 51 -- .../plugins/monocular/chart-repo/.gitignore | 1 - .../plugins/monocular/chart-repo/Dockerfile | 12 - .../plugins/monocular/chart-repo/Makefile | 8 - .../monocular/chart-repo/chart_repo.go | 53 -- .../plugins/monocular/chart-repo/datastore.go | 16 - .../plugins/monocular/chart-repo/delete.go | 73 -- .../plugins/monocular/chart-repo/go.mod | 24 - .../plugins/monocular/chart-repo/go.sum | 54 -- .../plugins/monocular/chart-repo/mongodb.go | 84 -- .../plugins/monocular/chart-repo/sync.go | 75 -- .../chart-repo/testdata/valid-index.yaml | 69 -- .../plugins/monocular/chart-repo/types.go | 61 -- .../plugins/monocular/chart-repo/utils.go | 406 ---------- .../monocular/chart-repo/utils_test.go | 572 ------------- .../plugins/monocular/chart-repo/version.go | 50 -- .../plugins/monocular/chartsvc/Dockerfile | 10 - .../plugins/monocular/chartsvc/Makefile | 6 - .../plugins/monocular/chartsvc/README.md | 6 - .../plugins/monocular/chartsvc/datastore.go | 15 - .../plugins/monocular/chartsvc/go.mod | 16 - .../plugins/monocular/chartsvc/go.sum | 51 -- .../plugins/monocular/chartsvc/handler.go | 290 ------- .../monocular/chartsvc/handler_test.go | 749 ------------------ .../plugins/monocular/chartsvc/main.go | 105 --- .../plugins/monocular/chartsvc/main_test.go | 467 ----------- .../monocular/chartsvc/models/chart.go | 67 -- .../plugins/monocular/chartsvc/mongodb.go | 88 -- .../plugins/monocular/chartsvc_main.txt | 15 - src/jetstream/plugins/monocular/endpoint.go | 54 -- src/jetstream/plugins/monocular/go.mod | 26 - src/jetstream/plugins/monocular/go.sum | 120 --- src/jetstream/plugins/monocular/main.go | 208 ----- src/jetstream/plugins/monocular/repository.go | 42 - .../plugins/monocular/sql_datastore.go | 347 -------- .../plugins/monocular/sync-source.sh | 38 - src/jetstream/plugins/monocular/sync.go | 85 -- 56 files changed, 7504 deletions(-) delete mode 100755 deploy/tools/populate-cf/susecon-2019.sh delete mode 100644 docs/connecting-k8s.md delete mode 100644 docs/eksdeployment.md delete mode 100644 docs/suse/deploy.md delete mode 100644 src/jetstream/plugins/kubernetes/awsiam_requests.go delete mode 100644 src/jetstream/plugins/kubernetes/cert_requests.go delete mode 100644 src/jetstream/plugins/kubernetes/cert_requests_test.go delete mode 100644 src/jetstream/plugins/kubernetes/endpoint_config.go delete mode 100644 src/jetstream/plugins/kubernetes/gke_auth.go delete mode 100644 src/jetstream/plugins/kubernetes/go.mod delete mode 100644 src/jetstream/plugins/kubernetes/go.sum delete mode 100644 src/jetstream/plugins/kubernetes/helm_client.go delete mode 100644 src/jetstream/plugins/kubernetes/helm_versions.go delete mode 100644 src/jetstream/plugins/kubernetes/install_release.go delete mode 100644 src/jetstream/plugins/kubernetes/kube_config.go delete mode 100644 src/jetstream/plugins/kubernetes/kube_dashboard.go delete mode 100644 src/jetstream/plugins/kubernetes/list_releases.go delete mode 100644 src/jetstream/plugins/kubernetes/main.go delete mode 100644 src/jetstream/plugins/monocular/20190307115300_ChartStore.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/.gitignore delete mode 100644 src/jetstream/plugins/monocular/chart-repo/Dockerfile delete mode 100644 src/jetstream/plugins/monocular/chart-repo/Makefile delete mode 100644 src/jetstream/plugins/monocular/chart-repo/chart_repo.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/datastore.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/delete.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/go.mod delete mode 100644 src/jetstream/plugins/monocular/chart-repo/go.sum delete mode 100644 src/jetstream/plugins/monocular/chart-repo/mongodb.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/sync.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml delete mode 100644 src/jetstream/plugins/monocular/chart-repo/types.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/utils.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/utils_test.go delete mode 100644 src/jetstream/plugins/monocular/chart-repo/version.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/Dockerfile delete mode 100644 src/jetstream/plugins/monocular/chartsvc/Makefile delete mode 100644 src/jetstream/plugins/monocular/chartsvc/README.md delete mode 100644 src/jetstream/plugins/monocular/chartsvc/datastore.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/go.mod delete mode 100644 src/jetstream/plugins/monocular/chartsvc/go.sum delete mode 100644 src/jetstream/plugins/monocular/chartsvc/handler.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/handler_test.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/main.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/main_test.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/models/chart.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc/mongodb.go delete mode 100644 src/jetstream/plugins/monocular/chartsvc_main.txt delete mode 100644 src/jetstream/plugins/monocular/endpoint.go delete mode 100644 src/jetstream/plugins/monocular/go.mod delete mode 100644 src/jetstream/plugins/monocular/go.sum delete mode 100644 src/jetstream/plugins/monocular/main.go delete mode 100644 src/jetstream/plugins/monocular/repository.go delete mode 100644 src/jetstream/plugins/monocular/sql_datastore.go delete mode 100755 src/jetstream/plugins/monocular/sync-source.sh delete mode 100644 src/jetstream/plugins/monocular/sync.go diff --git a/deploy/tools/populate-cf/susecon-2019.sh b/deploy/tools/populate-cf/susecon-2019.sh deleted file mode 100755 index 3aef555cc2..0000000000 --- a/deploy/tools/populate-cf/susecon-2019.sh +++ /dev/null @@ -1,320 +0,0 @@ -#!/bin/bash -#set -e - -# This script will populate Cloud Foundry with a set of orgs, spaces and apps. - -ORGNAME="SUSECON 2019" -ORGNAME2="SUSE Hackweek" -ORGNAME3="SUSE CAP" -ORGNAME4="SUSE Developers" -SPACENAME=dev -SPACENAME2=prod -SPACENAME3=test - -ORGQUOTA_NAME=susecon-org-quota -ORGQUOTA_TOTALMEMORY=100M -ORGQUOTA_APPINSTANCEMEMORY=50M -ORGQUOTA_ROUTES=50 -ORGQUOTA_SERVICEINSTANCES=50 -ORGQUOTA_APPINSTANCES=50 - -SPACEQUOTA_NAME=susecon-space-quota -SPACEQUOTA_TOTALMEMORY=70M -SPACEQUOTA_APPINSTANCEMEMORY=50M -SPACEQUOTA_ROUTES=6 -SPACEQUOTA_SERVICEINSTANCES=5 -SPACEQUOTA_APPINSTANCES=5 - -SERVICE_TYPE="persi-nfs" -SERVICE_NAME="susecon-persi-nfs" - -SERVICEINSTANCE_PCF_1_TYPE=p-mysql -SERVICEINSTANCE_PCF_1_PLAN=512mb -SERVICEINSTANCE_PCF_1_NAME=susecon-p-mysql -SERVICEINSTANCE_PCF_1_PARAMS='{"name":"value1","name":"value1"}' - -SERVICEINSTANCE_PCF_2_TYPE=p-rabbitmq -SERVICEINSTANCE_PCF_2_PLAN=standard -SERVICEINSTANCE_PCF_2_NAME=susecon-p-rabbitmq -SERVICEINSTANCE_PCF_2_PARAMS='{"name":"value2","name":"value2"}' - -SERVICEINSTANCE_SCF_1_TYPE=$SERVICE_TYPE -SERVICEINSTANCE_SCF_1_PLAN=10mb -SERVICEINSTANCE_SCF_1_NAME=susecon-mysql-dev-1 -SERVICEINSTANCE_SCF_1_PARAMS='{"name":"value3","name":"value3"}' - -SERVICEINSTANCE_SCF_2_TYPE=$SERVICE_TYPE -SERVICEINSTANCE_SCF_2_PLAN=20mb -SERVICEINSTANCE_SCF_2_NAME=susecon-mysql-dev-2 -SERVICEINSTANCE_SCF_2_PARAMS='{"name":"value4","name":"value4"}' - -function login { - cf login -a https://api.local.pcfdev.io --skip-ssl-validation -} - -function createQuota { - echo Creating Quota: $1 - echo Total Memory $2 - echo Instance Memory $3 - echo Routes $4 - echo Service Instances $5 - echo App Instances $6 - - if [ "$7" = true ]; then - #cf create-quota QUOTA [-m TOTAL_MEMORY] [-i INSTANCE_MEMORY] [-r ROUTES] [-s SERVICE_INSTANCES] [-a APP_INSTANCES] [--allow-paid-service-plans] [--reserved-route-ports RESERVED_ROUTE_PORTS] - cf create-quota "$1" -m "$2" -i "$3" -r "$4" -s "$5" -a "$6" - cf quotas - else - #cf create-space-quota QUOTA [-i INSTANCE_MEMORY] [-m MEMORY] [-r ROUTES] [-s SERVICE_INSTANCES] [-a APP_INSTANCES] [--allow-paid-service-plans] [--reserved-route-ports RESERVED_ROUTE_PORTS] - cf target -o "$ORGNAME" - cf create-space-quota "$1" -m "$2" -i "$3" -r "$4" -s "$5" -a "$6" - cf space-quotas - fi -} - -# Create an org, optionally assign it the qiven quota -function createOrg { - if [ -z "$2" ]; then - cf create-org "$1" - else - cf create-org "$1" -q "$2" - fi -} - -function createSpace { - SPACE_QUOTA_ARGS="" - SPACE_ORG=$1 - if [ "$2" = "true" ]; then - SPACE_QUOTA_ARGS=-q $SPACEQUOTA_NAME - fi - - echo "Creating spaces in $SPACE_ORG : $SPACE_QUOTA_ARGS" - - #cf create-space SPACE [-o ORG] [-q SPACE_QUOTA] - cf create-space "$SPACENAME" -o "$SPACE_ORG" ${SPACE_QUOTA_ARGS} - cf create-space "$SPACENAME2" -o "$SPACE_ORG" ${SPACE_QUOTA_ARGS} - cf create-space "$SPACENAME3" -o "$SPACE_ORG" ${SPACE_QUOTA_ARGS} -} - -function createServiceInstance { - echo Creating service: "$1", Type: "$2", Plan: "$3" - #cf create-service SERVICE PLAN SERVICE_INSTANCE -c '{"name":"value","name":"value"}' - cf create-service "$2" "$3" "$1" -c "$4" -} - -function createServiceInstances { - cf target -o "$ORGNAME3" -s dev - createServiceInstance "$SERVICEINSTANCE_NAME" "$SERVICEINSTANCE_TYPE" "$SERVICEINSTANCE_PLAN" "$SERVICEINSTANCE_PARAMS" - createServiceInstance "$SERVICEINSTANCE_NAME2" "$SERVICEINSTANCE_TYPE2" "$SERVICEINSTANCE_PLAN2" "$SERVICEINSTANCE_PARAMS2" -} - -function createApp { - echo Creating App: "$1" - echo Disk Limit: "$2" - echo Memory Limit: "$3" - echo Number of instances: "$4" - - cf target -o "$ORGNAME" -s "$SPACENAME" - cf push "$1" -k "$2" -m "$3" -i "$4" --no-manifest --no-start -} - -function createApps { - TEMP_PUSH_FOLDER=temp-push-folder - rm -rf $TEMP_PUSH_FOLDER - mkdir $TEMP_PUSH_FOLDER -p - pushd $TEMP_PUSH_FOLDER - - # Create these first, so they are not the most recent apps - cf target -o "$ORGNAME3" -s prod - # rm -rf cf-demo-app - # git clone https://github.com/nwmac/cf-demo-app - # pushd cf-demo-app - # cf push SUSECON_Demo_App --random-route -p . - # popd - - rm -rf cf-quick-app - git clone https://github.com/nwmac/cf-quick-app.git - pushd cf-quick-app - - cf target -o "$ORGNAME3" -s dev - cf push Scheduler -p . -b binary_buildpack -i 4 - cf push Notifier -p . -b binary_buildpack - cf push StaticWebSite -p . -b binary_buildpack - cf push APIServer -p . -b binary_buildpack - - # Stop one of the apps - cf stop Scheduler - - cf target -o "$ORGNAME" -s dev - - # Create an app in the 'Staging Failed' state - git checkout staging-fails - cf push BillingServer -p . - popd - - - # Create a few others to show space quotas - rm -rf empty-app - mkdir empty-app -p - pushd empty-app - touch delete-me - # Won't be running, so won't actually use any quota - createApp "IncompleteApp" "5M" "5M" 1 - popd - - rm -rf go-env - git clone https://github.com/cf-stratos/go-env - pushd go-env - cf push -m 22M - - # This app will use 3 application instances from teh quota - cf scale go-env -i 3 -f - - # Push the same app but call it TestApp - #cf push TestApp -p . --no-start - - popd - - popd -} - -function bindServiceInstancesToApp { - cf target -o "$ORGNAME3" -s dev - cf bind-service "Scheduler" "$SERVICEINSTANCE_NAME" - cf bind-service "Notifier" "$SERVICEINSTANCE_NAME2" - cf bind-service "Notifier" "$SERVICEINSTANCE_NAME" - cf bind-service "StaticWebSite" "$SERVICEINSTANCE_NAME2" -} - -function create { - createQuota "$ORGQUOTA_NAME" "$ORGQUOTA_TOTALMEMORY" "$ORGQUOTA_APPINSTANCEMEMORY" "$ORGQUOTA_ROUTES" "$ORGQUOTA_SERVICEINSTANCES" "$ORGQUOTA_APPINSTANCES" true - createOrg "$ORGNAME" "$ORGQUOTA_NAME" - createSpace "$ORGNAME" - createOrg "$ORGNAME2" - createSpace "$ORGNAME2" - createOrg "$ORGNAME3" - createSpace "$ORGNAME3" - createOrg "$ORGNAME4" "$ORGQUOTA_NAME" - createSpace "$ORGNAME4" - createQuota "$SPACEQUOTA_NAME" "$SPACEQUOTA_TOTALMEMORY" "$SPACEQUOTA_APPINSTANCEMEMORY" "$SPACEQUOTA_ROUTES" "$SPACEQUOTA_SERVICEINSTANCES" "$SPACEQUOTA_APPINSTANCES" false - - # Assign space quotas only in the first org - cf target -o "$ORGNAME" - cf set-space-quota "$SPACENAME" "$SPACEQUOTA_NAME" - cf set-space-quota "$SPACENAME2" "$SPACEQUOTA_NAME" - cf set-space-quota "$SPACENAME3" "$SPACEQUOTA_NAME" - - if [ "$CREATE_SERVICES" = true ]; then - createServiceInstances - fi - - createApps - - if [ "$CREATE_SERVICES" = true ]; then - bindServiceInstancesToApp - fi -} - -function showHelp { - - echo This script creates a set of orgs and spaces and populates a few applications. - echo Options: - echo -c to clean the orgs, space and apps - echo -s to create services -} - -function clean { - echo "Cleaning...." - echo Targeting $ORGNAME and deleting it\'s content - cf target -o "$ORGNAME" - cf delete-space "$SPACENAME" -f - cf delete-space "$SPACENAME2" -f - cf delete-space "$SPACENAME3" -f - cf delete-space-quota "$SPACEQUOTA_NAME" -f - - echo Deleting Orgs - # Delete org will also delete spaces, apps, service instances, routes, private domains and space-scoped service brokers - cf delete-org "$ORGNAME" -f - cf delete-org "$ORGNAME2" -f - cf delete-org "$ORGNAME3" -f - cf delete-org "$ORGNAME4" -f - cf delete-org "$ORGNAME5" -f - cf delete-org "$ORGNAME6" -f - cf delete-quota "$ORGQUOTA_NAME" -f -} - -echo "=================================================" -echo "Org, Space, Quota, Apps script " -echo "=================================================" -echo "" - -# Quick check that the cf cli is available -echo "Checking that the CF cli is available..." -cf --version -if [ ! $? -eq 0 ]; then - echo "This script needs the CF cli to be installed" - exit -1 -fi - -CLEAN=false -CREATE_SERVICES=false -CF=SCF -while getopts ":cpsh" opt ; do - case $opt in - h) - showHelp - exit 0 - ;; - c) - CLEAN=true - ;; - s) - CREATE_SERVICES=true - ;; - p) - CF=PCF - ;; - esac -done - -if [ "$CF" = "SCF" ]; then - echo Using SCF - SERVICEINSTANCE_NAME=$SERVICEINSTANCE_SCF_1_NAME - SERVICEINSTANCE_TYPE=$SERVICEINSTANCE_SCF_1_TYPE - SERVICEINSTANCE_PLAN=$SERVICEINSTANCE_SCF_1_PLAN - SERVICEINSTANCE_PARAMS=$SERVICEINSTANCE_SCF_1_PARAMS - - SERVICEINSTANCE_NAME2=$SERVICEINSTANCE_SCF_2_NAME - SERVICEINSTANCE_TYPE2=$SERVICEINSTANCE_SCF_2_TYPE - SERVICEINSTANCE_PLAN2=$SERVICEINSTANCE_SCF_2_PLAN - SERVICEINSTANCE_PARAMS2=$SERVICEINSTANCE_SCF_2_PARAMS -else - echo Using PCF - SERVICEINSTANCE_NAME=$SERVICEINSTANCE_PCF_1_NAME - SERVICEINSTANCE_TYPE=$SERVICEINSTANCE_PCF_1_TYPE - SERVICEINSTANCE_PLAN=$SERVICEINSTANCE_PCF_1_PLAN - SERVICEINSTANCE_PARAMS=$SERVICEINSTANCE_PCF_1_PARAMS - - SERVICEINSTANCE_NAME2=$SERVICEINSTANCE_PCF_2_NAME - SERVICEINSTANCE_TYPE2=$SERVICEINSTANCE_PCF_2_TYPE - SERVICEINSTANCE_PLAN2=$SERVICEINSTANCE_PCF_2_PLAN - SERVICEINSTANCE_PARAMS2=$SERVICEINSTANCE_PCF_2_PARAMS -fi - -#login -if [ "$CLEAN" = true ]; then - echo "===========================" - echo "Cleaning orgs and spaces..." - echo "===========================" - clean - exit 0 -fi - -echo "=================================================" -echo "Creating orgs, spaces, quota and applications ..." -echo "=================================================" - -create - -echo "" -echo "All done" diff --git a/docs/connecting-k8s.md b/docs/connecting-k8s.md deleted file mode 100644 index b43d225c60..0000000000 --- a/docs/connecting-k8s.md +++ /dev/null @@ -1,79 +0,0 @@ -# Connecting Different Kinds of Kubernetes Clusters - -Currently the Stratos Kubernetes plugin supports the following four types of clusters: - -1. CAASP (OIDC) -2. AWS EKS (AWS IAM auth) -2. Azure AKS -4. Certificate based Kubernetes authentication - -The following details, how to find the endpoint URL required to register the cluster in Stratos and what credentials are required to connect. - -## CAASP (OIDC) -To connect a CAASP cluster to Stratos, download a `kubeconfig` from Velum. - -1. To find the endpoint URL, inspect the file. The `server` property details the endpoint URL - -``` -apiVersion: v1 -kind: Config -clusters: -- name: caasp - cluster: - server: https://kube-api-x1.devenv.caasp.suse.net:6443 <---Endpoint URL - certificate-authority-data: 1c1MFpYSnVZV3dnUTBFd0hoY05NVGd4TURBMU1USXhNalU1V2hjTk1qZ3hNREF5TVRJeE1qVTVXakNCb1RFTApNQWtHQTFVRUJoTUNSRVV4RURBT0JnTlZCQWdNQjBKaGRtRnlhV0V4RWpBUUJnTlZCQWNNQ1U1MWNtVnRZbVZ5Clp6RWJNQmtHQTFVRUNnd1NVMVZUUlNCQmRYUnZaMl... -``` -2. Specify the Endpoint URL when adding the endpoint to Stratos. -3. To connect to Kubernetes, select the `CAASP (OIDC)` option, and upload the `kubeconfig` file downloaded from Velum. - -## Amazon EKS -The following details are required to connect to an EKS system: -- EKS Cluster endpoint URL. (To register the endpoint). - - This can be located in the generated configuration. See the following example. -To Connect the following details are required: -- Cluster Name (See the following example) -- AWS Access Key -- AWS Secret Key - -### EKS Endpoint URL And Cluster Name -You can locate the EKS cluster endpoint URL and the cluster name, by inspecting the generated cluster configuration in your local `kubeconfig`. - -``` -10:20 $ cat ~/.kube/config -- cluster: - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa...QXR2N3dOQkt3eFhsYgpxZm5HRUs0WHRmSWNIcjJHSjhZOXdIa0lPRm0rR3Nvak1PaG1pK05wbER2YjVJc3BmMmxxbXdLd3RmRT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - server: https://40BCD34B7E297903DA2EAF19B6164521.sk1.us-east-1.eks.amazonaws.com - name: arn:aws:eks:us-east-1:138384977974:cluster/BRSSCF - -``` -The endpoint URL is specified in the `server` property (i.e. `https://40BCD34B7E297903DA2EAF19B6164521.sk1.us-east-1.eks.amazonaws.com`), while the cluster name is the last part of the `name` property (i.e `BRSSCF`). - -## Azure AKS -To connect an AKS kubernetes instance, the following is required: -1. AKS Endpoint URL, which can be found from the AKS console or the generated kubernetes configuration. -2. To connect to the cluster, provide the `kubeconfig` file. - -## Certificate based authentication (Minikube) - -Minikube by default uses TLS certificates for authentication. To find the Minikube endpoint URL, locate the `minikube` entry in your local `kubeconfig` file. In the following example, the `minikube` endpoint URL is `https://192.168.99.100:8443`. - -``` -- cluster: - certificate-authority: /home/user/.minikube/ca.crt - server: https://192.168.99.100:8443 - name: minikube -``` - -To connect to the cluster, locate the relevant entry in the `users` section in your kubernetes config file. - -``` -users: -- name: minikube - user: - client-certificate: /home/user/.minikube/client.crt - client-key: /home/user/.minikube/client.key - -``` -The two files specified under `client-certificate` and `client-key` are required to connect to the cluster. -Select the `Kubernetes Cert Auth` option in the connect dialog and select the two files to connect. \ No newline at end of file diff --git a/docs/eksdeployment.md b/docs/eksdeployment.md deleted file mode 100644 index cbf1eccf4e..0000000000 --- a/docs/eksdeployment.md +++ /dev/null @@ -1,154 +0,0 @@ -# Stratos, SCF and metrics on EKS - -## EKS Setup - -Follow the instructions outlined in https://docs.aws.amazon.com/eks/latest/userguide/getting-started.html to deploy an EKS cluster. - -If you plan to deploy SCF in the cluster, make the following modifications when creating the worker nodes. -- Set `NodeInstanceType` to `t2.large` -- Set `NodeInstanceVolume` to `75` - -## Helm Setup - -Download the latest Helm release (atleast 2.9 is required for RBAC support) from https://github.com/helm/helm/releases - -Save the following to a file caleld `helm-rbac.yaml` -``` -apiVersion: v1 -kind: ServiceAccount -metadata: - name: tiller - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRoleBinding -metadata: - name: tiller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: - - kind: ServiceAccount - name: tiller - namespace: kube-system -``` - -Apply the configuration to the EKS cluster -``` -$ kubectl apply -f helm-rbac.yaml -``` - -Install Helm -``` -$ helm init --service-account tiller -``` - -## Storage Classes - -Two storage classes are required, one general storage class that will be marked as the `default` storage class in the cluster, and a storage class that is scoped to a single `AZ`. This scoped storage class will be used to deploy Stratos and Metrics, that make use of shared storage volumes. - -To setup the `default` storage class save the following to a file `default_storage_class.yaml` -``` -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: gp2 - annotations: - storageclass.kubernetes.io/is-default-class: "true" - labels: - kubernetes.io/cluster-service: "true" -provisioner: kubernetes.io/aws-ebs -parameters: - type: gp2 -``` - -To create the storage class, execute the following: -``` -$ kubectl apply -f default_storage_class.yaml -``` - -To setup the scoped storage class, save the following to `scoped_storage_class.yaml`. -``` -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: gp2scoped -provisioner: kubernetes.io/aws-ebs -parameters: - type: gp2 - zone: "us-east-1a" -reclaimPolicy: Retain -mountOptions: - - debug -``` -To create the storage class, execute the following: -``` -$ kubectl apply -f scoped_storage_class.yaml -``` - -In this guide, the scoped storage class will be referred to as `gp2scoped`. -## SCF Installation - -To deploy SCF, follow instructions detailed in https://github.com/SUSE/scf/wiki/Deployment-on-Amazon-EKS, starting from the [Deploy Cloud Foundry](https://github.com/SUSE/scf/wiki/Deployment-on-Amazon-EKS#deploy-cloud-foundry) section. - -The initial steps can be skipped, (changing storage volume size, helm and storage class configuration). - -The SCF config values file, will be referred to as `scf-config-values.yaml` in the guide. - - -## Metrics Installation - -Download the latest metrics chart from [here](). Or use the latest published `devel` release. - -Save the following configuration overrides to a file named `metrics-values.yaml`. - -``` -useLb: true -kubernetes: - authEndpoint: < EKS Cluster endpoint > -prometheus: - kubeStateMetrics: - enabled: true - server: - persistentVolume: - storageClass: gp2scoped -kube: - external_metrics_port: 443 - storage_class: - persistent: "gp2scoped" - shared: "gp2scoped" -``` -Deploy `metrics` to your cluster: - -``` - -$ helm install stratos/metrics --namespace metrics --name metrics -f metrics-values.yaml -f scf-config-values.yaml -``` - -Once all pods are `Ready`, retrieve the load balancer address for the `metrics` Endpoint. - -``` -$ kubectl get services --namespace metrics -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE -metrics-f-exp-service ClusterIP 10.100.219.223 9186/TCP 43m -metrics-metrics-nginx LoadBalancer 10.100.31.139 a98a9c6f3d5e111e8b51d0eeeba70c15-724925591.us-east-1.elb.amazonaws.com,172.31.34.100 443:30943/TCP 43m -metrics-prometheus-kube-state-metrics ClusterIP None 80/TCP 43m -prometheus-service ClusterIP 10.100.32.254 9090/TCP 43m - -``` - -The address in this example is `https://a98a9c6f3d5e111e8b51d0eeeofba70c15-724925591.us-east-1.elb.amazonaws.com`. Make a note it. - -## Stratos Deployment - -To deploy Stratos on EKS, the following configuration overrides are required, save the following to a file named `stratos-values.yaml`. -``` -storageClass: gp2scoped -useLb: true -``` - -Install `stratos` with Helm -``` -$ helm install stratos/console -f stratos-values.yaml --namespace stratos --name stratos -``` diff --git a/docs/suse/deploy.md b/docs/suse/deploy.md deleted file mode 100644 index 2e9026f4c8..0000000000 --- a/docs/suse/deploy.md +++ /dev/null @@ -1,175 +0,0 @@ -# Deploying Stratos - -The following instructions cover how to: - -- Deploy Stratos -- Connect Kubernetes to Stratos to enable Kubernetes views in Stratos -- Deploy Stratos Metrics -- Connect Stratos Metrics to Stratos to enable Metrics views in Stratos - -These instructions assume that you are deploying the SUSE Cloud Application Platform and that you have deployed UAA/SCF using a `scf-config-values` configuration file. - -## Install Stratos with Helm - -> NOTE: Full details on deploying Stratos to Kubernetes are available [here](https://github.com/SUSE/stratos/tree/v2-master/deploy/kubernetes) - -> NOTE: These instructions assume that you have added the SUSE Helm Repository with the name 'suse' - -To deploy Stratos, use the same `scf-config-values.yaml` file that you used to deploy SCF/UAA. - -Ensure you have a Storage Class configured and that is set to be the default - see [here](https://github.com/SUSE/stratos/tree/v2-master/deploy/kubernetes#specifying-a-custom-storage-class) for more information. - -Install with: - -``` -helm install suse/console \ - --name susecf-console \ - --namespace stratos \ - --values scf-config-values.yaml -``` - -Wait until all pods are in the Ready state. - -You can locate the IP and Port that Stratos is running on with: - -``` -kubectl get service stratos-ui-ext --namespace=stratos -``` - -This will give output similar to: - -``` -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE -stratos-ui-ext NodePort 172.24.239.140 10.17.3.1 80:30862/TCP,8443:32129/TCP 1h -``` - -> NOTE: When you log in to Stratos, your SUSE Cloud Foundry dpeloyment should already be registered and connected to Stratos. - -## Connecting Kubernetes to Stratos - -Stratos can show information from your Kubernetes environment. - -To enable this, you must register and connect your Kubernetes environment with Stratos. - -In the Stratos UI, go to `Endpoints` in the left-hand side navigation and click on the `+` icon in the top-right on the view - you should be shown the `Register new Endpoint` view. - -1. Select `Kubernetes` from the `Endpoint Type` dropdown -1. Enter a memorable name for yor environment in the `Name` field -1. Enter the URL of the API server for your Kubernetes environment -1. Check the `Skip SSL validation for the endpoint` if using self-signed certificates -1. Click `Finish` - -The view will refresh to show the new endpoint in the disconnected state. - -Next you will need to connect to this endpoint. - -1. In the table of endpoints, click the three-dot menu icon alongside the endpoint that you added above -1. Click on 'Connect' in the dropdown menu -1. Select the appropriate authentication type and provide the necessary values (see below for more information) -1. Click `Connect` - -Once connected, you should see a `Kubernetes` menu item in the left-hand side navigation - click on this to view the Kubernetes metadata. - -### Connecting to Kubernetes - -When connecting to Kubernetes you need to provide authentication information in order to connect - the `Auth Type` and information required depends on the Kubernetes platform that you are using: - -- For CaaSP, use the Auth Type `CAASP (OIDC)` and provide a valid `kubeconfig` file for your environment - -- For Amazon EKS use the Auth Type `AWS IAM (EKS)` and provide the name of your EKS cluster and your AWS Access Key ID and Secret Access Key - -- For Azure AKS use the Auth Type `Azure AKS` and provide a valid `kubeconfig` file for your environment - -- For Minikube use the Auth Type `Kubernetes Cert Auth` and provide the Certificate and Certificate Key files - - -> NOTE: For more details - see [here](https://github.com/SUSE/stratos/blob/v2-master/docs/connecting-k8s.md). - -## Deploying Metrics - -Stratos can show metrics data from Prometheus for both Cloud Foundry and Kubernetes. - -In order to do this, you need to deploy the `stratos-metrics` Helm chart - this deploys Prometheus with the necessary exporters that collect data from Cloud Foundry and Kubernetes. It also wraps Prometheus with an nginx server to provide authentication. - -As with deploying Stratos, you should deploy the metrics Helm chart using the same `scf-config-values.yaml` file that was used for deploying SCF and UAA. - -Create a new yaml file named `stratos-metrics-values.yaml`, with the following contents: - -``` -kubernetes: - authEndpoint: $KUBE_SERVER_ADDRESS -prometheus: - kubeStateMetrics: - enabled: true -nginx: - username: $USERNAME - password: $PASSWORD -``` - -Where: - -- `$KUBE_SERVER_ADDRESS` is the same URL that you used when registering your Kubernetes environment with Stratos (the Kubernetes API Server URL). -- `$USERNAME` should be chosen by you as the username that you will use when connecting to Stratos Metrics -- `$PASSWORD` should be chosen by you as the password that you will use when connecting to Stratos Metrics - -> Note: If you omit the `nginx` section in this file, the default username and password will be `metrics` and `s3cr3t`. - -Install Metrics with: - -``` -helm install suse/metrics \ - --name susecf-metrics \ - --namespace metrics \ - --values scf-config-values.yaml \ - --values stratos-metrics-values.yaml \ -``` - -Wait until all pods are in the Ready state. - -You can locate the IP and Port that Stratos Metrics is running on with: - -``` -kubectl get service susecf-metrics-metrics-nginx --namespace=metrics -``` - -This will give output similar to: - -``` -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE -susecf-metrics-metrics-nginx NodePort 172.24.218.219 10.17.3.1 443:31173/TCP 13s -``` - -> Note: If you are using a private container registry, you will need to provide your registry details and credentials in a configuration file - see [here](https://github.com/SUSE/stratos-metrics/blob/master/README.md#deploying-metrics-from-a-private-image-repository) for more details. - -## Connecting Stratos Metrics to Stratos - -When Stratos Metrics is connected to Stratos, additional views are enabled that show metrics metadata that has been ingested into the Stratos Metrics Prometheus server. - -To enable this, you must register and connect your Stratos Metrics instance with Stratos. - -In the Stratos UI, go to `Endpoints` in the left-hand side navigation and click on the `+` icon in the top-right on the view - you should be shown the `Register new Endpoint` view. - -1. Select `Metrics` from the `Endpoint Type` dropdown -1. Enter a memorable name for yor environment in the `Name` field -1. Enter the URL of your Metrics endpoint -1. Check the `Skip SSL validation for the endpoint` if using self-signed certificates -1. Click `Finish` - -The view will refresh to show the new endpoint in the disconnected state. - -Next you will need to connect to this endpoint. - -1. In the table of endpoints, click the three-dot menu icon alongside the endpoint that you added above -1. Click on 'Connect' in the dropdown menu -1. Enter the username and password for your Stratos Metrics instance -1. Click `Connect` - -Once connected, you should see that the name of your Metrices endpoint is a hyperlink and clicking on it should show basic metadata about the Stratos Metrics endpoint. - -Metrics data and views should now be available in the UI, for example: - -- On the `Instances` tab for an Application, the table should show an additional `Cell` column to indicate which Diego Cell the instance is running on. This should be clickable to navigate to a Cell view showing Cell information and metrics - -- On the view for an Application there should be a new `Metrics` tab that shows Application metrics - -- On the Kubernetes views, views such as the `Node` view should show an additional `Metrics` tab with metric information diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go index 80a9bd12d0..04d173bf4e 100644 --- a/src/jetstream/load_plugins.go +++ b/src/jetstream/load_plugins.go @@ -6,9 +6,7 @@ import ( "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundryhosting" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/demo" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/metrics" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userfavorites" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinfo" "github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/userinvite" @@ -34,8 +32,6 @@ func (pp *portalProxy) loadPlugins() { {"userinfo", userinfo.Init}, // userinvite depends on cloudfoundry & cloudfoundryhosting {"userinvite", userinvite.Init}, - {"kubernetes", kubernetes.Init}, - {"monocular", monocular.Init}, {"userfavorites", userfavorites.Init}, {"demo", demo.Init}, } { diff --git a/src/jetstream/plugins/kubernetes/awsiam_requests.go b/src/jetstream/plugins/kubernetes/awsiam_requests.go deleted file mode 100644 index 58c96ade4e..0000000000 --- a/src/jetstream/plugins/kubernetes/awsiam_requests.go +++ /dev/null @@ -1,137 +0,0 @@ -package kubernetes - -import ( - "encoding/json" - "errors" - "fmt" - "net/http" - "time" - - // "github.com/SermoDigital/jose/jws" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/sts" - "github.com/kubernetes-sigs/aws-iam-authenticator/pkg/token" -) - -type AWSIAMUserInfo struct { - Cluster string `json:"cluster"` - AccessKey string `json:"accessKey"` - SecretKey string `json:"secretKey"` -} - -func (c *AWSIAMUserInfo) Retrieve() (credentials.Value, error) { - return credentials.Value{ - AccessKeyID: c.AccessKey, - SecretAccessKey: c.SecretKey, - }, nil -} - -func (c *AWSIAMUserInfo) IsExpired() bool { - return true -} - -func (c *KubernetesSpecification) FetchIAMToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) { - log.Debug("FetchIAMToken") - - // Place the IAM properties into a JSON Struct and store that in the Refresh Token - // Then use the refresh method to get a current access token - cluster := ec.FormValue("cluster") - accessKey := ec.FormValue("access_key") - secretKey := ec.FormValue("secret_key") - - if len(cluster) == 0 || len(accessKey) == 0 || len(secretKey) == 0 { - return nil, nil, errors.New("Need cluster, access key and secret key") - } - - info := AWSIAMUserInfo{ - Cluster: cluster, - AccessKey: accessKey, - SecretKey: secretKey, - } - - jsonString, err := json.Marshal(info) - if err != nil { - return nil, nil, err - } - - refreshToken := string(jsonString) - - // Use the AWS IAM library to get a token - accessToken, err := c.getTokenIAM(info) - - // Tokens last 15 minutes - expiry := time.Now().Local().Add(time.Minute * time.Duration(15)) - - tokenRecord := c.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false) - tokenRecord.AuthType = AuthConnectTypeAWSIAM - return &tokenRecord, &cnsiRecord, nil -} - -func (c *KubernetesSpecification) GetCNSIUserFromIAMToken(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) { - return &interfaces.ConnectedUser{ - GUID: "AWS IAM", - Name: "IAM", - }, true -} - -func (c *KubernetesSpecification) getTokenIAM(info AWSIAMUserInfo) (string, error) { - generator, err := token.NewGenerator(false) - if err != nil { - return "", fmt.Errorf("AWS IAM: Failed to create generator due to %+v", err) - } - - sess, err := session.NewSessionWithOptions(session.Options{ - AssumeRoleTokenProvider: token.StdinStderrTokenProvider, - SharedConfigState: session.SharedConfigEnable, - }) - if err != nil { - return "", fmt.Errorf("AWS IAM: Failed to create new session %+v", err) - } - - creds := credentials.NewCredentials(&info) - stsAPI := sts.New(sess, &aws.Config{Credentials: creds}) - tok, err := generator.GetWithSTS(info.Cluster, stsAPI) - if err != nil { - return "", fmt.Errorf("AWS IAM: Failed to get token due to: %+v ", err) - } - - // Got the token - return tok.Token, nil -} - -func (c *KubernetesSpecification) doAWSIAMFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) { - log.Debug("doAWSIAMFlowRequest") - - authHandler := c.portalProxy.OAuthHandlerFunc(cnsiRequest, req, c.RefreshIAMToken) - return c.portalProxy.DoAuthFlowRequest(cnsiRequest, req, authHandler) -} - -func (c *KubernetesSpecification) RefreshIAMToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) { - log.Debug("RefreshIAMToken") - - userToken, ok := c.portalProxy.GetCNSITokenRecordWithDisconnected(cnsiGUID, userGUID) - if !ok { - return t, fmt.Errorf("Info could not be found for user with GUID %s", userGUID) - } - - // Refresh token is the IAM info - var iamInfo AWSIAMUserInfo - err = json.Unmarshal([]byte(userToken.RefreshToken), &iamInfo) - if err != nil { - return userToken, fmt.Errorf("Could not get the IAM info from the refresh token: %v+", err) - } - - token, err := c.getTokenIAM(iamInfo) - if err != nil { - return userToken, fmt.Errorf("Could not get new token using the IAM info: %v+", err) - } - - userToken.AuthToken = token - return userToken, nil -} diff --git a/src/jetstream/plugins/kubernetes/cert_requests.go b/src/jetstream/plugins/kubernetes/cert_requests.go deleted file mode 100644 index de552389ea..0000000000 --- a/src/jetstream/plugins/kubernetes/cert_requests.go +++ /dev/null @@ -1,167 +0,0 @@ -package kubernetes - -import ( - "bytes" - "crypto/tls" - "encoding/base64" - "encoding/json" - "errors" - "fmt" - "net" - "net/http" - "strings" - "time" - - // "github.com/SermoDigital/jose/jws" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" -) - -type KubeCertAuth struct { - Certificate string `json:"cert"` - CertificateKey string `json:"certKey"` - Token string `json:"token,omitempty"` -} - -func (k *KubeCertAuth) GetJSON() (string, error) { - jsonString, err := json.Marshal(k) - if err != nil { - return "", err - } - return string(jsonString), nil -} - -func (k *KubeCertAuth) GetCerticate() (tls.Certificate, error) { - cert, err := tls.X509KeyPair([]byte(k.Certificate), []byte(k.CertificateKey)) - if err != nil { - return tls.Certificate{}, err - } - return cert, nil -} - -func (c *KubernetesSpecification) extractCerts(ec echo.Context) (*KubeCertAuth, error) { - - kubeCertAuth := &KubeCertAuth{} - - bodyReader := ec.Request().Body - defer bodyReader.Close() - buf := new(bytes.Buffer) - buf.ReadFrom(bodyReader) - body := buf.String() - firstColon := strings.IndexByte(body, ':') - - cert, err := base64.StdEncoding.DecodeString(body[:firstColon]) - if err != nil { - return nil, err - } - certKey, err := base64.StdEncoding.DecodeString(body[firstColon+1:]) - if err != nil { - return nil, err - } - - kubeCertAuth.Certificate = string(cert) - kubeCertAuth.CertificateKey = string(certKey) - return kubeCertAuth, nil - -} - -func (c *KubernetesSpecification) FetchCertAuth(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) { - log.Info("FetchCerts") - - kubeCertAuth, err := c.extractCerts(ec) - if err != nil { - return nil, nil, errors.New("Unable to find required certificate and certificate key") - } - - jsonString, err := kubeCertAuth.GetJSON() - if err != nil { - return nil, nil, err - } - - // Refresh token isn't required since the AccessToken will never expire - refreshToken := jsonString - - accessToken := jsonString - - // Tokens lasts forever - expiry := time.Now().Local().Add(time.Hour * time.Duration(100000)) - disconnected := false - tokenRecord := c.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, disconnected) - tokenRecord.AuthType = AuthConnectTypeCertAuth - return &tokenRecord, &cnsiRecord, nil -} - -func (c *KubernetesSpecification) GetCNSIUserFromCertAuth(cnsiGUID string, cfTokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) { - return &interfaces.ConnectedUser{ - GUID: "Kube Cert Auth", - Name: "Cert Auth", - }, true -} - -func (c *KubernetesSpecification) doCertAuthFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) { - log.Debug("doCertAuthFlowRequest") - - authHandler := func(tokenRec interfaces.TokenRecord, cnsi interfaces.CNSIRecord) (*http.Response, error) { - - kubeAuthToken := &KubeCertAuth{} - err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken) - if err != nil { - return nil, err - } - cert, err := kubeAuthToken.GetCerticate() - if err != nil { - return nil, err - } - dial := (&net.Dialer{ - Timeout: time.Duration(30) * time.Second, - KeepAlive: 30 * time.Second, - }).Dial - - sslTransport := &http.Transport{ - Proxy: http.ProxyFromEnvironment, - Dial: dial, - TLSHandshakeTimeout: 10 * time.Second, // 10 seconds is a sound default value (default is 0) - TLSClientConfig: &tls.Config{ - InsecureSkipVerify: true, - Certificates: []tls.Certificate{cert}, - }, - MaxIdleConnsPerHost: 6, // (default is 2) - } - - kubeCertClient := http.Client{} - kubeCertClient.Transport = sslTransport - kubeCertClient.Timeout = time.Duration(30) * time.Second - - if kubeAuthToken.Token != "" { - req.Header.Set("Authorization", "bearer "+kubeAuthToken.Token) - } - - res, err := kubeCertClient.Do(req) - - kubeCertClient.CloseIdleConnections() - - if err != nil { - return nil, fmt.Errorf("Request failed: %v", err) - } - - if res.StatusCode != 401 { - return res, nil - } - return res, fmt.Errorf("Request failed with status code: %d ", res.StatusCode) - - } - return c.portalProxy.DoAuthFlowRequest(cnsiRequest, req, authHandler) -} - -func (c *KubernetesSpecification) RefreshCertAuth(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) { - log.Debug("RefreshCertAuth") - // This shouldn't be called since cert-auth K8S shouldn't expire - - userToken, ok := c.portalProxy.GetCNSITokenRecordWithDisconnected(cnsiGUID, userGUID) - if !ok { - return t, fmt.Errorf("Info could not be found for user with GUID %s", userGUID) - } - - return userToken, nil -} diff --git a/src/jetstream/plugins/kubernetes/cert_requests_test.go b/src/jetstream/plugins/kubernetes/cert_requests_test.go deleted file mode 100644 index 223a08df53..0000000000 --- a/src/jetstream/plugins/kubernetes/cert_requests_test.go +++ /dev/null @@ -1,55 +0,0 @@ -package kubernetes - -import ( - "encoding/json" - "net/http/httptest" - "strings" - "testing" - - "github.com/labstack/echo" -) - -func TestFetchCertAuth(t *testing.T) { - - kubeSpec := &KubernetesSpecification{} - - mockConnectRequet := "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURBRENDQWVpZ0F3SUJBZ0lCQWpBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwdGFXNXAKYTNWaVpVTkJNQjRYRFRFNE1UQXhNakUyTlRnMU1Wb1hEVEU1TVRBeE16RTJOVGcxTVZvd01URVhNQlVHQTFVRQpDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGakFVQmdOVkJBTVREVzFwYm1scmRXSmxMWFZ6WlhJd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEeFNtT2dORmV5VjkyRE5Sa0RmNVNSZlk5WHhGRVkKbFF2Z3lEcmFnVVpCcXFTaFBaZGdFdnBFWlVObkVoa1ZaYnc5WGUxelFMdVFuZnJEaERzOHlqTk8xWTV4ZUt2cwpIQlVBZEsxa2FQMlBXMVhSN3hxREh2SFdhQ3dRWVdHK1Bsa0NXMzg1YzBsNktXRUc5SVlFWFdkT1VDbEZuT3ZoCnJBN2RTNWR5eFViU3FCd0RSSDljMlhDVjQ4c1dLZnJhdmQvMTg5bWJENStQRk9ZditnRFFycHBTYnUzQytjTmYKbC93NDl0L0NQWlQ4bHFWU2FBUHhzOXFKbStKSFVFWHk3a1p2bGRZbG83NjJ3V1B6c0JoaXNkNU5ua2hmbGhrUApKSWNrWjN5eWF5bkdkOWJlKzdva2hwVEt1STNReGh5MTBrMWsxc1dyYmJTWVJDbmQ1akdVN3N2REFnTUJBQUdqClB6QTlNQTRHQTFVZER3RUIvd1FFQXdJRm9EQWRCZ05WSFNVRUZqQVVCZ2dyQmdFRkJRY0RBUVlJS3dZQkJRVUgKQXdJd0RBWURWUjBUQVFIL0JBSXdBREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBQ2NNS2IreVNOeG9wYmRGNwpqcTBTN1EvQmFUbWhzWnVUWDRPL2V4ZllkZFpwK0didDc2VEVqYWdmUmQvbXFFazlheFAxWDVzWkRhQ283blkzCitDdnpMb1h2Y3NHdnVnRTJSWStsSjdBbTdLS0lTdGVGTFdsRnBDTXJBWXF6TG1Wb3NyeDlWM0ZTbWY2REdWRk4KSmVVVFBnYTFrNTltMUNFSjZDYTAzM2hEYmp6aWsxd0xtR3pLVmRDR29HT1N0Vm1tbTZFWWMza1hheGVXTUtuMQpoRDhmREV5R3p1Z2hhTkQyYjZGdnlha28yUVQ3dFd3L09yMXNhQWQ1S2N5Wk4xdDVtUHI1RHh0SmFKNHN2dzh4Ck01R0MySFVUM2pzK3dQdDVSUlpSRXd2MkNCUVNHUWtxcDFrWTNLV1pXTDB2WEQvbjJqYlZGUUtacHQ2dDZKT3EKaVQ2bnlRPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=:LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBOFVwam9EUlhzbGZkZ3pVWkEzK1VrWDJQVjhSUkdKVUw0TWc2Mm9GR1FhcWtvVDJYCllCTDZSR1ZEWnhJWkZXVzhQVjN0YzBDN2tKMzZ3NFE3UE1velR0V09jWGlyN0J3VkFIU3RaR2o5ajF0VjBlOGEKZ3g3eDFtZ3NFR0Zodmo1WkFsdC9PWE5KZWlsaEJ2U0dCRjFuVGxBcFJaenI0YXdPM1V1WGNzVkcwcWdjQTBSLwpYTmx3bGVQTEZpbjYycjNmOWZQWm13K2ZqeFRtTC9vQTBLNmFVbTd0d3ZuRFg1ZjhPUGJmd2oyVS9KYWxVbWdECjhiUGFpWnZpUjFCRjh1NUdiNVhXSmFPK3RzRmo4N0FZWXJIZVRaNUlYNVlaRHlTSEpHZDhzbXNweG5mVzN2dTYKSklhVXlyaU4wTVljdGRKTlpOYkZxMjIwbUVRcDNlWXhsTzdMd3dJREFRQUJBb0lCQVFESEVJd291NFl1U0hjagpyRWE2c0NLdDlWeXhGL0dmeWpkR2QycTJvamlJTEhRdDRsWmttTU9JY2RLdDBpeUhqcXRDSlora21oOGtMSEdaCnBCb0xDUFpUYjdSWXdTbDFYYVdsL3B5ZVhrL3lXWFB3QXNkb3JicnZISHBkK1RsZWJxbVlYRXdWNVpzVkFkWmUKbXBXR1BGamlMeGdkcWx5Z2pnYWxZNXZLd0I2eDR3MHZTczdaUVBoQkFqTSs3a2Q3ZUpBRUJHZUxRL1lRTEIvVgo1Qmtrci9mT2d6K1A3V2t5QUovRk1iRzY4K0E3Z1FHeTJvWGdnbHVsOXg5YjlkcXJDSm5NVHFkNENvbU5qTmFjCkpValhjMEVGeFJqTjdOR0djenhXREVnc1dicGMxeFpYK20zcEQrQnRDd3BSeXJ4Q3NDWGwrTllnT01Jb1FZaWIKaUxQZzhsM0JBb0dCQVBQa3BMdTM0U1NhQVJNOE1YMWxCckdMa0k2cjlLZW5MaVZNYU55bG9CMWtyM29DaEJueApiek5kMkdxaXNBbEJFb3JVWEdkOVBadVNqYmRGMnVxTGgvdVMvdlBBMUpmR3drakZERmNyTVlXeDExWGVMcy9RCmYrdjF2dmQ5RUp5b0w2ekIxQkhaelZuenFIQ2w4OWlvNEY3Wkl3MmlKQ0NjWlJiN2JlOUdzbkdiQW9HQkFQMUUKckR3bldQNG5XN00wdlJYcFVkY3Q1UE96dHZIVFpoNTFJaC93NklOQzladXl3eFJoMi9XTEs0ZlZBRDYxeFloTgpVR0FvU2FUQzRrZWdoYlUvTWY5aWtBS3c3MWRPdk5HSzBSdjROTlZwbEJWbFhhcnF5OEpTeGJIcnNNU25rSTI4CjhNZ21YdlYvNkYwZTUxWFl1bHlYUXNqVWpCbVRXUTUzZnRWcXRhVDVBb0dCQU9vRkpod0pJRHNpbW8xK1lHNVYKbGNxZWhDS2gxS3RadXVtSEc4YzhGUnFmRmRFWXdQQ3p2V09vVkpSZGJsUXk0RHZkOEp4TWkrVFBCclFvanhvbQpzR0F3ZC9vanVObTVtWXFCcUltcnBHVUljL3FzcW5ZMU5jbVBqNkdobTJMMTdtanh3eTh0c2VEeDcxbkhvdWJ0CmcveitsS2ZzUUlZYUN0VzJnNUhvWUNpcEFvR0JBTTNtcHAvQTNYakNScXJLbFc3YTRNNHZZWk0rNTl4eUlQTmkKQnZ3d3Z0YjMrUFU3djUweWNjQ09CRFhKMVFrbWZoRHh5Z1ppdW54WWM5NEhncXgzVkE1cjh1ZzlNRmVxaTVkUApZL0Y1T0hySCtydnFUTnhIUnFBVTZ1UmEyTHNILzEwNzNnVGFMUmtwZzU4eElLR0tNUGhWZ05ZRTltRlVpWEpaCmM2UE52UjhCQW9HQU0zNTlZSUNUalNNYlYvSjJUbUx1Zjh2ejh0WVJDeXlla0h6Z2tTcmpqWUZWNmoxUTllWGQKa1ZFWitaYW1xYkZvUmxqK1lHS21XQ0w0OXJTWkYxNmVYL1V3OW5haEErcmtYL21aaERkOXIrVE90enpycUVYSQpUQVlld3R5ZGEzUzkyaytOWU8zZE5kbWZLQVdYV2JzdjZUKzBBTXR6VTFkMlNaaDlsTU5aVkUwPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=" - e := echo.New() - req := httptest.NewRequest(echo.POST, "/pp/v1/auth/login/cnsi?cert=&certKey=&cnsi_guid=testGuid&connect_type=kube-cert-auth&system_shared=false", strings.NewReader(mockConnectRequet)) - - engineReq := req - rec := httptest.NewRecorder() - res := echo.NewResponse(rec, e) - c := e.NewContext(engineReq, res) - - kubeCertAuth, err := kubeSpec.extractCerts(c) - if err != nil { - t.Fail() - } - - if kubeCertAuth.Certificate == "" { - t.Fail() - } - - if kubeCertAuth.CertificateKey == "" { - t.Fail() - } - - jsonString, err := kubeCertAuth.GetJSON() - - if err != nil { - t.Fail() - } - - testKubeCertAuth := &KubeCertAuth{} - err = json.NewDecoder(strings.NewReader(jsonString)).Decode(testKubeCertAuth) - if err != nil { - t.Fail() - } - if testKubeCertAuth.Certificate != kubeCertAuth.Certificate { - t.Fail() - } - if testKubeCertAuth.CertificateKey != kubeCertAuth.CertificateKey { - t.Fail() - } -} diff --git a/src/jetstream/plugins/kubernetes/endpoint_config.go b/src/jetstream/plugins/kubernetes/endpoint_config.go deleted file mode 100644 index cf2fbe79a2..0000000000 --- a/src/jetstream/plugins/kubernetes/endpoint_config.go +++ /dev/null @@ -1,94 +0,0 @@ -package kubernetes - -import ( - "encoding/json" - "errors" - "strings" - - log "github.com/sirupsen/logrus" - - restclient "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" -) - -// GetConfigForEndpoint gets a config for the Kubernetes go-client for the specified endpoint -func GetConfigForEndpoint(masterURL string, token interfaces.TokenRecord) (*restclient.Config, error) { - return clientcmd.BuildConfigFromKubeconfigGetter(masterURL, func() (*clientcmdapi.Config, error) { - - log.Debug("GetConfigForEndpoint") - - name := "cluster-0" - - // Create a config - - // Initialize a new config - context := clientcmdapi.NewContext() - context.Cluster = name - context.AuthInfo = name - - // Configure the cluster - cluster := clientcmdapi.NewCluster() - cluster.Server = masterURL - cluster.InsecureSkipTLSVerify = true - - // Configure auth information - authInfo := clientcmdapi.NewAuthInfo() - err := addAuthInfoForEndpoint(authInfo, token) - - config := clientcmdapi.NewConfig() - config.Clusters[name] = cluster - config.Contexts[name] = context - config.AuthInfos[name] = authInfo - config.CurrentContext = context.Cluster - - return config, err - }) - -} - -func addAuthInfoForEndpoint(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error { - - log.Debug("addAuthInfoForEndpoint") - log.Warn(tokenRec.AuthType) - - switch { - case tokenRec.AuthType == "gke-auth": - log.Warn("GKE AUTH") - return addGKEAuth(info, tokenRec) - case tokenRec.AuthType == AuthConnectTypeCertAuth, tokenRec.AuthType == AuthConnectTypeKubeConfigAz: - return addCertAuth(info, tokenRec) - default: - log.Error("Unsupported auth type") - } - return errors.New("Unsupported auth type") -} - -func addCertAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error { - kubeAuthToken := &KubeCertAuth{} - err := json.NewDecoder(strings.NewReader(tokenRec.AuthToken)).Decode(kubeAuthToken) - if err != nil { - return err - } - - info.ClientCertificateData = []byte(kubeAuthToken.Certificate) - info.ClientKeyData = []byte(kubeAuthToken.CertificateKey) - info.Token = kubeAuthToken.Token - - return nil -} - -func addGKEAuth(info *clientcmdapi.AuthInfo, tokenRec interfaces.TokenRecord) error { - gkeInfo := &GKEConfig{} - err := json.Unmarshal([]byte(tokenRec.RefreshToken), &gkeInfo) - if err != nil { - return err - } - - log.Warn("HERE") - - info.Token = tokenRec.AuthToken - return nil -} diff --git a/src/jetstream/plugins/kubernetes/gke_auth.go b/src/jetstream/plugins/kubernetes/gke_auth.go deleted file mode 100644 index c25d8631da..0000000000 --- a/src/jetstream/plugins/kubernetes/gke_auth.go +++ /dev/null @@ -1,166 +0,0 @@ -package kubernetes - -import ( - "encoding/json" - "errors" - "fmt" - "io/ioutil" - "net/http" - "net/url" - "strings" - "time" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "github.com/SermoDigital/jose/jws" -) - -const ( - gkeConfigType = "authorized_user" - googleOAuthEndpoint = "https://www.googleapis.com/oauth2/v4/token" -) - -// GKEConfig is the format of the config file we expect for GKE authentication -type GKEConfig struct { - ClientID string `json:"client_id"` - ClientSecret string `json:"client_secret"` - RefreshToken string `json:"refresh_token"` - Type string `json:"type"` - Email string `json:"email"` -} - -// FetchGKEToken will create a token for the GKE Authentication using the POSTed data -func (c *KubernetesSpecification) FetchGKEToken(cnsiRecord interfaces.CNSIRecord, ec echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) { - log.Debug("FetchGKEToken") - - // We should already have the refresh token in the body sent to us - req := ec.Request() - - // Need to extract the parameters from the request body - defer req.Body.Close() - body, err := ioutil.ReadAll(req.Body) - if err != nil { - return nil, nil, err - } - - gkeInfo := &GKEConfig{} - err = json.Unmarshal(body, &gkeInfo) - if err != nil { - return nil, nil, err - } - - // Type needs to be "authorized_user" - if gkeInfo.Type != gkeConfigType || len(gkeInfo.RefreshToken) == 0 { - return nil, nil, errors.New("Invalid configuration file") - } - - oauthToken, err := c.refreshGKEToken(cnsiRecord.SkipSSLValidation, gkeInfo.ClientID, gkeInfo.ClientSecret, gkeInfo.RefreshToken) - if err != nil { - return nil, nil, fmt.Errorf("Could not refresh the GKE token: %v+", err) - } - - token, err := jws.ParseJWT([]byte(oauthToken.IDToken)) - if err != nil { - log.Info(err) - return nil, nil, errors.New("Can not parse JWT Access token") - } - - email := token.Claims().Get("email") - if emailAddress, ok := email.(string); ok { - gkeInfo.Email = emailAddress - } - - tokenInfo, err := json.Marshal(gkeInfo) - if err != nil { - return nil, nil, err - } - - // Create a new token record - we need to store the client ID and secret as well, so cheekily use the refresh token for this - tokenRecord := c.portalProxy.InitEndpointTokenRecord(0, oauthToken.AccessToken, string(tokenInfo), false) - tokenRecord.AuthType = AuthConnectTypeGKE - return &tokenRecord, &cnsiRecord, nil -} - -// GetGKEUserFromToken gets the username from the GKE Token -func (c *KubernetesSpecification) GetGKEUserFromToken(cnsiGUID string, tokenRecord *interfaces.TokenRecord) (*interfaces.ConnectedUser, bool) { - log.Debug("GetGKEUserFromToken") - - gkeInfo := &GKEConfig{} - err := json.Unmarshal([]byte(tokenRecord.RefreshToken), &gkeInfo) - if err != nil { - return nil, false - } - - return &interfaces.ConnectedUser{ - GUID: gkeInfo.Email, - Name: gkeInfo.Email, - }, true -} - -func (c *KubernetesSpecification) doGKEFlowRequest(cnsiRequest *interfaces.CNSIRequest, req *http.Request) (*http.Response, error) { - log.Debug("doGKEFlowRequest") - - authHandler := c.portalProxy.OAuthHandlerFunc(cnsiRequest, req, c.RefreshGKEToken) - return c.portalProxy.DoAuthFlowRequest(cnsiRequest, req, authHandler) -} - -// RefreshGKEToken will refresh a GKE token -func (c *KubernetesSpecification) RefreshGKEToken(skipSSLValidation bool, cnsiGUID, userGUID, client, clientSecret, tokenEndpoint string) (t interfaces.TokenRecord, err error) { - log.Debug("RefreshGKEToken") - now := time.Now() - - userToken, ok := c.portalProxy.GetCNSITokenRecordWithDisconnected(cnsiGUID, userGUID) - if !ok { - return t, fmt.Errorf("Info could not be found for user with GUID %s", userGUID) - } - - // Refresh token is the GKE info - var gkeInfo GKEConfig - err = json.Unmarshal([]byte(userToken.RefreshToken), &gkeInfo) - if err != nil { - return userToken, fmt.Errorf("Could not get the GKE info from the refresh token: %v+", err) - } - - oauthToken, err := c.refreshGKEToken(skipSSLValidation, gkeInfo.ClientID, gkeInfo.ClientSecret, gkeInfo.RefreshToken) - if err != nil { - return userToken, fmt.Errorf("Could not refresh the GKE token: %v+", err) - } - - userToken.AuthToken = oauthToken.AccessToken - - duration := time.Duration(oauthToken.ExpiresIn) * time.Second - expiry := now.Add(duration).Unix() - userToken.TokenExpiry = expiry - - return userToken, nil -} - -func (c *KubernetesSpecification) refreshGKEToken(skipSSLValidation bool, clientID, clientSecret, refreshToken string) (u interfaces.UAAResponse, err error) { - log.Debug("refreshGKEToken") - tokenInfo := interfaces.UAAResponse{} - - // Go and get a new access token - httpClient := c.portalProxy.GetHttpClient(skipSSLValidation) - body := fmt.Sprintf("client_secret=%s&refresh_token=%s&client_id=%s&grant_type=refresh_token", url.QueryEscape(clientSecret), url.QueryEscape(refreshToken), url.QueryEscape(clientID)) - resp, err := httpClient.Post(googleOAuthEndpoint, "application/x-www-form-urlencoded", strings.NewReader(body)) - if err != nil { - return tokenInfo, err - } - - // Check status code - if resp.StatusCode != 200 { - return tokenInfo, fmt.Errorf("Failed to get access token: %s", resp.Status) - } - - // Parse the response - defer resp.Body.Close() - respBody, err := ioutil.ReadAll(resp.Body) - if err != nil { - return tokenInfo, err - } - - err = json.Unmarshal(respBody, &tokenInfo) - return tokenInfo, err -} diff --git a/src/jetstream/plugins/kubernetes/go.mod b/src/jetstream/plugins/kubernetes/go.mod deleted file mode 100644 index 172fbd9788..0000000000 --- a/src/jetstream/plugins/kubernetes/go.mod +++ /dev/null @@ -1,93 +0,0 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetetes - -go 1.12 - -require ( - github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect - github.com/Masterminds/goutils v1.1.0 // indirect - github.com/Masterminds/semver v1.4.2 // indirect - github.com/Masterminds/sprig v2.18.0+incompatible // indirect - github.com/SermoDigital/jose v0.9.1 - github.com/aws/aws-sdk-go v1.17.5 - github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect - github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000 - github.com/cyphar/filepath-securejoin v0.2.2 // indirect - github.com/docker/distribution v2.7.1+incompatible // indirect - github.com/docker/docker v1.13.1 // indirect - github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect - github.com/evanphx/json-patch v4.1.0+incompatible // indirect - github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect - github.com/ghodss/yaml v1.0.0 // indirect - github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect - github.com/go-openapi/spec v0.18.0 // indirect - github.com/gobwas/glob v0.2.3 // indirect - github.com/gogo/protobuf v1.2.1 // indirect - github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect - github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect - github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect - github.com/google/uuid v1.1.0 // indirect - github.com/googleapis/gnostic v0.2.0 // indirect - github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/hashicorp/golang-lru v0.5.0 // indirect - github.com/helm/monocular v1.4.0 - github.com/heptio/authenticator v0.3.0 // indirect - github.com/huandu/xstrings v1.2.0 // indirect - github.com/imdario/mergo v0.3.7 // indirect - github.com/json-iterator/go v1.1.5 // indirect - github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 - github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0 - github.com/labstack/echo v3.3.10+incompatible - github.com/mitchellh/go-wordwrap v1.0.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect - github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f - github.com/opencontainers/go-digest v1.0.0-rc1 // indirect - github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/prometheus/client_golang v0.9.2 // indirect - github.com/russross/blackfriday v2.0.0+incompatible // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - github.com/sirupsen/logrus v1.3.0 - github.com/spf13/cobra v0.0.3 // indirect - github.com/spf13/pflag v1.0.3 // indirect - github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect - github.com/unrolled/render v1.0.0 // indirect - golang.org/x/net v0.0.0-20190225153610-fe579d43d832 // indirect - golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 // indirect - golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect - google.golang.org/grpc v1.19.0 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/square/go-jose.v2 v2.2.2 // indirect - gopkg.in/yaml.v2 v2.2.2 - k8s.io/api v0.0.0-20190226013409-f951fa7b8c72 - k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a // indirect - k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb - k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 // indirect - k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c // indirect - k8s.io/client-go v10.0.0+incompatible - k8s.io/helm v2.12.3+incompatible - k8s.io/klog v0.2.0 - k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a // indirect - k8s.io/kubernetes v1.13.3 - k8s.io/utils v0.0.0-20190221042446-c2654d5206da // indirect - sigs.k8s.io/yaml v1.1.0 // indirect - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect -) - -replace ( - github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc - github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces - github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc - github.com/russross/blackfriday v2.0.0+incompatible => github.com/russross/blackfriday v1.5.2 - github.com/sergi/go-diff => github.com/sergi/go-diff v1.0.0 - github.com/spf13/cobra => github.com/spf13/cobra v0.0.3 - k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190221215341-5838f549963b - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca - k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 - k8s.io/kubernetes => k8s.io/kubernetes v1.13.3 -) diff --git a/src/jetstream/plugins/kubernetes/go.sum b/src/jetstream/plugins/kubernetes/go.sum deleted file mode 100644 index 71244c83a1..0000000000 --- a/src/jetstream/plugins/kubernetes/go.sum +++ /dev/null @@ -1,259 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA= -github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/sprig v2.18.0+incompatible h1:QoGhlbC6pter1jxKnjMFxT8EqsLuDE6FEcNbWEpw+lI= -github.com/Masterminds/sprig v2.18.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/SermoDigital/jose v0.9.1 h1:atYaHPD3lPICcbK1owly3aPm0iaJGSGPi0WD4vLznv8= -github.com/SermoDigital/jose v0.9.1/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= -github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= -github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= -github.com/aws/aws-sdk-go v1.17.5 h1:WW9Hm3KYo48iZHpmBc+b7sgyS0h32zgCvya28SLW4BU= -github.com/aws/aws-sdk-go v1.17.5/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U= -github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY= -github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo= -github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= -github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc= -github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-openapi/jsonpointer v0.17.0 h1:nH6xp8XdXHx8dqveo0ZuJBluCO2qGrPbDNZ0dwoRHP0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonreference v0.17.0 h1:yJW3HCkTHg7NOA+gZ83IPHzUSnUzGXhGmsdiCcMexbA= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/spec v0.18.0 h1:aIjeyG5mo5/FrvDkpKKEGZPmF9MPHahS72mzfVqeQXQ= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck= -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s= -github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= -github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU= -github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo= -github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ= -github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc h1:f8eY6cV/x1x+HLjOp4r72s/31/V2aTUtg5oKRRPf8/Q= -github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec= -github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE= -github.com/helm/monocular v1.5.0 h1:y8anOb2XLsCluYNOPx01G6EPqyBZ9fxDi+9BKbesULE= -github.com/helm/monocular v1.6.0 h1:zE8OggduPEtnF2x1XgrQnMwnKFUGCvk/RNs0NX8hgjg= -github.com/heptio/authenticator v0.3.0 h1:Xh6XWkLZ+CksGuky+vsr77mHnI9C4L3nwj+xuZu28J0= -github.com/heptio/authenticator v0.3.0/go.mod h1:Q86X8hc61JXhE5XxYLKmrSRWby/Oe8IIYZIBgmGVkTA= -github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= -github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE= -github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0 h1:HOC7YpUao5F3RTIncfBfoh+7/ID1Jl97ALNgEmWIjxo= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.0/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc h1:Ttr4Z3ZrMv4rAXn10UAqOC8ACx+F1omvcyV1a3hRArE= -github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20190111160901-390d9087a4bc/go.mod h1:ItxiN33Ho7Di8wiC4S4XqbH1NLF0DNdDWOd/5MI9gJU= -github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg= -github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= -github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0= -github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA= -github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/russross/blackfriday v2.0.0 h1:L7Oc72h7rDqGkbUorN/ncJ4N/y220/YRezHvBoKLOFA= -github.com/russross/blackfriday v2.0.0/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 h1:DNVk+NIkGS0RbLkjQOLCJb/759yfCysThkMbl7EXxyY= -github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245/go.mod h1:O1c8HleITsZqzNZDjSNzirUGsMT0oGu9LhHKoJrqO+A= -github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4= -github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8= -github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190225153610-fe579d43d832 h1:2IdId8zoI92l1bUzjAOygcAOkmCe13HY1j0rqPPPzB8= -golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346 h1:zxGQKdHVCsCsJpbd7ijKsVC27CyETheUBql7Br2TGmA= -golang.org/x/oauth2 v0.0.0-20190226191147-529b322ea346/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE= -k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/api v0.0.0-20190226013409-f951fa7b8c72 h1:4wrH+M4Kpkbbjs4UzT7XOvuhgBczsd4eXfBn9T5WqKk= -k8s.io/api v0.0.0-20190226013409-f951fa7b8c72/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= -k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87 h1:BMfPZfi3CkPd9e9Qbm+/AFgE6qXWQcbzUvC91LR3m7w= -k8s.io/apiextensions-apiserver v0.0.0-20190221221350-bfb440be4b87/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= -k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a h1:+yPI0R62TeitWAXHh5K5xVQrUF1JQwK+nrl5Lz6213E= -k8s.io/apiextensions-apiserver v0.0.0-20190225215027-42f453e3c54a/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= -k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb h1:+mNFBkhBgd0wFJ1K18cOYw3LVW7aMIM/pazb4i44aS0= -k8s.io/apimachinery v0.0.0-20190117220443-572dfc7bdfcb/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg= -k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca h1:rOczZwIfERvL7YLSQ96uI3NUYamzdK/MmSDIfChQRBk= -k8s.io/apimachinery v0.0.0-20190223094358-dcb391cde5ca/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/apiserver v0.0.0-20190221215341-5838f549963b h1:yFFYCR/UVj6hsYX6yRbY3CJ3917NF7tn0hwcdUil1aI= -k8s.io/apiserver v0.0.0-20190221215341-5838f549963b/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= -k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98 h1:aC93uSkvMU+AbozPRy72NtzFi7lefwzh4jKNuJZ8+ug= -k8s.io/apiserver v0.0.0-20190225213950-239e48e34c98/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= -k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca h1:UbXBTjFC1Yy5SDU8TPLVay3znB6yrlCo7Yq/q1VdESQ= -k8s.io/cli-runtime v0.0.0-20190221221947-d8fee89e76ca/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM= -k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c h1:fOmiMKsuY198ukXcZMRhEEQGYhVFhwCHn2j/fMExtcA= -k8s.io/cli-runtime v0.0.0-20190223141024-b5efea9a9c9c/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM= -k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible h1:xkYgpj1zwmLkSh7QASe/GUMTyjPI3hwHy7k/RcQSp2A= -k8s.io/client-go v2.0.0-alpha.0.0.20190202011228-6e4752048fde+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34= -k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w= -k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= -k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c= -k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4 h1:gW+EUB2I96nbxVenV/8ctfbACsHP+yxlT2dhMCsiy+s= -k8s.io/kube-openapi v0.0.0-20180509051136-39cb288412c4/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a h1:x9PsbfKs/IaYsygEYCbR58UWoyxHQTeHjUDpy4o+QoE= -k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kubernetes v1.13.3 h1:46t44D87wKtdKFgr/lXM60K8xPrW0wO67Woof3Vsv6E= -k8s.io/kubernetes v1.13.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4= -k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= -sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 h1:O69FD9pJA4WUZlEwYatBEEkRWKQ5cKodWpdKTrCS/iQ= -vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/src/jetstream/plugins/kubernetes/helm_client.go b/src/jetstream/plugins/kubernetes/helm_client.go deleted file mode 100644 index 305da7a13f..0000000000 --- a/src/jetstream/plugins/kubernetes/helm_client.go +++ /dev/null @@ -1,137 +0,0 @@ -package kubernetes - -import ( - "errors" - "fmt" - - log "github.com/sirupsen/logrus" - - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/rest" - "k8s.io/helm/pkg/helm" - "k8s.io/helm/pkg/helm/portforwarder" - "k8s.io/helm/pkg/kube" - - // Import the OIDC auth plugin - _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" -) - -type KubeProxyError struct { - Name string -} - -type KubeProxyFunc func(*interfaces.ConnectedEndpoint, chan KubeProxyResponse) - -type KubeProxyResponse struct { - Endpoint string - Result interface{} - Error *KubeProxyError -} - -type KubeProxyResponses map[string]interface{} - -func (c *KubernetesSpecification) GetHelmClient(endpointGUID, userID string) (helm.Interface, *kubernetes.Clientset, *kube.Tunnel, error) { - // Need to get a config object for the target endpoint - var p = c.portalProxy - - cnsiRecord, err := p.GetCNSIRecord(endpointGUID) - if err != nil { - return nil, nil, nil, errors.New("Can not get endpoint record") - } - - tokenRecord, ok := p.GetCNSITokenRecord(endpointGUID, userID) - if !ok { - return nil, nil, nil, errors.New("Can not get user token for endpoint") - } - - config, err := GetConfigForEndpoint(cnsiRecord.APIEndpoint.String(), tokenRecord) - if err != nil { - return nil, nil, nil, errors.New("Can not get Kubernetes config for specified endpoint") - } - - kubeClient, err := kubernetes.NewForConfig(config) - if err != nil { - log.Error("Could not get kube client") - return nil, nil, nil, err - } - - tillerTunnel, err := portforwarder.New("kube-system", kubeClient, config) - if err != nil { - log.Error("Could not establish port forwarding for Tiller") - log.Error(err) - return nil, nil, nil, err - } - - log.Warnf("Tiller tunnel is using Port: %d", tillerTunnel.Local) - - // TODO: Concurrency? - tillerHost := fmt.Sprintf("127.0.0.1:%d", tillerTunnel.Local) - - client := newClient(tillerHost) - - return client, kubeClient, tillerTunnel, nil -} - -func (c *KubernetesSpecification) ProxyKubernetesAPI(userID string, f KubeProxyFunc) (KubeProxyResponses, error) { - - var p = c.portalProxy - k8sList := make([]*interfaces.ConnectedEndpoint, 0) - eps, err := p.ListEndpointsByUser(userID) - if err != nil { - return nil, fmt.Errorf("Could not get endpints Client for endpoint: %v+", err) - } - - for _, endpoint := range eps { - if endpoint.CNSIType == "k8s" { - k8sList = append(k8sList, endpoint) - } - } - - // Check that we actually have some - // TODO - done := make(chan KubeProxyResponse) - for _, endpoint := range k8sList { - go f(endpoint, done) - } - - responses := make(KubeProxyResponses) - for range k8sList { - res := <-done - if res.Error == nil { - responses[res.Endpoint] = res.Result - } else { - responses[res.Endpoint] = res.Error - } - } - - return responses, nil -} - -// configForContext creates a Kubernetes REST client configuration for a given kubeconfig context. -func configForContext(context string, kubeconfig string) (*rest.Config, error) { - config, err := kube.GetConfig(context, kubeconfig).ClientConfig() - if err != nil { - return nil, fmt.Errorf("could not get Kubernetes config for context %q: %s", context, err) - } - return config, nil -} - -// getKubeClient creates a Kubernetes config and client for a given kubeconfig context. -func getKubeClient(context string, kubeconfig string) (*rest.Config, kubernetes.Interface, error) { - config, err := configForContext(context, kubeconfig) - if err != nil { - return nil, nil, err - } - client, err := kubernetes.NewForConfig(config) - if err != nil { - return nil, nil, fmt.Errorf("could not get Kubernetes client: %s", err) - } - return config, client, nil -} - -func newClient(tillerHost string) helm.Interface { - options := []helm.Option{helm.Host(tillerHost), helm.ConnectTimeout(20)} - return helm.NewClient(options...) -} diff --git a/src/jetstream/plugins/kubernetes/helm_versions.go b/src/jetstream/plugins/kubernetes/helm_versions.go deleted file mode 100644 index c3bc1ae91f..0000000000 --- a/src/jetstream/plugins/kubernetes/helm_versions.go +++ /dev/null @@ -1,55 +0,0 @@ -package kubernetes - -import ( - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - // "k8s.io/client-go/kubernetes" - // "k8s.io/client-go/rest" - // "k8s.io/helm/pkg/helm" - // "k8s.io/helm/pkg/helm/portforwarder" - // "k8s.io/helm/pkg/kube" - // "k8s.io/helm/pkg/kube" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" -) - -// GetHelmVersions will retrieve Tiller details for all endpoints -func (c *KubernetesSpecification) GetHelmVersions(ec echo.Context) error { - - log.Debug("GetHelmVersions") - // Need to get a config object for the target endpoint - // endpointGUID := ec.Param("endpoint") - userID := ec.Get("user_id").(string) - - resp, err := c.ProxyKubernetesAPI(userID, c.fetchHelmVersion) - log.Warn(err) - return ec.JSON(200, resp) -} - -func (c *KubernetesSpecification) fetchHelmVersion(ep *interfaces.ConnectedEndpoint, done chan KubeProxyResponse) { - - respone := KubeProxyResponse{ - Endpoint: ep.GUID, - Result: nil, - } - - client, kubeClient, tiller, err := c.GetHelmClient(ep.GUID, ep.Account) - if err != nil { - done <- respone - return - } - - defer tiller.Close() - - resp, err := client.GetVersion() - if err != nil { - done <- respone - return - } - - _, _ = kubeClient.Discovery().ServerVersion() - - respone.Result = resp - done <- respone -} diff --git a/src/jetstream/plugins/kubernetes/install_release.go b/src/jetstream/plugins/kubernetes/install_release.go deleted file mode 100644 index 1625e5600e..0000000000 --- a/src/jetstream/plugins/kubernetes/install_release.go +++ /dev/null @@ -1,173 +0,0 @@ -package kubernetes - -import ( - "bytes" - "encoding/json" - "errors" - "fmt" - - "github.com/helm/monocular/chartsvc" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "k8s.io/helm/pkg/chartutil" - "k8s.io/helm/pkg/helm" -) - -const chartCollection = "charts" - -type installRequest struct { - Endpoint string `json:"endpoint"` - Name string `json:"releaseName"` - Namespace string `json:"releaseNamespace"` - Values string `json:"values"` - Chart struct { - Name string `json:"chartName"` - Repository string `json:"repo"` - Version string `json:"version"` - } `json:"chart"` -} - -// Monocular is a plugin for Monocular -type Monocular interface { - GetChartStore() chartsvc.ChartSvcDatastore -} - -// InstallRelease will install a release -func (c *KubernetesSpecification) InstallRelease(ec echo.Context) error { - - bodyReader := ec.Request().Body - buf := new(bytes.Buffer) - buf.ReadFrom(bodyReader) - - var params installRequest - err := json.Unmarshal(buf.Bytes(), ¶ms) - if err != nil { - return fmt.Errorf("Could not get Create Release Parameters: %v+", err) - } - - chartID := fmt.Sprintf("%s/%s", params.Chart.Repository, params.Chart.Name) - - log.Info("Installing release") - log.Info(chartID) - - downloadURL, err := c.GetChart(chartID, params.Chart.Version) - if err != nil { - return fmt.Errorf("Could not get the Download URL") - } - - log.Debugf("Chart Download URL: %s", downloadURL) - - // Get IO reader for the Chart - - // Should we ignore SSL certs? - // TODO: Look up Helm Repository endpoiint and use the value from that - http := c.portalProxy.GetHttpClient(true) - - resp, err := http.Get(downloadURL) - - // // Check StatusCode is 200 - // // Body is a io.ReadCloser - - if resp.StatusCode != 200 { - return fmt.Errorf("Could not download Chart Archive: %s", resp.Status) - } - - defer resp.Body.Close() - chart, err := chartutil.LoadArchive(resp.Body) - if err != nil { - return fmt.Errorf("Could not load chart from archive: %v+", err) - } - - log.Debug("Loaded chart") - - endpointGUID := params.Endpoint - userGUID := ec.Get("user_id").(string) - - client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID) - if err != nil { - return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err) - } - - defer tiller.Close() - - if _, err := chartutil.LoadRequirements(chart); err == nil { - log.Debug("Chart requirements loaded") - } else if err != chartutil.ErrRequirementsNotFound { - log.Error("Can not load requirements") - } else { - log.Error(err) - } - - installResponse, err := client.InstallReleaseFromChart( - chart, - params.Namespace, - helm.ValueOverrides([]byte(params.Values)), - helm.ReleaseName(params.Name), - helm.InstallDryRun(false), - helm.InstallReuseName(false), - helm.InstallDisableHooks(false), - helm.InstallDisableCRDHook(false), - helm.InstallTimeout(300), - helm.InstallWait(false), - helm.InstallDescription(""), - ) - - if err != nil { - return fmt.Errorf("Could not install Helm Chart: %v+", err) - - } - return ec.JSON(200, installResponse) -} - -func (c *KubernetesSpecification) GetChart(chartID, version string) (string, error) { - - helm := c.portalProxy.GetPlugin("monocular") - if helm == nil { - return "", errors.New("Could not find monocular plugin") - } - - monocular, ok := helm.(Monocular) - if !ok { - return "", errors.New("Could not find monocular plugin interface") - } - - store := monocular.GetChartStore() - chart, err := store.GetChart(chartID) - if err != nil { - log.Error("Could not find chart") - } - - // Find the download URL for the version - for _, chartVersion := range chart.ChartVersions { - if chartVersion.Version == version { - if len(chartVersion.URLs) == 1 { - return chartVersion.URLs[0], nil - } - } - } - - return "", errors.New("Could not find Chart Version") -} - -// DeleteRelease will delete a release -func (c *KubernetesSpecification) DeleteRelease(ec echo.Context) error { - - endpointGUID := ec.Param("endpoint") - releaseName := ec.Param("name") - - userGUID := ec.Get("user_id").(string) - client, _, tiller, err := c.GetHelmClient(endpointGUID, userGUID) - if err != nil { - return fmt.Errorf("Could not get Helm Client for endpoint: %v+", err) - } - - defer tiller.Close() - - deleteResponse, err := client.DeleteRelease(releaseName, helm.DeletePurge(true)) - if err != nil { - return fmt.Errorf("Could not delete Helm Release: %v+", err) - - } - return ec.JSON(200, deleteResponse) -} diff --git a/src/jetstream/plugins/kubernetes/kube_config.go b/src/jetstream/plugins/kubernetes/kube_config.go deleted file mode 100644 index 8d5c530883..0000000000 --- a/src/jetstream/plugins/kubernetes/kube_config.go +++ /dev/null @@ -1,323 +0,0 @@ -package kubernetes - -import ( - "encoding/base64" - "encoding/json" - "errors" - "fmt" - "io/ioutil" - "reflect" - "time" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces/config" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "gopkg.in/yaml.v2" - - "github.com/SermoDigital/jose/jws" -) - -type KubeConfigClusterDetail struct { - Server string `yaml:"server"` -} - -type KubeConfigCluster struct { - Name string `yaml:"name"` - Cluster struct { - Server string - } -} - -type KubeConfigAuthProviderOIDC struct { - ClientID string `yaml:"client-id"` - ClientSecret string `yaml:"client-secret"` - IDToken string `yaml:"id-token"` - IdpIssuerURL string `yaml:"idp-issuer-url"` - RefreshToken string `yaml:"refresh-token"` - Expiry time.Time -} - -type KubeConfigUser struct { - Name string `yaml:"name"` - User struct { - AuthProvider struct { - Name string `yaml:"name"` - Config map[string]interface{} `yaml:"config"` - } `yaml:"auth-provider,omitempty"` - ClientCertificate string `yaml:"client-certificate-data,omitempty"` - ClientKeyData string `yaml:"client-key-data,omitempty"` - Token string `yaml:"token,omitempty"` - } -} - -func (k *KubeConfigUser) isOIDCAuth() bool { - if k.User.AuthProvider.Name != "oidc" { - return false - } - return true -} -func (k *KubeConfigUser) isAKSAuth() bool { - if k.User.ClientCertificate == "" || - k.User.ClientKeyData == "" || - k.User.Token == "" { - return false - } - return true -} - -func (k *KubeConfigUser) getOIDCConfig() (*KubeConfigAuthProviderOIDC, error) { - - if !k.isOIDCAuth() { - return nil, errors.New("User doesn't use OIDC") - } - OIDCConfig := &KubeConfigAuthProviderOIDC{} - err := unMarshalHelper(k.User.AuthProvider.Config, OIDCConfig) - if err != nil { - log.Info(err) - return nil, errors.New("Can not unmarshal OIDC Auth Provider configuration") - } - - token, err := jws.ParseJWT([]byte(OIDCConfig.IDToken)) - if err != nil { - log.Info(err) - return nil, errors.New("Can not parse JWT Access token") - } - - expiry, ok := token.Claims().Expiration() - if !ok { - return nil, errors.New("Can not get Acces Token expiry time") - } - OIDCConfig.Expiry = expiry - - return OIDCConfig, nil -} - -func (k *KubeConfigUser) getAKSAuthConfig() (*KubeCertAuth, error) { - - if !k.isAKSAuth() { - return nil, errors.New("User doesn't use AKS") - } - - cert, err := base64.StdEncoding.DecodeString(k.User.ClientCertificate) - if err != nil { - return nil, errors.New("Unable to decode certificate") - } - certKey, err := base64.StdEncoding.DecodeString(k.User.ClientKeyData) - if err != nil { - return nil, errors.New("Unable to decode certificate key") - } - kubeCertAuth := &KubeCertAuth{ - Certificate: string(cert), - CertificateKey: string(certKey), - Token: k.User.Token, - } - return kubeCertAuth, nil -} - -//ExtraScopes string `yaml:"extra-scopes"` - -type KubeConfigContexts struct { - Context struct { - Cluster string - User string - } `yaml:"context"` -} - -type KubeConfigFile struct { - ApiVersion string `yaml:"apiVersion"` - Kind string `yaml:"kind"` - Clusters []KubeConfigCluster `yaml:"clusters"` - Users []KubeConfigUser `yaml:"users"` - Contexts []KubeConfigContexts `yaml:"contexts"` -} - -func (k *KubeConfigFile) GetClusterByAPIEndpoint(endpoint string) (*KubeConfigCluster, error) { - for _, cluster := range k.Clusters { - if cluster.Cluster.Server == endpoint { - return &cluster, nil - } - } - return nil, fmt.Errorf("Unable to find cluster") -} - -func (k *KubeConfigFile) GetClusterContext(clusterName string) (*KubeConfigContexts, error) { - for _, context := range k.Contexts { - if context.Context.Cluster == clusterName { - return &context, nil - } - } - return nil, fmt.Errorf("Unable to find context") -} - -func (k *KubeConfigFile) GetUser(userName string) (*KubeConfigUser, error) { - for _, user := range k.Users { - if user.Name == userName { - return &user, nil - } - } - return nil, fmt.Errorf("Unable to find user") -} - -func (k *KubeConfigFile) GetUserForCluster(clusterEndpoint string) (*KubeConfigUser, error) { - cluster, err := k.GetClusterByAPIEndpoint(clusterEndpoint) - - if err != nil { - return nil, errors.New("Unable to find cluster in kubeconfig") - } - - clusterName := cluster.Name - - if clusterName == "" { - return nil, errors.New("Unable to find cluster") - } - - context, err := k.GetClusterContext(clusterName) - if err != nil { - return nil, errors.New("Unable to find cluster context") - } - - kubeConfigUser, err := k.GetUser(context.Context.User) - if err != nil { - return nil, errors.New("Can not find config for Kubernetes cluster") - } - - return kubeConfigUser, nil -} - -func (p *KubernetesSpecification) parseKubeConfig(kubeConfigData []byte) (*KubeConfigFile, error) { - - kubeConfig := &KubeConfigFile{} - err := yaml.Unmarshal(kubeConfigData, &kubeConfig) - if err != nil { - return nil, err - } - if kubeConfig.ApiVersion != "v1" || kubeConfig.Kind != "Config" { - return nil, errors.New("Not a valid Kubernetes Config file") - } - - return kubeConfig, nil -} - -func (p *KubernetesSpecification) FetchKubeConfigTokenOIDC(cnsiRecord interfaces.CNSIRecord, c echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) { - - req := c.Request() - - // Need to extract the parameters from the request body - defer req.Body.Close() - body, err := ioutil.ReadAll(req.Body) - if err != nil { - return nil, nil, err - } - - kubeConfig, err := p.parseKubeConfig(body) - - kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String()) - - if err != nil { - return nil, nil, fmt.Errorf("Unable to find cluster in kubeconfig") - } - - // We only support OIDC auth provider at the moment - if kubeConfigUser.User.AuthProvider.Name != "oidc" { - return nil, nil, errors.New("Unsupported authentication provider") - } - - oidcConfig, err := kubeConfigUser.getOIDCConfig() - if err != nil { - log.Info(err) - return nil, nil, errors.New("Can not unmarshal OIDC Auth Provider configuration") - } - tokenRecord := p.portalProxy.InitEndpointTokenRecord(oidcConfig.Expiry.Unix(), oidcConfig.IDToken, oidcConfig.RefreshToken, false) - tokenRecord.AuthType = interfaces.AuthTypeOIDC - - oauthMetadata := &interfaces.OAuth2Metadata{} - oauthMetadata.ClientID = oidcConfig.ClientID - oauthMetadata.ClientSecret = oidcConfig.ClientSecret - oauthMetadata.IssuerURL = oidcConfig.IdpIssuerURL - - jsonString, err := json.Marshal(oauthMetadata) - if err == nil { - tokenRecord.Metadata = string(jsonString) - } - - // Could try and make a K8S Api call to validate the token - // Or, maybe we can verify the access token with the auth URL ? - - return &tokenRecord, &cnsiRecord, nil -} - -func (p *KubernetesSpecification) FetchKubeConfigTokenAKS(cnsiRecord interfaces.CNSIRecord, c echo.Context) (*interfaces.TokenRecord, *interfaces.CNSIRecord, error) { - - req := c.Request() - - // Need to extract the parameters from the request body - defer req.Body.Close() - body, err := ioutil.ReadAll(req.Body) - if err != nil { - return nil, nil, err - } - - kubeConfig, err := p.parseKubeConfig(body) - - kubeConfigUser, err := kubeConfig.GetUserForCluster(cnsiRecord.APIEndpoint.String()) - if err != nil { - return nil, nil, errors.New("Unable to find cluster in kubeconfig") - } - - authConfig, err := kubeConfigUser.getAKSAuthConfig() - if err != nil { - return nil, nil, errors.New("User doesn't use AKS auth") - } - - jsonString, err := authConfig.GetJSON() - if err != nil { - return nil, nil, err - } - // Refresh token isn't required since the AccessToken will never expire - refreshToken := jsonString - - accessToken := jsonString - // Indefinite expiry - expiry := time.Now().Local().Add(time.Hour * time.Duration(100000)) - - tokenRecord := p.portalProxy.InitEndpointTokenRecord(expiry.Unix(), accessToken, refreshToken, false) - tokenRecord.AuthType = AuthConnectTypeKubeConfigAz - - return &tokenRecord, &cnsiRecord, nil -} - -func unMarshalHelper(values map[string]interface{}, intf interface{}) error { - - value := reflect.ValueOf(intf) - - if value.Kind() != reflect.Ptr { - return errors.New("config: must provide pointer to struct value") - } - - value = value.Elem() - if value.Kind() != reflect.Struct { - return errors.New("config: must provide pointer to struct value") - } - - nFields := value.NumField() - typ := value.Type() - - for i := 0; i < nFields; i++ { - field := value.Field(i) - strField := typ.Field(i) - tag := strField.Tag.Get("yaml") - if tag == "" { - continue - } - - if tagValue, ok := values[tag].(string); ok { - if err := config.SetStructFieldValue(value, field, tagValue); err != nil { - return err - } - } - } - - return nil -} diff --git a/src/jetstream/plugins/kubernetes/kube_dashboard.go b/src/jetstream/plugins/kubernetes/kube_dashboard.go deleted file mode 100644 index d24d596380..0000000000 --- a/src/jetstream/plugins/kubernetes/kube_dashboard.go +++ /dev/null @@ -1,365 +0,0 @@ -package kubernetes - -import ( - //"context" - "encoding/json" - "errors" - "fmt" - "net" - "net/http" - "net/http/httputil" - "net/url" - "strings" - "time" - - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - - utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apimachinery/pkg/util/proxy" - "k8s.io/client-go/rest" - "k8s.io/client-go/transport" - - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/api/legacyscheme" - api "k8s.io/kubernetes/pkg/apis/core" - k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" -) - -// GET /api/v1/namespaces/{namespace}/pods/{name}/proxy - -// http://localhost:8001/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/. - -//GET /api/v1/namespaces/{namespace}/services/{name}/proxy - -const defaultFlushInterval = 200 * time.Millisecond - -type responder struct{} - -type dashboardStatusResponse struct { - Endpoint string `json:"guid"` - Installed bool `json:"installed"` - Pod *v1.Pod `json:"pod"` -} - -func (r *responder) Error(w http.ResponseWriter, req *http.Request, err error) { - log.Errorf("Error while proxying request: %v", err) - http.Error(w, err.Error(), http.StatusInternalServerError) -} - -// Get the config for the certificate authentication -func getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) { - masterURL := cnsiRecord.APIEndpoint.String() - return GetConfigForEndpoint(masterURL, *tokenRecord) -} - -// Get the config for the certificate authentication -func __getConfig(cnsiRecord *interfaces.CNSIRecord, tokenRecord *interfaces.TokenRecord) (*rest.Config, error) { - - config := rest.Config{} - config.Host = cnsiRecord.APIEndpoint.String() - - // Only support certs for now - kubeAuthToken := &KubeCertAuth{} - err := json.NewDecoder(strings.NewReader(tokenRecord.AuthToken)).Decode(kubeAuthToken) - if err != nil { - return nil, err - } - - config.TLSClientConfig = rest.TLSClientConfig{} - config.TLSClientConfig.CertData = []byte(kubeAuthToken.Certificate) - config.TLSClientConfig.KeyData = []byte(kubeAuthToken.CertificateKey) - config.TLSClientConfig.Insecure = true - return &config, nil -} - -// makeUpgradeTransport creates a transport that explicitly bypasses HTTP2 support -// for proxy connections that must upgrade. -func makeUpgradeTransport(config *rest.Config, keepalive time.Duration) (proxy.UpgradeRequestRoundTripper, error) { - transportConfig, err := config.TransportConfig() - if err != nil { - return nil, err - } - tlsConfig, err := transport.TLSConfigFor(transportConfig) - if err != nil { - return nil, err - } - rt := utilnet.SetOldTransportDefaults(&http.Transport{ - TLSClientConfig: tlsConfig, - DialContext: (&net.Dialer{ - Timeout: 30 * time.Second, - KeepAlive: keepalive, - }).DialContext, - }) - - upgrader, err := transport.HTTPWrappersForConfig(transportConfig, proxy.MirrorRequest) - if err != nil { - return nil, err - } - return proxy.NewUpgradeRequestRoundTripper(rt, upgrader), nil -} - -// normalizeLocation returns the result of parsing the full URL, with scheme set to http if missing -func normalizeLocation(location *url.URL) *url.URL { - normalized, _ := url.Parse(location.String()) - if len(normalized.Scheme) == 0 { - normalized.Scheme = "http" - } - return normalized -} - -func (k *KubernetesSpecification) kubeDashboardProxy(c echo.Context) error { - log.Debug("kubeDashboardTest request") - - // c.Response().Header().Set("X-FRAME-OPTIONS", "sameorigin") - - cnsiGUID := c.Param("guid") - userGUID := c.Get("user_id").(string) - - var p = k.portalProxy - - log.Debug(c.Request().RequestURI) - - var prefix = "/pp/v1/kubedash/ui/" + cnsiGUID + "/" - - path := c.Request().RequestURI[len(prefix):] - - log.Debug(path) - - cnsiRecord, err := p.GetCNSIRecord(cnsiGUID) - if err != nil { - //return sendSSHError("Could not get endpoint information") - return errors.New("Could not get endpoint information") - } - - // Get token for this users - tokenRec, ok := p.GetCNSITokenRecord(cnsiGUID, userGUID) - if !ok { - //return sendSSHError("Could not get endpoint information") - return errors.New("Could not get token") - } - - log.Debug(tokenRec.AuthToken) - log.Debug(tokenRec.AuthType) - - // Make the info call to the SSH endpoint info - // Currently this is not cached, so we must get it each time - apiEndpoint := cnsiRecord.APIEndpoint - log.Debug(apiEndpoint) - // target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/", apiEndpoint) - //target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/", apiEndpoint) - // target := http://localhost:8001/api/v1/namespaces/kube-system/services/kubernetes-dashboard/proxy - - // TODO: Need namespace and whether it is https or http - target := fmt.Sprintf("%s/api/v1/namespaces/kube-system/services/http:kubernetes-dashboard:/proxy/%s", apiEndpoint, path) - log.Debug(target) - targetURL, _ := url.Parse(target) - targetURL = normalizeLocation(targetURL) - - config, err := getConfig(&cnsiRecord, &tokenRec) - if err != nil { - return errors.New("Could not get config for this auth type") - } - - log.Info("Config") - log.Info(config.Host) - log.Info("Making request") - req := c.Request() - w := c.Response().Writer - log.Info("%v+", req) - - // if h.tryUpgrade(w, req) { - // return - // } - // if h.UpgradeRequired { - // h.Responder.Error(w, req, errors.NewBadRequest("Upgrade request required")) - // return - // } - - loc := targetURL - loc.RawQuery = req.URL.RawQuery - - // If original request URL ended in '/', append a '/' at the end of the - // of the proxy URL - if !strings.HasSuffix(loc.Path, "/") && strings.HasSuffix(req.URL.Path, "/") { - loc.Path += "/" - } - - log.Info(loc) - - // From pkg/genericapiserver/endpoints/handlers/proxy.go#ServeHTTP: - // Redirect requests with an empty path to a location that ends with a '/' - // This is essentially a hack for http://issue.k8s.io/4958. - // Note: Keep this code after tryUpgrade to not break that flow. - if len(loc.Path) == 0 { - log.Info("Redirecting") - var queryPart string - if len(req.URL.RawQuery) > 0 { - queryPart = "?" + req.URL.RawQuery - } - w.Header().Set("Location", req.URL.Path+"/"+queryPart) - w.WriteHeader(http.StatusMovedPermanently) - return nil - } - - // if transport == nil || wrapTransport { - // h.Transport = h.defaultProxyTransport(req.URL, h.Transport) - // } - - transport, err := rest.TransportFor(config) - if err != nil { - log.Info("Could not get transport") - return err - } - - log.Info(transport) - - // WithContext creates a shallow clone of the request with the new context. - newReq := req.WithContext(req.Context()) - //newReq := req.WithContext(context.Background()) - newReq.Header = utilnet.CloneHeader(req.Header) - newReq.URL = loc - - // Set auth header so we log in if needed - if len(tokenRec.AuthToken) > 0 { - newReq.Header.Add("Authorization", "Bearer "+tokenRec.AuthToken) - log.Info("Setting auth header") - } - - proxy := httputil.NewSingleHostReverseProxy(&url.URL{Scheme: loc.Scheme, Host: loc.Host}) - proxy.Transport = transport - proxy.FlushInterval = defaultFlushInterval - proxy.ModifyResponse = func(response *http.Response) error { - log.Debugf("GOT PROXY RESPONSE: %s", loc.String()) - log.Debugf("%d", response.StatusCode) - log.Debug(response.Header.Get("Content-Type")) - - log.Debugf("%v+", response.Header) - response.Header.Del("X-FRAME-OPTIONS") - response.Header.Set("X-FRAME-OPTIONS", "sameorigin") - log.Debug("%v+", response) - return nil - } - - log.Errorf("Proxy: %s", target) - - // Note that ServeHttp is non blocking and uses a go routine under the hood - proxy.ServeHTTP(w, newReq) - - // We need this to be blocking - - // select { - // case <-newReq.Context().Done(): - // return newReq.Context().Err() - // } - - log.Errorf("Finished proxying request: %s", target) - - return nil -} - -// Determine if the specified Kube endpoint has the dashboard installed and ready -func (k *KubernetesSpecification) kubeDashboardStatus(c echo.Context) error { - endpointGUID := c.Param("guid") - - status := dashboardStatusResponse{ - Endpoint: endpointGUID, - Installed: false, - } - - pod, err := k.getKubeDashboardPod(c, "app%3Dkubernetes-dashboard") - if err != nil { - pod, err = k.getKubeDashboardPod(c, "k8s-app%3Dkubernetes-dashboard") - } - - status.Pod = pod - if err == nil { - status.Installed = true - } - - jsonString, err := json.Marshal(status) - if err != nil { - return interfaces.NewHTTPShadowError( - http.StatusBadRequest, - "Unable Marshal status response", - "Unable Marshal status response") - } - - c.Response().Header().Set("Content-Type", "application/json") - c.Response().Write(jsonString) - return nil -} - -// Determine if the specified Kube endpoint has the dashboard installed and ready -func (k *KubernetesSpecification) getKubeDashboardPod(c echo.Context, labelSelector string) (*v1.Pod, error) { - log.Debug("kubeDashboardStatus request") - - cnsiGUID := c.Param("guid") - userGUID := c.Get("user_id").(string) - - var p = k.portalProxy - response, err := p.DoProxySingleRequest(cnsiGUID, userGUID, "GET", "/api/v1/pods?labelSelector="+labelSelector, nil, nil) - - if err != nil { - return nil, interfaces.NewHTTPShadowError( - http.StatusNotFound, - "Could not fetch pod list", - "Could not fetch pod list") - } - - ok, list, err := tryDecodePodList(response.Response) - if !ok { - return nil, interfaces.NewHTTPShadowError( - http.StatusNotFound, - "Kube dashboard not installed - could not decode pod list", - "Kube dashboard not installed - could not decode pod list") - } - - if len(list.Items) == 0 { - return nil, interfaces.NewHTTPShadowError( - http.StatusOK, - "Kube dashboard not installed", - "Kube dashboard not installed") - } - - // Should just be one pod - if len(list.Items) != 1 { - return nil, interfaces.NewHTTPShadowError( - http.StatusNotFound, - "Kube dashboard not installed - too many pods", - "Kube dashboard not installed - too many pods") - } - - pod := list.Items[0] - if pod.Status.Phase != "Running" { - return nil, interfaces.NewHTTPShadowError( - http.StatusNotFound, - "Dashboard not running", - "Dashboard not running") - } - - return &pod, nil -} - -func tryDecodePodList(data []byte) (parsed bool, pods v1.PodList, err error) { - obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), data) - if err != nil { - return false, pods, err - } - - newPods, ok := obj.(*api.PodList) - // Check whether the object could be converted to list of pods. - if !ok { - err = fmt.Errorf("invalid pods list: %#v", obj) - return false, pods, err - } - - v1Pods := &v1.PodList{} - if err := k8s_api_v1.Convert_core_PodList_To_v1_PodList(newPods, v1Pods, nil); err != nil { - return true, pods, err - } - return true, *v1Pods, err -} diff --git a/src/jetstream/plugins/kubernetes/list_releases.go b/src/jetstream/plugins/kubernetes/list_releases.go deleted file mode 100644 index ef0f45e250..0000000000 --- a/src/jetstream/plugins/kubernetes/list_releases.go +++ /dev/null @@ -1,146 +0,0 @@ -package kubernetes - -import ( - //"encoding/json" - //"fmt" - "net/url" - - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - // "k8s.io/client-go/kubernetes" - // "k8s.io/client-go/rest" - "k8s.io/helm/pkg/helm" - // "k8s.io/helm/pkg/kube" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" -) - -type kubeReleasesData struct { - Endpoint string `json:"endpoint"` - Name string `json:"releaseName"` - Namespace string `json:"releaseNamespace"` - Chart struct { - Name string `json:"chartName"` - Repository string `json:"repo"` - Version string `json:"version"` - } `json:"chart"` -} - -type kubeReleasesResponse map[string]kubeReleasesData - -// ListReleases will list the helm releases for all endpoints -func (c *KubernetesSpecification) ListReleases(ec echo.Context) error { - log.Debug("ListReleases") - - // Need to get a config object for the target endpoint - // endpointGUID := ec.Param("endpoint") - userID := ec.Get("user_id").(string) - - resp, err := c.ProxyKubernetesAPI(userID, c.listReleases) - if err != nil { - return err - } - return ec.JSON(200, resp) -} - -// List releases for a single endpoint -func (c *KubernetesSpecification) listReleases(ep *interfaces.ConnectedEndpoint, done chan KubeProxyResponse) { - - response := KubeProxyResponse{ - Endpoint: ep.GUID, - Result: nil, - } - - log.Warnf("listReleases: START: %s", ep.GUID) - client, _, tiller, err := c.GetHelmClient(ep.GUID, ep.Account) - if err != nil { - log.Warnf("listReleases: CLIENT_ERROR: %s", ep.GUID) - done <- response - return - } - - defer tiller.Close() - - log.Warnf("listReleases: REQUEST: %s", ep.GUID) - - res, err := client.ListReleases( - helm.ReleaseListStatuses(nil), - ) - if err != nil { - log.Warnf("listReleases: ERROR: %s", ep.GUID) - log.Error(err) - - done <- response - return - } - - log.Warnf("listReleases: OK: %s", ep.GUID) - response.Result = res - done <- response -} - -// GetRelease will get release status for the given release -func (c *KubernetesSpecification) GetRelease(ec echo.Context) error { - - // Need to get a config object for the target endpoint - endpointGUID := ec.Param("endpoint") - release := ec.Param("name") - userID := ec.Get("user_id").(string) - - client, _, tiller, err := c.GetHelmClient(endpointGUID, userID) - if err != nil { - return err - } - - defer tiller.Close() - - res, err := client.ReleaseStatus(release, helm.StatusReleaseVersion(0)) - if err != nil { - log.Error(err) - return err - } - - return ec.JSON(200, res) -} - -// ListReleases will list the helm releases for all endpoints -func (c *KubernetesSpecification) aListReleases(ec echo.Context) error { - - // Need to get a config object for the target endpoint - // endpointGUID := ec.Param("endpoint") - userID := ec.Get("user_id").(string) - - // Get the config maps directly - don't go via Tiller - - requests := c.makeKubeProxyRequest(userID, "GET", "/api/v1/configmaps?labelSelector=OWNER%3DTILLER") - responses, _ := c.portalProxy.DoProxyRequest(requests) - return c.portalProxy.SendProxiedResponse(ec, responses) -} - -func (c *KubernetesSpecification) makeKubeProxyRequest(userID, method, uri string) []interfaces.ProxyRequestInfo { - - var p = c.portalProxy - eps, err := p.ListEndpointsByUser(userID) - if err != nil { - return nil - } - - // Construct the metadata for proxying - requests := make([]interfaces.ProxyRequestInfo, 0) - for _, endpoint := range eps { - if endpoint.CNSIType == "k8s" { - req := interfaces.ProxyRequestInfo{} - req.UserGUID = userID - req.ResultGUID = endpoint.GUID - req.EndpointGUID = endpoint.GUID - req.Method = method - - uri, _ := url.Parse(uri) - req.URI = uri - requests = append(requests, req) - } - } - - return requests -} diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go deleted file mode 100644 index b8b0598ed5..0000000000 --- a/src/jetstream/plugins/kubernetes/main.go +++ /dev/null @@ -1,188 +0,0 @@ -package kubernetes - -import ( - "net/url" - "strings" - - "errors" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" -) - -type KubernetesSpecification struct { - portalProxy interfaces.PortalProxy - endpointType string -} - -// KubeDashboardPluginConfigSetting is config value send back to the client to indicate if the kube dashboard can be navigated to -const KubeDashboardPluginConfigSetting = "kubeDashboardEnabled" - -const ( - EndpointType = "k8s" - CLIENT_ID_KEY = "K8S_CLIENT" - AuthConnectTypeKubeConfig = "KubeConfig" - AuthConnectTypeKubeConfigAz = "kubeconfig-az" - AuthConnectTypeAWSIAM = "aws-iam" - AuthConnectTypeCertAuth = "kube-cert-auth" - AuthConnectTypeGKE = "gke-auth" -) - -func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) { - return &KubernetesSpecification{portalProxy: portalProxy, endpointType: EndpointType}, nil -} - -func (c *KubernetesSpecification) GetEndpointPlugin() (interfaces.EndpointPlugin, error) { - return c, nil -} - -func (c *KubernetesSpecification) GetRoutePlugin() (interfaces.RoutePlugin, error) { - return c, nil -} - -func (c *KubernetesSpecification) GetMiddlewarePlugin() (interfaces.MiddlewarePlugin, error) { - return nil, errors.New("Not implemented!") -} - -func (c *KubernetesSpecification) GetType() string { - return EndpointType -} - -func (c *KubernetesSpecification) GetClientId() string { - return c.portalProxy.Env().String(CLIENT_ID_KEY, "k8s") -} - -func (c *KubernetesSpecification) Register(echoContext echo.Context) error { - log.Debug("Kubernetes Register...") - return c.portalProxy.RegisterEndpoint(echoContext, c.Info) -} - -func (c *KubernetesSpecification) Validate(userGUID string, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord) error { - response, err := c.portalProxy.DoProxySingleRequest(cnsiRecord.GUID, userGUID, "GET", "api/v1/pods?limit=1", nil, nil) - if err != nil { - return err - } - - if response.StatusCode >= 400 { - return errors.New("Unable to connect to endpoint") - } - - return nil -} - -func (c *KubernetesSpecification) Connect(ec echo.Context, cnsiRecord interfaces.CNSIRecord, userId string) (*interfaces.TokenRecord, bool, error) { - log.Debug("Kubernetes Connect...") - - connectType := ec.FormValue("connect_type") - - // OIDC ? - if strings.EqualFold(connectType, AuthConnectTypeKubeConfig) { - tokenRecord, _, err := c.FetchKubeConfigTokenOIDC(cnsiRecord, ec) - if err != nil { - return nil, false, err - } - return tokenRecord, false, nil - } - - // AKS ? - if strings.EqualFold(connectType, AuthConnectTypeKubeConfigAz) { - tokenRecord, _, err := c.FetchKubeConfigTokenAKS(cnsiRecord, ec) - if err != nil { - return nil, false, err - } - return tokenRecord, false, nil - } - - // IAM Creds? - if strings.EqualFold(connectType, AuthConnectTypeAWSIAM) { - tokenRecord, _, err := c.FetchIAMToken(cnsiRecord, ec) - if err != nil { - return nil, false, err - } - return tokenRecord, false, nil - } - - // Cert Auth? - if strings.EqualFold(connectType, AuthConnectTypeCertAuth) { - tokenRecord, _, err := c.FetchCertAuth(cnsiRecord, ec) - if err != nil { - return nil, false, err - } - return tokenRecord, false, nil - } - - // GKE ? - if strings.EqualFold(connectType, AuthConnectTypeGKE) { - tokenRecord, _, err := c.FetchGKEToken(cnsiRecord, ec) - if err != nil { - return nil, false, err - } - return tokenRecord, false, nil - } - - return nil, false, errors.New("Unsupported Auth connection type for Kubernetes endpoint") -} - -// Init the Kubernetes Jetstream plugin -func (c *KubernetesSpecification) Init() error { - c.portalProxy.AddAuthProvider(AuthConnectTypeAWSIAM, interfaces.AuthProvider{ - Handler: c.doAWSIAMFlowRequest, - UserInfo: c.GetCNSIUserFromIAMToken, - }) - c.portalProxy.AddAuthProvider(AuthConnectTypeCertAuth, interfaces.AuthProvider{ - Handler: c.doCertAuthFlowRequest, - UserInfo: c.GetCNSIUserFromCertAuth, - }) - c.portalProxy.AddAuthProvider(AuthConnectTypeKubeConfigAz, interfaces.AuthProvider{ - Handler: c.doCertAuthFlowRequest, - UserInfo: c.GetCNSIUserFromCertAuth, - }) - c.portalProxy.AddAuthProvider(AuthConnectTypeGKE, interfaces.AuthProvider{ - Handler: c.doGKEFlowRequest, - UserInfo: c.GetGKEUserFromToken, - }) - - c.portalProxy.GetConfig().PluginConfig[KubeDashboardPluginConfigSetting] = "false" - - return nil -} - -func (c *KubernetesSpecification) AddAdminGroupRoutes(echoGroup *echo.Group) { - // no-op -} - -func (c *KubernetesSpecification) AddSessionGroupRoutes(echoGroup *echo.Group) { - - // Kubernetes Dashboard Proxy - echoGroup.GET("/kubedash/ui/:guid/*", c.kubeDashboardProxy) - echoGroup.GET("/kubedash/:guid/status", c.kubeDashboardStatus) - - // Helm Routes - echoGroup.GET("/helm/releases", c.ListReleases) - echoGroup.POST("/helm/install", c.InstallRelease) - echoGroup.GET("/helm/versions", c.GetHelmVersions) - echoGroup.DELETE("/helm/releases/:endpoint/:name", c.DeleteRelease) - echoGroup.GET("/helm/releases/:endpoint/:name", c.GetRelease) -} - -func (c *KubernetesSpecification) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) { - log.Debug("Kubernetes Info") - var v2InfoResponse interfaces.V2Info - var newCNSI interfaces.CNSIRecord - - newCNSI.CNSIType = EndpointType - - _, err := url.Parse(apiEndpoint) - if err != nil { - return newCNSI, nil, err - } - - newCNSI.TokenEndpoint = apiEndpoint - newCNSI.AuthorizationEndpoint = apiEndpoint - - return newCNSI, v2InfoResponse, nil -} - -func (c *KubernetesSpecification) UpdateMetadata(info *interfaces.Info, userGUID string, echoContext echo.Context) { -} diff --git a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go b/src/jetstream/plugins/monocular/20190307115300_ChartStore.go deleted file mode 100644 index 9eed7d37d7..0000000000 --- a/src/jetstream/plugins/monocular/20190307115300_ChartStore.go +++ /dev/null @@ -1,51 +0,0 @@ -package monocular - -import ( - "database/sql" - - "bitbucket.org/liamstask/goose/lib/goose" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" -) - -func init() { - datastore.RegisterMigration(20190307115301, "ChartStore", func(txn *sql.Tx, conf *goose.DBConf) error { - - createChartsTable := "CREATE TABLE IF NOT EXISTS charts (" - createChartsTable += "id VARCHAR(255) NOT NULL," - createChartsTable += "name VARCHAR(255) NOT NULL," - createChartsTable += "repo_name VARCHAR(255) NOT NULL," - createChartsTable += "update_batch VARCHAR(64) NOT NULL," - createChartsTable += "content TEXT," - createChartsTable += "last_updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP," - createChartsTable += "PRIMARY KEY (id) );" - - _, err := txn.Exec(createChartsTable) - if err != nil { - return err - } - - createIndex := "CREATE INDEX charts_id ON charts (id);" - _, err = txn.Exec(createIndex) - if err != nil { - return err - } - - createChartFilesTable := "CREATE TABLE IF NOT EXISTS chart_files (" - createChartFilesTable += "id VARCHAR(255) NOT NULL," - createChartFilesTable += "filename VARCHAR(64) NOT NULL," - createChartFilesTable += "chart_id VARCHAR(255) NOT NULL," - createChartFilesTable += "name VARCHAR(255) NOT NULL," - createChartFilesTable += "repo_name VARCHAR(255) NOT NULL," - createChartFilesTable += "digest VARCHAR(255) NOT NULL," - createChartFilesTable += "content BLOB," - createChartFilesTable += "PRIMARY KEY (id, filename) );" - - _, err = txn.Exec(createChartFilesTable) - if err != nil { - return err - } - - return nil - }) -} diff --git a/src/jetstream/plugins/monocular/chart-repo/.gitignore b/src/jetstream/plugins/monocular/chart-repo/.gitignore deleted file mode 100644 index 253eef939d..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -chart-repo-sync diff --git a/src/jetstream/plugins/monocular/chart-repo/Dockerfile b/src/jetstream/plugins/monocular/chart-repo/Dockerfile deleted file mode 100644 index 7e4085c8d1..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM golang:1.11 as builder -COPY . /go/src/github.com/helm/monocular -WORKDIR /go/src/github.com/helm/monocular - -ARG VERSION -RUN CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-X main.version=$VERSION" ./cmd/chart-repo - -FROM scratch -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/helm/monocular/chart-repo /chart-repo -USER 1001 -CMD ["/chart-repo"] diff --git a/src/jetstream/plugins/monocular/chart-repo/Makefile b/src/jetstream/plugins/monocular/chart-repo/Makefile deleted file mode 100644 index 34ec0f9d1b..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -IMAGE_REPO ?= quay.io/helmpack/chart-repo -IMAGE_TAG ?= latest -# Version of the binary to be produced -VERSION ?= $$(git rev-parse HEAD) - -docker-build: - # We use the context of the root dir - docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} --build-arg "VERSION=${VERSION}" -f Dockerfile ../../ diff --git a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go b/src/jetstream/plugins/monocular/chart-repo/chart_repo.go deleted file mode 100644 index dec5e2f22d..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/chart_repo.go +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "os" - - "github.com/spf13/cobra" -) - -var rootCmd = &cobra.Command{ - Use: "chart-repo", - Short: "Chart Repository utility", - Run: func(cmd *cobra.Command, args []string) { - cmd.Help() - }, -} - -func main() { - cmd := rootCmd - if err := cmd.Execute(); err != nil { - os.Exit(1) - } -} - -func init() { - cmds := []*cobra.Command{syncCmd, deleteCmd} - - for _, cmd := range cmds { - rootCmd.AddCommand(cmd) - cmd.Flags().String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)") - cmd.Flags().String("mongo-database", "charts", "MongoDB database") - cmd.Flags().String("mongo-user", "", "MongoDB user") - // see version.go - cmd.Flags().StringVarP(&userAgentComment, "user-agent-comment", "", "", "UserAgent comment used during outbound requests") - cmd.Flags().Bool("debug", false, "verbose logging") - } - rootCmd.AddCommand(versionCmd) -} diff --git a/src/jetstream/plugins/monocular/chart-repo/datastore.go b/src/jetstream/plugins/monocular/chart-repo/datastore.go deleted file mode 100644 index 29ab74b533..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/datastore.go +++ /dev/null @@ -1,16 +0,0 @@ -package chartrepo - -import ( - "bytes" -) - -type ChartRepoDatastore interface { - DeleteRepo(string) error - - // ImportCharts will import all charts - must be for same repo - and remove and charts not in the imported set - ImportCharts([]Chart) error - - StoreChartIcon(Chart, bytes.Buffer) error - - StoreChartFiles(string, ChartFiles) error -} diff --git a/src/jetstream/plugins/monocular/chart-repo/delete.go b/src/jetstream/plugins/monocular/chart-repo/delete.go deleted file mode 100644 index abe6d6071c..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/delete.go +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "os" - - "github.com/kubeapps/common/datastore" - "github.com/sirupsen/logrus" - "github.com/spf13/cobra" -) - -var deleteCmd = &cobra.Command{ - Use: "delete [REPO NAME]", - Short: "delete a chart repository", - Run: func(cmd *cobra.Command, args []string) { - if len(args) != 1 { - logrus.Info("Need exactly one argument: [REPO NAME]") - cmd.Help() - return - } - mongoURL, err := cmd.Flags().GetString("mongo-url") - if err != nil { - logrus.Fatal(err) - } - mongoDB, err := cmd.Flags().GetString("mongo-database") - if err != nil { - logrus.Fatal(err) - } - mongoUser, err := cmd.Flags().GetString("mongo-user") - if err != nil { - logrus.Fatal(err) - } - mongoPW := os.Getenv("MONGO_PASSWORD") - debug, err := cmd.Flags().GetBool("debug") - if err != nil { - logrus.Fatal(err) - } - if debug { - logrus.SetLevel(logrus.DebugLevel) - } - mongoConfig := datastore.Config{URL: mongoURL, Database: mongoDB, Username: mongoUser, Password: mongoPW} - dbSession, err := datastore.NewSession(mongoConfig) - if err != nil { - logrus.Fatalf("Can't connect to mongoDB: %v", err) - } - - monogoDB, err := NewMongoDBChartRepoDatastore(dbSession) - if err != nil { - logrus.Fatalf("Can't create data store for mongoDB: %v", err) - } - - if err = monogoDB.DeleteRepo(args[0]); err != nil { - logrus.Fatalf("Can't delete chart repository %s from database: %v", args[0], err) - } - - logrus.Infof("Successfully deleted the chart repository %s from database", args[0]) - }, -} diff --git a/src/jetstream/plugins/monocular/chart-repo/go.mod b/src/jetstream/plugins/monocular/chart-repo/go.mod deleted file mode 100644 index 46ed194b78..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/go.mod +++ /dev/null @@ -1,24 +0,0 @@ -module github.com/helm/monocular/chartrepo - -require ( - github.com/BurntSushi/toml v0.3.1 // indirect - github.com/Masterminds/semver v1.4.2 // indirect - github.com/arschles/assert v1.0.0 - github.com/cyphar/filepath-securejoin v0.2.2 // indirect - github.com/disintegration/imaging v1.6.0 - github.com/ghodss/yaml v1.0.0 - github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 - github.com/gobwas/glob v0.2.3 // indirect - github.com/golang/protobuf v1.2.0 // indirect - github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 - github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 - github.com/pkg/errors v0.8.1 // indirect - github.com/sirupsen/logrus v1.3.0 - github.com/spf13/cobra v0.0.3 - github.com/spf13/pflag v1.0.3 // indirect - github.com/stretchr/testify v1.2.2 - gopkg.in/yaml.v2 v2.2.2 // indirect - k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 // indirect - k8s.io/client-go v10.0.0+incompatible // indirect - k8s.io/helm v2.12.3+incompatible -) diff --git a/src/jetstream/plugins/monocular/chart-repo/go.sum b/src/jetstream/plugins/monocular/chart-repo/go.sum deleted file mode 100644 index 5d22ac0f7c..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/go.sum +++ /dev/null @@ -1,54 +0,0 @@ -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/arschles/assert v1.0.0 h1:NofQbRhtxcLgP+XoKunA7J6UMJNTqX7xR/19tej8UsA= -github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA= -github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs= -github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE= -k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/client-go v10.0.0+incompatible h1:+xQQxwjrcIPWDMJBAS+1G2FNk1McoPnb53xkvcDiDqE= -k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/helm v2.12.3+incompatible h1:53+OqKezGNWI8QOHzyb+G1y78MuZURHL/yivhRZ8mIY= -k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= diff --git a/src/jetstream/plugins/monocular/chart-repo/mongodb.go b/src/jetstream/plugins/monocular/chart-repo/mongodb.go deleted file mode 100644 index 3cae153147..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/mongodb.go +++ /dev/null @@ -1,84 +0,0 @@ -package chartrepo - -import ( - "bytes" - "github.com/globalsign/mgo/bson" - "github.com/kubeapps/common/datastore" -) - -// const ( -// chartCollection = "charts" -// chartFilesCollection = "files" -// defaultTimeoutSeconds = 10 -// additionalCAFile = "/usr/local/share/ca-certificates/ca.crt" -// ) - -type MongoDBChartRepoDatastore struct { - dbSession datastore.Session -} - -// NewMongoDBChartRepoDatastore creates a new MongoDB data store -func NewMongoDBChartRepoDatastore(dbSession datastore.Session) (*MongoDBChartRepoDatastore, error) { - return &MongoDBChartRepoDatastore{dbSession: dbSession}, nil -} - -func (m *MongoDBChartRepoDatastore) DeleteRepo(repoName string) error { - db, closer := m.dbSession.DB() - defer closer() - _, err := db.C(chartCollection).RemoveAll(bson.M{ - "repo.name": repoName, - }) - if err != nil { - return err - } - - _, err = db.C(chartFilesCollection).RemoveAll(bson.M{ - "repo.name": repoName, - }) - return err -} - -func (m *MongoDBChartRepoDatastore) ImportCharts(charts []Chart) error { - var pairs []interface{} - var chartIDs []string - for _, c := range charts { - chartIDs = append(chartIDs, c.ID) - // charts to upsert - pair of selector, chart - pairs = append(pairs, bson.M{"_id": c.ID}, c) - } - - db, closer := m.dbSession.DB() - defer closer() - bulk := db.C(chartCollection).Bulk() - - // Upsert pairs of selectors, charts - bulk.Upsert(pairs...) - - // Remove charts no longer existing in index - bulk.RemoveAll(bson.M{ - "_id": bson.M{ - "$nin": chartIDs, - }, - "repo.name": charts[0].Repo.Name, - }) - - _, err := bulk.Run() - return err -} - -func (m *MongoDBChartRepoDatastore) StoreChartIcon(c Chart, b bytes.Buffer) error { - db, closer := m.dbSession.DB() - defer closer() - return db.C(chartCollection).UpdateId(c.ID, bson.M{"$set": bson.M{"raw_icon": b.Bytes()}}) -} - -func (m *MongoDBChartRepoDatastore) StoreChartFiles(chartFilesID string, chartFiles ChartFiles) error { - db, closer := m.dbSession.DB() - defer closer() - - // inserts the chart files if not already indexed, or updates the existing - // entry if digest has changed - db.C(chartFilesCollection).UpsertId(chartFilesID, chartFiles) - - return nil -} diff --git a/src/jetstream/plugins/monocular/chart-repo/sync.go b/src/jetstream/plugins/monocular/chart-repo/sync.go deleted file mode 100644 index d4b1e8da13..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/sync.go +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "os" - - "github.com/kubeapps/common/datastore" - "github.com/sirupsen/logrus" - "github.com/spf13/cobra" -) - -var syncCmd = &cobra.Command{ - Use: "sync [REPO NAME] [REPO URL]", - Short: "add a new chart repository, and resync its charts periodically", - Run: func(cmd *cobra.Command, args []string) { - if len(args) != 2 { - logrus.Info("Need exactly two arguments: [REPO NAME] [REPO URL]") - cmd.Help() - return - } - - mongoURL, err := cmd.Flags().GetString("mongo-url") - if err != nil { - logrus.Fatal(err) - } - mongoDB, err := cmd.Flags().GetString("mongo-database") - if err != nil { - logrus.Fatal(err) - } - mongoUser, err := cmd.Flags().GetString("mongo-user") - if err != nil { - logrus.Fatal(err) - } - mongoPW := os.Getenv("MONGO_PASSWORD") - debug, err := cmd.Flags().GetBool("debug") - if err != nil { - logrus.Fatal(err) - } - if debug { - logrus.SetLevel(logrus.DebugLevel) - } - mongoConfig := datastore.Config{URL: mongoURL, Database: mongoDB, Username: mongoUser, Password: mongoPW} - dbSession, err := datastore.NewSession(mongoConfig) - if err != nil { - logrus.Fatalf("Can't connect to mongoDB: %v", err) - } - - monogoDB, err := NewMongoDBChartRepoDatastore(dbSession) - if err != nil { - logrus.Fatalf("Can't create data store for mongoDB: %v", err) - } - - authorizationHeader := os.Getenv("AUTHORIZATION_HEADER") - if err = SyncRepo(monogoDB, args[0], args[1], authorizationHeader); err != nil { - logrus.Fatalf("Can't add chart repository to database: %v", err) - } - - logrus.Infof("Successfully added the chart repository %s to database", args[0]) - }, -} diff --git a/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml b/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml deleted file mode 100644 index d5a93537c1..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/testdata/valid-index.yaml +++ /dev/null @@ -1,69 +0,0 @@ -entries: - acs-engine-autoscaler: - - apiVersion: v1 - appVersion: 2.1.1 - created: 2017-12-06T18:48:59.568323124Z - description: Scales worker nodes within agent pools - digest: 39e66eb53c310529bd9dd19776f8ba662e063a4ebd51fc5ec9f2267e2e073e3e - icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png - maintainers: - - email: ritazh@microsoft.com - name: ritazh - - email: wibuch@microsoft.com - name: wbuchwalter - name: acs-engine-autoscaler - sources: - - https://github.com/wbuchwalter/Kubernetes-acs-engine-autoscaler - urls: - - https://kubernetes-charts.storage.googleapis.com/acs-engine-autoscaler-2.1.1.tgz - version: 2.1.1 - wordpress: - - appVersion: 4.9.1 - created: 2017-12-06T18:48:59.644981487Z - description: new description! - digest: 74889e60a35dcffa4686f88bb23de863fed2b6e63a69b1f4858dde37c301885c - engine: gotpl - home: http://www.wordpress.com/ - icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png - keywords: - - wordpress - - cms - - blog - - http - - web - - application - - php - maintainers: - - email: containers@bitnami.com - name: bitnami-bot - name: wordpress - sources: - - https://github.com/bitnami/bitnami-docker-wordpress - urls: - - https://kubernetes-charts.storage.googleapis.com/wordpress-0.7.5.tgz - version: 0.7.5 - - appVersion: 4.9.0 - created: 2017-12-01T11:49:00.136950565Z - description: Web publishing platform for building blogs and websites. - digest: a69139ef3008eeb11ca60261ec2ded61e84ce7db32bb3626056e84bcff7ec270 - engine: gotpl - home: http://www.wordpress.com/ - icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png - keywords: - - wordpress - - cms - - cms - - blog - - http - - web - - application - - php - maintainers: - - email: containers@bitnami.com - name: bitnami-bot - name: wordpress - sources: - - https://github.com/bitnami/bitnami-docker-wordpress - urls: - - https://kubernetes-charts.storage.googleapis.com/wordpress-0.7.4.tgz - version: 0.7.4 diff --git a/src/jetstream/plugins/monocular/chart-repo/types.go b/src/jetstream/plugins/monocular/chart-repo/types.go deleted file mode 100644 index 3ce7789c9e..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/types.go +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "time" -) - -type Repo struct { - Name string `json:"name"` - URL string `json:"url"` - AuthorizationHeader string `bson:"-"` -} - -type Maintainer struct { - Name string `json:"name"` - Email string `json:"email"` -} - -type Chart struct { - ID string `json:"-" bson:"_id"` - Name string `json:"name"` - Repo Repo `json:"repo"` - Description string `json:"description"` - Home string `json:"home"` - Keywords []string `json:"keywords"` - Maintainers []Maintainer `json:"maintainers"` - Sources []string `json:"sources"` - Icon string `json:"icon"` - ChartVersions []ChartVersion `json:"chart_versions"` -} - -type ChartVersion struct { - Version string `json:"version"` - AppVersion string `json:"app_version"` - Created time.Time `json:"created"` - Digest string `json:"digest"` - URLs []string `json:"urls"` -} - -type ChartFiles struct { - ID string `bson:"_id"` - Readme string - Values string - Repo Repo - Digest string -} diff --git a/src/jetstream/plugins/monocular/chart-repo/utils.go b/src/jetstream/plugins/monocular/chart-repo/utils.go deleted file mode 100644 index c5bbd2bbe3..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/utils.go +++ /dev/null @@ -1,406 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "archive/tar" - "bytes" - "compress/gzip" - "crypto/tls" - "crypto/x509" - "errors" - "fmt" - "io" - "io/ioutil" - "net/http" - "net/url" - "os" - "path" - "strings" - "sync" - "time" - - "github.com/disintegration/imaging" - "github.com/ghodss/yaml" - "github.com/jinzhu/copier" - log "github.com/sirupsen/logrus" - helmrepo "k8s.io/helm/pkg/repo" -) - -const ( - chartCollection = "charts" - chartFilesCollection = "files" - defaultTimeoutSeconds = 10 - additionalCAFile = "/usr/local/share/ca-certificates/ca.crt" -) - -type importChartFilesJob struct { - Name string - Repo Repo - ChartVersion ChartVersion -} - -type httpClient interface { - Do(req *http.Request) (*http.Response, error) -} - -var netClient httpClient = &http.Client{} - -func parseRepoUrl(repoURL string) (*url.URL, error) { - repoURL = strings.TrimSpace(repoURL) - return url.ParseRequestURI(repoURL) -} - -func init() { - var err error - netClient, err = initNetClient(additionalCAFile) - if err != nil { - log.Fatal(err) - } -} - -// Syncing is performed in the following steps: -// 1. Update database to match chart metadata from index -// 2. Concurrently process icons for charts (concurrently) -// 3. Concurrently process the README and values.yaml for the latest chart version of each chart -// 4. Concurrently process READMEs and values.yaml for historic chart versions -// -// These steps are processed in this way to ensure relevant chart data is -// imported into the database as fast as possible. E.g. we want all icons for -// charts before fetching readmes for each chart and version pair. -func SyncRepo(store ChartRepoDatastore, repoName, repoURL string, authorizationHeader string) error { - url, err := parseRepoUrl(repoURL) - if err != nil { - log.WithFields(log.Fields{"url": repoURL}).WithError(err).Error("failed to parse URL") - return err - } - - r := Repo{Name: repoName, URL: url.String(), AuthorizationHeader: authorizationHeader} - index, err := fetchRepoIndex(r) - if err != nil { - return err - } - - charts := chartsFromIndex(index, r) - err = store.ImportCharts(charts) - if err != nil { - return err - } - - // Process 10 charts at a time - numWorkers := 10 - iconJobs := make(chan Chart, numWorkers) - chartFilesJobs := make(chan importChartFilesJob, numWorkers) - var wg sync.WaitGroup - - log.Debugf("starting %d workers", numWorkers) - for i := 0; i < numWorkers; i++ { - wg.Add(1) - go importWorker(store, &wg, iconJobs, chartFilesJobs) - } - - // Enqueue jobs to process chart icons - for _, c := range charts { - iconJobs <- c - } - // Close the iconJobs channel to signal the worker pools to move on to the - // chart files jobs - close(iconJobs) - - // Iterate through the list of charts and enqueue the latest chart version to - // be processed. Append the rest of the chart versions to a list to be - // enqueued later - var toEnqueue []importChartFilesJob - for _, c := range charts { - chartFilesJobs <- importChartFilesJob{c.Name, c.Repo, c.ChartVersions[0]} - for _, cv := range c.ChartVersions[1:] { - toEnqueue = append(toEnqueue, importChartFilesJob{c.Name, c.Repo, cv}) - } - } - - // Enqueue all the remaining chart versions - for _, cfj := range toEnqueue { - chartFilesJobs <- cfj - } - // Close the chartFilesJobs channel to signal the worker pools that there are - // no more jobs to process - close(chartFilesJobs) - - // Wait for the worker pools to finish processing - wg.Wait() - - return nil -} - -func fetchRepoIndex(r Repo) (*helmrepo.IndexFile, error) { - indexURL, err := parseRepoUrl(r.URL) - if err != nil { - log.WithFields(log.Fields{"url": r.URL}).WithError(err).Error("failed to parse URL") - return nil, err - } - indexURL.Path = path.Join(indexURL.Path, "index.yaml") - req, err := http.NewRequest("GET", indexURL.String(), nil) - if err != nil { - log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("could not build repo index request") - return nil, err - } - - req.Header.Set("User-Agent", userAgent()) - if len(r.AuthorizationHeader) > 0 { - req.Header.Set("Authorization", r.AuthorizationHeader) - } - - res, err := netClient.Do(req) - if res != nil { - defer res.Body.Close() - } - if err != nil { - log.WithFields(log.Fields{"url": req.URL.String()}).WithError(err).Error("error requesting repo index") - return nil, err - } - - if res.StatusCode != http.StatusOK { - log.WithFields(log.Fields{"url": req.URL.String(), "status": res.StatusCode}).Error("error requesting repo index, are you sure this is a chart repository?") - return nil, errors.New("repo index request failed") - } - - body, err := ioutil.ReadAll(res.Body) - if err != nil { - return nil, err - } - return parseRepoIndex(body) -} - -func parseRepoIndex(body []byte) (*helmrepo.IndexFile, error) { - var index helmrepo.IndexFile - err := yaml.Unmarshal(body, &index) - if err != nil { - return nil, err - } - index.SortEntries() - return &index, nil -} - -func chartsFromIndex(index *helmrepo.IndexFile, r Repo) []Chart { - var charts []Chart - for _, entry := range index.Entries { - if entry[0].GetDeprecated() { - log.WithFields(log.Fields{"name": entry[0].GetName()}).Info("skipping deprecated chart") - continue - } - charts = append(charts, newChart(entry, r)) - } - return charts -} - -// Takes an entry from the index and constructs a database representation of the -// object. -func newChart(entry helmrepo.ChartVersions, r Repo) Chart { - var c Chart - copier.Copy(&c, entry[0]) - copier.Copy(&c.ChartVersions, entry) - c.Repo = r - c.ID = fmt.Sprintf("%s/%s", r.Name, c.Name) - return c -} - -func importWorker(store ChartRepoDatastore, wg *sync.WaitGroup, icons <-chan Chart, chartFiles <-chan importChartFilesJob) { - defer wg.Done() - for c := range icons { - log.WithFields(log.Fields{"name": c.Name}).Debug("importing icon") - if err := fetchAndImportIcon(store, c); err != nil { - log.WithFields(log.Fields{"name": c.Name}).WithError(err).Error("failed to import icon") - } - } - for j := range chartFiles { - log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).Debug("importing readme and values") - if err := fetchAndImportFiles(store, j.Name, j.Repo, j.ChartVersion); err != nil { - log.WithFields(log.Fields{"name": j.Name, "version": j.ChartVersion.Version}).WithError(err).Error("failed to import files") - } - } -} - -func fetchAndImportIcon(store ChartRepoDatastore, c Chart) error { - if c.Icon == "" { - log.WithFields(log.Fields{"name": c.Name}).Info("icon not found") - return nil - } - - req, err := http.NewRequest("GET", c.Icon, nil) - if err != nil { - return err - } - req.Header.Set("User-Agent", userAgent()) - if len(c.Repo.AuthorizationHeader) > 0 { - req.Header.Set("Authorization", c.Repo.AuthorizationHeader) - } - - res, err := netClient.Do(req) - if res != nil { - defer res.Body.Close() - } - if err != nil { - return err - } - - if res.StatusCode != http.StatusOK { - return fmt.Errorf("%d %s", res.StatusCode, c.Icon) - } - - orig, err := imaging.Decode(res.Body) - if err != nil { - return err - } - - // TODO: make this configurable? - icon := imaging.Fit(orig, 160, 160, imaging.Lanczos) - - var b bytes.Buffer - imaging.Encode(&b, icon, imaging.PNG) - - return store.StoreChartIcon(c, b) -} - -func fetchAndImportFiles(store ChartRepoDatastore, name string, r Repo, cv ChartVersion) error { - chartFilesID := fmt.Sprintf("%s/%s-%s", r.Name, name, cv.Version) - - // TODO: - // Check if we already have indexed files for this chart version and digest - // if err := db.C(chartFilesCollection).Find(bson.M{"_id": chartFilesID, "digest": cv.Digest}).One(&chartFiles{}); err == nil { - // log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("skipping existing files") - // return nil - // } - log.WithFields(log.Fields{"name": name, "version": cv.Version}).Debug("fetching files") - - url := chartTarballURL(r, cv) - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return err - } - req.Header.Set("User-Agent", userAgent()) - if len(r.AuthorizationHeader) > 0 { - req.Header.Set("Authorization", r.AuthorizationHeader) - } - - res, err := netClient.Do(req) - if err != nil { - return err - } - defer res.Body.Close() - - // We read the whole chart into memory, this should be okay since the chart - // tarball needs to be small enough to fit into a GRPC call (Tiller - // requirement) - gzf, err := gzip.NewReader(res.Body) - if err != nil { - return err - } - defer gzf.Close() - - tarf := tar.NewReader(gzf) - - readmeFileName := name + "/README.md" - valuesFileName := name + "/values.yaml" - filenames := []string{valuesFileName, readmeFileName} - - files, err := extractFilesFromTarball(filenames, tarf) - if err != nil { - return err - } - - chartFiles := ChartFiles{ID: chartFilesID, Repo: r, Digest: cv.Digest} - if v, ok := files[readmeFileName]; ok { - chartFiles.Readme = v - } else { - log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("README.md not found") - } - if v, ok := files[valuesFileName]; ok { - chartFiles.Values = v - } else { - log.WithFields(log.Fields{"name": name, "version": cv.Version}).Info("values.yaml not found") - } - - return store.StoreChartFiles(chartFilesID, chartFiles) -} - -func extractFilesFromTarball(filenames []string, tarf *tar.Reader) (map[string]string, error) { - ret := make(map[string]string) - for { - header, err := tarf.Next() - if err == io.EOF { - break - } - if err != nil { - return ret, err - } - - for _, f := range filenames { - if header.Name == f { - var b bytes.Buffer - io.Copy(&b, tarf) - ret[f] = string(b.Bytes()) - break - } - } - } - return ret, nil -} - -func chartTarballURL(r Repo, cv ChartVersion) string { - source := cv.URLs[0] - if _, err := parseRepoUrl(source); err != nil { - // If the chart URL is not absolute, join with repo URL. It's fine if the - // URL we build here is invalid as we can catch this error when actually - // making the request - u, _ := url.Parse(r.URL) - u.Path = path.Join(u.Path, source) - return u.String() - } - return source -} - -func initNetClient(additionalCA string) (*http.Client, error) { - // Get the SystemCertPool, continue with an empty pool on error - caCertPool, _ := x509.SystemCertPool() - if caCertPool == nil { - caCertPool = x509.NewCertPool() - } - - // If additionalCA exists, load it - if _, err := os.Stat(additionalCA); !os.IsNotExist(err) { - certs, err := ioutil.ReadFile(additionalCA) - if err != nil { - return nil, fmt.Errorf("Failed to append %s to RootCAs: %v", additionalCA, err) - } - - // Append our cert to the system pool - if ok := caCertPool.AppendCertsFromPEM(certs); !ok { - return nil, fmt.Errorf("Failed to append %s to RootCAs", additionalCA) - } - } - - // Return Transport for testing purposes - return &http.Client{ - Timeout: time.Second * defaultTimeoutSeconds, - Transport: &http.Transport{ - TLSClientConfig: &tls.Config{ - RootCAs: caCertPool, - }, - Proxy: http.ProxyFromEnvironment, - }, - }, nil -} diff --git a/src/jetstream/plugins/monocular/chart-repo/utils_test.go b/src/jetstream/plugins/monocular/chart-repo/utils_test.go deleted file mode 100644 index 457f5bd025..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/utils_test.go +++ /dev/null @@ -1,572 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "archive/tar" - "bytes" - "compress/gzip" - "crypto/rand" - "errors" - "fmt" - "image" - "image/color" - "io" - "io/ioutil" - "net/http" - "net/http/httptest" - "os" - "path" - "strings" - "testing" - - "github.com/arschles/assert" - "github.com/disintegration/imaging" - "github.com/globalsign/mgo/bson" - "github.com/kubeapps/common/datastore/mockstore" - log "github.com/sirupsen/logrus" - "github.com/stretchr/testify/mock" -) - -var validRepoIndexYAMLBytes, _ = ioutil.ReadFile("testdata/valid-index.yaml") -var validRepoIndexYAML = string(validRepoIndexYAMLBytes) - -var invalidRepoIndexYAML = "invalid" - -type badHTTPClient struct{} - -func (h *badHTTPClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - w.WriteHeader(500) - return w.Result(), nil -} - -type goodHTTPClient struct{} - -func (h *goodHTTPClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - // Don't accept trailing slashes - if strings.HasPrefix(req.URL.Path, "//") { - w.WriteHeader(500) - } - // If subpath repo URL test, check that index.yaml is correctly added to the - // subpath - if req.URL.Host == "subpath.test" && req.URL.Path != "/subpath/index.yaml" { - w.WriteHeader(500) - } - - w.Write([]byte(validRepoIndexYAML)) - return w.Result(), nil -} - -type authenticatedHTTPClient struct{} - -func (h *authenticatedHTTPClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - - // Ensure we're sending the right Authorization header - if !strings.Contains(req.Header.Get("Authorization"), "Bearer ThisSecretAccessTokenAuthenticatesTheClient") { - w.WriteHeader(500) - } - w.Write([]byte(validRepoIndexYAML)) - return w.Result(), nil -} - -type badIconClient struct{} - -func (h *badIconClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - w.Write([]byte("not-an-image")) - return w.Result(), nil -} - -type goodIconClient struct{} - -func iconBytes() []byte { - var b bytes.Buffer - img := imaging.New(1, 1, color.White) - imaging.Encode(&b, img, imaging.PNG) - return b.Bytes() -} - -func (h *goodIconClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - w.Write(iconBytes()) - return w.Result(), nil -} - -type goodTarballClient struct { - c chart - skipReadme bool - skipValues bool -} - -var testChartReadme = "# readme for chart\n\nBest chart in town" -var testChartValues = "image: test" - -func (h *goodTarballClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - gzw := gzip.NewWriter(w) - files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}} - if !h.skipValues { - files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues}) - } - if !h.skipReadme { - files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme}) - } - createTestTarball(gzw, files) - gzw.Flush() - return w.Result(), nil -} - -type authenticatedTarballClient struct { - c chart -} - -func (h *authenticatedTarballClient) Do(req *http.Request) (*http.Response, error) { - w := httptest.NewRecorder() - - // Ensure we're sending the right Authorization header - if !strings.Contains(req.Header.Get("Authorization"), "Bearer ThisSecretAccessTokenAuthenticatesTheClient") { - w.WriteHeader(500) - } else { - gzw := gzip.NewWriter(w) - files := []tarballFile{{h.c.Name + "/Chart.yaml", "should be a Chart.yaml here..."}} - files = append(files, tarballFile{h.c.Name + "/values.yaml", testChartValues}) - files = append(files, tarballFile{h.c.Name + "/README.md", testChartReadme}) - createTestTarball(gzw, files) - gzw.Flush() - } - return w.Result(), nil -} - -func Test_syncURLInvalidity(t *testing.T) { - tests := []struct { - name string - repoURL string - }{ - {"invalid URL", "not-a-url"}, - {"invalid URL", "https//google.com"}, - } - m := mock.Mock{} - dbSession := mockstore.NewMockSession(&m) - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - err := syncRepo(dbSession, "test", tt.repoURL, "") - assert.ExistsErr(t, err, tt.name) - }) - } -} - -func Test_fetchRepoIndex(t *testing.T) { - tests := []struct { - name string - r repo - }{ - {"valid HTTP URL", repo{URL: "http://my.examplerepo.com"}}, - {"valid HTTPS URL", repo{URL: "https://my.examplerepo.com"}}, - {"valid trailing URL", repo{URL: "https://my.examplerepo.com/"}}, - {"valid subpath URL", repo{URL: "https://subpath.test/subpath/"}}, - {"valid URL with trailing spaces", repo{URL: "https://subpath.test/subpath/ "}}, - {"valid URL with leading spaces", repo{URL: " https://subpath.test/subpath/"}}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - netClient = &goodHTTPClient{} - _, err := fetchRepoIndex(tt.r) - assert.NoErr(t, err) - }) - } - - t.Run("authenticated request", func(t *testing.T) { - netClient = &authenticatedHTTPClient{} - _, err := fetchRepoIndex(repo{URL: "https://my.examplerepo.com", AuthorizationHeader: "Bearer ThisSecretAccessTokenAuthenticatesTheClient"}) - assert.NoErr(t, err) - }) - - t.Run("failed request", func(t *testing.T) { - netClient = &badHTTPClient{} - _, err := fetchRepoIndex(repo{URL: "https://my.examplerepo.com"}) - assert.ExistsErr(t, err, "failed request") - }) -} - -func Test_fetchRepoIndexUserAgent(t *testing.T) { - tests := []struct { - name string - version string - userAgentComment string - expectedUserAgent string - }{ - {"default user agent", "", "", "chart-repo/devel"}, - {"custom version no app", "1.0", "", "chart-repo/1.0"}, - {"custom version and app", "1.0", "monocular/1.2", "chart-repo/1.0 (monocular/1.2)"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - // Override global variables used to generate the userAgent - if tt.version != "" { - version = tt.version - } - - if tt.userAgentComment != "" { - userAgentComment = tt.userAgentComment - } - - server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { - assert.Equal(t, tt.expectedUserAgent, req.Header.Get("User-Agent"), "expected user agent") - rw.Write([]byte(validRepoIndexYAML)) - })) - // Close the server when test finishes - defer server.Close() - - netClient = server.Client() - - _, err := fetchRepoIndex(repo{URL: server.URL}) - assert.NoErr(t, err) - }) - } -} - -func Test_parseRepoIndex(t *testing.T) { - tests := []struct { - name string - repoYAML string - }{ - {"invalid", "invalid"}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - _, err := parseRepoIndex([]byte(tt.repoYAML)) - assert.ExistsErr(t, err, tt.name) - }) - } - - t.Run("valid", func(t *testing.T) { - index, err := parseRepoIndex([]byte(validRepoIndexYAML)) - assert.NoErr(t, err) - assert.Equal(t, len(index.Entries), 2, "number of charts") - assert.Equal(t, index.Entries["acs-engine-autoscaler"][0].GetName(), "acs-engine-autoscaler", "chart version populated") - }) -} - -func Test_chartsFromIndex(t *testing.T) { - r := repo{Name: "test", URL: "http://testrepo.com"} - index, _ := parseRepoIndex([]byte(validRepoIndexYAML)) - charts := chartsFromIndex(index, r) - assert.Equal(t, len(charts), 2, "number of charts") - - indexWithDeprecated := validRepoIndexYAML + ` - deprecated-chart: - - name: deprecated-chart - deprecated: true` - index2, err := parseRepoIndex([]byte(indexWithDeprecated)) - assert.NoErr(t, err) - charts = chartsFromIndex(index2, r) - assert.Equal(t, len(charts), 2, "number of charts") -} - -func Test_newChart(t *testing.T) { - r := repo{Name: "test", URL: "http://testrepo.com"} - index, _ := parseRepoIndex([]byte(validRepoIndexYAML)) - c := newChart(index.Entries["wordpress"], r) - assert.Equal(t, c.Name, "wordpress", "correctly built") - assert.Equal(t, len(c.ChartVersions), 2, "correctly built") - assert.Equal(t, c.Description, "new description!", "takes chart fields from latest entry") - assert.Equal(t, c.Repo, r, "repo set") - assert.Equal(t, c.ID, "test/wordpress", "id set") -} - -func Test_importCharts(t *testing.T) { - m := &mock.Mock{} - // Ensure Upsert func is called with some arguments - m.On("Upsert", mock.Anything) - m.On("RemoveAll", mock.Anything) - dbSession := mockstore.NewMockSession(m) - index, _ := parseRepoIndex([]byte(validRepoIndexYAML)) - charts := chartsFromIndex(index, repo{Name: "test", URL: "http://testrepo.com"}) - importCharts(dbSession, charts) - - m.AssertExpectations(t) - // The Bulk Upsert method takes an array that consists of a selector followed by an interface to upsert. - // So for x charts to upsert, there should be x*2 elements (each chart has it's own selector) - // e.g. [selector1, chart1, selector2, chart2, ...] - args := m.Calls[0].Arguments.Get(0).([]interface{}) - assert.Equal(t, len(args), len(charts)*2, "number of selector, chart pairs to upsert") - for i := 0; i < len(args); i += 2 { - c := args[i+1].(chart) - assert.Equal(t, args[i], bson.M{"_id": "test/" + c.Name}, "selector") - } -} - -func Test_DeleteRepo(t *testing.T) { - m := &mock.Mock{} - m.On("RemoveAll", bson.M{ - "repo.name": "test", - }) - dbSession := mockstore.NewMockSession(m) - - err := deleteRepo(dbSession, "test") - if err != nil { - t.Errorf("failed to delete chart repo test: %v", err) - } - m.AssertExpectations(t) -} - -func Test_fetchAndImportIcon(t *testing.T) { - t.Run("no icon", func(t *testing.T) { - m := mock.Mock{} - dbSession := mockstore.NewMockSession(&m) - c := chart{ID: "test/acs-engine-autoscaler"} - assert.NoErr(t, fetchAndImportIcon(dbSession, c)) - }) - - index, _ := parseRepoIndex([]byte(validRepoIndexYAML)) - charts := chartsFromIndex(index, repo{Name: "test", URL: "http://testrepo.com"}) - - t.Run("failed download", func(t *testing.T) { - netClient = &badHTTPClient{} - c := charts[0] - m := mock.Mock{} - dbSession := mockstore.NewMockSession(&m) - assert.Err(t, fmt.Errorf("500 %s", c.Icon), fetchAndImportIcon(dbSession, c)) - }) - - t.Run("bad icon", func(t *testing.T) { - netClient = &badIconClient{} - c := charts[0] - m := mock.Mock{} - dbSession := mockstore.NewMockSession(&m) - assert.Err(t, image.ErrFormat, fetchAndImportIcon(dbSession, c)) - }) - - t.Run("valid icon", func(t *testing.T) { - netClient = &goodIconClient{} - c := charts[0] - m := mock.Mock{} - dbSession := mockstore.NewMockSession(&m) - m.On("UpdateId", c.ID, bson.M{"$set": bson.M{"raw_icon": iconBytes()}}).Return(nil) - assert.NoErr(t, fetchAndImportIcon(dbSession, c)) - m.AssertExpectations(t) - }) -} - -func Test_fetchAndImportFiles(t *testing.T) { - index, _ := parseRepoIndex([]byte(validRepoIndexYAML)) - charts := chartsFromIndex(index, repo{Name: "test", URL: "http://testrepo.com", AuthorizationHeader: "Bearer ThisSecretAccessTokenAuthenticatesTheClient1s"}) - cv := charts[0].ChartVersions[0] - - t.Run("http error", func(t *testing.T) { - m := mock.Mock{} - m.On("One", mock.Anything).Return(errors.New("return an error when checking if readme already exists to force fetching")) - dbSession := mockstore.NewMockSession(&m) - netClient = &badHTTPClient{} - assert.Err(t, io.EOF, fetchAndImportFiles(dbSession, charts[0].Name, charts[0].Repo, cv)) - }) - - t.Run("file not found", func(t *testing.T) { - netClient = &goodTarballClient{c: charts[0], skipValues: true, skipReadme: true} - m := mock.Mock{} - m.On("One", mock.Anything).Return(errors.New("return an error when checking if files already exists to force fetching")) - chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version) - m.On("UpsertId", chartFilesID, chartFiles{chartFilesID, "", "", charts[0].Repo, cv.Digest}) - dbSession := mockstore.NewMockSession(&m) - err := fetchAndImportFiles(dbSession, charts[0].Name, charts[0].Repo, cv) - assert.NoErr(t, err) - m.AssertExpectations(t) - }) - - t.Run("authenticated request", func(t *testing.T) { - netClient = &authenticatedTarballClient{c: charts[0]} - m := mock.Mock{} - m.On("One", mock.Anything).Return(errors.New("return an error when checking if files already exists to force fetching")) - chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version) - m.On("UpsertId", chartFilesID, chartFiles{chartFilesID, testChartReadme, testChartValues, charts[0].Repo, cv.Digest}) - dbSession := mockstore.NewMockSession(&m) - err := fetchAndImportFiles(dbSession, charts[0].Name, charts[0].Repo, cv) - assert.NoErr(t, err) - m.AssertExpectations(t) - }) - - t.Run("valid tarball", func(t *testing.T) { - netClient = &goodTarballClient{c: charts[0]} - m := mock.Mock{} - m.On("One", mock.Anything).Return(errors.New("return an error when checking if files already exists to force fetching")) - chartFilesID := fmt.Sprintf("%s/%s-%s", charts[0].Repo.Name, charts[0].Name, cv.Version) - m.On("UpsertId", chartFilesID, chartFiles{chartFilesID, testChartReadme, testChartValues, charts[0].Repo, cv.Digest}) - dbSession := mockstore.NewMockSession(&m) - err := fetchAndImportFiles(dbSession, charts[0].Name, charts[0].Repo, cv) - assert.NoErr(t, err) - m.AssertExpectations(t) - }) - - t.Run("file exists", func(t *testing.T) { - m := mock.Mock{} - // don't return an error when checking if files already exists - m.On("One", mock.Anything).Return(nil) - dbSession := mockstore.NewMockSession(&m) - err := fetchAndImportFiles(dbSession, charts[0].Name, charts[0].Repo, cv) - assert.NoErr(t, err) - m.AssertNotCalled(t, "UpsertId", mock.Anything, mock.Anything) - }) -} - -func Test_chartTarballURL(t *testing.T) { - r := repo{Name: "test", URL: "http://testrepo.com"} - tests := []struct { - name string - cv chartVersion - wanted string - }{ - {"absolute url", chartVersion{URLs: []string{"http://testrepo.com/wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"}, - {"relative url", chartVersion{URLs: []string{"wordpress-0.1.0.tgz"}}, "http://testrepo.com/wordpress-0.1.0.tgz"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - assert.Equal(t, chartTarballURL(r, tt.cv), tt.wanted, "url") - }) - } -} - -func Test_extractFilesFromTarball(t *testing.T) { - tests := []struct { - name string - files []tarballFile - filename string - want string - }{ - {"file", []tarballFile{{"file.txt", "best file ever"}}, "file.txt", "best file ever"}, - {"multiple file tarball", []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}}, "file2.txt", "worst file ever"}, - {"file in dir", []tarballFile{{"file.txt", "best file ever"}, {"test/file2.txt", "worst file ever"}}, "test/file2.txt", "worst file ever"}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var b bytes.Buffer - createTestTarball(&b, tt.files) - r := bytes.NewReader(b.Bytes()) - tarf := tar.NewReader(r) - files, err := extractFilesFromTarball([]string{tt.filename}, tarf) - assert.NoErr(t, err) - assert.Equal(t, files[tt.filename], tt.want, "file body") - }) - } - - t.Run("extract multiple files", func(t *testing.T) { - var b bytes.Buffer - tFiles := []tarballFile{{"file.txt", "best file ever"}, {"file2.txt", "worst file ever"}} - createTestTarball(&b, tFiles) - r := bytes.NewReader(b.Bytes()) - tarf := tar.NewReader(r) - files, err := extractFilesFromTarball([]string{tFiles[0].Name, tFiles[1].Name}, tarf) - assert.NoErr(t, err) - assert.Equal(t, len(files), 2, "matches") - for _, f := range tFiles { - assert.Equal(t, files[f.Name], f.Body, "file body") - } - }) - - t.Run("file not found", func(t *testing.T) { - var b bytes.Buffer - createTestTarball(&b, []tarballFile{{"file.txt", "best file ever"}}) - r := bytes.NewReader(b.Bytes()) - tarf := tar.NewReader(r) - name := "file2.txt" - files, err := extractFilesFromTarball([]string{name}, tarf) - assert.NoErr(t, err) - assert.Equal(t, files[name], "", "file body") - }) - - t.Run("not a tarball", func(t *testing.T) { - b := make([]byte, 4) - rand.Read(b) - r := bytes.NewReader(b) - tarf := tar.NewReader(r) - files, err := extractFilesFromTarball([]string{"file2.txt"}, tarf) - assert.Err(t, io.ErrUnexpectedEOF, err) - assert.Equal(t, len(files), 0, "file body") - }) -} - -type tarballFile struct { - Name, Body string -} - -func createTestTarball(w io.Writer, files []tarballFile) { - // Create a new tar archive. - tarw := tar.NewWriter(w) - - // Add files to the archive. - for _, file := range files { - hdr := &tar.Header{ - Name: file.Name, - Mode: 0600, - Size: int64(len(file.Body)), - } - if err := tarw.WriteHeader(hdr); err != nil { - log.Fatalln(err) - } - if _, err := tarw.Write([]byte(file.Body)); err != nil { - log.Fatalln(err) - } - } - // Make sure to check the error on Close. - if err := tarw.Close(); err != nil { - log.Fatal(err) - } -} - -func Test_initNetClient(t *testing.T) { - // Test env - otherDir, err := ioutil.TempDir("", "ca-registry") - if err != nil { - t.Fatal(err) - } - defer os.RemoveAll(otherDir) - - // Create cert - caCert := `-----BEGIN CERTIFICATE----- -MIIC6jCCAdKgAwIBAgIUKVfzA7lfBgSYP8enCVhlm0ql5YwwDQYJKoZIhvcNAQEL -BQAwDTELMAkGA1UEAxMCQ0EwHhcNMTgxMjEyMTQxNzAwWhcNMjMxMjExMTQxNzAw -WjANMQswCQYDVQQDEwJDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -ALZU3fsAgvoUuLSHr24apslaYyuX84wGoZQmtFtQ+A3DF9KL/2nn3yZ6qJPkH0TF -sbObEQRNi+P6vQ3nI/dSNMX5PzMBP2CB6L7zEXzZQEHtAK0Bzva5CKEBGX7OfIKl -aBvs+dzKVJBdb+Oh0maacMwa4QbcD6ejzF90jUbaO65lpQpcL7KQdppKOGNclRaA -hQTV2VsxrV4hH7K9btaTTxso+8W6p8v6X9vf40Ywx72p+SKnGh+FCrOp1gYLBLwo -4SM0OUQHRvqUlj0XhZk5pW0dMRwHcoz1S2GmE5bj4edr4j+zGzGxa2wRGKvM0OCn -Do84AVszTFPmUf+mCl4pJNECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud -EwEB/wQFMAMBAf8wHQYDVR0OBBYEFI5l5k+MEhrbOQ29dOW1qJhI0yKaMA0GCSqG -SIb3DQEBCwUAA4IBAQByDebUOKzn6jfmXlW62vm09V+ipqId01wm21G9XMtMEqhc -xtun6YwQeTuGPtdepWG+NXuSsiX/HNAHeaumJaaljHhdKDisnMQ0CTnNsu8NPkAl -9iMEB3iXLWkb7+HgfPJAHZVGcMqMxNEMZYHB1Fh0G2Ne376X94+GYJ08qR2C8rUP -BShhMSktB578h4GtPIWSjPhDUWg1fGe7sewR+GPyuL9859hOD0wGm9tUixBKloCu -b90fhqZZ3FqZD7W1qJGKvz/8geqi0noip+uq/dokK1jarRkOVEJP+EvXkHo0tIuc -h251U/Daz6NiQBM9AxyAw6EHm8XAZBvCuebfzyrT ------END CERTIFICATE-----` - otherCA := path.Join(otherDir, "ca.crt") - err = ioutil.WriteFile(otherCA, []byte(caCert), 0644) - if err != nil { - t.Error(err) - } - - _, err = initNetClient(otherCA) - if err != nil { - t.Error(err) - } -} diff --git a/src/jetstream/plugins/monocular/chart-repo/version.go b/src/jetstream/plugins/monocular/chart-repo/version.go deleted file mode 100644 index 185e2f096d..0000000000 --- a/src/jetstream/plugins/monocular/chart-repo/version.go +++ /dev/null @@ -1,50 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartrepo - -import ( - "fmt" - - "github.com/spf13/cobra" -) - -var ( - version = "devel" - userAgentComment string -) - -// Returns the user agent to be used during calls to the chart repositories -// Examples: -// chart-repo/devel -// chart-repo/1.0 -// chart-repo/1.0 (monocular v1.0-beta4) -// More info here https://github.com/kubeapps/kubeapps/issues/767#issuecomment-436835938 -func userAgent() string { - ua := "chart-repo/" + version - if userAgentComment != "" { - ua = fmt.Sprintf("%s (%s)", ua, userAgentComment) - } - return ua -} - -var versionCmd = &cobra.Command{ - Use: "version", - Short: "returns version information", - Run: func(cmd *cobra.Command, args []string) { - fmt.Println(version) - }, -} diff --git a/src/jetstream/plugins/monocular/chartsvc/Dockerfile b/src/jetstream/plugins/monocular/chartsvc/Dockerfile deleted file mode 100644 index 639a9429c8..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM golang:1.11 as builder -COPY . /go/src/github.com/helm/monocular -WORKDIR /go/src/github.com/helm/monocular -RUN CGO_ENABLED=0 go build -a -installsuffix cgo ./cmd/chartsvc - -FROM scratch -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /go/src/github.com/helm/monocular/chartsvc /chartsvc -EXPOSE 8080 -CMD ["/chartsvc"] diff --git a/src/jetstream/plugins/monocular/chartsvc/Makefile b/src/jetstream/plugins/monocular/chartsvc/Makefile deleted file mode 100644 index 291d260aab..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE_REPO ?= quay.io/helmpack/chartsvc -IMAGE_TAG ?= latest - -docker-build: - # We use the context of the root dir - docker build --pull --rm -t ${IMAGE_REPO}:${IMAGE_TAG} -f Dockerfile ../../ diff --git a/src/jetstream/plugins/monocular/chartsvc/README.md b/src/jetstream/plugins/monocular/chartsvc/README.md deleted file mode 100644 index 2cc0afc9d3..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Chartsvc - -Chartsvc is a service for Monocular that reads chart metadata from the database -and presents it in a RESTful API. It should be used with the -[chart-repo](https://github.com/helm/monocular/tree/master/cmd/chart-repo) to -populate chart metadata in the database. diff --git a/src/jetstream/plugins/monocular/chartsvc/datastore.go b/src/jetstream/plugins/monocular/chartsvc/datastore.go deleted file mode 100644 index 98e0306e71..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/datastore.go +++ /dev/null @@ -1,15 +0,0 @@ -package chartsvc - -import ( - //"bytes" - "github.com/helm/monocular/chartsvc/models" -) - -type ChartSvcDatastore interface { - ListRepositories() ([]string, error) - ListCharts() ([]*models.Chart, error) - GetChart(chartID string) (models.Chart, error) - GetChartVersion(chartID, version string) (models.Chart, error) - GetChartIcon(chartID string) ([]byte, error) - GetChartVersionReadme(chartID, version string) ([]byte, error) -} diff --git a/src/jetstream/plugins/monocular/chartsvc/go.mod b/src/jetstream/plugins/monocular/chartsvc/go.mod deleted file mode 100644 index b5d4d61532..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module github.com/helm/monocular/chartsvc - -require ( - github.com/disintegration/imaging v1.6.0 - github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 - github.com/gorilla/mux v1.7.0 - github.com/helm/monocular v1.4.0 - github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 - github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 - github.com/prometheus/client_golang v0.9.2 // indirect - github.com/sirupsen/logrus v1.3.0 - github.com/stretchr/testify v1.2.2 - github.com/unrolled/render v1.0.0 // indirect - github.com/urfave/negroni v1.0.0 - k8s.io/helm v2.12.3+incompatible -) diff --git a/src/jetstream/plugins/monocular/chartsvc/go.sum b/src/jetstream/plugins/monocular/chartsvc/go.sum deleted file mode 100644 index 2b1a44c353..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/go.sum +++ /dev/null @@ -1,51 +0,0 @@ -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA= -github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U= -github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec= -github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE= -github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs= -github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4= -github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg= -github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w= -k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= diff --git a/src/jetstream/plugins/monocular/chartsvc/handler.go b/src/jetstream/plugins/monocular/chartsvc/handler.go deleted file mode 100644 index 96ce07bf2e..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/handler.go +++ /dev/null @@ -1,290 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartsvc - -import ( - "fmt" - "net/http" - - "github.com/globalsign/mgo/bson" - "github.com/gorilla/mux" - "github.com/helm/monocular/chartsvc/models" - "github.com/kubeapps/common/response" - log "github.com/sirupsen/logrus" -) - -// Params a key-value map of path params -type Params map[string]string - -// WithParams can be used to wrap handlers to take an extra arg for path params -type WithParams func(http.ResponseWriter, *http.Request, Params) - -func (h WithParams) ServeHTTP(w http.ResponseWriter, req *http.Request) { - vars := mux.Vars(req) - h(w, req, vars) -} - -const chartCollection = "charts" -const filesCollection = "files" - -type apiResponse struct { - ID string `json:"id"` - Type string `json:"type"` - Attributes interface{} `json:"attributes"` - Links interface{} `json:"links"` - Relationships relMap `json:"relationships"` -} - -type apiListResponse []*apiResponse - -type selfLink struct { - Self string `json:"self"` -} - -type relMap map[string]rel -type rel struct { - Data interface{} `json:"data"` - Links selfLink `json:"links"` -} - -// ListCharts returns a list of charts -func ListCharts(w http.ResponseWriter, req *http.Request) { - charts, err := dataStore.ListCharts() - if err != nil { - log.WithError(err).Error("could not fetch charts") - response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w) - return - } - - cl := newChartListResponse(charts) - response.NewDataResponse(cl).Write(w) -} - -// listRepoCharts returns a list of charts in the given repo -func listRepoCharts(w http.ResponseWriter, req *http.Request, params Params) { - db, closer := dbSession.DB() - defer closer() - var charts []*models.Chart - if err := db.C(chartCollection).Find(bson.M{"repo.name": params["repo"]}).Sort("_id").All(&charts); err != nil { - log.WithError(err).Error("could not fetch charts") - response.NewErrorResponse(http.StatusInternalServerError, "could not fetch all charts").Write(w) - return - } - - cl := newChartListResponse(charts) - response.NewDataResponse(cl).Write(w) -} - -// getChart returns the chart from the given repo -func getChart(w http.ResponseWriter, req *http.Request, params Params) { - var chart models.Chart - chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"]) - chart, err := dataStore.GetChart(chartID) - if err != nil { - log.WithError(err).Errorf("could not find chart with id %s", chartID) - response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w) - return - } - - cr := newChartResponse(&chart) - response.NewDataResponse(cr).Write(w) -} - -// listChartVersions returns a list of chart versions for the given chart -func listChartVersions(w http.ResponseWriter, req *http.Request, params Params) { - var chart models.Chart - chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"]) - chart, err := dataStore.GetChart(chartID) - if err != nil { - log.WithError(err).Errorf("could not find chart with id %s", chartID) - response.NewErrorResponse(http.StatusNotFound, "could not find chart").Write(w) - return - } - - cvl := newChartVersionListResponse(&chart) - response.NewDataResponse(cvl).Write(w) -} - -// getChartVersion returns the given chart version -func getChartVersion(w http.ResponseWriter, req *http.Request, params Params) { - chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"]) - version := params["version"] - chart, err := dataStore.GetChartVersion(chartID, version) - if err != nil { - log.WithError(err).Errorf("could not find chart with id %s", chartID) - response.NewErrorResponse(http.StatusNotFound, "could not find chart version").Write(w) - return - } - - cvr := newChartVersionResponse(&chart, chart.ChartVersions[0]) - response.NewDataResponse(cvr).Write(w) -} - -// getChartIcon returns the icon for a given chart -func getChartIcon(w http.ResponseWriter, req *http.Request, params Params) { - chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"]) - rawIcon, err := dataStore.GetChartIcon(chartID) - if err != nil { - log.WithError(err).Errorf("could not find chart with id %s", chartID) - http.NotFound(w, req) - return - } - - if rawIcon == nil { - http.NotFound(w, req) - return - } - - w.Write(rawIcon) -} - -// getChartVersionReadme returns the README for a given chart -func getChartVersionReadme(w http.ResponseWriter, req *http.Request, params Params) { - chartID := fmt.Sprintf("%s/%s", params["repo"], params["chartName"]) - version := params["version"] - fileID := fmt.Sprintf("%s-%s", chartID, version) - readme, err := dataStore.GetChartVersionReadme(chartID, version) - if err != nil { - log.WithError(err).Errorf("could not find files with id %s", fileID) - http.NotFound(w, req) - return - } - if len(readme) == 0 { - log.Errorf("could not find a README for id %s", fileID) - http.NotFound(w, req) - return - } - w.Write(readme) -} - -// getChartVersionValues returns the values.yaml for a given chart -func getChartVersionValues(w http.ResponseWriter, req *http.Request, params Params) { - db, closer := dbSession.DB() - defer closer() - var files models.ChartFiles - fileID := fmt.Sprintf("%s/%s-%s", params["repo"], params["chartName"], params["version"]) - if err := db.C(filesCollection).FindId(fileID).One(&files); err != nil { - log.WithError(err).Errorf("could not find values.yaml with id %s", fileID) - http.NotFound(w, req) - return - } - - w.Write([]byte(files.Values)) -} - -// listChartsWithFilters returns the list of repos that contains the given chart and the latest version found -func listChartsWithFilters(w http.ResponseWriter, req *http.Request, params Params) { - db, closer := dbSession.DB() - defer closer() - - var charts []*models.Chart - if err := db.C(chartCollection).Find(bson.M{ - "name": params["chartName"], - "chartversions": bson.M{ - "$elemMatch": bson.M{"version": req.FormValue("version"), "appversion": req.FormValue("appversion")}, - }}).Select(bson.M{ - "name": 1, "repo": 1, - "chartversions": bson.M{"$slice": 1}, - }).All(&charts); err != nil { - log.WithError(err).Errorf( - "could not find charts with the given name %s, version %s and appversion %s", - params["chartName"], req.FormValue("version"), req.FormValue("appversion"), - ) - // continue to return empty list - } - - cl := newChartListResponse(charts) - response.NewDataResponse(cl).Write(w) -} - -func newChartResponse(c *models.Chart) *apiResponse { - latestCV := c.ChartVersions[0] - return &apiResponse{ - Type: "chart", - ID: c.ID, - Attributes: chartAttributes(*c), - Links: selfLink{pathPrefix + "/charts/" + c.ID}, - Relationships: relMap{ - "latestChartVersion": rel{ - Data: chartVersionAttributes(c.ID, latestCV), - Links: selfLink{pathPrefix + "/charts/" + c.ID + "/versions/" + latestCV.Version}, - }, - }, - } -} - -func newChartListResponse(charts []*models.Chart) apiListResponse { - // We will keep track of unique digest:chart to avoid duplicates - chartDigests := map[string]bool{} - cl := apiListResponse{} - for _, c := range charts { - // Must be at least one chart version - if len(c.ChartVersions) > 0 { - digest := c.ChartVersions[0].Digest - // Filter out the chart if we've seen the same digest before - if _, ok := chartDigests[digest]; !ok { - chartDigests[digest] = true - // Don't want to send back version information in chart list request - cl = append(cl, newChartResponse(c)) - } - } else { - log.Warnf("No versions for chart: %s", c.Name) - } - } - return cl -} - -func chartVersionAttributes(cid string, cv models.ChartVersion) models.ChartVersion { - cv.Readme = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/README.md" - cv.Values = pathPrefix + "/assets/" + cid + "/versions/" + cv.Version + "/values.yaml" - return cv -} - -func chartAttributes(c models.Chart) models.Chart { - if c.RawIcon != nil { - c.Icon = pathPrefix + "/assets/" + c.ID + "/logo-160x160-fit.png" - } else { - // If the icon wasn't processed, it is either not set or invalid - c.Icon = "" - } - c.ChartVersions = nil - return c -} - -func newChartVersionResponse(c *models.Chart, cv models.ChartVersion) *apiResponse { - return &apiResponse{ - Type: "chartVersion", - ID: fmt.Sprintf("%s-%s", c.ID, cv.Version), - Attributes: chartVersionAttributes(c.ID, cv), - Links: selfLink{pathPrefix + "/charts/" + c.ID + "/versions/" + cv.Version}, - Relationships: relMap{ - "chart": rel{ - Data: chartAttributes(*c), - Links: selfLink{pathPrefix + "/charts/" + c.ID}, - }, - }, - } -} - -func newChartVersionListResponse(c *models.Chart) apiListResponse { - var cvl apiListResponse - for _, cv := range c.ChartVersions { - cvl = append(cvl, newChartVersionResponse(c, cv)) - } - - return cvl -} diff --git a/src/jetstream/plugins/monocular/chartsvc/handler_test.go b/src/jetstream/plugins/monocular/chartsvc/handler_test.go deleted file mode 100644 index af7d7b489f..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/handler_test.go +++ /dev/null @@ -1,749 +0,0 @@ -/* -Copyright (c) 2018 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartsvc - -import ( - "bytes" - "encoding/json" - "errors" - "image/color" - "net/http" - "net/http/httptest" - "strings" - "testing" - - "github.com/disintegration/imaging" - "github.com/helm/monocular/chartsvc/models" - "github.com/kubeapps/common/datastore/mockstore" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" -) - -type bodyAPIListResponse struct { - Data *apiListResponse `json:"data"` -} - -type bodyAPIResponse struct { - Data apiResponse `json:"data"` -} - -var chartsList []*models.Chart - -const testChartReadme = "# Quickstart\n\n```bash\nhelm install my-repo/my-chart\n```" -const testChartValues = "image:\n registry: docker.io\n repository: my-repo/my-chart\n tag: 0.1.0" - -func iconBytes() []byte { - var b bytes.Buffer - img := imaging.New(1, 1, color.White) - imaging.Encode(&b, img, imaging.PNG) - return b.Bytes() -} - -func Test_chartAttributes(t *testing.T) { - tests := []struct { - name string - chart models.Chart - }{ - {"chart has no icon", models.Chart{ - ID: "stable/wordpress", - }}, - {"chart has a icon", models.Chart{ - ID: "repo/mychart", RawIcon: iconBytes(), - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - c := chartAttributes(tt.chart) - assert.Equal(t, tt.chart.ID, c.ID) - assert.Equal(t, tt.chart.RawIcon, c.RawIcon) - if len(tt.chart.RawIcon) == 0 { - assert.Equal(t, len(c.Icon), 0, "icon url should be undefined") - } else { - assert.Equal(t, c.Icon, pathPrefix+"/assets/"+tt.chart.ID+"/logo-160x160-fit.png", "the icon url should be the same") - } - }) - } -} - -func Test_chartVersionAttributes(t *testing.T) { - tests := []struct { - name string - chart models.Chart - }{ - {"my-chart", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}, - }}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - cv := chartVersionAttributes(tt.chart.ID, tt.chart.ChartVersions[0]) - assert.Equal(t, cv.Version, tt.chart.ChartVersions[0].Version, "version string should be the same") - assert.Equal(t, cv.Readme, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/README.md", "README.md resource path should be the same") - assert.Equal(t, cv.Values, pathPrefix+"/assets/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version+"/values.yaml", "values.yaml resource path should be the same") - }) - } -} - -func Test_newChartResponse(t *testing.T) { - tests := []struct { - name string - chart models.Chart - }{ - {"chart has only one version", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "1.2.3"}}}, - }, - {"chart has many versions", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.2"}, {Version: "0.1.0"}}, - }}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - cResponse := newChartResponse(&tt.chart) - assert.Equal(t, cResponse.Type, "chart", "response type is chart") - assert.Equal(t, cResponse.ID, tt.chart.ID, "chart ID should be the same") - assert.Equal(t, cResponse.Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0") - assert.Equal(t, cResponse.Links.(selfLink).Self, pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same") - assert.Equal(t, len(cResponse.Attributes.(models.Chart).ChartVersions), len(tt.chart.ChartVersions), "number of chart versions in the response should be the same") - }) - } -} - -func Test_newChartListResponse(t *testing.T) { - tests := []struct { - name string - input []*models.Chart - result []*models.Chart - }{ - {"no charts", []*models.Chart{}, []*models.Chart{}}, - {"has one chart", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }, []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }}, - {"has two charts", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }, []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "stable/wordpress", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }}, - {"has a duplicated chart", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "other-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }, []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }}, - {"has a duplicated older chart version but different latest versions", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.2", Digest: "345"}, {Version: "0.0.1", Digest: "123"}}}, - {ID: "other-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.2", Digest: "678"}, {Version: "0.0.1", Digest: "123"}}}, - }, []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.2", Digest: "345"}, {Version: "0.0.1", Digest: "123"}}}, - {ID: "other-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.2", Digest: "678"}, {Version: "0.0.1", Digest: "123"}}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - clResponse := newChartListResponse(tt.input) - assert.Equal(t, len(clResponse), len(tt.result), "number of charts in response should be the same") - for i := range tt.result { - assert.Equal(t, clResponse[i].Type, "chart", "response type is chart") - assert.Equal(t, clResponse[i].ID, tt.result[i].ID, "chart ID should be the same") - assert.Equal(t, clResponse[i].Relationships["latestChartVersion"].Data.(models.ChartVersion).Version, tt.result[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0") - assert.Equal(t, clResponse[i].Links.(selfLink).Self, pathPrefix+"/charts/"+tt.result[i].ID, "self link should be the same") - assert.Equal(t, len(clResponse[i].Attributes.(models.Chart).ChartVersions), len(tt.result[i].ChartVersions), "number of chart versions in the response should be the same") - } - }) - } -} - -func Test_newChartVersionResponse(t *testing.T) { - tests := []struct { - name string - chart models.Chart - }{ - {"my-chart", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.2.3"}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - for i := range tt.chart.ChartVersions { - cvResponse := newChartVersionResponse(&tt.chart, tt.chart.ChartVersions[i]) - assert.Equal(t, cvResponse.Type, "chartVersion", "response type is chartVersion") - assert.Equal(t, cvResponse.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix") - assert.Equal(t, cvResponse.Links.(interface{}).(selfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same") - assert.Equal(t, cvResponse.Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same") - assert.Equal(t, cvResponse.Relationships["chart"].Data.(interface{}).(models.Chart), tt.chart, "chart in relatioship matches") - } - }) - } -} - -func Test_newChartVersionListResponse(t *testing.T) { - tests := []struct { - name string - chart models.Chart - }{ - {"chart has no versions", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{}, - }}, - {"chart has one version", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}}, - }}, - {"chart has many versions", models.Chart{ - ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}, {Version: "0.0.2"}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - cvListResponse := newChartVersionListResponse(&tt.chart) - assert.Equal(t, len(cvListResponse), len(tt.chart.ChartVersions), "number of chart versions in response should be the same") - for i := range tt.chart.ChartVersions { - assert.Equal(t, cvListResponse[i].Type, "chartVersion", "response type is chartVersion") - assert.Equal(t, cvListResponse[i].ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "reponse id should have chart version suffix") - assert.Equal(t, cvListResponse[i].Links.(interface{}).(selfLink).Self, pathPrefix+"/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[i].Version, "self link should be the same") - assert.Equal(t, cvListResponse[i].Attributes.(models.ChartVersion).Version, tt.chart.ChartVersions[i].Version, "chart version in the response should be the same") - } - }) - } -} - -func Test_listCharts(t *testing.T) { - tests := []struct { - name string - charts []*models.Chart - }{ - {"no charts", []*models.Chart{}}, - {"one chart", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }}, - {"two charts", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "stable/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - m.On("All", &chartsList).Run(func(args mock.Arguments) { - *args.Get(0).(*[]*models.Chart) = tt.charts - }) - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts", nil) - listCharts(w, req) - - m.AssertExpectations(t) - assert.Equal(t, http.StatusOK, w.Code) - - var b bodyAPIListResponse - json.NewDecoder(w.Body).Decode(&b) - if b.Data == nil { - t.Fatal("chart list shouldn't be null") - } - data := *b.Data - assert.Len(t, data, len(tt.charts)) - for i, resp := range data { - assert.Equal(t, resp.ID, tt.charts[i].ID, "chart id in the response should be the same") - assert.Equal(t, resp.Type, "chart", "response type is chart") - assert.Equal(t, resp.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.charts[i].ID, "self link should be the same") - assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.charts[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0") - } - }) - } -} - -func Test_listRepoCharts(t *testing.T) { - tests := []struct { - name string - repo string - charts []*models.Chart - }{ - {"repo has no charts", "my-repo", []*models.Chart{}}, - {"repo has one chart", "my-repo", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }}, - {"repo has many charts", "my-repo", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "my-repo/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - m.On("All", &chartsList).Run(func(args mock.Arguments) { - *args.Get(0).(*[]*models.Chart) = tt.charts - }) - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts/"+tt.repo, nil) - params := Params{ - "repo": "my-repo", - } - - listRepoCharts(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, http.StatusOK, w.Code) - - var b bodyAPIListResponse - json.NewDecoder(w.Body).Decode(&b) - data := *b.Data - assert.Len(t, data, len(tt.charts)) - for i, resp := range data { - assert.Equal(t, resp.ID, tt.charts[i].ID, "chart id in the response should be the same") - assert.Equal(t, resp.Type, "chart", "response type is chart") - assert.Equal(t, resp.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.charts[i].ChartVersions[0].Version, "latestChartVersion should match version at index 0") - } - }) - } -} - -func Test_getChart(t *testing.T) { - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID, nil) - parts := strings.Split(tt.chart.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - } - - getChart(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code) - if tt.wantCode == http.StatusOK { - var b bodyAPIResponse - json.NewDecoder(w.Body).Decode(&b) - assert.Equal(t, b.Data.ID, tt.chart.ID, "chart id in the response should be the same") - assert.Equal(t, b.Data.Type, "chart", "response type is chart") - assert.Equal(t, b.Data.Links.(map[string]interface{})["self"], pathPrefix+"/charts/"+tt.chart.ID, "self link should be the same") - assert.Equal(t, b.Data.Relationships["latestChartVersion"].Data.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "latestChartVersion should match version at index 0") - } - }) - } -} - -func Test_listChartVersions(t *testing.T) { - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions", nil) - parts := strings.Split(tt.chart.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - } - - listChartVersions(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code) - if tt.wantCode == http.StatusOK { - var b bodyAPIListResponse - json.NewDecoder(w.Body).Decode(&b) - data := *b.Data - for i, resp := range data { - assert.Equal(t, resp.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[i].Version, "chart id in the response should be the same") - assert.Equal(t, resp.Type, "chartVersion", "response type is chartVersion") - assert.Equal(t, resp.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[i].Version, "chart version should match") - } - } - }) - } -} - -func Test_getChartVersion(t *testing.T) { - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts/"+tt.chart.ID+"/versions/"+tt.chart.ChartVersions[0].Version, nil) - parts := strings.Split(tt.chart.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - "version": tt.chart.ChartVersions[0].Version, - } - - getChartVersion(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code) - if tt.wantCode == http.StatusOK { - var b bodyAPIResponse - json.NewDecoder(w.Body).Decode(&b) - assert.Equal(t, b.Data.ID, tt.chart.ID+"-"+tt.chart.ChartVersions[0].Version, "chart id in the response should be the same") - assert.Equal(t, b.Data.Type, "chartVersion", "response type is chartVersion") - assert.Equal(t, b.Data.Attributes.(map[string]interface{})["version"], tt.chart.ChartVersions[0].Version, "chart version should match") - } - }) - } -} - -func Test_getChartIcon(t *testing.T) { - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart has icon", - nil, - models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes()}, - http.StatusOK, - }, - { - "chart does not have a icon", - nil, - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/assets/"+tt.chart.ID+"/logo-160x160-fit.png", nil) - parts := strings.Split(tt.chart.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - } - - getChartIcon(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code, "http status code should match") - if tt.wantCode == http.StatusOK { - assert.Equal(t, w.Body.Bytes(), tt.chart.RawIcon, "raw icon data should match") - } - }) - } -} - -func Test_getChartVersionReadme(t *testing.T) { - tests := []struct { - name string - version string - err error - files models.ChartFiles - wantCode int - }{ - { - "chart does not exist", - "0.1.0", - errors.New("return an error when checking if chart exists"), - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - "1.2.3", - nil, - models.ChartFiles{ID: "my-repo/my-chart", Readme: testChartReadme}, - http.StatusOK, - }, - { - "chart does not have a readme", - "1.1.1", - nil, - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.ChartFiles) = tt.files - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/README.md", nil) - parts := strings.Split(tt.files.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - "version": "0.1.0", - } - - getChartVersionReadme(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code, "http status code should match") - if tt.wantCode == http.StatusOK { - assert.Equal(t, string(w.Body.Bytes()), tt.files.Readme, "content of the readme should match") - } - }) - } -} - -func Test_getChartVersionValues(t *testing.T) { - tests := []struct { - name string - version string - err error - files models.ChartFiles - wantCode int - }{ - { - "chart does not exist", - "0.1.0", - errors.New("return an error when checking if chart exists"), - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - "3.2.1", - nil, - models.ChartFiles{ID: "my-repo/my-chart", Values: testChartValues}, - http.StatusOK, - }, - { - "chart does not have values.yaml", - "2.2.2", - nil, - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.ChartFiles) = tt.files - }) - } - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/assets/"+tt.files.ID+"/versions/"+tt.version+"/values.yaml", nil) - parts := strings.Split(tt.files.ID, "/") - params := Params{ - "repo": parts[0], - "chartName": parts[1], - "version": "0.1.0", - } - - getChartVersionValues(w, req, params) - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, w.Code, "http status code should match") - if tt.wantCode == http.StatusOK { - assert.Equal(t, string(w.Body.Bytes()), tt.files.Values, "content of values.yaml should match") - } - }) - } -} - -func Test_findLatestChart(t *testing.T) { - t.Run("returns mocked chart", func(t *testing.T) { - chart := &models.Chart{ - Name: "foo", - ID: "foo", - Repo: models.Repo{Name: "bar"}, - ChartVersions: []models.ChartVersion{ - models.ChartVersion{Version: "1.0.0", AppVersion: "0.1.0"}, - models.ChartVersion{Version: "0.0.1", AppVersion: "0.1.0"}, - }, - } - charts := []*models.Chart{chart} - reqVersion := "1.0.0" - reqAppVersion := "0.1.0" - - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - m.On("All", &chartsList).Run(func(args mock.Arguments) { - *args.Get(0).(*[]*models.Chart) = charts - }) - - w := httptest.NewRecorder() - req := httptest.NewRequest("GET", "/charts?name="+chart.Name+"&version="+reqVersion+"&appversion="+reqAppVersion, nil) - params := Params{ - "name": chart.Name, - "version": reqVersion, - "appversion": reqAppVersion, - } - - listChartsWithFilters(w, req, params) - - var b bodyAPIListResponse - json.NewDecoder(w.Body).Decode(&b) - if b.Data == nil { - t.Fatal("chart list shouldn't be null") - } - data := *b.Data - - if data[0].ID != chart.ID { - t.Errorf("Expecting %v, received %v", chart, data[0].ID) - } - }) -} diff --git a/src/jetstream/plugins/monocular/chartsvc/main.go b/src/jetstream/plugins/monocular/chartsvc/main.go deleted file mode 100644 index 17791abef9..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/main.go +++ /dev/null @@ -1,105 +0,0 @@ -/* -Copyright (c) 2017 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartsvc - -import ( - "flag" - "net/http" - "os" - - "github.com/gorilla/mux" - "github.com/heptiolabs/healthcheck" - "github.com/kubeapps/common/datastore" - log "github.com/sirupsen/logrus" - "github.com/urfave/negroni" -) - -const pathPrefix = "/v1" - -var dbSession datastore.Session - -// Data store to use (abstratcs from MongoDB) -var dataStore ChartSvcDatastore - -func setupRoutes() http.Handler { - r := mux.NewRouter() - - // Healthcheck - health := healthcheck.NewHandler() - r.Handle("/live", health) - r.Handle("/ready", health) - - // Routes - apiv1 := r.PathPrefix(pathPrefix).Subrouter() - apiv1.Methods("GET").Path("/charts").Queries("name", "{chartName}", "version", "{version}", "appversion", "{appversion}").Handler(WithParams(listChartsWithFilters)) - apiv1.Methods("GET").Path("/charts").HandlerFunc(ListCharts) - apiv1.Methods("GET").Path("/charts/{repo}").Handler(WithParams(listRepoCharts)) - apiv1.Methods("GET").Path("/charts/{repo}/{chartName}").Handler(WithParams(getChart)) - apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions").Handler(WithParams(listChartVersions)) - apiv1.Methods("GET").Path("/charts/{repo}/{chartName}/versions/{version}").Handler(WithParams(getChartVersion)) - apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/logo-160x160-fit.png").Handler(WithParams(getChartIcon)) - apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/README.md").Handler(WithParams(getChartVersionReadme)) - apiv1.Methods("GET").Path("/assets/{repo}/{chartName}/versions/{version}/values.yaml").Handler(WithParams(getChartVersionValues)) - - n := negroni.Classic() - n.UseHandler(r) - return n -} - -func main() { - dbURL := flag.String("mongo-url", "localhost", "MongoDB URL (see https://godoc.org/github.com/globalsign/mgo#Dial for format)") - dbName := flag.String("mongo-database", "charts", "MongoDB database") - dbUsername := flag.String("mongo-user", "", "MongoDB user") - dbPassword := os.Getenv("MONGO_PASSWORD") - flag.Parse() - - mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword} - var err error - dbSession, err = datastore.NewSession(mongoConfig) - if err != nil { - log.WithFields(log.Fields{"host": *dbURL}).Fatal(err) - } - - n := setupRoutes() - - port := os.Getenv("PORT") - if port == "" { - port = "8080" - } - addr := ":" + port - log.WithFields(log.Fields{"addr": addr}).Info("Started chartsvc") - http.ListenAndServe(addr, n) -} - -// Stratos addition to chartsvc main.go - -// SetMongoConfig allosws Stratos plugin to configure MongoDB -func SetMongoConfig(dbURL, dbName, dbUsername *string, dbPassword string) (datastore.Session, error) { - var err error - mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword} - dbSession, err = datastore.NewSession(mongoConfig) - return dbSession, err -} - -// GetRoutes exposes the HTTP routes for the Chart Service API -func GetRoutes() http.Handler { - return setupRoutes() -} - -func SetStore(store ChartSvcDatastore) { - dataStore = store -} diff --git a/src/jetstream/plugins/monocular/chartsvc/main_test.go b/src/jetstream/plugins/monocular/chartsvc/main_test.go deleted file mode 100644 index 2ae0ad514d..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/main_test.go +++ /dev/null @@ -1,467 +0,0 @@ -/* -Copyright (c) 2017 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package chartsvc - -import ( - "encoding/json" - "errors" - "net/http" - "net/http/httptest" - "testing" - - "github.com/helm/monocular/chartsvc/models" - "github.com/kubeapps/common/datastore/mockstore" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" -) - -// tests the GET /live endpoint -func Test_GetLive(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - res, err := http.Get(ts.URL + "/live") - assert.NoError(t, err, "should not return an error") - defer res.Body.Close() - assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match") -} - -// tests the GET /ready endpoint -func Test_GetReady(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - res, err := http.Get(ts.URL + "/ready") - assert.NoError(t, err, "should not return an error") - defer res.Body.Close() - assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match") -} - -// tests the GET /{apiVersion}/charts endpoint -func Test_GetCharts(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - charts []*models.Chart - }{ - {"no charts", []*models.Chart{}}, - {"one chart", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1"}}}}, - }, - {"two charts", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "my-repo/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - m.On("All", &chartsList).Run(func(args mock.Arguments) { - *args.Get(0).(*[]*models.Chart) = tt.charts - }) - - res, err := http.Get(ts.URL + pathPrefix + "/charts") - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match") - - var b bodyAPIListResponse - json.NewDecoder(res.Body).Decode(&b) - assert.Len(t, *b.Data, len(tt.charts)) - }) - } -} - -// tests the GET /{apiVersion}/charts/{repo} endpoint -func Test_GetChartsInRepo(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - repo string - charts []*models.Chart - }{ - {"repo has no charts", "my-repo", []*models.Chart{}}, - {"repo has one chart", "my-repo", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - }}, - {"repo has many charts", "my-repo", []*models.Chart{ - {ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.0.1", Digest: "123"}}}, - {ID: "my-repo/dokuwiki", ChartVersions: []models.ChartVersion{{Version: "1.2.3", Digest: "1234"}, {Version: "1.2.2", Digest: "12345"}}}, - }}, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - m.On("All", &chartsList).Run(func(args mock.Arguments) { - *args.Get(0).(*[]*models.Chart) = tt.charts - }) - - res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.repo) - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, http.StatusOK, "http status code should match") - - var b bodyAPIListResponse - json.NewDecoder(res.Body).Decode(&b) - assert.Len(t, *b.Data, len(tt.charts)) - }) - } -} - -// tests the GET /{apiVersion}/charts/{repo}/{chartName} endpoint -func Test_GetChartInRepo(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID) - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match") - }) - } -} - -// tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions endpoint -func Test_ListChartVersions(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID + "/versions") - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match") - }) - } -} - -// tests the GET /{apiVersion}/charts/{repo}/{chartName}/versions/{:version} endpoint -func Test_GetChartVersion(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusNotFound, - }, - { - "chart exists", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}}}, - http.StatusOK, - }, - { - "chart has multiple versions", - nil, - models.Chart{ID: "my-repo/my-chart", ChartVersions: []models.ChartVersion{{Version: "0.1.0"}, {Version: "0.0.1"}}}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/charts/" + tt.chart.ID + "/versions/" + tt.chart.ChartVersions[0].Version) - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match") - }) - } -} - -// tests the GET /{apiVersion}/assets/{repo}/{chartName}/logo-160x160-fit.png endpoint -func Test_GetChartIcon(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - err error - chart models.Chart - wantCode int - }{ - { - "chart does not exist", - errors.New("return an error when checking if chart exists"), - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart has icon", - nil, - models.Chart{ID: "my-repo/my-chart", RawIcon: iconBytes()}, - http.StatusOK, - }, - { - "chart does not have a icon", - nil, - models.Chart{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.Chart{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.Chart) = tt.chart - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.chart.ID + "/logo-160x160-fit.png") - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match") - }) - } -} - -// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/README.md endpoint -func Test_GetChartReadme(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - version string - err error - files models.ChartFiles - wantCode int - }{ - { - "chart does not exist", - "0.1.0", - errors.New("return an error when checking if chart exists"), - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - "1.2.3", - nil, - models.ChartFiles{ID: "my-repo/my-chart", Readme: testChartReadme}, - http.StatusOK, - }, - { - "chart does not have a readme", - "1.1.1", - nil, - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.ChartFiles) = tt.files - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/README.md") - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, tt.wantCode, res.StatusCode, "http status code should match") - }) - } -} - -// tests the GET /{apiVersion}/assets/{repo}/{chartName}/versions/{version}/values.yaml endpoint -func Test_GetChartValues(t *testing.T) { - ts := httptest.NewServer(setupRoutes()) - defer ts.Close() - - tests := []struct { - name string - version string - err error - files models.ChartFiles - wantCode int - }{ - { - "chart does not exist", - "0.1.0", - errors.New("return an error when checking if chart exists"), - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusNotFound, - }, - { - "chart exists", - "3.2.1", - nil, - models.ChartFiles{ID: "my-repo/my-chart", Values: testChartValues}, - http.StatusOK, - }, - { - "chart does not have values.yaml", - "2.2.2", - nil, - models.ChartFiles{ID: "my-repo/my-chart"}, - http.StatusOK, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - var m mock.Mock - dbSession = mockstore.NewMockSession(&m) - if tt.err != nil { - m.On("One", mock.Anything).Return(tt.err) - } else { - m.On("One", &models.ChartFiles{}).Return(nil).Run(func(args mock.Arguments) { - *args.Get(0).(*models.ChartFiles) = tt.files - }) - } - - res, err := http.Get(ts.URL + pathPrefix + "/assets/" + tt.files.ID + "/versions/" + tt.version + "/values.yaml") - assert.NoError(t, err) - defer res.Body.Close() - - m.AssertExpectations(t) - assert.Equal(t, res.StatusCode, tt.wantCode, "http status code should match") - }) - } -} diff --git a/src/jetstream/plugins/monocular/chartsvc/models/chart.go b/src/jetstream/plugins/monocular/chartsvc/models/chart.go deleted file mode 100644 index f4e981dfbc..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/models/chart.go +++ /dev/null @@ -1,67 +0,0 @@ -/* -Copyright (c) 2017 The Helm Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package models - -import ( - "time" - - "k8s.io/helm/pkg/proto/hapi/chart" -) - -// Repo holds the App repository details -type Repo struct { - Name string `json:"name"` - URL string `json:"url"` -} - -// Chart is a higher-level representation of a chart package -type Chart struct { - ID string `json:"" bson:"_id"` - Name string `json:"name"` - Repo Repo `json:"repo"` - Description string `json:"description"` - Home string `json:"home"` - Keywords []string `json:"keywords"` - Maintainers []chart.Maintainer `json:"maintainers"` - Sources []string `json:"sources"` - Icon string `json:"icon"` - RawIcon []byte `json:"-" bson:"raw_icon"` - ChartVersions []ChartVersion `json:"chart_versions,omitempty"` -} - -// type ChartWithVersions struct { -// Chart -// Versions []ChartVersion `json:"versions"` -// } - -// ChartVersion is a representation of a specific version of a chart -type ChartVersion struct { - Version string `json:"version"` - AppVersion string `json:"app_version"` - Created time.Time `json:"created"` - Digest string `json:"digest"` - URLs []string `json:"urls"` - Readme string `json:"readme" bson:"-"` - Values string `json:"values" bson:"-"` -} - -// ChartFiles holds the README and values for a given chart version -type ChartFiles struct { - ID string `bson:"_id"` - Readme string - Values string -} diff --git a/src/jetstream/plugins/monocular/chartsvc/mongodb.go b/src/jetstream/plugins/monocular/chartsvc/mongodb.go deleted file mode 100644 index bcb0aac1d9..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc/mongodb.go +++ /dev/null @@ -1,88 +0,0 @@ -package chartsvc - -import ( - //"bytes" - "fmt" - "github.com/globalsign/mgo/bson" - "github.com/helm/monocular/chartsvc/models" - "github.com/kubeapps/common/datastore" -) - -// const ( -// chartCollection = "charts" -// chartFilesCollection = "files" -// defaultTimeoutSeconds = 10 -// additionalCAFile = "/usr/local/share/ca-certificates/ca.crt" -// ) - -type MongoDBChartSvcDatastore struct { - dbSession datastore.Session -} - -// MongoDBChartSvcDatastore creates a new MongoDB data store -func NewMongoDBChartSvcDatastore(dbSession datastore.Session) (*MongoDBChartSvcDatastore, error) { - return &MongoDBChartSvcDatastore{dbSession: dbSession}, nil -} - -func (m *MongoDBChartSvcDatastore) ListRepositories() ([]string, error) { - return nil, nil -} - -func (m *MongoDBChartSvcDatastore) ListCharts() ([]*models.Chart, error) { - db, closer := dbSession.DB() - defer closer() - var charts []*models.Chart - err := db.C(chartCollection).Find(nil).Sort("name").All(&charts) - return charts, err -} - -func (m *MongoDBChartSvcDatastore) GetChart(chartID string) (models.Chart, error) { - db, closer := dbSession.DB() - defer closer() - var chart models.Chart - err := db.C(chartCollection).FindId(chartID).One(&chart) - return chart, err -} - -func (m *MongoDBChartSvcDatastore) GetChartVersion(chartID, version string) (models.Chart, error) { - db, closer := dbSession.DB() - defer closer() - var chart models.Chart - err := db.C(chartCollection).Find(bson.M{ - "_id": chartID, - "chartversions": bson.M{"$elemMatch": bson.M{"version": version}}, - }).Select(bson.M{ - "name": 1, "repo": 1, "description": 1, "home": 1, "keywords": 1, "maintainers": 1, "sources": 1, - "chartversions.$": 1, - }).One(&chart) - return chart, err -} - -func (m *MongoDBChartSvcDatastore) GetChartIcon(chartID string) ([]byte, error) { - db, closer := dbSession.DB() - defer closer() - var chart models.Chart - err := db.C(chartCollection).FindId(chartID).One(&chart) - if err != nil { - return nil, fmt.Errorf("No icon available for chart: %s", chartID) - } - - if chart.RawIcon == nil { - return nil, fmt.Errorf("No icon available for chart: %s", chartID) - } - - return chart.RawIcon, nil -} - -func (m *MongoDBChartSvcDatastore) GetChartVersionReadme(chartID, version string) ([]byte, error) { - db, closer := dbSession.DB() - defer closer() - var files models.ChartFiles - fileID := fmt.Sprintf("/%s-%s", chartID, version) - if err := db.C(filesCollection).FindId(fileID).One(&files); err != nil { - return nil, err - } - - readme := []byte(files.Readme) - return readme, nil -} diff --git a/src/jetstream/plugins/monocular/chartsvc_main.txt b/src/jetstream/plugins/monocular/chartsvc_main.txt deleted file mode 100644 index 33c73651be..0000000000 --- a/src/jetstream/plugins/monocular/chartsvc_main.txt +++ /dev/null @@ -1,15 +0,0 @@ - -// Stratos addition to chartsvc main.go - -// SetMongoConfig allosws Stratos plugin to configure MongoDB -func SetMongoConfig(dbURL, dbName, dbUsername *string, dbPassword string) (datastore.Session, error) { - var err error - mongoConfig := datastore.Config{URL: *dbURL, Database: *dbName, Username: *dbUsername, Password: dbPassword} - dbSession, err = datastore.NewSession(mongoConfig) - return dbSession, err -} - -// GetRoutes exposes the HTTP routes for the Chart Service API -func GetRoutes() http.Handler { - return setupRoutes() -} diff --git a/src/jetstream/plugins/monocular/endpoint.go b/src/jetstream/plugins/monocular/endpoint.go deleted file mode 100644 index 66ef809295..0000000000 --- a/src/jetstream/plugins/monocular/endpoint.go +++ /dev/null @@ -1,54 +0,0 @@ -package monocular - -import ( - "errors" - "net/url" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" -) - -func (m *Monocular) GetType() string { - return EndpointType -} - -func (m *Monocular) GetClientId() string { - return "helm" -} - -func (m *Monocular) Register(echoContext echo.Context) error { - log.Debug("Helm Repository Register...") - return m.portalProxy.RegisterEndpoint(echoContext, m.Info) -} - -func (m *Monocular) Validate(userGUID string, cnsiRecord interfaces.CNSIRecord, tokenRecord interfaces.TokenRecord) error { - return nil -} - -func (m *Monocular) Connect(ec echo.Context, cnsiRecord interfaces.CNSIRecord, userId string) (*interfaces.TokenRecord, bool, error) { - // Note: Helm Repositories don't support connecting - return nil, false, errors.New("Connecting not support for a Helm Repository") -} - -func (m *Monocular) Info(apiEndpoint string, skipSSLValidation bool) (interfaces.CNSIRecord, interface{}, error) { - // NOTE: This should check that the endpoint is actually a Helm Repository - log.Debug("Helm Repository Info") - var v2InfoResponse interfaces.V2Info - var newCNSI interfaces.CNSIRecord - - newCNSI.CNSIType = EndpointType - - _, err := url.Parse(apiEndpoint) - if err != nil { - return newCNSI, nil, err - } - - newCNSI.TokenEndpoint = apiEndpoint - newCNSI.AuthorizationEndpoint = apiEndpoint - - return newCNSI, v2InfoResponse, nil -} - -func (m *Monocular) UpdateMetadata(info *interfaces.Info, userGUID string, echoContext echo.Context) { -} diff --git a/src/jetstream/plugins/monocular/go.mod b/src/jetstream/plugins/monocular/go.mod deleted file mode 100644 index c1ab22d72c..0000000000 --- a/src/jetstream/plugins/monocular/go.mod +++ /dev/null @@ -1,26 +0,0 @@ -module github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular - -go 1.12 - -require ( - bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c - github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000 - github.com/go-sql-driver/mysql v1.4.1 // indirect - github.com/helm/monocular v1.4.0 - github.com/helm/monocular/chartrepo v0.0.0-00010101000000-000000000000 - github.com/helm/monocular/chartsvc v0.0.0-00010101000000-000000000000 - github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 - github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect - github.com/labstack/echo v3.3.10+incompatible - github.com/lib/pq v1.0.0 // indirect - github.com/mattn/go-sqlite3 v1.10.0 // indirect - github.com/satori/go.uuid v1.2.0 - github.com/sirupsen/logrus v1.3.0 - github.com/ziutek/mymysql v1.5.4 // indirect -) - -replace ( - github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ../../repository/interfaces - github.com/helm/monocular/chartrepo => ./chart-repo - github.com/helm/monocular/chartsvc => ./chartsvc -) diff --git a/src/jetstream/plugins/monocular/go.sum b/src/jetstream/plugins/monocular/go.sum deleted file mode 100644 index cfa2ec9c01..0000000000 --- a/src/jetstream/plugins/monocular/go.sum +++ /dev/null @@ -1,120 +0,0 @@ -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c h1:bkb2NMGo3/Du52wvYj9Whth5KZfMV6d3O0Vbr3nz/UE= -bitbucket.org/liamstask/goose v0.0.0-20150115234039-8488cc47d90c/go.mod h1:hSVuE3qU7grINVSwrmzHfpg9k87ALBk+XaualNyUzI4= -github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/arschles/assert v1.0.0/go.mod h1:m/u69zW43x0h8dTHcv3JJZljINyEYgBuf5fYJP6WikI= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/cloudfoundry-community/go-cfenv v1.17.0 h1:qfxEfn8qKkaHY3ZEk/Y2noY79HBASvNgmtHK9x4+6GY= -github.com/cloudfoundry-community/go-cfenv v1.17.0/go.mod h1:2UgWvQTRXUuIZ/x3KnW6fk6CgPBhcV4UQb/UGIrUyyI= -github.com/cloudfoundry-incubator/stratos v2.0.0-beta-001+incompatible h1:UUxNbLjhv2cfymub5yNN1tjjqYkteHBBagb4jcbXEIQ= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/disintegration/imaging v1.6.0 h1:nVPXRUUQ36Z7MNf0O77UzgnOb1mkMMor7lmJMJXc/mA= -github.com/disintegration/imaging v1.6.0/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U= -github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU= -github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/govau/cf-common v0.0.7 h1:uhp1P6XM6GGzu1+A4C7LELLX/9mCmH6W5DpJZC0kWmo= -github.com/govau/cf-common v0.0.7/go.mod h1:5xL/OfE7wxeyHlXb7iei0rAbdQ/5v6dF18BZknPv7NQ= -github.com/helm/monocular v1.4.0 h1:g0sOpuMe+9u+aPfd9ZO8mWV+c8W0dfGyBG9Wl23nwec= -github.com/helm/monocular v1.4.0/go.mod h1:PpkCN0v4zVVigsIHnsQdJytKFmaUkwfhxB7z33a9/gE= -github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40 h1:GT4RsKmHh1uZyhmTkWJTDALRjSHYQp6FRKrotf0zhAs= -github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40/go.mod h1:NtmN9h8vrTveVQRLHcX2HQ5wIPBDCsZ351TGbZWgg38= -github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3 h1:sHsPfNMAG70QAvKbddQ0uScZCHQoZsT5NykGRCeeeIs= -github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 h1:wdTBUArlqtBYGN2Dd4+zsaFxFH0m4iGCHToW10jPX0k= -github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4/go.mod h1:TsgmjeDpbftqhwPKInJ3v+l+xbHs4goiB6DFb2WqY9c= -github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 h1:mkl3tvPHIuPaWsLtmHTybJeoVEW7cbePK73Ir8VtruA= -github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28/go.mod h1:T/T7jsxVqf9k/zYOqbgNAsANsjxTd1Yq3htjDhQ1H0c= -github.com/labstack/echo v3.3.10+incompatible h1:pGRcYk231ExFAyoAjAfD85kQzRJCRI8bbnE7CX5OEgg= -github.com/labstack/echo v3.3.10+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s= -github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0= -github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= -github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA= -github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4= -github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg= -github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= -github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 h1:gKMu1Bf6QINDnvyZuTaACm9ofY+PRh+5vFz4oxBZeF8= -github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4/go.mod h1:50wTf68f99/Zt14pr046Tgt3Lp2vLyFZKzbFXTOabXw= -github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI= -golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771 h1:XMECjVNpkFVT9uY40z07scw8Xtn2mUnkxx8BC3gjwoE= -k8s.io/apimachinery v0.0.0-20190221093215-450d01ad5771/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= -k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34= -k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= -k8s.io/helm v2.12.3+incompatible h1:wo1cdYjOnr5Z+LFuhtwIJaeQnec6D4gcg2H5UAKzY6w= -k8s.io/helm v2.12.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= diff --git a/src/jetstream/plugins/monocular/main.go b/src/jetstream/plugins/monocular/main.go deleted file mode 100644 index a834164206..0000000000 --- a/src/jetstream/plugins/monocular/main.go +++ /dev/null @@ -1,208 +0,0 @@ -package monocular - -import ( - "errors" - "net/http" - "strings" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/kubeapps/common/datastore" - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" - - "github.com/helm/monocular/chartrepo" - "github.com/helm/monocular/chartsvc" -) - -const ( - EndpointType = "helm" -) - -const prefix = "/pp/v1/chartsvc/" - -// Monocular is a plugin for Monocular -type Monocular struct { - portalProxy interfaces.PortalProxy - dbSession datastore.Session - chartSvcRoutes http.Handler - Store chartrepo.ChartRepoDatastore - QueryStore chartsvc.ChartSvcDatastore -} - -// Init creates a new Monocular -func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) { - return &Monocular{portalProxy: portalProxy}, nil -} - -func (m *Monocular) GetDBSession() datastore.Session { - return m.dbSession -} - -func (m *Monocular) GetChartStore() chartsvc.ChartSvcDatastore { - return m.QueryStore -} - -// Init performs plugin initialization -func (m *Monocular) Init() error { - - return errors.New("Manually disabled") - // #150 - Uncomment to enable helm plugin - // --------------------------------------- - // m.ConfigureSQL() - - // m.chartSvcRoutes = chartsvc.GetRoutes() - - // m.InitSync() - - // m.syncOnStartup() - - // return nil - // --------------------------------------- -} - -func (m *Monocular) syncOnStartup() { - - // Get the repositories that we currently have - repos, err := m.QueryStore.ListRepositories() - if err != nil { - log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err) - return - } - - // Get all of the helm endpoints - endpoints, err := m.portalProxy.ListEndpoints() - if err != nil { - log.Errorf("Chart Repostiory Startup: Unable to sync repositories: %v+", err) - return - } - - helmRepos := make([]string, 0) - for _, ep := range endpoints { - if ep.CNSIType == "helm" { - helmRepos = append(helmRepos, ep.Name) - - // Is this an endpoint that we don't have charts for ? - if !arrayContainsString(repos, ep.Name) { - log.Infof("Syncing helm repository to chart store: %s", ep.Name) - m.Sync(interfaces.EndpointRegisterAction, ep) - } - } - } - - // Now delete any repositories that are no longer registered as endpoints - for _, repo := range repos { - if !arrayContainsString(helmRepos, repo) { - log.Infof("Removing helm repository from chart store: %s", repo) - endpoint := &interfaces.CNSIRecord{ - GUID: repo, - Name: repo, - CNSIType: "helm", - } - m.Sync(interfaces.EndpointUnregisterAction, endpoint) - } - } -} - -// ArrayContainsString checks the string array to see if it contains the specifed value -func arrayContainsString(a []string, x string) bool { - for _, n := range a { - if x == n { - return true - } - } - return false -} - -// func (m *Monocular) ConfigureMonocular() error { -// log.Info("Connecting to MongoDB...") - -// var host = "127.0.0.1" -// var db = "monocular" -// var user = "mongoadmin" -// var password = "secret" - -// session, err := chartsvc.SetMongoConfig(&host, &db, &user, password) -// if err != nil { -// log.Warn("Could not connect to MongoDB") -// return err -// } - -// store, err := chartsvc.NewMongoDBChartSvcDatastore(session) -// if err != nil { -// return err -// } -// chartsvc.SetStore(store) -// m.QueryStore = store - -// syncStore, err := chartrepo.NewMongoDBChartRepoDatastore(session) -// if err != nil { -// return err -// } -// m.Store = syncStore -// log.Info("Connected to MongoDB") - -// return nil -// } - -func (m *Monocular) ConfigureSQL() error { - - log.Info("Connecting to SQL Helm Chart store") - - InitRepositoryProvider(m.portalProxy.GetConfig().DatabaseProviderName) - - store, err := NewSQLDBCMonocularDatastore(m.portalProxy.GetDatabaseConnection()) - if err != nil { - return err - } - - m.Store = store - m.QueryStore = store - - chartsvc.SetStore(store) - return nil -} - -func (m *Monocular) OnEndpointNotification(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) { - if endpoint.CNSIType == EndpointType { - m.Sync(action, endpoint) - } -} - -// GetMiddlewarePlugin gets the middleware plugin for this plugin -func (m *Monocular) GetMiddlewarePlugin() (interfaces.MiddlewarePlugin, error) { - return nil, errors.New("Not implemented") -} - -// GetEndpointPlugin gets the endpoint plugin for this plugin -func (m *Monocular) GetEndpointPlugin() (interfaces.EndpointPlugin, error) { - return m, nil -} - -// GetRoutePlugin gets the route plugin for this plugin -func (m *Monocular) GetRoutePlugin() (interfaces.RoutePlugin, error) { - return m, nil -} - -// AddAdminGroupRoutes adds the admin routes for this plugin to the Echo server -func (m *Monocular) AddAdminGroupRoutes(echoGroup *echo.Group) { - // no-op -} - -// AddSessionGroupRoutes adds the session routes for this plugin to the Echo server -func (m *Monocular) AddSessionGroupRoutes(echoGroup *echo.Group) { - // API for Helm Chart Repositories - echoGroup.GET("/chartrepos", m.ListRepos) - echoGroup.Any("/chartsvc/*", m.handleAPI) -} - -// Forward requests to the Chart Service API -func (m *Monocular) handleAPI(c echo.Context) error { - // Modify the path to remove our prefix for the Chart Service API - path := c.Request().URL.Path - if strings.Index(path, prefix) == 0 { - path = path[len(prefix)-1:] - c.Request().URL.Path = path - } - m.chartSvcRoutes.ServeHTTP(c.Response().Writer, c.Request()) - return nil -} diff --git a/src/jetstream/plugins/monocular/repository.go b/src/jetstream/plugins/monocular/repository.go deleted file mode 100644 index c1d3424fba..0000000000 --- a/src/jetstream/plugins/monocular/repository.go +++ /dev/null @@ -1,42 +0,0 @@ -package monocular - -import ( - "errors" - - "github.com/labstack/echo" - log "github.com/sirupsen/logrus" -) - -type HelmRepoInfo struct { - ID string `json:"id"` - Type string `json:"type"` - Attributes struct { - Name string `json:"name"` - URL string `json:"url"` - } `json:"attributes"` -} - -func (m *Monocular) ListRepos(c echo.Context) error { - log.Debug("ListRepos") - - endpoints, err := m.portalProxy.ListEndpoints() - if err != nil { - return errors.New("Could not get endpoints") - } - - repos := make([]HelmRepoInfo, 0) - for _, ep := range endpoints { - if ep.CNSIType == EndpointType { - // Helm endpoint - repo := HelmRepoInfo{ - ID: ep.Name, - Type: "repository", - } - repo.Attributes.Name = ep.Name - repo.Attributes.URL = ep.APIEndpoint.String() - repos = append(repos, repo) - } - } - - return c.JSON(200, repos) -} diff --git a/src/jetstream/plugins/monocular/sql_datastore.go b/src/jetstream/plugins/monocular/sql_datastore.go deleted file mode 100644 index ccb09dc339..0000000000 --- a/src/jetstream/plugins/monocular/sql_datastore.go +++ /dev/null @@ -1,347 +0,0 @@ -package monocular - -import ( - "bytes" - "database/sql" - "encoding/json" - "fmt" - "strings" - - "github.com/helm/monocular/chartrepo" - - uuid "github.com/satori/go.uuid" - log "github.com/sirupsen/logrus" - - "github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore" - "github.com/helm/monocular/chartsvc/models" -) - -var insertChart = `INSERT INTO charts (id, name, repo_name, update_batch, content) - VALUES ($1, $2, $3, $4, $5)` - -var deleteChart = `DELETE FROM charts WHERE id = $1` - -var countCharts = `SELECT COUNT(*) - FROM charts - WHERE id = $1` - -var updateChart = `UPDATE charts - SET name = $1, repo_name = $2, update_batch = $3, content = $4 - WHERE id = $5` - -var insertChartFile = `INSERT INTO chart_files (id, filename, chart_id, name, repo_name, digest, content) VALUES ($1, $2, $3, $4, $5, $6, $7)` -var updateChartFile = `UPDATE chart_files SET chart_id = $1, name = $2, repo_name = $3, digest = $4, content = $5 WHERE id = $6 AND filename = $7` -var countChartFile = `SELECT COUNT(*) FROM chart_Files WHERE id = $1 AND filename = $2` - -var deleteChartFiles = `DELETE FROM chart_files WHERE (name, repo_name) IN (SELECT name, repo_name FROM charts WHERE repo_name = $1 AND update_batch != $2)` -var deleteCharts = `DELETE FROM charts WHERE repo_name = $1 AND update_batch != $2` - -var deleteRepoChartFiles = `DELETE FROM chart_files WHERE repo_name = $1` -var deleteRepoCharts = `DELETE FROM charts WHERE repo_name = $1` - -var getAllCharts = `SELECT c.id, c.content, f.filename as has_icon from charts c left join chart_files f on c.id = f.chart_id AND f.filename="icon"` - -var getChart = `SELECT c.content, f.filename as has_icon from charts c LEFT JOIN chart_files f on c.id = f.chart_id AND f.filename="icon" WHERE c.id = $1` - -var getChartFile = `SELECT content from chart_files WHERE chart_id = $1 AND filename=$2` - -var getChartFileByID = `SELECT content from chart_files WHERE id = $1 AND filename=$2` - -var getRepositories = `SELECT DISTINCT repo_name from charts` - -type SQLDBCMonocularDatastore struct { - //dbSession datastore.Session - db *sql.DB -} - -// NewSQLDBCMonocularDatastore creates a new SQL data store -func NewSQLDBCMonocularDatastore(db *sql.DB) (*SQLDBCMonocularDatastore, error) { - return &SQLDBCMonocularDatastore{db: db}, nil -} - -// InitRepositoryProvider - One time init for the given DB Provider -func InitRepositoryProvider(databaseProvider string) { - // Modify the database statements if needed, for the given database type - insertChart = datastore.ModifySQLStatement(insertChart, databaseProvider) - deleteChart = datastore.ModifySQLStatement(deleteChart, databaseProvider) - countCharts = datastore.ModifySQLStatement(countCharts, databaseProvider) - updateChart = datastore.ModifySQLStatement(updateChart, databaseProvider) - insertChartFile = datastore.ModifySQLStatement(insertChartFile, databaseProvider) - updateChartFile = datastore.ModifySQLStatement(updateChartFile, databaseProvider) - countChartFile = datastore.ModifySQLStatement(countChartFile, databaseProvider) - deleteCharts = datastore.ModifySQLStatement(deleteCharts, databaseProvider) - deleteChartFiles = datastore.ModifySQLStatement(deleteChartFiles, databaseProvider) - deleteRepoChartFiles = datastore.ModifySQLStatement(deleteRepoChartFiles, databaseProvider) - deleteRepoCharts = datastore.ModifySQLStatement(deleteRepoCharts, databaseProvider) - - getAllCharts = datastore.ModifySQLStatement(getAllCharts, databaseProvider) - getChart = datastore.ModifySQLStatement(getChart, databaseProvider) - getChartFile = datastore.ModifySQLStatement(getChartFile, databaseProvider) - getChartFileByID = datastore.ModifySQLStatement(getChartFileByID, databaseProvider) - getRepositories = datastore.ModifySQLStatement(getRepositories, databaseProvider) -} - -// DeleteRepo will delete all charts and chart fils for a give repository -func (s *SQLDBCMonocularDatastore) DeleteRepo(repoName string) error { - - log.Debugf("Deleting helm repo: %s", repoName) - - // Delete all charts for a repo - if _, err := s.db.Exec(deleteRepoChartFiles, repoName); err != nil { - log.Error("Could not delete files") - return fmt.Errorf("Unable to delete chart files: %v", err) - } - - if _, err := s.db.Exec(deleteRepoCharts, repoName); err != nil { - log.Error("Could not delete charts") - return fmt.Errorf("Unable to delete chart: %v", err) - } - - return nil -} - -func (s *SQLDBCMonocularDatastore) ImportCharts(charts []chartrepo.Chart) error { - - if len(charts) == 0 { - return nil - } - - // Use a new batch ID for all charts, so we can then delete all removed charts - updateBatchID := uuid.NewV4().String() - - // Iterate over all of the charts, one by one - for _, c := range charts { - - // Check if existing chart exists - var count int - err := s.db.QueryRow(countCharts, c.ID).Scan(&count) - if err != nil { - log.Errorf("Unknown error attempting to find chart: %v", err) - } - - // Serialize Chart to JSON - content, err := json.Marshal(c) - if err != nil { - return fmt.Errorf("Could not serialize Chart to JSON: %v", err) - } - - switch count { - case 0: - log.Debug("Inserting new chart") - if _, err := s.db.Exec(insertChart, c.ID, c.Name, c.Repo.Name, updateBatchID, content); err != nil { - msg := "Unable to insert new Chart: %v" - log.Debugf(msg, err) - return fmt.Errorf(msg, err) - } - log.Debug("Chart inserted") - default: - log.Debug("Performing UPDATE of existing chart") - if _, updateErr := s.db.Exec(updateChart, c.Name, c.Repo.Name, updateBatchID, content, c.ID); updateErr != nil { - msg := "Unable to UPDATE UAA token: %v" - log.Debugf(msg, updateErr) - return fmt.Errorf(msg, updateErr) - } - } - } - - repoName := charts[0].Repo.Name - - // Delete all chart files for charts no longer needed - if _, err := s.db.Exec(deleteChartFiles, repoName, updateBatchID); err != nil { - return fmt.Errorf("Unable to delete chart files: %v", err) - } - - if _, err := s.db.Exec(deleteChart, repoName, updateBatchID); err != nil { - return fmt.Errorf("Unable to delete charts: %v", err) - } - - return nil -} - -func (s *SQLDBCMonocularDatastore) StoreChartIcon(c chartrepo.Chart, b bytes.Buffer) error { - // Store as a file - return s.addFile(c.ID, "icon", c.Name, c.Repo.Name, "icon", b.Bytes()) -} - -func (s *SQLDBCMonocularDatastore) StoreChartFiles(fileID string, files chartrepo.ChartFiles) error { - - ids := strings.Split(fileID, "/") - chartIDs := strings.Split(ids[1], "-") - - if len(files.Readme) > 0 { - if err := s.addFile(fileID, "readme", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Readme)); err != nil { - return err - } - } - - if len(files.Values) > 0 { - if err := s.addFile(fileID, "values", chartIDs[0], files.Repo.Name, files.Digest, []byte(files.Values)); err != nil { - return err - } - } - return nil -} - -func (s *SQLDBCMonocularDatastore) addFile(id, filename, name, repo, digest string, content []byte) error { - - chartID := fmt.Sprintf("%s/%s", repo, name) - - // Check if file already exists - var count int - err := s.db.QueryRow(countChartFile, id, filename).Scan(&count) - if err != nil { - log.Errorf("Unknown error attempting to find chart file: %v", err) - } - - switch count { - case 0: - log.Debug("Inserting new chart file") - if _, err := s.db.Exec(insertChartFile, id, filename, chartID, name, repo, digest, content); err != nil { - msg := "Unable to insert new chart file: %v" - log.Debugf(msg, err) - return fmt.Errorf(msg, err) - } - log.Debug("Chart inserted") - default: - log.Debug("Performing update of existing chart file") - if _, updateErr := s.db.Exec(updateChartFile, chartID, name, repo, digest, content, id, filename); updateErr != nil { - msg := "Unable to update existing chart file: %v" - log.Debugf(msg, updateErr) - return fmt.Errorf(msg, updateErr) - } - } - return nil -} - -// ListCharts gets all charts -func (s *SQLDBCMonocularDatastore) ListCharts() ([]*models.Chart, error) { - - rows, err := s.db.Query(getAllCharts) - if err != nil { - return nil, fmt.Errorf("Unable to retrieve Helm charts: %v", err) - } - defer rows.Close() - - var charts []*models.Chart - charts = make([]*models.Chart, 0) - - for rows.Next() { - var ( - id string - content []byte - hasIcon sql.NullString - ) - - err := rows.Scan(&id, &content, &hasIcon) - if err != nil { - return nil, fmt.Errorf("Unable to scan chart records: %v", err) - } - - // Deserialize JSON - chart := &models.Chart{} - if err := json.Unmarshal(content, chart); err == nil { - charts = append(charts, chart) - chart.ID = id - if hasIcon.Valid { - chart.RawIcon = []byte(hasIcon.String) - } - } - } - - if err = rows.Err(); err != nil { - return nil, fmt.Errorf("Unable to get chart records: %v", err) - } - - return charts, nil -} - -func (s *SQLDBCMonocularDatastore) GetChart(chartID string) (models.Chart, error) { - - var ( - content []byte - hasIcon sql.NullString - ) - - chart := models.Chart{} - - err := s.db.QueryRow(getChart, chartID).Scan(&content, &hasIcon) - if err != nil { - return chart, fmt.Errorf("Unable to scan chart record: %v", err) - } - - // Deserialize JSON - if err := json.Unmarshal(content, &chart); err == nil { - chart.ID = chartID - if hasIcon.Valid { - chart.RawIcon = []byte(hasIcon.String) - } - } else { - return chart, fmt.Errorf("Unable to deserialize chart: %v+", err) - } - - return chart, nil - -} - -func (s *SQLDBCMonocularDatastore) GetChartVersion(chartID, version string) (models.Chart, error) { - chart, err := s.GetChart(chartID) - if err != nil { - return chart, err - } - - // Find the version - for _, v := range chart.ChartVersions { - if v.Version == version { - chart.ChartVersions = make([]models.ChartVersion, 1) - chart.ChartVersions[0] = v - return chart, err - } - } - - return chart, fmt.Errorf("Can not find chart version: %s", version) -} - -func (s *SQLDBCMonocularDatastore) GetChartIcon(chartID string) ([]byte, error) { - var content []byte - err := s.db.QueryRow(getChartFile, chartID, "icon").Scan(&content) - if err != nil { - return nil, fmt.Errorf("Unable to scan chart file record: %v", err) - } - - return content, nil -} - -func (s *SQLDBCMonocularDatastore) GetChartVersionReadme(chartID, version string) ([]byte, error) { - var content []byte - fileID := fmt.Sprintf("%s-%s", chartID, version) - err := s.db.QueryRow(getChartFileByID, fileID, "readme").Scan(&content) - if err != nil { - return nil, fmt.Errorf("Unable to scan chart file record: %v", err) - } - - return content, nil -} - -// ListRepositories gets all repository names -func (s *SQLDBCMonocularDatastore) ListRepositories() ([]string, error) { - rows, err := s.db.Query(getRepositories) - if err != nil { - return nil, fmt.Errorf("Unable to retrieve Helm repositories: %v", err) - } - defer rows.Close() - - var repos []string - repos = make([]string, 0) - - for rows.Next() { - var name string - err := rows.Scan(&name) - if err != nil { - return nil, fmt.Errorf("Unable to scan repository records: %v", err) - } - - repos = append(repos, name) - } - - return repos, nil -} diff --git a/src/jetstream/plugins/monocular/sync-source.sh b/src/jetstream/plugins/monocular/sync-source.sh deleted file mode 100755 index c9f34721f6..0000000000 --- a/src/jetstream/plugins/monocular/sync-source.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -echo "== Sync Monocular backend code ==" - -DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -echo ${DIRPATH} - -pushd ${DIRPATH} >& /dev/null -rm -rf tmp -mkdir tmp -git clone https://github.com/helm/monocular.git ./tmp/monocular - -# Copy the golang backend code -cp -R ./tmp/monocular/cmd/* . - -# Add to the chartsvc API -cat ./chartsvc_main.txt >> ./chartsvc/main.go - -# Update packages -sed -i.bak -e 's/package main/package chartsvc/g' ./chartsvc/*.go -sed -i.bak -e 's/package main/package chartrepo/g' ./chart-repo/*.go - -# Remove .bak files -find . -name "*.bak" -type f -delete - -# Remove tmp folder -rm -rf ./tmp - -# Initialize go modules -cd ./chartsvc -go mod init github.com/helm/monocular/chartsvc - -cd ../chart-repo -go mod init github.com/helm/monocular/chartrepo - -popd >& /dev/null - -echo "All done" diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go deleted file mode 100644 index 29f93525f5..0000000000 --- a/src/jetstream/plugins/monocular/sync.go +++ /dev/null @@ -1,85 +0,0 @@ -package monocular - -import ( - "encoding/json" - "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces" - "github.com/helm/monocular/chartrepo" - log "github.com/sirupsen/logrus" -) - -type SyncJob struct { - Action interfaces.EndpointAction - Endpoint *interfaces.CNSIRecord -} - -type SyncMetadata struct { - Status string `json:"status"` - Busy bool `json:"busy"` -} - -// Sync Chanel -var syncChan = make(chan SyncJob, 100) - -func (m *Monocular) InitSync() { - go m.processSyncRequests() -} - -func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces.CNSIRecord) { - - job := SyncJob{ - Action: action, - Endpoint: endpoint, - } - - log.Warn("Scheduling Sync job") - syncChan <- job -} - -func (m *Monocular) processSyncRequests() { - log.Info("Helm Repository Sync init") - for job := range syncChan { - log.Info("Processing Job") - log.Info(job.Endpoint.Name) - - // Could be delete or sync - if job.Action == 0 { - log.Info("Syncing new repository") - metadata := SyncMetadata{ - Status: "Synchronizing", - Busy: true, - } - m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata)) - err := chartrepo.SyncRepo(m.Store, job.Endpoint.Name, job.Endpoint.APIEndpoint.String(), "") - metadata.Busy = false - if err != nil { - log.Warn("Failed to sync repository: %v+", err) - metadata.Status = "Sync Failed" - m.updateMetadata(job.Endpoint.GUID, metadata) - } else { - metadata.Status = "Synchronized" - m.updateMetadata(job.Endpoint.GUID, metadata) - } - log.Infof("Sync completed for repository: %s", job.Endpoint.APIEndpoint.String()) - } else if job.Action == 1 { - log.Infof("Deleting Helm Repository: %s", job.Endpoint.Name) - m.Store.DeleteRepo(job.Endpoint.Name) - } - } - - log.Info("processSyncRequests finished") -} - -func marshalSyncMetadata(metadata SyncMetadata) string { - jsonString, err := json.Marshal(metadata) - if err != nil { - return "" - } - return string(jsonString) -} - -func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) { - err := m.portalProxy.UpdateEndointMetadata(endpoint, marshalSyncMetadata(metadata)) - if err != nil { - log.Errorf("Failed to update endpoint metadata: %v+", err) - } -} From 95b52a39a2dc791a106f18987909d4f2e62e4320 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 24 Apr 2019 12:53:18 +0100 Subject: [PATCH 33/98] Remove backend downstream deps --- src/jetstream/go.mod | 13 +++++++------ src/jetstream/go.sum | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/jetstream/go.mod b/src/jetstream/go.mod index 96276aa575..5e93bfda8d 100644 --- a/src/jetstream/go.mod +++ b/src/jetstream/go.mod @@ -8,6 +8,7 @@ require ( code.cloudfoundry.org/cli v6.43.0+incompatible code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect + github.com/SermoDigital/jose v0.0.0-00010101000000-000000000000 // indirect github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect github.com/antonlindstrom/pgstore v0.0.0-20170604072116-a407030ba6d0 github.com/blang/semver v3.5.1+incompatible // indirect @@ -15,8 +16,6 @@ require ( github.com/cf-stratos/mysqlstore v0.0.0-20170822100912-304308519d13 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect github.com/cloudfoundry-community/go-cfenv v1.17.0 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes v0.0.0-00010101000000-000000000000 - github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular v0.0.0-00010101000000-000000000000 github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces v0.0.0-00010101000000-000000000000 github.com/cloudfoundry/bosh-cli v5.4.0+incompatible // indirect github.com/cloudfoundry/bosh-utils v0.0.0-20190206192830-9a0affed2bf1 // indirect @@ -24,11 +23,13 @@ require ( github.com/cloudfoundry/noaa v2.1.0+incompatible github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 github.com/cppforlife/go-patch v0.2.0 // indirect + github.com/cyphar/filepath-securejoin v0.2.2 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/domodwyer/mailyak v3.1.1+incompatible github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect github.com/fatih/color v1.7.0 // indirect github.com/go-sql-driver/mysql v1.4.1 + github.com/gogo/protobuf v1.2.1 // indirect github.com/golang/snappy v0.0.1 // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e // indirect @@ -41,7 +42,9 @@ require ( github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/kat-co/vala v0.0.0-20170210184112-42e1d8b61f12 github.com/kubeapps/common v0.0.0-20181107174310-61d8eb6f11b4 + github.com/kylelemons/go-gypsy v0.0.0-20160905020020-08cad365cd28 // indirect github.com/labstack/echo v3.3.10+incompatible + github.com/lib/pq v1.1.0 // indirect github.com/lunixbochs/vtclean v1.0.0 // indirect github.com/mailru/easyjson v0.0.0-20190221075403-6243d8e04c3f // indirect github.com/mattn/go-runewidth v0.0.4 // indirect @@ -51,6 +54,7 @@ require ( github.com/nwaples/rardecode v1.0.0 // indirect github.com/nwmac/sqlitestore v0.0.0-20180824125213-7d2ab221fb3f github.com/pierrec/lz4 v2.0.5+incompatible // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.3.0 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 // indirect @@ -58,6 +62,7 @@ require ( github.com/ulikunitz/xz v0.5.6 // indirect github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + github.com/ziutek/mymysql v1.5.4 // indirect golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 // indirect google.golang.org/appengine v1.5.0 // indirect @@ -68,10 +73,6 @@ require ( replace github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces => ./repository/interfaces -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/kubernetes => ./plugins/kubernetes - -replace github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/monocular => ./plugins/monocular - replace ( github.com/SermoDigital/jose => github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.1 diff --git a/src/jetstream/go.sum b/src/jetstream/go.sum index 1505523c87..7dbcab2689 100644 --- a/src/jetstream/go.sum +++ b/src/jetstream/go.sum @@ -181,6 +181,8 @@ github.com/labstack/gommon v0.2.8 h1:JvRqmeZcfrHC5u6uVleB4NxxNbzx6gpbJiQknDbKQu0 github.com/labstack/gommon v0.2.8/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lunixbochs/vtclean v1.0.0 h1:xu2sLAri4lGiovBDQKxl5mrXyESr3gUr5m5SM5+LVb8= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= From 251a16b6d0cf84ca4b850fa2453adb50de5ab77d Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 24 Apr 2019 13:08:31 +0100 Subject: [PATCH 34/98] cc fixes --- docs/invite-user-guide.md | 9 ++++----- .../features/dashboard/side-nav/side-nav.component.scss | 4 ++-- .../entity-summary-title.component.scss | 2 +- .../entity-summary-title.component.ts | 3 +-- .../table-cell-edit-variable.component.scss | 2 +- .../endpoint/endpoint-card/endpoint-card.component.scss | 2 +- .../simple-usage-chart.component.theme.scss | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docs/invite-user-guide.md b/docs/invite-user-guide.md index 2eb4478cef..58f9283f96 100644 --- a/docs/invite-user-guide.md +++ b/docs/invite-user-guide.md @@ -80,8 +80,8 @@ The following configuration is required in order to configure the SMTP server an To use custom email templates, create a folder and add the two templates with the following file names: -1. user-invite-email.txt = Plain text template -1. user-invite-email.helm = HTML text template +1. user-invite-email.txt = Plain text template +1. user-invite-email.helm = HTML text template When deploying Stratos with `cf push` set the environment variable `TEMPLATE_DIR` to the folder name where your custom templates are located. This can be done on the command line or by adding this environment variable to the `manifest.yml` file. @@ -107,7 +107,6 @@ The following configuration is required in order to configure the SMTP server an If you wish to use custom email templates for user invitation, follow these steps: - Create the namespace that you are going to use when installing Stratos: ``` @@ -116,8 +115,8 @@ kubectl create namespace stratos Create a Config Map for the template files - this assumes you have the following two files in the current directory: -1. user-invite-email.txt = Plain text template -1. user-invite-email.helm = HTML text template +1. user-invite-email.txt = Plain text template +1. user-invite-email.helm = HTML text template Create the Config Map with: diff --git a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.scss b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.scss index fcf134a0ce..1301995321 100644 --- a/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.scss +++ b/src/frontend/packages/core/src/features/dashboard/side-nav/side-nav.component.scss @@ -92,7 +92,7 @@ $icon-nav-width: 50px; pointer-events: none; } &__logo-img, - &__item-label { + &__item-label { opacity: 1; } &__copyright-icon, @@ -165,7 +165,7 @@ $transition-delay: .5s; width: $side-nav-mat-icon-height-large; } &__item-label, - &__copyright { + &__copyright { opacity: 0; } &__logo-img { diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss index 000c6311c9..a96068938d 100644 --- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss +++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.scss @@ -40,7 +40,7 @@ margin: 10px; } &__content { - background: linear-gradient(to bottom, transparent 0%, whitesmoke 10%); + background: linear-gradient(to bottom, transparent 0%, #f5f5f5 10%); margin: 0 -20px -20px; padding: 0 20px 20px; } diff --git a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts index 8e44809362..7b049b1f96 100644 --- a/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts +++ b/src/frontend/packages/core/src/shared/components/entity-summary-title/entity-summary-title.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; @Component({ selector: 'app-entity-summary-title', @@ -12,5 +12,4 @@ export class EntitySummaryTitleComponent { @Input() subText: string; @Input() imagePath: string; @Input() inlineImagePath: string; - constructor() { } } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss index 4949f4f4eb..eb9c8d43a8 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.scss @@ -6,4 +6,4 @@ mat-form-field { .cell-edit-variable { width: 100%; -} \ No newline at end of file +} diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss index 64710d806d..fecb6b7c9a 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss @@ -35,7 +35,7 @@ &-text { display: flex; flex-direction: column; - font-size: 16px + font-size: 16px; } } } diff --git a/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.theme.scss b/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.theme.scss index b829328f34..17f8579c43 100644 --- a/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.theme.scss +++ b/src/frontend/packages/core/src/shared/components/simple-usage-chart/simple-usage-chart.component.theme.scss @@ -11,7 +11,7 @@ .simple-usage-graph-color { @each $color in $colors { &--#{nth($color, 1)} { - background-color: #{nth($color, 2)} + background-color: #{nth($color, 2)}; } &--#{nth($color, 1)}-background { background-color: transparentize(nth($color, 2), .8); From a97448c40a220a60fef4d9958506ab17fc3976b5 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 25 Apr 2019 11:05:30 +0100 Subject: [PATCH 35/98] First round of custom hidden property on custom tabs --- .../autoscaler/app-autoscaler.actions.ts | 13 +++-- .../autoscaler-tab-extension.component.ts | 47 ++++++++++--------- .../custom/autoscaler/autoscaler.effects.ts | 41 ++++++++-------- .../extension/dynamic-extension-routes.ts | 6 +-- .../src/core/extension/extension-service.ts | 44 +++++++++++++---- .../application-tabs-base.component.ts | 18 +++---- .../cloud-foundry-tabs-base.component.ts | 6 +-- .../cloud-foundry-cell-base.component.ts | 2 +- .../page-side-nav.component.html | 2 +- .../page-side-nav/page-side-nav.component.ts | 32 +++++++++---- 10 files changed, 130 insertions(+), 81 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index 6f3a3ea0d1..6da6dc725a 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -1,5 +1,6 @@ import { RequestOptions } from '@angular/http'; import { Action } from '@ngrx/store'; + import { appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, @@ -46,12 +47,14 @@ export const FETCH_APP_AUTOSCALER_METRIC = '[New App Autoscaler] Fetch Metric'; export const UPDATE_APP_AUTOSCALER_POLICY_STEP = '[Edit Autoscaler Polict] Step'; export class GetAppAutoscalerHealthAction implements IRequestAction { + // TODO: RC update ctor names so they match common pattern (we really need to sort out our interfaces) constructor( - public appGuid: string, - public cfGuid: string, - ) { } - onSucceed: any; + public guid: string, + public endpointGuid: string, + ) { + } type = APP_AUTOSCALER_HEALTH; + entity = entityFactory(appAutoscalerHealthSchemaKey); entityKey = appAutoscalerHealthSchemaKey; } @@ -197,6 +200,6 @@ export class GetAppAutoscalerInsMetricAction extends GetAppAutoscalerMetricActio export class UpdateAppAutoscalerPolicyStepAction implements Action { constructor( public policy: any - ) { } + ) { } type = UPDATE_APP_AUTOSCALER_POLICY_STEP; } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 31a85f6271..d1dc5ace72 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -1,49 +1,52 @@ -import { StratosTab, StratosTabType } from '../../../core/extension/extension-service'; -import { ApplicationService } from '../../../features/applications/application.service'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, first, map, publishReplay, refCount } from 'rxjs/operators'; -import { - DetachAppAutoscalerPolicyAction, - GetAppAutoscalerAppMetricAction, - GetAppAutoscalerPolicyAction, - GetAppAutoscalerHealthAction, - GetAppAutoscalerScalingHistoryAction, - UpdateAppAutoscalerPolicyAction, -} from '../app-autoscaler.actions'; +import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators'; + import { RouterNav } from '../../../../../store/src/actions/router.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { MetricTypes } from '../autoscaler-helpers/autoscaler-util'; import { - appAutoscalerHealthSchemaKey, appAutoscalerAppMetricSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, entityFactory, } from '../../../../../store/src/helpers/entity-factory'; import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; -import { - getPaginationObservables, -} from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; -import { - AppAutoscalerAppMetric, - AppAutoscalerPolicy, - AppAutoscalerScalingHistory, -} from '../app-autoscaler.types'; import { EntityService } from '../../../core/entity-service'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; +import { StratosTab, StratosTabType } from '../../../core/extension/extension-service'; +import { ApplicationService } from '../../../features/applications/application.service'; import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; +import { + DetachAppAutoscalerPolicyAction, + GetAppAutoscalerAppMetricAction, + GetAppAutoscalerHealthAction, + GetAppAutoscalerPolicyAction, + GetAppAutoscalerScalingHistoryAction, + UpdateAppAutoscalerPolicyAction, +} from '../app-autoscaler.actions'; +import { AppAutoscalerAppMetric, AppAutoscalerPolicy, AppAutoscalerScalingHistory } from '../app-autoscaler.types'; +import { MetricTypes } from '../autoscaler-helpers/autoscaler-util'; @StratosTab({ type: StratosTabType.Application, label: 'Autoscale', link: 'autoscale', - action: new GetAppAutoscalerHealthAction(window.location.pathname.split('/')[3], window.location.pathname.split('/')[2]) + icon: 'meter', + iconFont: 'stratos-icons', + hidden: (store: Store, esf: EntityServiceFactory) => { + // TODO: RC Find a neater way to fetch guids (ActiveCf..) + const action = new GetAppAutoscalerHealthAction(window.location.pathname.split('/')[3], window.location.pathname.split('/')[2]); + return esf.create<{ uptime: number }>(action.entityKey, action.entity, action.guid, action).waitForEntity$.pipe( + map(health => health.entity.uptime > 0), + startWith(true) + ); + } }) @Component({ selector: 'app-autoscaler-tab-extension', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index f02e7818ca..a791ec03b1 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -3,6 +3,21 @@ import { Headers, Http, Request, RequestOptions, URLSearchParams } from '@angula import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; + +import { AppState } from '../../../../store/src/app-state'; +import { + resultPerPageParam, + resultPerPageParamDefault, +} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; +import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors'; +import { NormalizedResponse } from '../../../../store/src/types/api.types'; +import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../store/src/types/pagination.types'; +import { + ICFAction, + StartRequestAction, + WrapperRequestActionFailed, + WrapperRequestActionSuccess, +} from '../../../../store/src/types/request.types'; import { environment } from '../../environments/environment.prod'; import { APP_AUTOSCALER_HEALTH, @@ -19,24 +34,12 @@ import { UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, } from './app-autoscaler.actions'; -import { AppState } from '../../../../store/src/app-state'; +import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; import { buildMetricData } from './autoscaler-helpers/autoscaler-transform-metric'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, } from './autoscaler-helpers/autoscaler-transform-policy'; -import { resultPerPageParam, resultPerPageParamDefault } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; -import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors'; -import { NormalizedResponse } from '../../../../store/src/types/api.types'; -import { PaginationEntityState, PaginationParam } from '../../../../store/src/types/pagination.types'; -import { - ICFAction, - StartRequestAction, - WrapperRequestActionFailed, - WrapperRequestActionSuccess, -} from '../../../../store/src/types/request.types'; -import { PaginatedAction } from '../../../../store/src/types/pagination.types'; -import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; @@ -63,13 +66,13 @@ export class AutoscalerEffects { const apiAction = { entityKey: action.entityKey, type: action.type, - guid: action.appGuid + guid: action.guid } as ICFAction; this.store.dispatch(new StartRequestAction(apiAction, actionType)); const options = new RequestOptions(); options.url = `${commonPrefix}/health`; options.method = 'get'; - options.headers = this.addHeaders(action.cfGuid); + options.headers = this.addHeaders(action.endpointGuid); return this.http .request(new Request(options)).pipe( mergeMap(response => { @@ -78,10 +81,10 @@ export class AutoscalerEffects { entities: { [action.entityKey]: {} }, result: [] } as NormalizedResponse; - this.transformData(action.entityKey, mappedData, action.appGuid, healthInfo); - if (healthInfo.uptime > 0 && action.onSucceed) { - action.onSucceed(); - } + this.transformData(action.entityKey, mappedData, action.guid, healthInfo); + // if (healthInfo.uptime > 0 && action.onSucceed) { + // action.onSucceed(); + // } return [ new WrapperRequestActionSuccess(mappedData, apiAction, actionType) ]; diff --git a/src/frontend/packages/core/src/core/extension/dynamic-extension-routes.ts b/src/frontend/packages/core/src/core/extension/dynamic-extension-routes.ts index 2dc1d1d106..e27d1daa19 100644 --- a/src/frontend/packages/core/src/core/extension/dynamic-extension-routes.ts +++ b/src/frontend/packages/core/src/core/extension/dynamic-extension-routes.ts @@ -6,14 +6,14 @@ import { getRoutesFromExtensions, StratosRouteType } from './extension-service'; /** * This is used to dynamically add an extension's routes - since we can't do this - * if the extentsion's module is lazy-loaded. + * if the extension's module is lazy-loaded. * * This CanActive plugin typically is added to the route config to catch all unknown routes '**' - * When activated, it removes itself from the routing congif, so it only evern activates once. + * When activated, it removes itself from the routing config, so it only ever activates once. * * It checks if there are any new routes from extensions that need to be added and add them. * - * Lastly, it navigates to the saem route that it intercepted - if a new extension route + * Lastly, it navigates to the same route that it intercepted - if a new extension route * was added that now matches, it gets the route, otherwise the route goes up the chain * as it would have before. */ diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts index bc591d3201..38cbb23b64 100644 --- a/src/frontend/packages/core/src/core/extension/extension-service.ts +++ b/src/frontend/packages/core/src/core/extension/extension-service.ts @@ -1,9 +1,11 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Type } from '@angular/core'; import { Route, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { AppState } from '../../../../store/src/app-state'; +import { IPageSideNavTab } from '../../features/dashboard/page-side-nav/page-side-nav.component'; +import { EntityServiceFactory } from '../entity-service-factory.service'; import { EndpointAuthTypeConfig, EndpointTypeExtensionConfig, ExtensionEntitySchema } from './extension-types'; export const extensionsActionRouteKey = 'extensionsActionsKey'; @@ -33,7 +35,18 @@ export interface StratosTabMetadata { type: StratosTabType; label: string; link: string; - action: any; + icon: string; + iconFont?: string; + hidden?: (store: Store, esf: EntityServiceFactory) => Observable; + // action: any; + + // TODO: RC Diff between StratosTabMetadata & IPageSideNavTab. One purely for config & other for functionality? + // key?: string; + // label: string; + // matIcon?: string; + // matIconFont?: string; + // link: string; + // hidden?: Observable; } // The different types of Action @@ -71,12 +84,17 @@ export interface StratosEndpointExtensionConfig { export type StratosRouteType = StratosTabType | StratosActionType; +export interface StratosExtensionRoutes { + path: string; + component: Type; +} + // Stores the extension metadata as defined by the decorators const extensionMetadata = { loginComponent: null, - extensionRoutes: {}, - tabs: {}, - actions: {}, + extensionRoutes: {} as { [key: string]: StratosExtensionRoutes[] }, + tabs: {} as { [key: string]: IPageSideNavTab[] }, + actions: {} as { [key: string]: StratosActionMetadata[] }, endpointTypes: [], authTypes: [], entities: [] as ExtensionEntitySchema[] @@ -117,7 +135,7 @@ export function StratosLoginComponent() { return target => extensionMetadata.loginComponent = target; } -function addExtensionTab(tab: StratosTabType, target: any, props: any) { +function addExtensionTab(tab: StratosTabType, target: any, props: StratosTabMetadata) { if (!extensionMetadata.tabs[tab]) { extensionMetadata.tabs[tab] = []; } @@ -129,10 +147,16 @@ function addExtensionTab(tab: StratosTabType, target: any, props: any) { path: props.link, component: target }); - extensionMetadata.tabs[tab].push(props); + extensionMetadata.tabs[tab].push({ + label: props.label, + link: props.link, + matIcon: props.icon, + matIconFont: props.iconFont, + hidden: props.hidden + }); } -function addExtensionAction(action: StratosActionType, target: any, props: any) { +function addExtensionAction(action: StratosActionType, target: any, props: StratosActionMetadata) { if (!extensionMetadata.actions[action]) { extensionMetadata.actions[action] = []; extensionMetadata.extensionRoutes[action] = []; @@ -209,11 +233,11 @@ export class ExtensionService { // Helpers to access Extension metadata (without using the injectable Extension Service) -export function getRoutesFromExtensions(routeType: StratosRouteType) { +export function getRoutesFromExtensions(routeType: StratosRouteType): StratosExtensionRoutes[] { return extensionMetadata.extensionRoutes[routeType] || []; } -export function getTabsFromExtensions(tabType: StratosTabType) { +export function getTabsFromExtensions(tabType: StratosTabType): IPageSideNavTab[] { return extensionMetadata.tabs[tabType] || []; } diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index b7c6caf190..0b8edeb495 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -97,7 +97,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { { link: 'routes', label: 'Routes', matIconFont: 'stratos-icons', matIcon: 'network_route' }, { link: 'log-stream', label: 'Log Stream', matIcon: 'featured_play_list' }, { link: 'services', label: 'Services', matIconFont: 'stratos-icons', matIcon: 'service' }, - { link: 'variables', label: 'Variables', matIcon: 'list', hidden: appDoesNotHaveEnvVars$ }, + { link: 'variables', label: 'Variables', matIcon: 'list', hidden$: appDoesNotHaveEnvVars$ }, { link: 'events', label: 'Events', matIcon: 'watch_later' } ]; @@ -117,14 +117,14 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { // Add any tabs from extensions const tabs = getTabsFromExtensions(StratosTabType.Application); tabs.map((extensionTab) => { - if (extensionTab.action) { - extensionTab.action.onSucceed = () => { - this.tabLinks.push(extensionTab); - }; - this.store.dispatch(extensionTab.action); - } else { - this.tabLinks.push(extensionTab); - } + // if (extensionTab.action) { + // extensionTab.action.onSucceed = () => { + // this.tabLinks.push(extensionTab); + // }; + // this.store.dispatch(extensionTab.action); + // } else { + this.tabLinks.push(extensionTab); + // } }); // Ensure Git SCM tab gets updated if the app is redeployed from a different SCM Type diff --git a/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts index ffa9b593f6..a212f6980a 100644 --- a/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts @@ -75,19 +75,19 @@ export class CloudFoundryTabsBaseComponent implements OnInit { link: CloudFoundryTabsBaseComponent.cells, label: 'Cells', matIcon: 'select_all', - hidden: cellsHidden$ + hidden$: cellsHidden$ }, { link: 'routes', label: 'Routes', matIcon: 'network_route', matIconFont: 'stratos-icons', }, { link: CloudFoundryTabsBaseComponent.users, label: 'Users', - hidden: usersHidden$, + hidden$: usersHidden$, matIcon: 'people' }, { link: CloudFoundryTabsBaseComponent.firehose, label: 'Firehose', - hidden: firehoseHidden$, + hidden$: firehoseHidden$, matIcon: 'featured_play_list' }, { link: 'feature-flags', label: 'Feature Flags', matIcon: 'flag' }, diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts index 62450af26e..bb520a701e 100644 --- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts +++ b/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts @@ -72,7 +72,7 @@ export class CloudFoundryCellBaseComponent { first() ); - this.tabLinks.find(link => link.link === CloudFoundryCellBaseComponent.AppsLinks).hidden = + this.tabLinks.find(link => link.link === CloudFoundryCellBaseComponent.AppsLinks).hidden$ = cfEndpointService.currentUser$.pipe( map(user => !user.admin) ); diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html index 53e4272a17..c045b8725f 100644 --- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html +++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html @@ -9,7 +9,7 @@

@@ -172,7 +174,9 @@ -
No specific date schedule.
+
+ No specific date schedule.

@@ -212,7 +216,9 @@ -
No recurring schedule.
+
+ No recurring schedule.
diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index d7d2b43d72..f37b6d41a9 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -35,7 +35,6 @@ import { UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, } from './app-autoscaler.actions'; -import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; import { buildMetricData } from './autoscaler-helpers/autoscaler-transform-metric'; import { autoscalerTransformArrayToMap, @@ -390,5 +389,3 @@ export class AutoscalerEffects { } } - -export const selectUpdateAutoscalerPolicyState = (state: AppState): UpdateAutoscalerPolicyState => state.updateAutoscalerPolicy; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts deleted file mode 100644 index 43b3d14541..0000000000 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy.reducer.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { UPDATE_APP_AUTOSCALER_POLICY_STEP } from './app-autoscaler.actions'; -import { UpdateAutoscalerPolicyState } from './app-autoscaler.types'; - -const defaultState: UpdateAutoscalerPolicyState = { - policy: { - instance_min_count: 1, - instance_max_count: 10, - scaling_rules_form: [], - schedules: {} - } -}; - -export function updateAutoscalerPolicyReducer(state: UpdateAutoscalerPolicyState = defaultState, action) { - switch (action.type) { - case UPDATE_APP_AUTOSCALER_POLICY_STEP: - return { ...state, policy: action.policy }; - default: - return state; - } -} diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts index f351d4b27a..8e9533576b 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -4,7 +4,7 @@ import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/materi import { Store } from '@ngrx/store'; import * as moment from 'moment-timezone'; import { Observable, of as observableOf, Subscription } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { filter, map } from 'rxjs/operators'; import { AppState } from '../../../../../../store/src/app-state'; import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; @@ -12,7 +12,7 @@ import { EntityService } from '../../../../core/entity-service'; import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.actions'; +import { GetAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { autoscalerTransformArrayToMap } from '../../autoscaler-helpers/autoscaler-transform-policy'; import { PolicyAlert, PolicyDefault } from '../../autoscaler-helpers/autoscaler-util'; @@ -37,7 +37,7 @@ export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { private editLimitValid = true; private appAutoscalerPolicyErrorSub: Subscription; private appAutoscalerPolicyService: EntityService; - private currentPolicy: any; + private currentPolicy: AppAutoscalerPolicy; constructor( public applicationService: ApplicationService, @@ -61,6 +61,7 @@ export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { false ); this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( + filter(({ entityRequestInfo }) => entityRequestInfo && entityRequestInfo.fetching === false), map(({ entity }) => { if (entity && entity.entity) { this.currentPolicy = entity.entity; @@ -90,8 +91,12 @@ export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); this.currentPolicy.schedules.timezone = this.editLimitForm.get('timezone').value; - this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); - return observableOf({ success: true }); + return observableOf({ + success: true, + data: { + ...this.currentPolicy + } + }); } validateGlobalLimitMin(): ValidatorFn { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index a34da8aa81..1c3f8bb6d2 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -1,6 +1,6 @@ -
+
- + diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 0e8889ec9e..e97495bc48 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -1,31 +1,28 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { Component } from '@angular/core'; +import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, of as observableOf } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { AppState } from '../../../../../../store/src/app-state'; +import { of as observableOf } from 'rxjs'; + import { ApplicationService } from '../../../../features/applications/application.service'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - UpperOperators, + cloneObject, + getAdjustmentType, + getScaleType, LowerOperators, - PolicyDefaultSetting, + MetricPercentageTypes, MetricTypes, - getScaleType, - getAdjustmentType, PolicyAlert, + PolicyDefaultSetting, PolicyDefaultTrigger, - MetricPercentageTypes, - cloneObject + UpperOperators, } from '../../autoscaler-helpers/autoscaler-util'; import { - numberWithFractionOrExceedRange, + getThresholdMax, getThresholdMin, - getThresholdMax + numberWithFractionOrExceedRange, } from '../../autoscaler-helpers/autoscaler-validation'; -import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; -import { UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.actions'; @Component({ selector: 'app-edit-autoscaler-policy-step2', @@ -35,22 +32,21 @@ import { UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.action { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep2Component implements OnInit { +export class EditAutoscalerPolicyStep2Component { policyAlert = PolicyAlert; metricTypes = MetricTypes; operatorTypes = UpperOperators.concat(LowerOperators); editTriggerForm: FormGroup; - appAutoscalerPolicy$: Observable; - public currentPolicy: any; + public currentPolicy: AppAutoscalerPolicy; + public testing = false; private editIndex = -1; private editScaleType = 'upper'; private editAdjustmentType = 'value'; constructor( public applicationService: ApplicationService, - private store: Store, private fb: FormBuilder, ) { this.editTriggerForm = this.fb.group({ @@ -70,13 +66,8 @@ export class EditAutoscalerPolicyStep2Component implements OnInit { }); } - ngOnInit() { - this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( - map(state => { - this.currentPolicy = state.policy; - return this.currentPolicy; - }) - ); + onEnter = (data: AppAutoscalerPolicy) => { + this.currentPolicy = data; } addTrigger = () => { @@ -128,10 +119,10 @@ export class EditAutoscalerPolicyStep2Component implements OnInit { this.editIndex = -1; } - onNext: StepOnNextFunction = () => { - this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); - return observableOf({ success: true }); - } + onNext: StepOnNextFunction = () => observableOf({ + success: true, + data: { ...this.currentPolicy } + }) validateTriggerMetricType(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index f80294c91a..8cb26d1c4f 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -1,7 +1,7 @@ -
+
+ *ngFor="let rule of currentPolicy.schedules && currentPolicy.schedules.recurring_schedule; let index = index"> diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index 9dbfeea948..dfd7b25565 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -1,23 +1,30 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { Component } from '@angular/core'; +import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; -import { Observable, of as observableOf } from 'rxjs'; -import { map } from 'rxjs/operators'; import * as moment from 'moment-timezone'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { AppState } from '../../../../../../store/src/app-state'; +import { Observable, of as observableOf } from 'rxjs'; + import { ApplicationService } from '../../../../features/applications/application.service'; -import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; -import { UpdateAppAutoscalerPolicyStepAction } from '../../app-autoscaler.actions'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - MomentFormateDate, PolicyAlert, shiftArray, PolicyDefaultRecurringSchedule, cloneObject, WeekdayOptions, MonthdayOptions + cloneObject, + MomentFormateDate, + MonthdayOptions, + PolicyAlert, + PolicyDefaultRecurringSchedule, + shiftArray, + WeekdayOptions, } from '../../autoscaler-helpers/autoscaler-util'; import { - numberWithFractionOrExceedRange, dateIsAfter, timeIsSameOrAfter, recurringSchedulesOverlapping, + dateIsAfter, + numberWithFractionOrExceedRange, + recurringSchedulesOverlapping, + timeIsSameOrAfter, } from '../../autoscaler-helpers/autoscaler-validation'; import { - validateRecurringSpecificMin, validateRecurringSpecificMax + validateRecurringSpecificMax, + validateRecurringSpecificMin, } from '../edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; @Component({ @@ -28,7 +35,7 @@ import { { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep3Component implements OnInit { +export class EditAutoscalerPolicyStep3Component { policyAlert = PolicyAlert; weekdayOptions = WeekdayOptions; @@ -36,7 +43,7 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { editRecurringScheduleForm: FormGroup; appAutoscalerPolicy$: Observable; - private currentPolicy: any; + public currentPolicy: AppAutoscalerPolicy; private editIndex = -1; private editEffectiveType = 'always'; private editRepeatType = 'week'; @@ -48,7 +55,6 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { constructor( public applicationService: ApplicationService, - private store: Store, private fb: FormBuilder, ) { this.editRecurringScheduleForm = this.fb.group({ @@ -66,13 +72,8 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { }); } - ngOnInit() { - this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( - map(state => { - this.currentPolicy = state.policy; - return this.currentPolicy; - }) - ); + onEnter = (data: AppAutoscalerPolicy) => { + this.currentPolicy = data; } addRecurringSchedule = () => { @@ -165,10 +166,10 @@ export class EditAutoscalerPolicyStep3Component implements OnInit { this.editIndex = -1; } - onNext: StepOnNextFunction = () => { - this.store.dispatch(new UpdateAppAutoscalerPolicyStepAction(this.currentPolicy)); - return observableOf({ success: true }); - } + onNext: StepOnNextFunction = () => observableOf({ + success: true, + data: { ...this.currentPolicy } + }) validateRecurringScheduleGlobal(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index 8e06a38403..08d52117e2 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -1,7 +1,7 @@ -
+
+ *ngFor="let rule of currentPolicy.schedules && currentPolicy.schedules.specific_date; let index = index"> @@ -105,5 +105,6 @@ - +
\ No newline at end of file diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index dfdecafbae..f4efa2d78b 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -1,29 +1,30 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators, ValidatorFn, AbstractControl } from '@angular/forms'; +import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; +import * as moment from 'moment-timezone'; import { Observable, Subscription } from 'rxjs'; -import { filter, map, distinctUntilChanged, take } from 'rxjs/operators'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; +import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; + import { AppState } from '../../../../../../store/src/app-state'; -import { ApplicationService } from '../../../../features/applications/application.service'; +import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; import { EntityService } from '../../../../core/entity-service'; import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; -import { - entityFactory, -} from '../../../../../../store/src/helpers/entity-factory'; +import { ApplicationService } from '../../../../features/applications/application.service'; +import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate, cloneObject + cloneObject, + MomentFormateDateTimeT, + PolicyAlert, + PolicyDefaultSpecificDate, } from '../../autoscaler-helpers/autoscaler-util'; import { - numberWithFractionOrExceedRange, dateTimeIsSameOrAfter, - specificDateRangeOverlapping + numberWithFractionOrExceedRange, + specificDateRangeOverlapping, } from '../../autoscaler-helpers/autoscaler-validation'; -import * as moment from 'moment-timezone'; -import { selectUpdateAutoscalerPolicyState } from '../../autoscaler.effects'; import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.module'; @Component({ @@ -34,15 +35,14 @@ import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.modu { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { +export class EditAutoscalerPolicyStep4Component implements OnDestroy { policyAlert = PolicyAlert; editSpecificDateForm: FormGroup; - appAutoscalerPolicy$: Observable; private updateAppAutoscalerPolicyService: EntityService; private appAutoscalerPolicyErrorSub: Subscription; - private currentPolicy: any; + public currentPolicy: AppAutoscalerPolicy; private editIndex = -1; private editMutualValidation = { limit: true, @@ -65,12 +65,6 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { } ngOnInit() { - this.appAutoscalerPolicy$ = this.store.select(selectUpdateAutoscalerPolicyState).pipe( - map(state => { - this.currentPolicy = state.policy; - return this.currentPolicy; - }) - ); this.updateAppAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerUpdatedPolicySchemaKey, entityFactory(appAutoscalerUpdatedPolicySchemaKey), @@ -80,6 +74,10 @@ export class EditAutoscalerPolicyStep4Component implements OnInit, OnDestroy { ); } + onEnter = (data: AppAutoscalerPolicy) => { + this.currentPolicy = data; + } + ngOnDestroy(): void { if (this.appAutoscalerPolicyErrorSub) { this.appAutoscalerPolicyErrorSub.unsubscribe(); diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 209dcd621c..4fccb7e1e2 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -11,13 +11,13 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en - + - + - diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index ff932668d5..b4b2cc3727 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; + import { ApplicationService } from '../../../features/applications/application.service'; @Component({ diff --git a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.html b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.html index 7e81408eba..84f6d5a596 100644 --- a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.html +++ b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.html @@ -6,4 +6,4 @@

-
+
\ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.ts b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.ts index b46ed767c5..2f45c98d6d 100644 --- a/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.ts +++ b/src/frontend/packages/core/src/shared/components/loading-page/loading-page.component.ts @@ -2,7 +2,7 @@ import { animate, style, transition, trigger } from '@angular/animations'; import { Component, Input, OnInit } from '@angular/core'; import { schema } from 'normalizr'; import { combineLatest, Observable, of as observableOf } from 'rxjs'; -import { debounceTime, filter, first, map, startWith } from 'rxjs/operators'; +import { filter, first, map, startWith } from 'rxjs/operators'; import { EntityMonitor } from '../../monitors/entity-monitor'; import { EntityMonitorFactory } from '../../monitors/entity-monitor.factory.service'; diff --git a/src/frontend/packages/core/test-framework/store-test-helper.ts b/src/frontend/packages/core/test-framework/store-test-helper.ts index 02a37de5a2..d2822051b1 100644 --- a/src/frontend/packages/core/test-framework/store-test-helper.ts +++ b/src/frontend/packages/core/test-framework/store-test-helper.ts @@ -21858,19 +21858,7 @@ function getDefaultInitialTestStoreState(): AppState { [testSCFGuid]: getDefaultEndpointRoles() }, state: getDefaultRolesRequestState() - }, - updateAutoscalerPolicy: { - policy: { - instance_min_count: 1, - instance_max_count: 10, - scaling_rules_form: [], - schedules: { - timezone: '', - recurring_schedule: [], - specific_date: [] - } - } - }, + } }; } diff --git a/src/frontend/packages/store/src/app-state.ts b/src/frontend/packages/store/src/app-state.ts index db79a98786..290ce61013 100644 --- a/src/frontend/packages/store/src/app-state.ts +++ b/src/frontend/packages/store/src/app-state.ts @@ -15,7 +15,6 @@ import { IRecentlyVisitedState } from './types/recently-visited.types'; import { RoutingHistory } from './types/routing.type'; import { UAASetupState } from './types/uaa-setup.types'; import { UsersRolesState } from './types/users-roles.types'; -import { UpdateAutoscalerPolicyState } from '../../core/src/custom/autoscaler/app-autoscaler.types'; export interface IRequestTypeState { [entityKey: string]: IRequestEntityTypeState; @@ -42,5 +41,4 @@ export interface AppState { currentUserRoles: ICurrentUserRolesState; userFavoritesGroups: IUserFavoritesGroupsState; recentlyVisited: IRecentlyVisitedState; - updateAutoscalerPolicy: UpdateAutoscalerPolicyState; } diff --git a/src/frontend/packages/store/src/reducers.module.ts b/src/frontend/packages/store/src/reducers.module.ts index f1ff8e6c5e..c999740ac5 100644 --- a/src/frontend/packages/store/src/reducers.module.ts +++ b/src/frontend/packages/store/src/reducers.module.ts @@ -21,7 +21,6 @@ import { requestPaginationReducer } from './reducers/pagination-reducer.generato import { routingReducer } from './reducers/routing.reducer'; import { uaaSetupReducer } from './reducers/uaa-setup.reducers'; import { UsersRolesReducer } from './reducers/users-roles.reducer'; -import { updateAutoscalerPolicyReducer } from '../../core/src/custom/autoscaler/edit-autoscaler-policy.reducer'; // NOTE: Revisit when ngrx-store-logger supports Angular 7 (https://github.com/btroncone/ngrx-store-logger) @@ -52,7 +51,6 @@ export const appReducers = { currentUserRoles: currentUserRolesReducer, userFavoritesGroups: userFavoriteGroupsReducer, recentlyVisited: recentlyVisitedReducer, - updateAutoscalerPolicy: updateAutoscalerPolicyReducer, } as ActionReducerMap<{}>; const metaReducers = []; From 6ba38fa8ebdd3f5289a40ef64730dd6a1c4eaf74 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 26 Apr 2019 16:34:21 +0100 Subject: [PATCH 45/98] Fix thresholdmax, removes console errors --- .../autoscaler-transform-metric.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts index 0c746d4bcd..341105ca2b 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts @@ -1,12 +1,6 @@ import * as moment from 'moment'; -import { - getScaleType, - metricMap, - S2NS, - MomentFormateTimeS, - normalColor, - MetricPercentageTypes -} from './autoscaler-util'; + +import { getScaleType, metricMap, MetricPercentageTypes, MomentFormateTimeS, normalColor, S2NS } from './autoscaler-util'; function initMeticData(metricName) { return { @@ -249,7 +243,7 @@ function getChartMax(trigger, maxValue) { thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); } thresholdmax = Math.max(maxValue, thresholdmax, 10); - thresholdmax = getTrimedInteger(getTrimedInteger); + thresholdmax = getTrimedInteger(thresholdmax); return thresholdmax; } From 33087e504b2108445b95469fc761cae81ab39135 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 1 May 2019 15:49:35 +0100 Subject: [PATCH 46/98] Fix after merge --- .../card-autoscaler-default.component.ts | 4 +- package-lock.json | 5440 +++++++++-------- 2 files changed, 2741 insertions(+), 2703 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts index b1dc4ed192..93f3ef2edc 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts @@ -4,7 +4,6 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; -import { CardStatus } from '../../../../../core/src/shared/shared.types'; import { AppState } from '../../../../../store/src/app-state'; import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; @@ -12,6 +11,7 @@ import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selecto import { EntityService } from '../../../core/entity-service'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; import { ApplicationService } from '../../../features/applications/application.service'; +import { StratosStatus } from '../../../shared/shared.types'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; @@ -37,7 +37,7 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { ); } - status$: Observable; + status$: Observable; appAutoscalerPolicyService: EntityService; appAutoscalerPolicyUpdateService: EntityService; public appAutoscalerPolicy$: Observable; diff --git a/package-lock.json b/package-lock.json index 9dca4762f2..358676f9a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } } } @@ -84,10 +84,10 @@ "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ansi-styles": { @@ -104,11 +104,11 @@ "dev": true, "optional": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "clone": { @@ -136,12 +136,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "json-schema-traverse": { @@ -156,15 +156,15 @@ "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", "dev": true, "requires": { - "clone": "^2.1.2", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "mime": "^1.4.1", - "mkdirp": "^0.5.0", - "promise": "^7.1.1", - "request": "^2.83.0", - "source-map": "~0.6.0" + "clone": "2.1.2", + "errno": "0.1.7", + "graceful-fs": "4.1.11", + "image-size": "0.5.5", + "mime": "1.6.0", + "mkdirp": "0.5.1", + "promise": "7.3.1", + "request": "2.88.0", + "source-map": "0.6.1" } }, "mime-db": { @@ -181,7 +181,7 @@ "dev": true, "optional": true, "requires": { - "mime-db": "~1.38.0" + "mime-db": "1.38.0" } }, "node-sass": { @@ -191,25 +191,25 @@ "dev": true, "optional": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.3", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" }, "dependencies": { "request": { @@ -219,26 +219,26 @@ "dev": true, "optional": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.22", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" } } } @@ -249,7 +249,7 @@ "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" } }, "rxjs": { @@ -258,7 +258,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "semver": { @@ -287,7 +287,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } }, "uuid": { @@ -317,7 +317,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "semver": { @@ -365,7 +365,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } } } @@ -389,10 +389,10 @@ "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "chokidar": { @@ -401,19 +401,19 @@ "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "lodash.debounce": "4.0.8", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" } }, "fast-deep-equal": { @@ -434,7 +434,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "source-map": { @@ -449,7 +449,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } } } @@ -470,7 +470,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } } } @@ -480,7 +480,7 @@ "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.6.tgz", "integrity": "sha512-ICKPS+bKabhQNqnPoVZegUAhgNPbVFlrxHoJ+ZZeVGxw5iBE8TnP3a2sRvakdMTKhykDlwVVGMKLxu2Y34uhmg==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/cdk": { @@ -488,8 +488,8 @@ "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.3.tgz", "integrity": "sha512-0M3nwq+c9+d+p0XeU12I9djutlsajRrxcu7AvHQXUs/5grYFsXsX0f468qXDiKmcgqGUBNtN2fBOUhGNlispuQ==", "requires": { - "parse5": "^5.0.0", - "tslib": "^1.7.1" + "parse5": "5.1.0", + "tslib": "1.9.3" }, "dependencies": { "parse5": { @@ -526,10 +526,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "ansi-escapes": { @@ -549,19 +549,19 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "lodash.debounce": "4.0.8", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" } }, "cli-cursor": { @@ -570,7 +570,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "2.0.0" } }, "fast-deep-equal": { @@ -584,7 +584,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "inquirer": { @@ -601,11 +601,11 @@ "figures": "2.0.0", "lodash": "4.17.11", "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.1.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.0.0", - "through": "^2.3.6" + "run-async": "2.3.0", + "rxjs": "6.3.3", + "string-width": "2.1.1", + "strip-ansi": "5.0.0", + "through": "2.3.8" } }, "is-fullwidth-code-point": { @@ -637,7 +637,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "opn": { @@ -646,7 +646,7 @@ "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" } }, "restore-cursor": { @@ -655,8 +655,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "2.0.1", + "signal-exit": "3.0.2" } }, "run-async": { @@ -665,7 +665,7 @@ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "is-promise": "2.1.0" } }, "rxjs": { @@ -674,7 +674,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "semver": { @@ -694,8 +694,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "strip-ansi": { @@ -704,7 +704,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -715,7 +715,7 @@ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", "dev": true, "requires": { - "ansi-regex": "^4.0.0" + "ansi-regex": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -731,7 +731,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } } } @@ -741,7 +741,7 @@ "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.6.tgz", "integrity": "sha512-jzWUgsgS0dmPy7yDHX4qCqVpt7ZZmHhApgkg5RkzTAlp+0cvZ/KsDpBgHXnZUIfmk/5g1/EtTbkbClgp1kCkIg==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/compiler": { @@ -749,7 +749,7 @@ "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.6.tgz", "integrity": "sha512-GXdvgH8oxK8HRh/FelN3U5p0tsTUwGh8b/iuuJKaunBSSDDjIy7pPnn3zT+lN4YeEi6qN1XWudt+HpWHYHyymg==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/compiler-cli": { @@ -759,15 +759,15 @@ "dev": true, "requires": { "canonical-path": "1.0.0", - "chokidar": "^2.1.1", - "convert-source-map": "^1.5.1", - "dependency-graph": "^0.7.2", - "magic-string": "^0.25.0", - "minimist": "^1.2.0", - "reflect-metadata": "^0.1.2", - "shelljs": "^0.8.1", - "source-map": "^0.6.1", - "tslib": "^1.9.0", + "chokidar": "2.1.2", + "convert-source-map": "1.5.1", + "dependency-graph": "0.7.2", + "magic-string": "0.25.2", + "minimist": "1.2.0", + "reflect-metadata": "0.1.13", + "shelljs": "0.8.3", + "source-map": "0.6.1", + "tslib": "1.9.3", "yargs": "9.0.1" }, "dependencies": { @@ -789,18 +789,18 @@ "integrity": "sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.0" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.1.0" } }, "cliui": { @@ -809,9 +809,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" }, "dependencies": { "string-width": { @@ -820,9 +820,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } } } @@ -833,10 +833,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" } }, "mem": { @@ -845,7 +845,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "minimist": { @@ -866,9 +866,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "path-type": { @@ -877,7 +877,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "^2.0.0" + "pify": "2.3.0" } }, "pify": { @@ -892,9 +892,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" } }, "read-pkg-up": { @@ -903,8 +903,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" + "find-up": "2.1.0", + "read-pkg": "2.0.0" } }, "readdirp": { @@ -913,9 +913,9 @@ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.1.11", + "micromatch": "3.1.10", + "readable-stream": "2.3.6" } }, "shelljs": { @@ -924,9 +924,9 @@ "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==", "dev": true, "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" + "glob": "7.1.2", + "interpret": "1.1.0", + "rechoir": "0.6.2" } }, "source-map": { @@ -941,8 +941,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -957,7 +957,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -986,19 +986,19 @@ "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=", "dev": true, "requires": { - "camelcase": "^4.1.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "read-pkg-up": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^7.0.0" + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" } }, "yargs-parser": { @@ -1007,7 +1007,7 @@ "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -1017,7 +1017,7 @@ "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.6.tgz", "integrity": "sha512-MZg17DWH1KUoDa9wFYK9Z+3F7DnUW2DjSwGyIi9U4cB54IWFhgt1JsA0mcuSYuRSRpvwaArCDC2AN90f+0/EFA==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/flex-layout": { @@ -1025,7 +1025,7 @@ "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-7.0.0-beta.23.tgz", "integrity": "sha512-jH2i3i/M7SbK6scVlj2urVL5OhzwavbQ7KwvUjyc/UwccKnnzuOuWEGCINLja/aoaUO3I35LluCLv6a6VN0olA==", "requires": { - "tslib": "^1.7.1" + "tslib": "1.9.3" } }, "@angular/forms": { @@ -1033,7 +1033,7 @@ "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.6.tgz", "integrity": "sha512-At72AJNGe+Zzmryb7DDIG+iws7zKdgZx/eEVjZ/Obu/yREefbZY4R7q83U90Vljtn97BwJPx9ur9ttxE9WpnlA==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/http": { @@ -1041,7 +1041,7 @@ "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.6.tgz", "integrity": "sha512-B5TC8JFW/I+ms5iJthGjf/eg1tKKqpO6yrOpDSQofHG7Dd4dozyGXGznFJTRFfNda5rku61/qnQaa8SyQyuplQ==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/language-service": { @@ -1055,7 +1055,7 @@ "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.3.3.tgz", "integrity": "sha512-DZdJaVpXsd5QlfpN5P871llw8AKh5QvRiyro3QRmEajYN85Xiawqpbt7O60TrwcFM6DzYLI3UeyWq8LFdmi/+Q==", "requires": { - "tslib": "^1.7.1" + "tslib": "1.9.3" } }, "@angular/material-moment-adapter": { @@ -1063,7 +1063,7 @@ "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.3.3.tgz", "integrity": "sha512-Fp2EcFpwdwa5qWWBa7G1mJZuaQ3oD3pohyo04HD2ud8YFP5IPbeoHVc65JC7TIwQFbVKk0lojXK3b2vQXZOapw==", "requires": { - "tslib": "^1.7.1" + "tslib": "1.9.3" } }, "@angular/platform-browser": { @@ -1071,7 +1071,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.6.tgz", "integrity": "sha512-VE4yS4l8Cdx6DlvrbOFOZDKmQuyz1RhVcshgSt9hKlkehvAXMtX8Sqnp6po7z0aPykTh0TZZtMtLEerkFEe+DA==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/platform-browser-dynamic": { @@ -1079,7 +1079,7 @@ "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.6.tgz", "integrity": "sha512-/co/q4v11nKin2MFscCMZyixbW103I2FxbPgCAYBN5NSvfIwTrt5J6xWmDoKJ8HkZBqL3R9B+uhYdzsRN/pQxg==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@angular/platform-server": { @@ -1087,9 +1087,9 @@ "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.6.tgz", "integrity": "sha512-rtLT0BxgEGJDYGMeFNYfna3H91JITFfm4Qd86nH7EmR1mVWa563lSQle1VWwbQhRbj5fDhwt+anbVwz7SEn7ew==", "requires": { - "domino": "^2.1.0", - "tslib": "^1.9.0", - "xhr2": "^0.1.4" + "domino": "2.1.2", + "tslib": "1.9.3", + "xhr2": "0.1.4" } }, "@angular/router": { @@ -1097,7 +1097,7 @@ "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.6.tgz", "integrity": "sha512-ayMVor4Mu4wk7JKpt51UxHovnLB4munZ8ELR1CA4w+s0rJsSSwyB4WXElC+DbgCyl7BYLAaGui2c5DbTAJ9jlw==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "@mrmlnc/readdir-enhanced": { @@ -1106,8 +1106,8 @@ "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", "dev": true, "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" + "call-me-maybe": "1.0.1", + "glob-to-regexp": "0.3.0" } }, "@ngrx/effects": { @@ -1155,7 +1155,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } } } @@ -1172,20 +1172,20 @@ "integrity": "sha512-rt+YzuNpmVGIt5agPM5Z61cMaSLRmEcpiI4HdVL8eOBw7HicVk2N894rHbQdU3/LHZUt592zq8Z7jOFUtbV3JQ==", "dev": true, "requires": { - "@types/yargs": "^11.0.0", - "app-root-path": "^2.0.1", + "@types/yargs": "11.1.2", + "app-root-path": "2.1.0", "cosmiconfig": "4.0.0", "fs-extra": "6.0.0", "graphviz": "0.0.8", "ignore": "5.0.4", "npm-run-all": "4.1.5", - "opn": "^5.3.0", + "opn": "5.3.0", "rxjs": "6.3.3", "semver": "5.4.1", "strip-json-comments": "2.0.1", "tmp": "0.0.33", - "viz.js": "^1.8.1", - "yargs": "^11.0.0", + "viz.js": "1.8.2", + "yargs": "11.1.0", "yargs-parser": "10.0.0" }, "dependencies": { @@ -1207,9 +1207,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "fs-extra": { @@ -1218,9 +1218,9 @@ "integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" } }, "ignore": { @@ -1241,7 +1241,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "mem": { @@ -1250,7 +1250,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } }, "os-locale": { @@ -1259,9 +1259,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" } }, "rxjs": { @@ -1270,7 +1270,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "semver": { @@ -1285,8 +1285,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -1295,7 +1295,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "strip-json-comments": { @@ -1322,18 +1322,18 @@ "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" }, "dependencies": { "yargs-parser": { @@ -1342,7 +1342,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -1353,7 +1353,7 @@ "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -1374,10 +1374,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "chokidar": { @@ -1385,19 +1385,19 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "lodash.debounce": "4.0.8", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" } }, "fast-deep-equal": { @@ -1415,7 +1415,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "source-map": { @@ -1434,7 +1434,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } } } @@ -1460,10 +1460,10 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "chokidar": { @@ -1471,19 +1471,19 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "lodash.debounce": "4.0.8", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" } }, "fast-deep-equal": { @@ -1502,7 +1502,7 @@ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "semver": { @@ -1521,7 +1521,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } } } @@ -1531,18 +1531,18 @@ "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-10.1.0.tgz", "integrity": "sha512-0nZ3ub5o/qQfFMz+av89u/VKqsqiVhPFBDDOOPq2qimP83i+pcb0i3MEao7PSxIbKAEkL/pwRcEJw4KDZ8B67w==", "requires": { - "d3": "^4.10.2", - "d3-array": "^1.2.1", - "d3-brush": "^1.0.4", - "d3-color": "^1.0.3", - "d3-force": "^1.1.0", - "d3-format": "^1.2.0", - "d3-hierarchy": "^1.1.5", - "d3-interpolate": "^1.1.5", - "d3-scale": "^1.0.6", - "d3-selection": "^1.1.0", - "d3-shape": "^1.2.0", - "d3-time-format": "^2.1.0" + "d3": "4.13.0", + "d3-array": "1.2.4", + "d3-brush": "1.0.6", + "d3-color": "1.2.3", + "d3-force": "1.2.0", + "d3-format": "1.3.2", + "d3-hierarchy": "1.1.8", + "d3-interpolate": "1.3.2", + "d3-scale": "1.0.7", + "d3-selection": "1.4.0", + "d3-shape": "1.3.4", + "d3-time-format": "2.1.3" } }, "@tweenjs/tween.js": { @@ -1579,7 +1579,7 @@ "integrity": "sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==", "dev": true, "requires": { - "@types/node": "*" + "@types/node": "11.9.4" } }, "@types/jasmine": { @@ -1594,7 +1594,7 @@ "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==", "dev": true, "requires": { - "@types/jasmine": "*" + "@types/jasmine": "2.8.7" } }, "@types/karma": { @@ -1603,9 +1603,9 @@ "integrity": "sha512-xm+iMKgLSpTPo1Z7wLKbrZt8aLzA1udb9UOb9+OSDMFIufqlbp0DXQpY75EQ3ETi6EJiaohIodBlMs+UD4NSMQ==", "dev": true, "requires": { - "@types/bluebird": "*", - "@types/node": "*", - "log4js": "^3.0.0" + "@types/bluebird": "3.5.25", + "@types/node": "11.9.4", + "log4js": "3.0.6" } }, "@types/marked": { @@ -1639,10 +1639,10 @@ "integrity": "sha512-ZgEZ1TiD+KGA9LiAAPPJL68Id2UWfeSO62ijSXZjFJArVV+2pKcsVHmrcu+1oiE3q6eDGiFiSolRc4JHoerBBg==", "dev": true, "requires": { - "@types/caseless": "*", - "@types/form-data": "*", - "@types/node": "*", - "@types/tough-cookie": "*" + "@types/caseless": "0.12.1", + "@types/form-data": "2.2.1", + "@types/node": "11.9.4", + "@types/tough-cookie": "2.3.5" } }, "@types/selenium-webdriver": { @@ -1674,9 +1674,9 @@ "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", "dev": true, "requires": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.6.1" + "@types/node": "11.9.4", + "@types/source-list-map": "0.1.2", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -1767,7 +1767,7 @@ "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==", "dev": true, "requires": { - "@xtuc/ieee754": "^1.2.0" + "@xtuc/ieee754": "1.2.0" } }, "@webassemblyjs/leb128": { @@ -1889,8 +1889,8 @@ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" + "jsonparse": "1.3.1", + "through": "2.3.8" } }, "abbrev": { @@ -1905,7 +1905,7 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "~2.1.18", + "mime-types": "2.1.18", "negotiator": "0.6.1" } }, @@ -1927,7 +1927,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "acorn": "^3.0.4" + "acorn": "3.3.0" }, "dependencies": { "acorn": { @@ -1956,7 +1956,7 @@ "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==", "dev": true, "requires": { - "es6-promisify": "^5.0.0" + "es6-promisify": "5.0.0" } }, "agentkeepalive": { @@ -1965,7 +1965,7 @@ "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", "dev": true, "requires": { - "humanize-ms": "^1.2.1" + "humanize-ms": "1.2.1" } }, "ajv": { @@ -1974,10 +1974,10 @@ "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" }, "dependencies": { "fast-deep-equal": { @@ -2013,6 +2013,7 @@ "dev": true, "requires": { "kind-of": "3.2.2", + "longest": "1.0.1", "repeat-string": "1.6.1" }, "dependencies": { @@ -2022,7 +2023,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -2038,7 +2039,7 @@ "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.3.2.tgz", "integrity": "sha512-eyPb6FnaA8d4lBh3v31F3YLLblr9Nn8zv25uKVmxPkA2/te6QDg0sPMqy6o8GouwW+U9LKzcUJZZBHa0ICY/rg==", "requires": { - "@tweenjs/tween.js": "^17.1.0" + "@tweenjs/tween.js": "17.2.0" } }, "ansi-align": { @@ -2047,7 +2048,7 @@ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "string-width": "^2.0.0" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -2068,8 +2069,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -2078,7 +2079,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2089,7 +2090,7 @@ "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "requires": { - "ansi-wrap": "^0.1.0" + "ansi-wrap": "0.1.0" } }, "ansi-cyan": { @@ -2143,7 +2144,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.1" } }, "ansi-wrap": { @@ -2157,8 +2158,8 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" } }, "app-root-path": { @@ -2173,7 +2174,7 @@ "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=", "dev": true, "requires": { - "buffer-equal": "^1.0.0" + "buffer-equal": "1.0.0" } }, "aproba": { @@ -2194,8 +2195,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "argparse": { @@ -2204,7 +2205,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" } }, "argv": { @@ -2224,7 +2225,7 @@ "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=", "dev": true, "requires": { - "make-iterator": "^1.0.0" + "make-iterator": "1.0.1" } }, "arr-flatten": { @@ -2238,7 +2239,7 @@ "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=", "dev": true, "requires": { - "make-iterator": "^1.0.0" + "make-iterator": "1.0.1" } }, "arr-union": { @@ -2276,8 +2277,8 @@ "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=", "dev": true, "requires": { - "array-slice": "^1.0.0", - "is-number": "^4.0.0" + "array-slice": "1.1.0", + "is-number": "4.0.0" }, "dependencies": { "is-number": { @@ -2294,7 +2295,7 @@ "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==", "dev": true, "requires": { - "is-number": "^4.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { @@ -2329,9 +2330,9 @@ "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==", "dev": true, "requires": { - "default-compare": "^1.0.0", - "get-value": "^2.0.6", - "kind-of": "^5.0.2" + "default-compare": "1.0.0", + "get-value": "2.0.6", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -2348,7 +2349,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "array-uniq": { @@ -2392,9 +2393,9 @@ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "assert": { @@ -2435,10 +2436,10 @@ "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.2", - "process-nextick-args": "^1.0.7", - "stream-exhaust": "^1.0.1" + "end-of-stream": "1.4.1", + "once": "1.4.0", + "process-nextick-args": "1.0.7", + "stream-exhaust": "1.0.2" }, "dependencies": { "process-nextick-args": { @@ -2472,7 +2473,7 @@ "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=", "dev": true, "requires": { - "async-done": "^1.2.2" + "async-done": "1.3.1" } }, "asynckit": { @@ -2492,12 +2493,12 @@ "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==", "dev": true, "requires": { - "browserslist": "^4.4.1", - "caniuse-lite": "^1.0.30000929", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.13", - "postcss-value-parser": "^3.3.1" + "browserslist": "4.4.1", + "caniuse-lite": "1.0.30000938", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "7.0.14", + "postcss-value-parser": "3.3.1" } }, "aws-sign2": { @@ -2518,9 +2519,9 @@ "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" }, "dependencies": { "ansi-styles": { @@ -2535,11 +2536,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -2580,7 +2581,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "^6.22.0" + "babel-runtime": "6.26.0" } }, "babel-runtime": { @@ -2589,8 +2590,8 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.6.5", + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -2647,15 +2648,15 @@ "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=", "dev": true, "requires": { - "arr-filter": "^1.1.1", - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "array-each": "^1.0.0", - "array-initial": "^1.0.0", - "array-last": "^1.1.1", - "async-done": "^1.2.2", - "async-settle": "^1.0.0", - "now-and-later": "^2.0.0" + "arr-filter": "1.1.2", + "arr-flatten": "1.1.0", + "arr-map": "2.0.2", + "array-each": "1.0.1", + "array-initial": "1.1.0", + "array-last": "1.3.0", + "async-done": "1.3.1", + "async-settle": "1.0.0", + "now-and-later": "2.0.0" } }, "backo2": { @@ -2674,13 +2675,13 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.2.1", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.1", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -2688,7 +2689,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -2696,7 +2697,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -2704,7 +2705,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -2712,9 +2713,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -2750,7 +2751,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "better-assert": { @@ -2785,7 +2786,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "~2.0.0" + "inherits": "2.0.3" } }, "blocking-proxy": { @@ -2794,7 +2795,7 @@ "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "1.2.0" }, "dependencies": { "minimist": { @@ -2824,15 +2825,15 @@ "dev": true, "requires": { "bytes": "3.0.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "~1.6.3", + "depd": "1.1.2", + "http-errors": "1.6.3", "iconv-lite": "0.4.23", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.5.2", "raw-body": "2.3.3", - "type-is": "~1.6.16" + "type-is": "1.6.16" }, "dependencies": { "iconv-lite": { @@ -2841,7 +2842,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } } } @@ -2852,12 +2853,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "array-flatten": "2.1.2", + "deep-equal": "1.0.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.2.3", + "multicast-dns-service-types": "1.1.0" } }, "boxen": { @@ -2866,13 +2867,13 @@ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "dev": true, "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.2.2", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.1" }, "dependencies": { "ansi-regex": { @@ -2899,8 +2900,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -2909,7 +2910,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -2919,7 +2920,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -2928,16 +2929,16 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -2945,7 +2946,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -2962,12 +2963,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-cipher": { @@ -2976,9 +2977,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "browserify-aes": "1.2.0", + "browserify-des": "1.0.2", + "evp_bytestokey": "1.0.3" } }, "browserify-des": { @@ -2987,10 +2988,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { @@ -2999,8 +3000,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "bn.js": "4.11.8", + "randombytes": "2.1.0" } }, "browserify-sign": { @@ -3009,13 +3010,13 @@ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.4.1", + "inherits": "2.0.3", + "parse-asn1": "5.1.4" } }, "browserify-zlib": { @@ -3024,7 +3025,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "~1.0.5" + "pako": "1.0.6" } }, "browserslist": { @@ -3033,9 +3034,9 @@ "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000929", - "electron-to-chromium": "^1.3.103", - "node-releases": "^1.1.3" + "caniuse-lite": "1.0.30000938", + "electron-to-chromium": "1.3.113", + "node-releases": "1.1.8" } }, "browserstack": { @@ -3044,7 +3045,7 @@ "integrity": "sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==", "dev": true, "requires": { - "https-proxy-agent": "^2.2.1" + "https-proxy-agent": "2.2.1" } }, "browserstack-local": { @@ -3053,11 +3054,11 @@ "integrity": "sha512-ilZlmiy7XYJxsztYan7XueHVr3Ix9EVh/mCiYN1G53wRPEW/hg1KMsseM6UExzVbexEqFEfwjkBLeFlSqxh+bQ==", "dev": true, "requires": { - "https-proxy-agent": "^2.2.1", - "is-running": "^2.0.0", - "ps-tree": "=1.1.1", - "sinon": "^1.17.6", - "temp-fs": "^0.9.9" + "https-proxy-agent": "2.2.1", + "is-running": "2.1.0", + "ps-tree": "1.1.1", + "sinon": "1.17.7", + "temp-fs": "0.9.9" }, "dependencies": { "ps-tree": { @@ -3066,7 +3067,7 @@ "integrity": "sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A==", "dev": true, "requires": { - "event-stream": "=3.3.4" + "event-stream": "3.3.4" } } } @@ -3077,9 +3078,9 @@ "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "base64-js": "1.3.0", + "ieee754": "1.1.12", + "isarray": "1.0.0" } }, "buffer-alloc": { @@ -3088,8 +3089,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" } }, "buffer-alloc-unsafe": { @@ -3164,19 +3165,19 @@ "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { - "bluebird": "^3.5.1", - "chownr": "^1.0.1", - "glob": "^7.1.2", - "graceful-fs": "^4.1.11", - "lru-cache": "^4.1.1", - "mississippi": "^2.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^5.2.4", - "unique-filename": "^1.1.0", - "y18n": "^4.0.0" + "bluebird": "3.5.1", + "chownr": "1.1.1", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "lru-cache": "4.1.3", + "mississippi": "2.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "5.3.0", + "unique-filename": "1.1.1", + "y18n": "4.0.0" } }, "cache-base": { @@ -3184,15 +3185,15 @@ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.2.1", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.0", + "to-object-path": "0.3.0", + "union-value": "1.0.0", + "unset-value": "1.0.0" } }, "call-me-maybe": { @@ -3207,7 +3208,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "^0.2.0" + "callsites": "0.2.0" } }, "callsite": { @@ -3222,14 +3223,21 @@ "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", "dev": true }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, "camelcase-keys": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" }, "dependencies": { "camelcase": { @@ -3271,8 +3279,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "align-text": "0.1.4", + "lazy-cache": "1.0.4" } }, "chalk": { @@ -3281,9 +3289,9 @@ "integrity": "sha512-LvixLAQ4MYhbf7hgL4o5PeK32gJKvVzDRiSNIApDofQvyhl8adgG2lJVXn4+ekQoK7HL9RF8lqxwerpe0x2pCw==", "dev": true, "requires": { - "ansi-styles": "^3.1.0", - "escape-string-regexp": "^1.0.5", - "supports-color": "^4.0.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" }, "dependencies": { "has-flag": { @@ -3298,7 +3306,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "^2.0.0" + "has-flag": "2.0.0" } } } @@ -3315,18 +3323,18 @@ "integrity": "sha512-zW8iXYZtXMx4kux/nuZVXjkLP+CyIK5Al5FHnj1OgTKGZfp4Oy6/ymtMSKFv3GD8DviEmUPmJg9eFdJ/JzudMg==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.1.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.1", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^2.1.1", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.0" + "anymatch": "2.0.0", + "async-each": "1.0.1", + "braces": "2.3.2", + "fsevents": "1.2.7", + "glob-parent": "3.1.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "4.0.0", + "normalize-path": "2.1.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0", + "upath": "1.1.0" } }, "chownr": { @@ -3341,7 +3349,7 @@ "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "ci-info": { @@ -3356,8 +3364,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "circular-dependency-plugin": { @@ -3376,10 +3384,10 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -3387,7 +3395,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -3398,7 +3406,7 @@ "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", "dev": true, "requires": { - "source-map": "~0.6.0" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -3421,7 +3429,7 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "^1.0.1" + "restore-cursor": "1.0.1" } }, "cli-width": { @@ -3437,8 +3445,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", + "center-align": "0.1.3", + "right-align": "0.1.3", "wordwrap": "0.0.2" }, "dependencies": { @@ -3469,10 +3477,10 @@ "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", "dev": true, "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" + "for-own": "1.0.0", + "is-plain-object": "2.0.4", + "kind-of": "6.0.2", + "shallow-clone": "1.0.0" } }, "clone-stats": { @@ -3487,9 +3495,9 @@ "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "dev": true, "requires": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" + "inherits": "2.0.3", + "process-nextick-args": "2.0.0", + "readable-stream": "2.3.6" } }, "co": { @@ -3511,7 +3519,7 @@ "dev": true, "requires": { "argv": "0.0.2", - "request": "^2.81.0", + "request": "2.88.0", "urlgrey": "0.4.4" } }, @@ -3521,12 +3529,12 @@ "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==", "dev": true, "requires": { - "app-root-path": "^2.1.0", - "css-selector-tokenizer": "^0.7.0", - "cssauron": "^1.4.0", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.1" + "app-root-path": "2.1.0", + "css-selector-tokenizer": "0.7.1", + "cssauron": "1.4.0", + "semver-dsl": "1.0.1", + "source-map": "0.5.7", + "sprintf-js": "1.1.2" }, "dependencies": { "source-map": { @@ -3549,9 +3557,9 @@ "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", "dev": true, "requires": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" + "arr-map": "2.0.2", + "for-own": "1.0.0", + "make-iterator": "1.0.1" } }, "collection-visit": { @@ -3559,8 +3567,8 @@ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color-convert": { @@ -3569,7 +3577,7 @@ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { - "color-name": "^1.1.1" + "color-name": "1.1.3" } }, "color-name": { @@ -3605,7 +3613,7 @@ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -3642,7 +3650,7 @@ "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==", "dev": true, "requires": { - "mime-db": ">= 1.38.0 < 2" + "mime-db": "1.38.0" }, "dependencies": { "mime-db": { @@ -3659,13 +3667,13 @@ "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==", "dev": true, "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.5", "bytes": "3.0.0", - "compressible": "~2.0.14", + "compressible": "2.0.16", "debug": "2.6.9", - "on-headers": "~1.0.1", + "on-headers": "1.0.1", "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "vary": "1.1.2" } }, "concat-map": { @@ -3679,10 +3687,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" } }, "configstore": { @@ -3691,12 +3699,12 @@ "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.3.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.4.2", + "xdg-basedir": "3.0.0" } }, "connect": { @@ -3707,7 +3715,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.0", - "parseurl": "~1.3.2", + "parseurl": "1.3.2", "utils-merge": "1.0.1" }, "dependencies": { @@ -3718,12 +3726,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.3.1", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.3.1", + "unpipe": "1.0.0" } }, "statuses": { @@ -3752,7 +3760,7 @@ "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", "dev": true, "requires": { - "date-now": "^0.1.4" + "date-now": "0.1.4" } }, "console-control-strings": { @@ -3803,12 +3811,12 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" } }, "copy-descriptor": { @@ -3822,8 +3830,8 @@ "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", "dev": true, "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "each-props": "1.3.2", + "is-plain-object": "2.0.4" } }, "copy-webpack-plugin": { @@ -3832,14 +3840,14 @@ "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==", "dev": true, "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "globby": "^7.1.1", - "is-glob": "^4.0.0", - "loader-utils": "^1.1.0", - "minimatch": "^3.0.4", - "p-limit": "^1.0.0", - "serialize-javascript": "^1.4.0" + "cacache": "10.0.4", + "find-cache-dir": "1.0.0", + "globby": "7.1.1", + "is-glob": "4.0.0", + "loader-utils": "1.2.3", + "minimatch": "3.0.4", + "p-limit": "1.2.0", + "serialize-javascript": "1.6.1" }, "dependencies": { "globby": { @@ -3848,12 +3856,12 @@ "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "glob": "7.1.2", + "ignore": "3.3.8", + "pify": "3.0.0", + "slash": "1.0.0" } } } @@ -3874,10 +3882,10 @@ "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==", "dev": true, "requires": { - "is-directory": "^0.3.1", - "js-yaml": "^3.9.0", - "parse-json": "^4.0.0", - "require-from-string": "^2.0.1" + "is-directory": "0.3.1", + "js-yaml": "3.11.0", + "parse-json": "4.0.0", + "require-from-string": "2.0.2" }, "dependencies": { "parse-json": { @@ -3886,8 +3894,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.2" } } } @@ -3898,8 +3906,8 @@ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "bn.js": "4.11.8", + "elliptic": "6.4.1" } }, "create-error-class": { @@ -3908,7 +3916,7 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "capture-stack-trace": "^1.0.0" + "capture-stack-trace": "1.0.1" } }, "create-hash": { @@ -3917,11 +3925,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" } }, "create-hmac": { @@ -3930,12 +3938,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.3", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "cross-spawn": { @@ -3944,8 +3952,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "which": "1.3.1" } }, "crypto-browserify": { @@ -3954,17 +3962,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "1.0.1", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.3", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.3", + "pbkdf2": "3.0.17", + "public-encrypt": "4.0.3", + "randombytes": "2.1.0", + "randomfill": "1.0.4" } }, "crypto-random-string": { @@ -3985,9 +3993,9 @@ "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", "dev": true, "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" + "cssesc": "0.1.0", + "fastparse": "1.1.2", + "regexpu-core": "1.0.0" } }, "cssauron": { @@ -3996,7 +4004,7 @@ "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { - "through": "X.X.X" + "through": "2.3.8" } }, "cssesc": { @@ -4017,7 +4025,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "custom-event": { @@ -4038,7 +4046,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "^0.10.9" + "es5-ext": "0.10.44" } }, "d3": { @@ -4088,11 +4096,11 @@ "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz", "integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=", "requires": { - "d3-dispatch": "1", - "d3-drag": "1", - "d3-interpolate": "1", - "d3-selection": "1", - "d3-transition": "1" + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-interpolate": "1.1.6", + "d3-selection": "1.3.0", + "d3-transition": "1.1.1" } }, "d3-color": { @@ -4105,10 +4113,10 @@ "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz", "integrity": "sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==", "requires": { - "d3-collection": "1", - "d3-dispatch": "1", - "d3-quadtree": "1", - "d3-timer": "1" + "d3-collection": "1.0.4", + "d3-dispatch": "1.0.3", + "d3-quadtree": "1.0.3", + "d3-timer": "1.0.7" } }, "d3-format": { @@ -4126,7 +4134,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz", "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==", "requires": { - "d3-color": "1" + "d3-color": "1.0.3" } }, "d3-selection": { @@ -4139,7 +4147,7 @@ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz", "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=", "requires": { - "d3-path": "1" + "d3-path": "1.0.5" } }, "d3-time-format": { @@ -4147,7 +4155,7 @@ "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz", "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==", "requires": { - "d3-time": "1" + "d3-time": "1.0.8" } } } @@ -4167,11 +4175,11 @@ "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz", "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==", "requires": { - "d3-dispatch": "1", - "d3-drag": "1", - "d3-interpolate": "1", - "d3-selection": "1", - "d3-transition": "1" + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-interpolate": "1.3.2", + "d3-selection": "1.4.0", + "d3-transition": "1.1.1" } }, "d3-chord": { @@ -4179,8 +4187,8 @@ "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz", "integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=", "requires": { - "d3-array": "1", - "d3-path": "1" + "d3-array": "1.2.4", + "d3-path": "1.0.5" } }, "d3-collection": { @@ -4203,8 +4211,8 @@ "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz", "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==", "requires": { - "d3-dispatch": "1", - "d3-selection": "1" + "d3-dispatch": "1.0.3", + "d3-selection": "1.4.0" } }, "d3-dsv": { @@ -4212,9 +4220,9 @@ "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz", "integrity": "sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==", "requires": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" + "commander": "2.15.1", + "iconv-lite": "0.4.19", + "rw": "1.3.3" } }, "d3-ease": { @@ -4227,10 +4235,10 @@ "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.0.tgz", "integrity": "sha512-PFLcDnRVANHMudbQlIB87gcfQorEsDIAvRpZ2bNddfM/WxdsEkyrEaOIPoydhH1I1V4HPjNLGOMLXCA0AuGQ9w==", "requires": { - "d3-collection": "1", - "d3-dispatch": "1", - "d3-quadtree": "1", - "d3-timer": "1" + "d3-collection": "1.0.4", + "d3-dispatch": "1.0.3", + "d3-quadtree": "1.0.3", + "d3-timer": "1.0.7" } }, "d3-format": { @@ -4243,7 +4251,7 @@ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz", "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==", "requires": { - "d3-array": "1" + "d3-array": "1.2.4" } }, "d3-hierarchy": { @@ -4256,7 +4264,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz", "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==", "requires": { - "d3-color": "1" + "d3-color": "1.2.3" } }, "d3-path": { @@ -4289,10 +4297,10 @@ "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz", "integrity": "sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==", "requires": { - "d3-collection": "1", - "d3-dispatch": "1", - "d3-dsv": "1", - "xmlhttprequest": "1" + "d3-collection": "1.0.4", + "d3-dispatch": "1.0.3", + "d3-dsv": "1.0.8", + "xmlhttprequest": "1.8.0" } }, "d3-scale": { @@ -4300,13 +4308,13 @@ "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz", "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==", "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-color": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" + "d3-array": "1.2.4", + "d3-collection": "1.0.4", + "d3-color": "1.2.3", + "d3-format": "1.3.2", + "d3-interpolate": "1.3.2", + "d3-time": "1.0.8", + "d3-time-format": "2.1.3" } }, "d3-selection": { @@ -4319,7 +4327,7 @@ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.4.tgz", "integrity": "sha512-izaz4fOpOnY3CD17hkZWNxbaN70sIGagLR/5jb6RS96Y+6VqX+q1BQf1av6QSBRdfULi3Gb8Js4CzG4+KAPjMg==", "requires": { - "d3-path": "1" + "d3-path": "1.0.5" } }, "d3-time": { @@ -4332,7 +4340,7 @@ "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz", "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==", "requires": { - "d3-time": "1" + "d3-time": "1.0.8" } }, "d3-timer": { @@ -4345,12 +4353,12 @@ "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz", "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==", "requires": { - "d3-color": "1", - "d3-dispatch": "1", - "d3-ease": "1", - "d3-interpolate": "1", - "d3-selection": "^1.1.0", - "d3-timer": "1" + "d3-color": "1.2.3", + "d3-dispatch": "1.0.3", + "d3-ease": "1.0.3", + "d3-interpolate": "1.3.2", + "d3-selection": "1.4.0", + "d3-timer": "1.0.7" } }, "d3-voronoi": { @@ -4363,11 +4371,11 @@ "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.1.tgz", "integrity": "sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==", "requires": { - "d3-dispatch": "1", - "d3-drag": "1", - "d3-interpolate": "1", - "d3-selection": "1", - "d3-transition": "1" + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-interpolate": "1.3.2", + "d3-selection": "1.4.0", + "d3-transition": "1.1.1" } }, "dashdash": { @@ -4376,7 +4384,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "date-format": { @@ -4440,7 +4448,7 @@ "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", "dev": true, "requires": { - "kind-of": "^5.0.2" + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -4457,8 +4465,8 @@ "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==", "dev": true, "requires": { - "execa": "^0.10.0", - "ip-regex": "^2.1.0" + "execa": "0.10.0", + "ip-regex": "2.1.0" }, "dependencies": { "cross-spawn": { @@ -4467,11 +4475,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "execa": { @@ -4480,13 +4488,13 @@ "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "6.0.5", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } } } @@ -4503,8 +4511,8 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" + "foreach": "2.0.5", + "object-keys": "1.0.11" } }, "define-property": { @@ -4512,8 +4520,8 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4521,7 +4529,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -4529,7 +4537,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -4537,9 +4545,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -4550,12 +4558,12 @@ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" + "globby": "6.1.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "p-map": "1.2.0", + "pify": "3.0.0", + "rimraf": "2.6.2" }, "dependencies": { "globby": { @@ -4564,11 +4572,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -4599,12 +4607,12 @@ "integrity": "sha1-fP7PXvffuAL60nq49b5a5UbFt54=", "dev": true, "requires": { - "async": "^1.5.2", - "bluebird": "^3.3.5", - "extend-shallow": "^2.0.1", - "lazy-cache": "^1.0.4", - "matched": "^0.4.1", - "rimraf": "^2.5.2" + "async": "1.5.2", + "bluebird": "3.5.1", + "extend-shallow": "2.0.1", + "lazy-cache": "1.0.4", + "matched": "0.4.4", + "rimraf": "2.6.2" }, "dependencies": { "extend-shallow": { @@ -4613,7 +4621,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -4636,8 +4644,8 @@ "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", "dev": true, "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "destroy": { @@ -4658,7 +4666,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "detect-node": { @@ -4685,9 +4693,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "bn.js": "4.11.8", + "miller-rabin": "4.0.1", + "randombytes": "2.1.0" } }, "dir-glob": { @@ -4696,8 +4704,8 @@ "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", "dev": true, "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" + "arrify": "1.0.1", + "path-type": "3.0.0" } }, "dns-equal": { @@ -4712,8 +4720,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "ip": "1.1.5", + "safe-buffer": "5.1.2" } }, "dns-txt": { @@ -4722,7 +4730,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "buffer-indexof": "1.1.1" } }, "doctrine": { @@ -4731,8 +4739,8 @@ "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" + "esutils": "2.0.2", + "isarray": "1.0.0" } }, "dom-serialize": { @@ -4741,10 +4749,10 @@ "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", "dev": true, "requires": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" + "custom-event": "1.0.1", + "ent": "2.2.0", + "extend": "3.0.1", + "void-elements": "2.0.1" } }, "domain-browser": { @@ -4764,7 +4772,7 @@ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "dev": true, "requires": { - "is-obj": "^1.0.0" + "is-obj": "1.0.1" } }, "duplexer": { @@ -4785,10 +4793,10 @@ "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "dev": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" } }, "each-props": { @@ -4797,8 +4805,8 @@ "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", "dev": true, "requires": { - "is-plain-object": "^2.0.1", - "object.defaults": "^1.1.0" + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0" } }, "ecc-jsbn": { @@ -4808,7 +4816,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "~0.1.0" + "jsbn": "0.1.1" } }, "ee-first": { @@ -4829,13 +4837,13 @@ "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "bn.js": "4.11.8", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "emojis-list": { @@ -4856,7 +4864,7 @@ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "~0.4.13" + "iconv-lite": "0.4.19" } }, "end-of-stream": { @@ -4865,7 +4873,7 @@ "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "engine.io": { @@ -4874,12 +4882,12 @@ "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.5", "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" + "debug": "3.1.0", + "engine.io-parser": "2.1.3", + "ws": "3.3.3" }, "dependencies": { "debug": { @@ -4901,14 +4909,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", + "debug": "3.1.0", + "engine.io-parser": "2.1.3", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", + "ws": "3.3.3", + "xmlhttprequest-ssl": "1.5.5", "yeast": "0.1.2" }, "dependencies": { @@ -4930,10 +4938,10 @@ "dev": true, "requires": { "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", + "arraybuffer.slice": "0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.5", - "has-binary2": "~1.0.2" + "has-binary2": "1.0.3" } }, "enhanced-resolve": { @@ -4942,9 +4950,9 @@ "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "tapable": "1.1.1" } }, "ent": { @@ -4965,7 +4973,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "~1.0.1" + "prr": "1.0.1" } }, "error-ex": { @@ -4974,7 +4982,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "error-stack-parser": { @@ -4982,7 +4990,7 @@ "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.1.tgz", "integrity": "sha1-oyArj7AxFKqbQKDjZp5IsrZaAQo=", "requires": { - "stackframe": "^1.0.3" + "stackframe": "1.0.4" } }, "es-abstract": { @@ -4991,11 +4999,11 @@ "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" + "es-to-primitive": "1.1.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "is-callable": "1.1.4", + "is-regex": "1.0.4" } }, "es-to-primitive": { @@ -5004,9 +5012,9 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "^1.1.1", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.1" + "is-callable": "1.1.4", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" } }, "es5-ext": { @@ -5015,9 +5023,9 @@ "integrity": "sha512-TO4Vt9IhW3FzDKLDOpoA8VS9BCV4b9WTf6BqvMOgfoa8wX73F3Kh3y2J7yTstTaXlQ0k1vq4DH2vw6RSs42z+g==", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1", + "next-tick": "1.0.0" } }, "es6-iterator": { @@ -5026,9 +5034,9 @@ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.44", + "es6-symbol": "3.1.1" } }, "es6-map": { @@ -5037,12 +5045,12 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", - "es6-set": "~0.1.5", - "es6-symbol": "~3.1.1", - "event-emitter": "~0.3.5" + "d": "1.0.0", + "es5-ext": "0.10.44", + "es6-iterator": "2.0.3", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" } }, "es6-promise": { @@ -5057,7 +5065,7 @@ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "es6-promise": "^4.0.3" + "es6-promise": "4.2.4" } }, "es6-set": { @@ -5066,11 +5074,11 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14", - "es6-iterator": "~2.0.1", + "d": "1.0.0", + "es5-ext": "0.10.44", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", - "event-emitter": "~0.3.5" + "event-emitter": "0.3.5" } }, "es6-symbol": { @@ -5079,8 +5087,8 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.44" } }, "es6-weak-map": { @@ -5089,10 +5097,10 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "dev": true, "requires": { - "d": "1", - "es5-ext": "^0.10.14", - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "d": "1.0.0", + "es5-ext": "0.10.44", + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "escape-html": { @@ -5113,11 +5121,11 @@ "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "dev": true, "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.2.0" + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" }, "dependencies": { "esprima": { @@ -5139,7 +5147,7 @@ "dev": true, "optional": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -5150,10 +5158,10 @@ "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", "dev": true, "requires": { - "es6-map": "^0.1.3", - "es6-weak-map": "^2.0.1", - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "eslint": { @@ -5209,11 +5217,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -5230,8 +5238,8 @@ "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.2.1", + "estraverse": "4.2.0" } }, "espree": { @@ -5240,8 +5248,8 @@ "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "dev": true, "requires": { - "acorn": "^5.5.0", - "acorn-jsx": "^3.0.0" + "acorn": "5.7.3", + "acorn-jsx": "3.0.1" }, "dependencies": { "acorn": { @@ -5264,7 +5272,7 @@ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "4.2.0" } }, "estraverse": { @@ -5297,8 +5305,8 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "d": "1.0.0", + "es5-ext": "0.10.44" } }, "event-stream": { @@ -5307,13 +5315,13 @@ "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "dev": true, "requires": { - "duplexer": "~0.1.1", - "from": "~0", - "map-stream": "~0.1.0", + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", "pause-stream": "0.0.11", - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" } }, "eventemitter3": { @@ -5334,7 +5342,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "^1.0.0" + "original": "1.0.2" } }, "evp_bytestokey": { @@ -5343,8 +5351,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "md5.js": "1.3.5", + "safe-buffer": "5.1.2" } }, "execa": { @@ -5353,13 +5361,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { @@ -5368,9 +5376,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "lru-cache": "4.1.3", + "shebang-command": "1.2.0", + "which": "1.3.1" } } } @@ -5393,9 +5401,9 @@ "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=", "dev": true, "requires": { - "array-slice": "^0.2.3", - "array-unique": "^0.2.1", - "braces": "^0.1.2" + "array-slice": "0.2.3", + "array-unique": "0.2.1", + "braces": "0.1.5" }, "dependencies": { "array-slice": { @@ -5416,7 +5424,7 @@ "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=", "dev": true, "requires": { - "expand-range": "^0.1.0" + "expand-range": "0.1.1" } } } @@ -5426,13 +5434,13 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -5440,7 +5448,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -5448,7 +5456,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5459,8 +5467,8 @@ "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=", "dev": true, "requires": { - "is-number": "^0.1.1", - "repeat-string": "^0.2.2" + "is-number": "0.1.1", + "repeat-string": "0.2.2" }, "dependencies": { "is-number": { @@ -5483,7 +5491,7 @@ "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=", "dev": true, "requires": { - "os-homedir": "^1.0.1" + "os-homedir": "1.0.2" } }, "express": { @@ -5492,36 +5500,36 @@ "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", "dev": true, "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.5", "array-flatten": "1.1.1", "body-parser": "1.18.3", "content-disposition": "0.5.2", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.3.1", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "finalhandler": "1.1.1", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.2", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.4", + "proxy-addr": "2.0.4", "qs": "6.5.2", - "range-parser": "~1.2.0", + "range-parser": "1.2.0", "safe-buffer": "5.1.2", "send": "0.16.2", "serve-static": "1.13.2", "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", + "statuses": "1.4.0", + "type-is": "1.6.16", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "array-flatten": { @@ -5535,7 +5543,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } } } @@ -5551,8 +5559,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -5560,7 +5568,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -5571,9 +5579,9 @@ "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", "dev": true, "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" + "chardet": "0.7.0", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" }, "dependencies": { "iconv-lite": { @@ -5582,7 +5590,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } } } @@ -5592,14 +5600,14 @@ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -5607,7 +5615,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -5615,7 +5623,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -5623,7 +5631,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -5631,7 +5639,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -5639,9 +5647,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -5658,9 +5666,9 @@ "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", "dev": true, "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "time-stamp": "^1.0.0" + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" } }, "fast-deep-equal": { @@ -5675,12 +5683,12 @@ "integrity": "sha512-TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==", "dev": true, "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.0.1", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.1", - "micromatch": "^3.1.10" + "@mrmlnc/readdir-enhanced": "2.2.1", + "@nodelib/fs.stat": "1.1.2", + "glob-parent": "3.1.0", + "is-glob": "4.0.0", + "merge2": "1.2.2", + "micromatch": "3.1.10" } }, "fast-json-stable-stringify": { @@ -5706,7 +5714,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.7.0" } }, "figgy-pudding": { @@ -5721,8 +5729,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" } }, "file-entry-cache": { @@ -5731,8 +5739,8 @@ "integrity": "sha1-RMYepgeuS+nBQC9B9EJwy/4zT/g=", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "flat-cache": "1.3.0", + "object-assign": "4.1.1" } }, "file-loader": { @@ -5741,8 +5749,8 @@ "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" + "loader-utils": "1.2.3", + "schema-utils": "1.0.0" } }, "fileset": { @@ -5751,8 +5759,8 @@ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", "dev": true, "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" + "glob": "7.1.2", + "minimatch": "3.0.4" } }, "fill-range": { @@ -5760,10 +5768,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -5771,7 +5779,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5783,12 +5791,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.2", + "statuses": "1.4.0", + "unpipe": "1.0.0" } }, "find-cache-dir": { @@ -5797,9 +5805,9 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^2.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "2.0.0" } }, "find-parent-dir": { @@ -5814,7 +5822,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "2.0.0" } }, "findup-sync": { @@ -5823,10 +5831,10 @@ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", "dev": true, "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" + "detect-file": "1.0.0", + "is-glob": "3.1.0", + "micromatch": "3.1.10", + "resolve-dir": "1.0.1" }, "dependencies": { "expand-tilde": { @@ -5835,7 +5843,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.1" } }, "global-modules": { @@ -5844,9 +5852,9 @@ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "1.0.2", + "is-windows": "1.0.2", + "resolve-dir": "1.0.1" } }, "global-prefix": { @@ -5855,11 +5863,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" + "expand-tilde": "2.0.2", + "homedir-polyfill": "1.0.1", + "ini": "1.3.5", + "is-windows": "1.0.2", + "which": "1.3.1" } }, "is-glob": { @@ -5868,7 +5876,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } }, "resolve-dir": { @@ -5877,8 +5885,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" + "expand-tilde": "2.0.2", + "global-modules": "1.0.0" } } } @@ -5889,11 +5897,11 @@ "integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" + "expand-tilde": "2.0.2", + "is-plain-object": "2.0.4", + "object.defaults": "1.1.0", + "object.pick": "1.3.0", + "parse-filepath": "1.0.2" }, "dependencies": { "expand-tilde": { @@ -5902,7 +5910,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.1" } } } @@ -5919,10 +5927,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" }, "dependencies": { "circular-json": { @@ -5937,13 +5945,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" } }, "globby": { @@ -5952,12 +5960,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -5971,7 +5979,8 @@ "flatted": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", - "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==" + "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", + "dev": true }, "flush-write-stream": { "version": "1.0.3", @@ -5979,8 +5988,8 @@ "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "follow-redirects": { @@ -5989,7 +5998,7 @@ "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", "dev": true, "requires": { - "debug": "^3.1.0" + "debug": "3.1.0" }, "dependencies": { "debug": { @@ -6014,7 +6023,7 @@ "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { - "for-in": "^1.0.1" + "for-in": "1.0.2" } }, "foreach": { @@ -6035,9 +6044,9 @@ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { - "asynckit": "^0.4.0", + "asynckit": "0.4.0", "combined-stream": "1.0.6", - "mime-types": "^2.1.12" + "mime-types": "2.1.18" } }, "formatio": { @@ -6046,7 +6055,7 @@ "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=", "dev": true, "requires": { - "samsam": "~1.1" + "samsam": "1.1.2" } }, "forwarded": { @@ -6060,7 +6069,7 @@ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fresh": { @@ -6081,8 +6090,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "front-matter": { @@ -6091,7 +6100,7 @@ "integrity": "sha1-91mDufL0E75ljJPf172M5AePXNs=", "dev": true, "requires": { - "js-yaml": "^3.4.6" + "js-yaml": "3.11.0" } }, "fs-access": { @@ -6100,7 +6109,7 @@ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", "dev": true, "requires": { - "null-check": "^1.0.0" + "null-check": "1.0.0" } }, "fs-exists-sync": { @@ -6115,9 +6124,9 @@ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^3.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" } }, "fs-minipass": { @@ -6126,7 +6135,7 @@ "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "fs-mkdirp-stream": { @@ -6135,8 +6144,8 @@ "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" + "graceful-fs": "4.1.11", + "through2": "2.0.3" } }, "fs-write-stream-atomic": { @@ -6145,10 +6154,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "graceful-fs": "4.1.11", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.6" } }, "fs.realpath": { @@ -6163,8 +6172,8 @@ "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==", "optional": true, "requires": { - "nan": "^2.9.2", - "node-pre-gyp": "^0.10.0" + "nan": "2.10.0", + "node-pre-gyp": "0.10.3" }, "dependencies": { "abbrev": { @@ -6186,8 +6195,8 @@ "bundled": true, "optional": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.6" } }, "balanced-match": { @@ -6198,7 +6207,7 @@ "version": "1.1.11", "bundled": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -6252,7 +6261,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "fs.realpath": { @@ -6265,14 +6274,14 @@ "bundled": true, "optional": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "glob": { @@ -6280,12 +6289,12 @@ "bundled": true, "optional": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-unicode": { @@ -6298,7 +6307,7 @@ "bundled": true, "optional": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "ignore-walk": { @@ -6306,7 +6315,7 @@ "bundled": true, "optional": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "inflight": { @@ -6314,8 +6323,8 @@ "bundled": true, "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6331,7 +6340,7 @@ "version": "1.0.0", "bundled": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "isarray": { @@ -6343,7 +6352,7 @@ "version": "3.0.4", "bundled": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -6354,8 +6363,8 @@ "version": "2.3.5", "bundled": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "minizlib": { @@ -6363,7 +6372,7 @@ "bundled": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "mkdirp": { @@ -6383,9 +6392,9 @@ "bundled": true, "optional": true, "requires": { - "debug": "^2.1.2", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" + "debug": "2.6.9", + "iconv-lite": "0.4.24", + "sax": "1.2.4" } }, "node-pre-gyp": { @@ -6393,16 +6402,16 @@ "bundled": true, "optional": true, "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.4", + "nopt": "4.0.1", + "npm-packlist": "1.2.0", + "npmlog": "4.1.2", + "rc": "1.2.8", + "rimraf": "2.6.3", + "semver": "5.6.0", + "tar": "4.4.8" } }, "nopt": { @@ -6410,8 +6419,8 @@ "bundled": true, "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npm-bundled": { @@ -6424,8 +6433,8 @@ "bundled": true, "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.5" } }, "npmlog": { @@ -6433,10 +6442,10 @@ "bundled": true, "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "number-is-nan": { @@ -6452,7 +6461,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "os-homedir": { @@ -6470,8 +6479,8 @@ "bundled": true, "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "path-is-absolute": { @@ -6489,10 +6498,10 @@ "bundled": true, "optional": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -6507,13 +6516,13 @@ "bundled": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -6521,7 +6530,7 @@ "bundled": true, "optional": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.3" } }, "safe-buffer": { @@ -6557,9 +6566,9 @@ "version": "1.0.2", "bundled": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string_decoder": { @@ -6567,14 +6576,14 @@ "bundled": true, "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { "version": "3.0.1", "bundled": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-json-comments": { @@ -6587,13 +6596,13 @@ "bundled": true, "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "util-deprecate": { @@ -6606,7 +6615,7 @@ "bundled": true, "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "wrappy": { @@ -6625,10 +6634,10 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" } }, "function-bind": { @@ -6643,14 +6652,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" } }, "gaze": { @@ -6659,7 +6668,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "^1.0.0" + "globule": "1.2.1" } }, "generate-function": { @@ -6674,7 +6683,7 @@ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, "requires": { - "is-property": "^1.0.0" + "is-property": "1.0.2" } }, "genfun": { @@ -6712,7 +6721,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -6721,12 +6730,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-parent": { @@ -6734,8 +6743,8 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -6743,7 +6752,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -6754,16 +6763,16 @@ "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=", "dev": true, "requires": { - "extend": "^3.0.0", - "glob": "^7.1.1", - "glob-parent": "^3.1.0", - "is-negated-glob": "^1.0.0", - "ordered-read-streams": "^1.0.0", - "pumpify": "^1.3.5", - "readable-stream": "^2.1.5", - "remove-trailing-separator": "^1.0.1", - "to-absolute-glob": "^2.0.0", - "unique-stream": "^2.0.2" + "extend": "3.0.1", + "glob": "7.1.2", + "glob-parent": "3.1.0", + "is-negated-glob": "1.0.0", + "ordered-read-streams": "1.0.1", + "pumpify": "1.5.1", + "readable-stream": "2.3.6", + "remove-trailing-separator": "1.1.0", + "to-absolute-glob": "2.0.2", + "unique-stream": "2.2.1" } }, "glob-to-regexp": { @@ -6778,10 +6787,10 @@ "integrity": "sha512-fK92r2COMC199WCyGUblrZKhjra3cyVMDiypDdqg1vsSDmexnbYivK1kNR4QItiNXLKmGlqan469ks67RtNa2g==", "dev": true, "requires": { - "async-done": "^1.2.0", - "chokidar": "^2.0.0", - "just-debounce": "^1.0.0", - "object.defaults": "^1.1.0" + "async-done": "1.3.1", + "chokidar": "2.0.3", + "just-debounce": "1.0.0", + "object.defaults": "1.1.0" } }, "global-dirs": { @@ -6790,7 +6799,7 @@ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "dev": true, "requires": { - "ini": "^1.3.4" + "ini": "1.3.5" } }, "global-modules": { @@ -6799,8 +6808,8 @@ "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=", "dev": true, "requires": { - "global-prefix": "^0.1.4", - "is-windows": "^0.2.0" + "global-prefix": "0.1.5", + "is-windows": "0.2.0" }, "dependencies": { "is-windows": { @@ -6817,10 +6826,10 @@ "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.0", - "ini": "^1.3.4", - "is-windows": "^0.2.0", - "which": "^1.2.12" + "homedir-polyfill": "1.0.1", + "ini": "1.3.5", + "is-windows": "0.2.0", + "which": "1.3.1" }, "dependencies": { "is-windows": { @@ -6843,13 +6852,13 @@ "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", "dev": true, "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" + "array-union": "1.0.2", + "dir-glob": "2.0.0", + "fast-glob": "2.2.2", + "glob": "7.1.2", + "ignore": "3.3.8", + "pify": "3.0.0", + "slash": "1.0.0" } }, "globule": { @@ -6869,7 +6878,7 @@ "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "dev": true, "requires": { - "sparkles": "^1.0.0" + "sparkles": "1.0.1" } }, "gonzales-pe-sl": { @@ -6878,7 +6887,7 @@ "integrity": "sha1-aoaLw4BkXxQf7rBCxvl/zHG1n+Y=", "dev": true, "requires": { - "minimist": "1.1.x" + "minimist": "1.1.3" }, "dependencies": { "minimist": { @@ -6895,17 +6904,17 @@ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "dev": true, "requires": { - "create-error-class": "^3.0.0", - "duplexer3": "^0.1.4", - "get-stream": "^3.0.0", - "is-redirect": "^1.0.0", - "is-retry-allowed": "^1.0.0", - "is-stream": "^1.0.0", - "lowercase-keys": "^1.0.0", - "safe-buffer": "^5.0.1", - "timed-out": "^4.0.0", - "unzip-response": "^2.0.1", - "url-parse-lax": "^1.0.0" + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.1", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" } }, "graceful-fs": { @@ -6919,7 +6928,7 @@ "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=", "dev": true, "requires": { - "temp": "~0.4.0" + "temp": "0.4.0" } }, "gulp": { @@ -6928,10 +6937,10 @@ "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=", "dev": true, "requires": { - "glob-watcher": "^5.0.0", - "gulp-cli": "^2.0.0", - "undertaker": "^1.0.0", - "vinyl-fs": "^3.0.0" + "glob-watcher": "5.0.1", + "gulp-cli": "2.0.1", + "undertaker": "1.2.0", + "vinyl-fs": "3.0.3" }, "dependencies": { "camelcase": { @@ -6946,9 +6955,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "gulp-cli": { @@ -6957,24 +6966,24 @@ "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==", "dev": true, "requires": { - "ansi-colors": "^1.0.1", - "archy": "^1.0.0", - "array-sort": "^1.0.0", - "color-support": "^1.1.3", - "concat-stream": "^1.6.0", - "copy-props": "^2.0.1", - "fancy-log": "^1.3.2", - "gulplog": "^1.0.0", - "interpret": "^1.1.0", - "isobject": "^3.0.1", - "liftoff": "^2.5.0", - "matchdep": "^2.0.0", - "mute-stdout": "^1.0.0", - "pretty-hrtime": "^1.0.0", - "replace-homedir": "^1.0.0", - "semver-greatest-satisfied-range": "^1.1.0", - "v8flags": "^3.0.1", - "yargs": "^7.1.0" + "ansi-colors": "1.1.0", + "archy": "1.0.0", + "array-sort": "1.0.0", + "color-support": "1.1.3", + "concat-stream": "1.6.2", + "copy-props": "2.0.4", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "interpret": "1.1.0", + "isobject": "3.0.1", + "liftoff": "2.5.0", + "matchdep": "2.0.0", + "mute-stdout": "1.0.0", + "pretty-hrtime": "1.0.3", + "replace-homedir": "1.0.0", + "semver-greatest-satisfied-range": "1.1.0", + "v8flags": "3.1.0", + "yargs": "7.1.0" } }, "y18n": { @@ -6989,19 +6998,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" } } } @@ -7012,11 +7021,11 @@ "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==", "dev": true, "requires": { - "get-stream": "^3.0.0", - "plugin-error": "^0.1.2", - "through2": "^2.0.1", - "vinyl": "^2.1.0", - "yazl": "^2.1.0" + "get-stream": "3.0.0", + "plugin-error": "0.1.2", + "through2": "2.0.3", + "vinyl": "2.1.0", + "yazl": "2.4.3" } }, "gulplog": { @@ -7025,7 +7034,7 @@ "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { - "glogg": "^1.0.0" + "glogg": "1.0.1" } }, "hammerjs": { @@ -7094,8 +7103,8 @@ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "ajv": "6.9.1", + "har-schema": "2.0.0" }, "dependencies": { "ajv": { @@ -7104,10 +7113,10 @@ "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "2.0.1", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.2.2" } }, "fast-deep-equal": { @@ -7128,7 +7137,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } } } @@ -7139,7 +7148,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -7148,7 +7157,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-binary2": { @@ -7186,7 +7195,7 @@ "integrity": "sha1-omHEwqbGZ+DHe3AKfyl8Oe86pYk=", "dev": true, "requires": { - "is-glob": "^2.0.1" + "is-glob": "2.0.1" }, "dependencies": { "is-extglob": { @@ -7201,7 +7210,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "1.0.0" } } } @@ -7223,9 +7232,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -7233,8 +7242,8 @@ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "kind-of": { @@ -7242,7 +7251,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7253,8 +7262,8 @@ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "hash.js": { @@ -7263,8 +7272,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" } }, "hmac-drbg": { @@ -7273,9 +7282,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "hash.js": "1.1.7", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "homedir-polyfill": { @@ -7284,7 +7293,7 @@ "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", "dev": true, "requires": { - "parse-passwd": "^1.0.0" + "parse-passwd": "1.0.0" } }, "hosted-git-info": { @@ -7299,10 +7308,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" + "inherits": "2.0.3", + "obuf": "1.1.2", + "readable-stream": "2.3.6", + "wbuf": "1.7.3" } }, "html-entities": { @@ -7329,10 +7338,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.4.0" } }, "http-parser-js": { @@ -7347,9 +7356,9 @@ "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" + "eventemitter3": "3.1.0", + "follow-redirects": "1.5.0", + "requires-port": "1.0.0" } }, "http-proxy-agent": { @@ -7358,7 +7367,7 @@ "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, "requires": { - "agent-base": "4", + "agent-base": "4.2.0", "debug": "3.1.0" }, "dependencies": { @@ -7391,9 +7400,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" } }, "https-browserify": { @@ -7408,8 +7417,8 @@ "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", "dev": true, "requires": { - "agent-base": "^4.1.0", - "debug": "^3.1.0" + "agent-base": "4.2.0", + "debug": "3.1.0" }, "dependencies": { "debug": { @@ -7429,7 +7438,7 @@ "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", "dev": true, "requires": { - "ms": "^2.0.0" + "ms": "2.0.0" } }, "iconv-lite": { @@ -7461,7 +7470,7 @@ "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "image-size": { @@ -7483,7 +7492,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "^2.1.0" + "import-from": "2.1.0" } }, "import-from": { @@ -7492,7 +7501,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "import-lazy": { @@ -7507,8 +7516,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "3.0.0", + "resolve-cwd": "2.0.0" }, "dependencies": { "find-up": { @@ -7517,7 +7526,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "locate-path": { @@ -7526,8 +7535,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "p-limit": { @@ -7536,7 +7545,7 @@ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.0.0" } }, "p-locate": { @@ -7545,7 +7554,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.1.0" } }, "p-try": { @@ -7560,7 +7569,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "3.0.0" } } } @@ -7583,7 +7592,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } }, "indexof": { @@ -7598,8 +7607,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -7652,11 +7661,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -7673,8 +7682,8 @@ "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==", "dev": true, "requires": { - "default-gateway": "^2.6.0", - "ipaddr.js": "^1.5.2" + "default-gateway": "2.7.2", + "ipaddr.js": "1.8.0" } }, "interpret": { @@ -7694,7 +7703,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.3.1" } }, "invert-kv": { @@ -7727,8 +7736,8 @@ "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" + "is-relative": "1.0.0", + "is-windows": "1.0.2" } }, "is-accessor-descriptor": { @@ -7736,7 +7745,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7744,7 +7753,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7760,7 +7769,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.11.0" } }, "is-buffer": { @@ -7774,7 +7783,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "^1.0.0" + "builtin-modules": "1.1.1" } }, "is-callable": { @@ -7789,7 +7798,7 @@ "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", "dev": true, "requires": { - "ci-info": "^1.5.0" + "ci-info": "1.6.0" } }, "is-data-descriptor": { @@ -7797,7 +7806,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7805,7 +7814,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7821,9 +7830,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -7855,7 +7864,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-fullwidth-code-point": { @@ -7864,7 +7873,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "is-glob": { @@ -7872,7 +7881,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, "is-installed-globally": { @@ -7881,8 +7890,8 @@ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "dev": true, "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" } }, "is-module": { @@ -7903,11 +7912,11 @@ "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "dev": true, "requires": { - "generate-function": "^2.0.0", - "generate-object-property": "^1.1.0", - "is-my-ip-valid": "^1.0.0", - "jsonpointer": "^4.0.0", - "xtend": "^4.0.0" + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" } }, "is-negated-glob": { @@ -7927,7 +7936,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -7935,7 +7944,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7951,7 +7960,7 @@ "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", "requires": { - "is-number": "^4.0.0" + "is-number": "4.0.0" }, "dependencies": { "is-number": { @@ -7973,7 +7982,7 @@ "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "1.0.1" } }, "is-path-inside": { @@ -7982,7 +7991,7 @@ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "1.0.2" } }, "is-plain-object": { @@ -7990,7 +7999,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-promise": { @@ -8017,7 +8026,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "^1.0.1" + "has": "1.0.3" } }, "is-relative": { @@ -8026,7 +8035,7 @@ "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, "requires": { - "is-unc-path": "^1.0.0" + "is-unc-path": "1.0.0" } }, "is-resolvable": { @@ -8071,7 +8080,7 @@ "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, "requires": { - "unc-path-regex": "^0.1.2" + "unc-path-regex": "0.1.2" } }, "is-utf8": { @@ -8108,7 +8117,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "^1.2.0" + "buffer-alloc": "1.2.0" } }, "isexe": { @@ -8162,11 +8171,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "has-flag": { @@ -8187,7 +8196,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "1.0.0" } } } @@ -8340,10 +8349,10 @@ "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==", "dev": true, "requires": { - "convert-source-map": "^1.5.0", - "istanbul-lib-instrument": "^1.7.3", - "loader-utils": "^1.1.0", - "schema-utils": "^0.3.0" + "convert-source-map": "1.5.1", + "istanbul-lib-instrument": "1.10.1", + "loader-utils": "1.2.3", + "schema-utils": "0.3.0" }, "dependencies": { "ajv": { @@ -8352,10 +8361,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "schema-utils": { @@ -8364,7 +8373,7 @@ "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, "requires": { - "ajv": "^5.0.0" + "ajv": "5.5.2" } } } @@ -8381,13 +8390,13 @@ "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==", "dev": true, "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.2.0", - "semver": "^5.3.0" + "babel-generator": "6.26.1", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.2.0", + "semver": "5.5.0" } }, "jasmine": { @@ -8396,9 +8405,9 @@ "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, "requires": { - "exit": "^0.1.2", - "glob": "^7.0.6", - "jasmine-core": "~2.8.0" + "exit": "0.1.2", + "glob": "7.1.2", + "jasmine-core": "2.8.0" }, "dependencies": { "jasmine-core": { @@ -8489,7 +8498,7 @@ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, "requires": { - "jsonify": "~0.0.0" + "jsonify": "0.0.0" } }, "json-stringify-safe": { @@ -8510,7 +8519,7 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "1.2.0" }, "dependencies": { "minimist": { @@ -8527,7 +8536,7 @@ "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "jsonify": { @@ -8566,11 +8575,11 @@ "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==", "dev": true, "requires": { - "core-js": "~2.3.0", - "es6-promise": "~3.0.2", - "lie": "~3.1.0", - "pako": "~1.0.2", - "readable-stream": "~2.0.6" + "core-js": "2.3.0", + "es6-promise": "3.0.2", + "lie": "3.1.1", + "pako": "1.0.6", + "readable-stream": "2.0.6" }, "dependencies": { "core-js": { @@ -8597,12 +8606,12 @@ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "0.10.31", + "util-deprecate": "1.0.2" } }, "string_decoder": { @@ -8641,6 +8650,7 @@ "http-proxy": "1.17.0", "isbinaryfile": "3.0.3", "lodash": "4.17.11", + "log4js": "3.0.6", "mime": "2.4.0", "minimatch": "3.0.4", "optimist": "0.6.1", @@ -8649,7 +8659,7 @@ "rimraf": "2.6.2", "safe-buffer": "5.1.2", "socket.io": "2.1.1", - "source-map": "^0.6.1", + "source-map": "0.6.1", "tmp": "0.0.33", "useragent": "2.3.0" }, @@ -8658,57 +8668,78 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" } }, + "circular-json": { + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", + "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", + "dev": true + }, "date-format": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", - "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", - "dev": true + "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==" }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "fs-extra": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" } }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "log4js": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz", - "integrity": "sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", + "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", "dev": true, "requires": { - "date-format": "^2.0.0", - "debug": "^3.1.0", - "flatted": "^2.0.0", - "rfdc": "^1.1.2", - "streamroller": "^1.0.1" + "circular-json": "0.5.9", + "date-format": "1.2.0", + "debug": "3.2.6", + "rfdc": "1.1.2", + "streamroller": "0.7.0" + }, + "dependencies": { + "date-format": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", + "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", + "dev": true + }, + "streamroller": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz", + "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", + "dev": true, + "requires": { + "date-format": "1.2.0", + "debug": "3.2.6", + "mkdirp": "0.5.1", + "readable-stream": "2.3.6" + } + } } }, "mime": { @@ -8720,8 +8751,7 @@ "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, "source-map": { "version": "0.6.1", @@ -8733,13 +8763,12 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz", "integrity": "sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==", - "dev": true, "requires": { - "async": "^2.6.1", - "date-format": "^2.0.0", - "debug": "^3.1.0", - "fs-extra": "^7.0.0", - "lodash": "^4.17.10" + "async": "2.6.2", + "date-format": "2.0.0", + "debug": "3.2.6", + "fs-extra": "7.0.1", + "lodash": "4.17.11" } } } @@ -8750,8 +8779,8 @@ "integrity": "sha1-IWh5xorATY1RQOmWGboEtZr9Rs8=", "dev": true, "requires": { - "fs-access": "^1.0.0", - "which": "^1.2.1" + "fs-access": "1.0.1", + "which": "1.3.1" } }, "karma-cli": { @@ -8760,7 +8789,7 @@ "integrity": "sha1-rmw8WKMTodALRRZMRVubhs4X+WA=", "dev": true, "requires": { - "resolve": "^1.1.6" + "resolve": "1.7.1" } }, "karma-coverage-istanbul-reporter": { @@ -8779,7 +8808,7 @@ "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", "dev": true, "requires": { - "jasmine-core": "^3.3" + "jasmine-core": "3.3.0" } }, "karma-jasmine-html-reporter": { @@ -8794,7 +8823,7 @@ "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==", "dev": true, "requires": { - "source-map-support": "^0.5.5" + "source-map-support": "0.5.10" } }, "karma-spec-reporter": { @@ -8803,7 +8832,7 @@ "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=", "dev": true, "requires": { - "colors": "^1.1.2" + "colors": "1.1.2" } }, "killable": { @@ -8823,7 +8852,7 @@ "integrity": "sha1-PTvNhgDnv971MjHHOf8FOu1WDkQ=", "dev": true, "requires": { - "graceful-fs": "^4.1.11" + "graceful-fs": "4.1.11" } }, "known-css-properties": { @@ -8838,8 +8867,8 @@ "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=", "dev": true, "requires": { - "default-resolution": "^2.0.0", - "es6-weak-map": "^2.0.1" + "default-resolution": "2.0.0", + "es6-weak-map": "2.0.2" } }, "latest-version": { @@ -8848,7 +8877,7 @@ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "dev": true, "requires": { - "package-json": "^4.0.0" + "package-json": "4.0.1" } }, "lazy-cache": { @@ -8863,7 +8892,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "^2.0.5" + "readable-stream": "2.3.6" } }, "lcid": { @@ -8872,7 +8901,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "1.0.0" } }, "lead": { @@ -8881,7 +8910,7 @@ "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=", "dev": true, "requires": { - "flush-write-stream": "^1.0.2" + "flush-write-stream": "1.0.3" } }, "less": { @@ -8890,15 +8919,15 @@ "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", "dev": true, "requires": { - "clone": "^2.1.2", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "mime": "^1.4.1", - "mkdirp": "^0.5.0", - "promise": "^7.1.1", - "request": "^2.83.0", - "source-map": "~0.6.0" + "clone": "2.1.2", + "errno": "0.1.7", + "graceful-fs": "4.1.11", + "image-size": "0.5.5", + "mime": "1.6.0", + "mkdirp": "0.5.1", + "promise": "7.3.1", + "request": "2.88.0", + "source-map": "0.6.1" }, "dependencies": { "clone": { @@ -8922,9 +8951,9 @@ "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==", "dev": true, "requires": { - "clone": "^2.1.1", - "loader-utils": "^1.1.0", - "pify": "^3.0.0" + "clone": "2.1.1", + "loader-utils": "1.2.3", + "pify": "3.0.0" } }, "less-plugin-npm-import": { @@ -8933,8 +8962,8 @@ "integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=", "dev": true, "requires": { - "promise": "~7.0.1", - "resolve": "~1.1.6" + "promise": "7.0.4", + "resolve": "1.1.7" }, "dependencies": { "promise": { @@ -8943,7 +8972,7 @@ "integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=", "dev": true, "requires": { - "asap": "~2.0.3" + "asap": "2.0.6" } }, "resolve": { @@ -8960,8 +8989,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "license-webpack-plugin": { @@ -8970,8 +8999,8 @@ "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==", "dev": true, "requires": { - "@types/webpack-sources": "^0.1.5", - "webpack-sources": "^1.2.0" + "@types/webpack-sources": "0.1.5", + "webpack-sources": "1.3.0" } }, "lie": { @@ -8980,7 +9009,7 @@ "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", "dev": true, "requires": { - "immediate": "~3.0.5" + "immediate": "3.0.6" } }, "liftoff": { @@ -8989,14 +9018,14 @@ "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=", "dev": true, "requires": { - "extend": "^3.0.0", - "findup-sync": "^2.0.0", - "fined": "^1.0.1", - "flagged-respawn": "^1.0.0", - "is-plain-object": "^2.0.4", - "object.map": "^1.0.0", - "rechoir": "^0.6.2", - "resolve": "^1.1.7" + "extend": "3.0.1", + "findup-sync": "2.0.0", + "fined": "1.1.0", + "flagged-respawn": "1.0.0", + "is-plain-object": "2.0.4", + "object.map": "1.0.1", + "rechoir": "0.6.2", + "resolve": "1.7.1" } }, "load-json-file": { @@ -9005,11 +9034,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" }, "dependencies": { "pify": { @@ -9032,9 +9061,9 @@ "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" + "big.js": "5.2.2", + "emojis-list": "2.1.0", + "json5": "1.0.1" } }, "locate-path": { @@ -9043,8 +9072,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "2.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -9104,10 +9133,10 @@ "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==", "dev": true, "requires": { - "circular-json": "^0.5.5", - "date-format": "^1.2.0", - "debug": "^3.1.0", - "rfdc": "^1.1.2", + "circular-json": "0.5.9", + "date-format": "1.2.0", + "debug": "3.2.6", + "rfdc": "1.1.2", "streamroller": "0.7.0" }, "dependencies": { @@ -9123,7 +9152,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -9146,13 +9175,19 @@ "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=", "dev": true }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", + "dev": true + }, "loose-envify": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "^3.0.0" + "js-tokens": "3.0.2" } }, "loud-rejection": { @@ -9161,8 +9196,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" } }, "lowercase-keys": { @@ -9177,8 +9212,8 @@ "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "magic-string": { @@ -9187,7 +9222,7 @@ "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==", "dev": true, "requires": { - "sourcemap-codec": "^1.4.4" + "sourcemap-codec": "1.4.4" } }, "make-dir": { @@ -9196,7 +9231,7 @@ "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "make-error": { @@ -9211,17 +9246,17 @@ "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==", "dev": true, "requires": { - "agentkeepalive": "^3.4.1", - "cacache": "^11.0.1", - "http-cache-semantics": "^3.8.1", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", - "lru-cache": "^4.1.2", - "mississippi": "^3.0.0", - "node-fetch-npm": "^2.0.2", - "promise-retry": "^1.1.1", - "socks-proxy-agent": "^4.0.0", - "ssri": "^6.0.0" + "agentkeepalive": "3.5.2", + "cacache": "11.3.2", + "http-cache-semantics": "3.8.1", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.1", + "lru-cache": "4.1.3", + "mississippi": "3.0.0", + "node-fetch-npm": "2.0.2", + "promise-retry": "1.1.1", + "socks-proxy-agent": "4.0.1", + "ssri": "6.0.1" }, "dependencies": { "bluebird": { @@ -9236,20 +9271,20 @@ "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", "dev": true, "requires": { - "bluebird": "^3.5.3", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" }, "dependencies": { "lru-cache": { @@ -9258,7 +9293,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "3.0.3" } } } @@ -9269,12 +9304,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "graceful-fs": { @@ -9289,16 +9324,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.3" } }, "pump": { @@ -9307,8 +9342,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "ssri": { @@ -9317,7 +9352,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "figgy-pudding": "3.5.1" } }, "yallist": { @@ -9334,7 +9369,7 @@ "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" } }, "map-age-cleaner": { @@ -9343,7 +9378,7 @@ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, "requires": { - "p-defer": "^1.0.0" + "p-defer": "1.0.0" } }, "map-cache": { @@ -9368,7 +9403,7 @@ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "mappy-breakpoints": { @@ -9387,9 +9422,9 @@ "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=", "dev": true, "requires": { - "findup-sync": "^2.0.0", - "micromatch": "^3.0.4", - "resolve": "^1.4.0", + "findup-sync": "2.0.0", + "micromatch": "3.1.10", + "resolve": "1.7.1", "stack-trace": "0.0.10" } }, @@ -9399,15 +9434,15 @@ "integrity": "sha1-Vte36xgDPwz5vFLrIJD6x9weifo=", "dev": true, "requires": { - "arr-union": "^3.1.0", - "async-array-reduce": "^0.2.0", - "extend-shallow": "^2.0.1", - "fs-exists-sync": "^0.1.0", - "glob": "^7.0.5", - "has-glob": "^0.1.1", - "is-valid-glob": "^0.3.0", - "lazy-cache": "^2.0.1", - "resolve-dir": "^0.1.0" + "arr-union": "3.1.0", + "async-array-reduce": "0.2.1", + "extend-shallow": "2.0.1", + "fs-exists-sync": "0.1.0", + "glob": "7.1.2", + "has-glob": "0.1.1", + "is-valid-glob": "0.3.0", + "lazy-cache": "2.0.2", + "resolve-dir": "0.1.1" }, "dependencies": { "extend-shallow": { @@ -9416,7 +9451,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "lazy-cache": { @@ -9425,7 +9460,7 @@ "integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=", "dev": true, "requires": { - "set-getter": "^0.1.0" + "set-getter": "0.1.0" } } } @@ -9436,9 +9471,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "hash-base": "3.0.4", + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "media-typer": { @@ -9453,9 +9488,9 @@ "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==", "dev": true, "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^1.0.0", - "p-is-promise": "^1.1.0" + "map-age-cleaner": "0.1.3", + "mimic-fn": "1.2.0", + "p-is-promise": "1.1.0" } }, "memory-fs": { @@ -9464,8 +9499,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.6" } }, "memorystream": { @@ -9480,16 +9515,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" }, "dependencies": { "minimist": { @@ -9529,19 +9564,19 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "miller-rabin": { @@ -9550,8 +9585,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" + "bn.js": "4.11.8", + "brorand": "1.1.0" } }, "mime": { @@ -9573,7 +9608,7 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "~1.33.0" + "mime-db": "1.33.0" } }, "mimic-fn": { @@ -9588,9 +9623,9 @@ "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" + "loader-utils": "1.2.3", + "schema-utils": "1.0.0", + "webpack-sources": "1.3.0" } }, "minimalistic-assert": { @@ -9610,7 +9645,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -9625,8 +9660,8 @@ "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "safe-buffer": "5.1.2", + "yallist": "3.0.3" }, "dependencies": { "yallist": { @@ -9643,7 +9678,7 @@ "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "2.3.5" } }, "mississippi": { @@ -9652,16 +9687,16 @@ "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^2.0.1", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "2.0.1", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.3" } }, "mixin-deep": { @@ -9669,8 +9704,8 @@ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -9678,7 +9713,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -9689,8 +9724,8 @@ "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" + "for-in": "0.1.8", + "is-extendable": "0.1.1" }, "dependencies": { "for-in": { @@ -9735,12 +9770,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "run-queue": "1.0.3" } }, "ms": { @@ -9754,8 +9789,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" + "dns-packet": "1.3.1", + "thunky": "1.0.3" } }, "multicast-dns-service-types": { @@ -9786,18 +9821,18 @@ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-odd": "^2.0.0", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "negotiator": { @@ -9824,34 +9859,34 @@ "integrity": "sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==", "dev": true, "requires": { - "@ngtools/json-schema": "^1.1.0", - "autoprefixer": "^9.0.0", - "browserslist": "^4.0.0", - "chalk": "^2.3.1", - "chokidar": "^2.0.3", - "clean-css": "^4.1.11", - "commander": "^2.12.0", - "fs-extra": "^7.0.0", - "glob": "^7.1.2", - "injection-js": "^2.2.1", - "less": "^3.8.0", - "less-plugin-npm-import": "^2.1.0", - "node-sass": "^4.9.3", - "node-sass-tilde-importer": "^1.0.0", - "opencollective-postinstall": "^2.0.1", - "postcss": "^7.0.0", - "postcss-url": "^8.0.0", - "read-pkg-up": "^4.0.0", - "rimraf": "^2.6.1", - "rollup": "^0.67.0", - "rollup-plugin-commonjs": "^9.1.3", - "rollup-plugin-json": "^3.1.0", - "rollup-plugin-node-resolve": "^4.0.0", - "rollup-plugin-sourcemaps": "^0.4.2", - "rxjs": "^6.0.0", - "stylus": "^0.54.5", - "uglify-js": "^3.0.7", - "update-notifier": "^2.3.0" + "@ngtools/json-schema": "1.1.0", + "autoprefixer": "9.4.6", + "browserslist": "4.4.1", + "chalk": "2.4.2", + "chokidar": "2.0.3", + "clean-css": "4.2.1", + "commander": "2.15.1", + "fs-extra": "7.0.1", + "glob": "7.1.2", + "injection-js": "2.2.1", + "less": "3.9.0", + "less-plugin-npm-import": "2.1.0", + "node-sass": "4.11.0", + "node-sass-tilde-importer": "1.0.2", + "opencollective-postinstall": "2.0.2", + "postcss": "7.0.14", + "postcss-url": "8.0.0", + "read-pkg-up": "4.0.0", + "rimraf": "2.6.2", + "rollup": "0.67.4", + "rollup-plugin-commonjs": "9.2.0", + "rollup-plugin-json": "3.1.0", + "rollup-plugin-node-resolve": "4.0.0", + "rollup-plugin-sourcemaps": "0.4.2", + "rxjs": "6.4.0", + "stylus": "0.54.5", + "uglify-js": "3.4.9", + "update-notifier": "2.5.0" }, "dependencies": { "chalk": { @@ -9860,9 +9895,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "find-up": { @@ -9871,7 +9906,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "fs-extra": { @@ -9880,9 +9915,9 @@ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" } }, "jsonfile": { @@ -9891,7 +9926,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.1.11" } }, "load-json-file": { @@ -9900,10 +9935,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" } }, "locate-path": { @@ -9912,8 +9947,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "p-limit": { @@ -9922,7 +9957,7 @@ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.0.0" } }, "p-locate": { @@ -9931,7 +9966,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.1.0" } }, "p-try": { @@ -9946,8 +9981,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.2" } }, "read-pkg": { @@ -9956,9 +9991,9 @@ "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "load-json-file": "4.0.0", + "normalize-package-data": "2.4.0", + "path-type": "3.0.0" } }, "read-pkg-up": { @@ -9967,8 +10002,8 @@ "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", "dev": true, "requires": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" + "find-up": "3.0.0", + "read-pkg": "3.0.0" } }, "strip-bom": { @@ -9985,20 +10020,13 @@ "integrity": "sha512-IO2zBWMAyAWZgK6zbPhmR3tNRgW+jfi/Z+Xkvaa42w6eYNQ8bEwYv7uxZo/3MQJ5RglxZ+6KsDLXPzjN+ZUEZw==", "dev": true, "requires": { - "deep-freeze-strict": "^1.1.1" + "deep-freeze-strict": "1.1.1" } }, "ngrx-store-localstorage": { - "version": "github:cf-stratos/ngrx-store-localstorage#43f7c6c840abafbfb28c23bec190290d529ba077", + "version": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9", "requires": { "lodash": "4.17.11" - }, - "dependencies": { - "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" - } } }, "ngx-moment": { @@ -10006,7 +10034,7 @@ "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.3.0.tgz", "integrity": "sha512-6fpllpJqLfjRWboOhphgeEYt+rzIA9O29rG5QWCebRt2X0uNk4P93sLEb0S8lbDF0dEp2NOC3UOD+xoCVlJQhA==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "nice-try": { @@ -10021,9 +10049,9 @@ "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", "dev": true, "requires": { - "encoding": "^0.1.11", - "json-parse-better-errors": "^1.0.0", - "safe-buffer": "^5.1.1" + "encoding": "0.1.12", + "json-parse-better-errors": "1.0.2", + "safe-buffer": "5.1.2" } }, "node-forge": { @@ -10044,18 +10072,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.1" }, "dependencies": { "semver": { @@ -10072,28 +10100,28 @@ "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==", "dev": true, "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", + "assert": "1.4.1", + "browserify-zlib": "0.2.0", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "3.0.0", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.0", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.6", + "stream-browserify": "2.0.2", + "stream-http": "2.8.3", + "string_decoder": "1.1.1", + "timers-browserify": "2.0.10", "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", + "url": "0.11.0", + "util": "0.11.1", "vm-browserify": "0.0.4" }, "dependencies": { @@ -10120,7 +10148,7 @@ "integrity": "sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==", "dev": true, "requires": { - "semver": "^5.3.0" + "semver": "5.5.0" } }, "node-sass": { @@ -10129,25 +10157,25 @@ "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", "dev": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.10.0", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.2", + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.clonedeep": "4.5.0", + "lodash.mergewith": "4.6.1", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "nan": "2.10.0", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.0", + "sass-graph": "2.2.4", + "stdout-stream": "1.4.0", + "true-case-path": "1.0.2" }, "dependencies": { "ansi-styles": { @@ -10162,11 +10190,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "supports-color": { @@ -10183,7 +10211,7 @@ "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==", "dev": true, "requires": { - "find-parent-dir": "^0.3.0" + "find-parent-dir": "0.3.0" } }, "nopt": { @@ -10192,7 +10220,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1" + "abbrev": "1.0.9" } }, "normalize-package-data": { @@ -10201,10 +10229,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "is-builtin-module": "^1.0.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.6.0", + "is-builtin-module": "1.0.0", + "semver": "5.5.0", + "validate-npm-package-license": "3.0.3" } }, "normalize-path": { @@ -10212,7 +10240,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } }, "normalize-range": { @@ -10232,7 +10260,7 @@ "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=", "dev": true, "requires": { - "once": "^1.3.2" + "once": "1.4.0" } }, "npm-bundled": { @@ -10247,10 +10275,10 @@ "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", "dev": true, "requires": { - "hosted-git-info": "^2.6.0", - "osenv": "^0.1.5", - "semver": "^5.5.0", - "validate-npm-package-name": "^3.0.0" + "hosted-git-info": "2.6.0", + "osenv": "0.1.5", + "semver": "5.5.0", + "validate-npm-package-name": "3.0.0" } }, "npm-packlist": { @@ -10259,8 +10287,8 @@ "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.6" } }, "npm-pick-manifest": { @@ -10269,9 +10297,9 @@ "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1", - "npm-package-arg": "^6.0.0", - "semver": "^5.4.1" + "figgy-pudding": "3.5.1", + "npm-package-arg": "6.1.0", + "semver": "5.5.0" } }, "npm-registry-fetch": { @@ -10280,12 +10308,12 @@ "integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==", "dev": true, "requires": { - "JSONStream": "^1.3.4", - "bluebird": "^3.5.1", - "figgy-pudding": "^3.4.1", - "lru-cache": "^4.1.3", - "make-fetch-happen": "^4.0.1", - "npm-package-arg": "^6.1.0" + "JSONStream": "1.3.5", + "bluebird": "3.5.1", + "figgy-pudding": "3.5.1", + "lru-cache": "4.1.3", + "make-fetch-happen": "4.0.1", + "npm-package-arg": "6.1.0" } }, "npm-run-all": { @@ -10294,15 +10322,15 @@ "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "memorystream": "^0.3.1", - "minimatch": "^3.0.4", - "pidtree": "^0.3.0", - "read-pkg": "^3.0.0", - "shell-quote": "^1.6.1", - "string.prototype.padend": "^3.0.0" + "ansi-styles": "3.2.1", + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "memorystream": "0.3.1", + "minimatch": "3.0.4", + "pidtree": "0.3.0", + "read-pkg": "3.0.0", + "shell-quote": "1.6.1", + "string.prototype.padend": "3.0.0" }, "dependencies": { "chalk": { @@ -10311,9 +10339,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "cross-spawn": { @@ -10322,11 +10350,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.5.0", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "load-json-file": { @@ -10335,10 +10363,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "graceful-fs": "4.1.11", + "parse-json": "4.0.0", + "pify": "3.0.0", + "strip-bom": "3.0.0" } }, "parse-json": { @@ -10347,8 +10375,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.1", + "json-parse-better-errors": "1.0.2" } }, "read-pkg": { @@ -10357,9 +10385,9 @@ "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "load-json-file": "4.0.0", + "normalize-package-data": "2.4.0", + "path-type": "3.0.0" } }, "strip-bom": { @@ -10376,7 +10404,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" } }, "npmlog": { @@ -10385,10 +10413,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "null-check": { @@ -10432,9 +10460,9 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -10442,7 +10470,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "kind-of": { @@ -10450,7 +10478,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -10466,7 +10494,7 @@ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.assign": { @@ -10475,10 +10503,10 @@ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" + "define-properties": "1.1.2", + "function-bind": "1.1.1", + "has-symbols": "1.0.0", + "object-keys": "1.0.11" } }, "object.defaults": { @@ -10487,10 +10515,10 @@ "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "dev": true, "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" + "array-each": "1.0.1", + "array-slice": "1.1.0", + "for-own": "1.0.0", + "isobject": "3.0.1" } }, "object.map": { @@ -10499,8 +10527,8 @@ "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", "dev": true, "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" + "for-own": "1.0.0", + "make-iterator": "1.0.1" } }, "object.pick": { @@ -10508,7 +10536,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "object.reduce": { @@ -10517,8 +10545,8 @@ "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=", "dev": true, "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" + "for-own": "1.0.0", + "make-iterator": "1.0.1" } }, "obuf": { @@ -10548,7 +10576,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { @@ -10569,7 +10597,7 @@ "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" } }, "optimist": { @@ -10578,8 +10606,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" + "minimist": "0.0.8", + "wordwrap": "0.0.3" }, "dependencies": { "wordwrap": { @@ -10596,12 +10624,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" } }, "ordered-read-streams": { @@ -10610,7 +10638,7 @@ "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.3.6" } }, "original": { @@ -10619,7 +10647,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "^1.4.3" + "url-parse": "1.4.4" } }, "os-browserify": { @@ -10640,7 +10668,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "^1.0.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -10655,8 +10683,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "p-defer": { @@ -10683,7 +10711,7 @@ "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "1.0.0" } }, "p-locate": { @@ -10692,7 +10720,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "1.2.0" } }, "p-map": { @@ -10713,10 +10741,10 @@ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "dev": true, "requires": { - "got": "^6.7.1", - "registry-auth-token": "^3.0.1", - "registry-url": "^3.0.3", - "semver": "^5.1.0" + "got": "6.7.1", + "registry-auth-token": "3.3.2", + "registry-url": "3.1.0", + "semver": "5.5.0" } }, "pacote": { @@ -10725,33 +10753,33 @@ "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==", "dev": true, "requires": { - "bluebird": "^3.5.3", - "cacache": "^11.3.2", - "figgy-pudding": "^3.5.1", - "get-stream": "^4.1.0", - "glob": "^7.1.3", - "lru-cache": "^5.1.1", - "make-fetch-happen": "^4.0.1", - "minimatch": "^3.0.4", - "minipass": "^2.3.5", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "normalize-package-data": "^2.4.0", - "npm-package-arg": "^6.1.0", - "npm-packlist": "^1.1.12", - "npm-pick-manifest": "^2.2.3", - "npm-registry-fetch": "^3.8.0", - "osenv": "^0.1.5", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "protoduck": "^5.0.1", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.2", - "semver": "^5.6.0", - "ssri": "^6.0.1", - "tar": "^4.4.8", - "unique-filename": "^1.1.1", - "which": "^1.3.1" + "bluebird": "3.5.3", + "cacache": "11.3.2", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "glob": "7.1.3", + "lru-cache": "5.1.1", + "make-fetch-happen": "4.0.1", + "minimatch": "3.0.4", + "minipass": "2.3.5", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "normalize-package-data": "2.4.0", + "npm-package-arg": "6.1.0", + "npm-packlist": "1.4.1", + "npm-pick-manifest": "2.2.3", + "npm-registry-fetch": "3.9.0", + "osenv": "0.1.5", + "promise-inflight": "1.0.1", + "promise-retry": "1.1.1", + "protoduck": "5.0.1", + "rimraf": "2.6.2", + "safe-buffer": "5.1.2", + "semver": "5.6.0", + "ssri": "6.0.1", + "tar": "4.4.8", + "unique-filename": "1.1.1", + "which": "1.3.1" }, "dependencies": { "bluebird": { @@ -10766,20 +10794,20 @@ "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", "dev": true, "requires": { - "bluebird": "^3.5.3", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" } }, "get-stream": { @@ -10788,7 +10816,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "glob": { @@ -10797,12 +10825,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "graceful-fs": { @@ -10817,7 +10845,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "3.0.3" } }, "mississippi": { @@ -10826,16 +10854,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.3" } }, "pump": { @@ -10844,8 +10872,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "semver": { @@ -10860,7 +10888,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "figgy-pudding": "3.5.1" } }, "tar": { @@ -10869,13 +10897,13 @@ "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.2.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" } }, "yallist": { @@ -10898,9 +10926,9 @@ "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "parse-asn1": { @@ -10909,12 +10937,12 @@ "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", "dev": true, "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.17", + "safe-buffer": "5.1.2" } }, "parse-filepath": { @@ -10923,9 +10951,9 @@ "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", "dev": true, "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" + "is-absolute": "1.0.0", + "map-cache": "0.2.2", + "path-root": "0.1.1" } }, "parse-json": { @@ -10934,7 +10962,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.1" } }, "parse-passwd": { @@ -10955,7 +10983,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "~1.0.0" + "better-assert": "1.0.2" } }, "parseuri": { @@ -10964,7 +10992,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "~1.0.0" + "better-assert": "1.0.2" } }, "parseurl": { @@ -10984,8 +11012,8 @@ "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", "dev": true, "requires": { - "process": "^0.11.1", - "util": "^0.10.3" + "process": "0.11.10", + "util": "0.10.3" } }, "path-browserify": { @@ -11034,7 +11062,7 @@ "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "dev": true, "requires": { - "path-root-regex": "^0.1.0" + "path-root-regex": "0.1.2" } }, "path-root-regex": { @@ -11055,7 +11083,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "^3.0.0" + "pify": "3.0.0" } }, "pause-stream": { @@ -11064,7 +11092,7 @@ "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "dev": true, "requires": { - "through": "~2.3" + "through": "2.3.8" } }, "pbkdf2": { @@ -11073,11 +11101,11 @@ "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "performance-now": { @@ -11110,7 +11138,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -11119,7 +11147,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "2.1.0" } }, "plugin-error": { @@ -11128,11 +11156,11 @@ "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", "dev": true, "requires": { - "ansi-cyan": "^0.1.1", - "ansi-red": "^0.1.1", - "arr-diff": "^1.0.1", - "arr-union": "^2.0.1", - "extend-shallow": "^1.1.2" + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" }, "dependencies": { "arr-diff": { @@ -11141,8 +11169,8 @@ "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", "dev": true, "requires": { - "arr-flatten": "^1.0.1", - "array-slice": "^0.2.3" + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" } }, "arr-union": { @@ -11163,7 +11191,7 @@ "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", "dev": true, "requires": { - "kind-of": "^1.1.0" + "kind-of": "1.1.0" } }, "kind-of": { @@ -11186,9 +11214,9 @@ "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==", "dev": true, "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" + "async": "1.5.2", + "debug": "2.6.9", + "mkdirp": "0.5.1" } }, "posix-character-classes": { @@ -11202,9 +11230,9 @@ "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "6.1.0" }, "dependencies": { "chalk": { @@ -11213,9 +11241,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" }, "dependencies": { "supports-color": { @@ -11224,7 +11252,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -11241,7 +11269,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -11252,10 +11280,10 @@ "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", "dev": true, "requires": { - "postcss": "^7.0.1", - "postcss-value-parser": "^3.2.3", - "read-cache": "^1.0.0", - "resolve": "^1.1.7" + "postcss": "7.0.14", + "postcss-value-parser": "3.3.1", + "read-cache": "1.0.0", + "resolve": "1.7.1" } }, "postcss-load-config": { @@ -11264,8 +11292,8 @@ "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==", "dev": true, "requires": { - "cosmiconfig": "^4.0.0", - "import-cwd": "^2.0.0" + "cosmiconfig": "4.0.0", + "import-cwd": "2.1.0" } }, "postcss-loader": { @@ -11274,10 +11302,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" + "loader-utils": "1.2.3", + "postcss": "7.0.14", + "postcss-load-config": "2.0.0", + "schema-utils": "1.0.0" } }, "postcss-url": { @@ -11286,11 +11314,11 @@ "integrity": "sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==", "dev": true, "requires": { - "mime": "^2.3.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.0", - "postcss": "^7.0.2", - "xxhashjs": "^0.2.1" + "mime": "2.4.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "postcss": "7.0.14", + "xxhashjs": "0.2.2" }, "dependencies": { "mime": { @@ -11349,7 +11377,7 @@ "dev": true, "optional": true, "requires": { - "asap": "~2.0.3" + "asap": "2.0.6" } }, "promise-inflight": { @@ -11364,8 +11392,8 @@ "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", "dev": true, "requires": { - "err-code": "^1.0.0", - "retry": "^0.10.0" + "err-code": "1.1.2", + "retry": "0.10.1" } }, "protoduck": { @@ -11374,7 +11402,7 @@ "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", "dev": true, "requires": { - "genfun": "^5.0.0" + "genfun": "5.0.0" } }, "protractor": { @@ -11383,22 +11411,22 @@ "integrity": "sha512-6TSYqMhUUzxr4/wN0ttSISqPMKvcVRXF4k8jOEpGWD8OioLak4KLgfzHK9FJ49IrjzRrZ+Mx1q2Op8Rk0zEcnQ==", "dev": true, "requires": { - "@types/node": "^6.0.46", - "@types/q": "^0.0.32", - "@types/selenium-webdriver": "^3.0.0", - "blocking-proxy": "^1.0.0", - "browserstack": "^1.5.1", - "chalk": "^1.1.3", - "glob": "^7.0.3", + "@types/node": "6.14.3", + "@types/q": "0.0.32", + "@types/selenium-webdriver": "3.0.10", + "blocking-proxy": "1.0.1", + "browserstack": "1.5.1", + "chalk": "1.1.3", + "glob": "7.1.2", "jasmine": "2.8.0", - "jasminewd2": "^2.1.0", - "optimist": "~0.6.0", + "jasminewd2": "2.2.0", + "optimist": "0.6.1", "q": "1.4.1", - "saucelabs": "^1.5.0", + "saucelabs": "1.5.0", "selenium-webdriver": "3.6.0", - "source-map-support": "~0.4.0", + "source-map-support": "0.4.18", "webdriver-js-extender": "2.0.0", - "webdriver-manager": "^12.0.6" + "webdriver-manager": "12.1.0" }, "dependencies": { "@types/node": { @@ -11419,11 +11447,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "del": { @@ -11432,13 +11460,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.2" } }, "globby": { @@ -11447,12 +11475,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "minimist": { @@ -11479,7 +11507,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.6" } }, "supports-color": { @@ -11494,17 +11522,17 @@ "integrity": "sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==", "dev": true, "requires": { - "adm-zip": "^0.4.9", - "chalk": "^1.1.1", - "del": "^2.2.0", - "glob": "^7.0.3", - "ini": "^1.3.4", - "minimist": "^1.2.0", - "q": "^1.4.1", - "request": "^2.87.0", - "rimraf": "^2.5.2", - "semver": "^5.3.0", - "xml2js": "^0.4.17" + "adm-zip": "0.4.11", + "chalk": "1.1.3", + "del": "2.2.2", + "glob": "7.1.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "q": "1.4.1", + "request": "2.88.0", + "rimraf": "2.6.2", + "semver": "5.5.0", + "xml2js": "0.4.19" } } } @@ -11515,7 +11543,7 @@ "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", "dev": true, "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.8.0" } }, @@ -11531,7 +11559,7 @@ "integrity": "sha1-mvZ6mdex0BMuUaUDCZ04qNKs4sM=", "dev": true, "requires": { - "table-parser": "^0.1.3" + "table-parser": "0.1.3" } }, "pseudomap": { @@ -11552,12 +11580,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" + "bn.js": "4.11.8", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.4", + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "pump": { @@ -11566,8 +11594,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "pumpify": { @@ -11576,9 +11604,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" + "duplexify": "3.6.0", + "inherits": "2.0.3", + "pump": "2.0.1" } }, "punycode": { @@ -11628,7 +11656,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "^5.1.0" + "safe-buffer": "5.1.2" } }, "randomfill": { @@ -11637,8 +11665,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "range-parser": { @@ -11665,7 +11693,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } } } @@ -11676,8 +11704,8 @@ "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" + "loader-utils": "1.2.3", + "schema-utils": "1.0.0" } }, "rc": { @@ -11686,10 +11714,10 @@ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "deep-extend": "0.6.0", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "minimist": { @@ -11712,7 +11740,7 @@ "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, "requires": { - "pify": "^2.3.0" + "pify": "2.3.0" }, "dependencies": { "pify": { @@ -11729,9 +11757,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" }, "dependencies": { "path-type": { @@ -11740,9 +11768,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -11759,8 +11787,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -11769,8 +11797,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -11779,7 +11807,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } } } @@ -11789,13 +11817,13 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -11803,10 +11831,10 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.6", + "set-immediate-shim": "1.0.1" } }, "readline2": { @@ -11815,8 +11843,8 @@ "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", "mute-stream": "0.0.5" } }, @@ -11826,7 +11854,7 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "^1.1.6" + "resolve": "1.7.1" } }, "redent": { @@ -11835,8 +11863,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" } }, "reflect-metadata": { @@ -11862,8 +11890,8 @@ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexpu-core": { @@ -11872,9 +11900,9 @@ "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", "dev": true, "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" + "regenerate": "1.4.0", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" } }, "registry-auth-token": { @@ -11883,8 +11911,8 @@ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", "dev": true, "requires": { - "rc": "^1.1.6", - "safe-buffer": "^5.0.1" + "rc": "1.2.8", + "safe-buffer": "5.1.2" } }, "registry-url": { @@ -11893,7 +11921,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "^1.0.1" + "rc": "1.2.8" } }, "regjsgen": { @@ -11908,7 +11936,7 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" }, "dependencies": { "jsesc": { @@ -11925,8 +11953,8 @@ "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==", "dev": true, "requires": { - "is-buffer": "^1.1.5", - "is-utf8": "^0.2.1" + "is-buffer": "1.1.6", + "is-utf8": "0.2.1" } }, "remove-bom-stream": { @@ -11935,9 +11963,9 @@ "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=", "dev": true, "requires": { - "remove-bom-buffer": "^3.0.0", - "safe-buffer": "^5.1.0", - "through2": "^2.0.3" + "remove-bom-buffer": "3.0.0", + "safe-buffer": "5.1.2", + "through2": "2.0.3" } }, "remove-trailing-separator": { @@ -11961,7 +11989,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.0.2" } }, "replace-ext": { @@ -11976,9 +12004,9 @@ "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1", - "is-absolute": "^1.0.0", - "remove-trailing-separator": "^1.1.0" + "homedir-polyfill": "1.0.1", + "is-absolute": "1.0.0", + "remove-trailing-separator": "1.1.0" } }, "replace-in-file": { @@ -11987,9 +12015,9 @@ "integrity": "sha512-fto9Ooab00CniGkSjRCZCamER7P5S4mZHQ4w4dLd09nwP3FtFfjUJh8/OVC/In4ki5MEy+dYO5v9r7rtq2DrYQ==", "dev": true, "requires": { - "chalk": "^2.3.2", - "glob": "^7.1.2", - "yargs": "^11.0.0" + "chalk": "2.4.1", + "glob": "7.1.2", + "yargs": "11.1.0" }, "dependencies": { "ansi-regex": { @@ -12010,9 +12038,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "cliui": { @@ -12021,9 +12049,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" } }, "is-fullwidth-code-point": { @@ -12038,9 +12066,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" }, "dependencies": { "mem": { @@ -12049,7 +12077,7 @@ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "1.2.0" } } } @@ -12060,8 +12088,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -12070,7 +12098,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } }, "which-module": { @@ -12091,18 +12119,18 @@ "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.1.1", - "find-up": "^2.1.0", - "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^9.0.2" + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" } }, "yargs-parser": { @@ -12111,7 +12139,7 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -12122,26 +12150,26 @@ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.1.3", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.22", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" }, "dependencies": { "extend": { @@ -12162,7 +12190,7 @@ "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==", "dev": true, "requires": { - "mime-db": "~1.38.0" + "mime-db": "1.38.0" } }, "uuid": { @@ -12179,7 +12207,7 @@ "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" }, "dependencies": { "lodash": { @@ -12197,8 +12225,8 @@ "dev": true, "requires": { "request-promise-core": "1.1.2", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" + "stealthy-require": "1.1.1", + "tough-cookie": "2.4.3" } }, "require-directory": { @@ -12225,8 +12253,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" + "caller-path": "0.1.0", + "resolve-from": "1.0.1" }, "dependencies": { "resolve-from": { @@ -12254,7 +12282,7 @@ "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "1.0.5" } }, "resolve-cwd": { @@ -12263,7 +12291,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-dir": { @@ -12272,8 +12300,8 @@ "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=", "dev": true, "requires": { - "expand-tilde": "^1.2.2", - "global-modules": "^0.2.3" + "expand-tilde": "1.2.2", + "global-modules": "0.2.3" } }, "resolve-from": { @@ -12288,7 +12316,7 @@ "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=", "dev": true, "requires": { - "value-or-function": "^3.0.0" + "value-or-function": "3.0.0" } }, "resolve-url": { @@ -12302,8 +12330,8 @@ "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "exit-hook": "^1.0.0", - "onetime": "^1.0.0" + "exit-hook": "1.1.1", + "onetime": "1.1.0" } }, "ret": { @@ -12320,7 +12348,8 @@ "rfdc": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz", - "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==" + "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==", + "dev": true }, "right-align": { "version": "0.1.3", @@ -12329,7 +12358,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "^0.1.1" + "align-text": "0.1.4" } }, "rimraf": { @@ -12338,7 +12367,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } }, "ripemd160": { @@ -12347,8 +12376,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "3.0.4", + "inherits": "2.0.3" } }, "rollup": { @@ -12358,7 +12387,7 @@ "dev": true, "requires": { "@types/estree": "0.0.39", - "@types/node": "*" + "@types/node": "11.9.4" } }, "rollup-plugin-commonjs": { @@ -12367,10 +12396,10 @@ "integrity": "sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==", "dev": true, "requires": { - "estree-walker": "^0.5.2", - "magic-string": "^0.25.1", - "resolve": "^1.8.1", - "rollup-pluginutils": "^2.3.3" + "estree-walker": "0.5.2", + "magic-string": "0.25.2", + "resolve": "1.10.0", + "rollup-pluginutils": "2.4.1" }, "dependencies": { "path-parse": { @@ -12385,7 +12414,7 @@ "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", "dev": true, "requires": { - "path-parse": "^1.0.6" + "path-parse": "1.0.6" } } } @@ -12396,7 +12425,7 @@ "integrity": "sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==", "dev": true, "requires": { - "rollup-pluginutils": "^2.3.1" + "rollup-pluginutils": "2.4.1" } }, "rollup-plugin-node-resolve": { @@ -12405,9 +12434,9 @@ "integrity": "sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==", "dev": true, "requires": { - "builtin-modules": "^3.0.0", - "is-module": "^1.0.0", - "resolve": "^1.8.1" + "builtin-modules": "3.0.0", + "is-module": "1.0.0", + "resolve": "1.10.0" }, "dependencies": { "builtin-modules": { @@ -12428,7 +12457,7 @@ "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", "dev": true, "requires": { - "path-parse": "^1.0.6" + "path-parse": "1.0.6" } } } @@ -12439,8 +12468,8 @@ "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=", "dev": true, "requires": { - "rollup-pluginutils": "^2.0.1", - "source-map-resolve": "^0.5.0" + "rollup-pluginutils": "2.4.1", + "source-map-resolve": "0.5.2" } }, "rollup-pluginutils": { @@ -12449,8 +12478,8 @@ "integrity": "sha512-wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw==", "dev": true, "requires": { - "estree-walker": "^0.6.0", - "micromatch": "^3.1.10" + "estree-walker": "0.6.0", + "micromatch": "3.1.10" }, "dependencies": { "estree-walker": { @@ -12467,7 +12496,7 @@ "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", "dev": true, "requires": { - "once": "^1.3.0" + "once": "1.4.0" } }, "run-queue": { @@ -12476,7 +12505,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "^1.1.1" + "aproba": "1.2.0" } }, "rw": { @@ -12495,7 +12524,7 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "rxjs-spy": { @@ -12503,11 +12532,11 @@ "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.0.2.tgz", "integrity": "sha512-rSzEEQLH07FPBqmxIC8oeI2Z7tWibvxKxybcKtcc6Cj8Tz178ySDgzgOkoct8dAz5IE/H2jrR2/l+ZYYfpuEXw==", "requires": { - "@types/circular-json": "^0.4.0", - "@types/stacktrace-js": "^0.0.32", - "circular-json": "^0.5.0", - "error-stack-parser": "^2.0.1", - "stacktrace-gps": "^3.0.2" + "@types/circular-json": "0.4.0", + "@types/stacktrace-js": "0.0.32", + "circular-json": "0.5.4", + "error-stack-parser": "2.0.1", + "stacktrace-gps": "3.0.2" } }, "rxjs-tslint": { @@ -12516,10 +12545,10 @@ "integrity": "sha512-odvEAx6VoZSJs5o9gWZ7SxgTuS8ldq0mr4qnprbr6flNtIt4DtNJSYJpBK0WEy0o+f1oe92XVHrmgco1e7Cpdw==", "dev": true, "requires": { - "chalk": "^2.4.0", - "optimist": "^0.6.1", - "tslint": "^5.9.1", - "tsutils": "^2.25.0" + "chalk": "2.4.1", + "optimist": "0.6.1", + "tslint": "5.13.0", + "tsutils": "2.27.1" }, "dependencies": { "chalk": { @@ -12528,9 +12557,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } } } @@ -12550,7 +12579,7 @@ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -12560,7 +12589,7 @@ }, "samsam": { "version": "1.1.2", - "resolved": "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz", "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=", "dev": true }, @@ -12588,9 +12617,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "y18n": { @@ -12605,19 +12634,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" } } } @@ -12628,20 +12657,20 @@ "integrity": "sha1-Yw9pwhaqIGuCMvsqqQe98zNrbYM=", "dev": true, "requires": { - "commander": "^2.8.1", - "eslint": "^2.7.0", + "commander": "2.15.1", + "eslint": "2.13.1", "front-matter": "2.1.2", - "fs-extra": "^3.0.1", - "glob": "^7.0.0", - "globule": "^1.0.0", - "gonzales-pe-sl": "^4.2.3", - "js-yaml": "^3.5.4", - "known-css-properties": "^0.3.0", - "lodash.capitalize": "^4.1.0", - "lodash.kebabcase": "^4.0.0", - "merge": "^1.2.0", - "path-is-absolute": "^1.0.0", - "util": "^0.10.3" + "fs-extra": "3.0.1", + "glob": "7.1.2", + "globule": "1.2.1", + "gonzales-pe-sl": "4.2.3", + "js-yaml": "3.11.0", + "known-css-properties": "0.3.0", + "lodash.capitalize": "4.2.1", + "lodash.kebabcase": "4.1.1", + "merge": "1.2.1", + "path-is-absolute": "1.0.1", + "util": "0.10.3" } }, "sass-loader": { @@ -12650,12 +12679,12 @@ "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", "dev": true, "requires": { - "clone-deep": "^2.0.1", - "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", - "neo-async": "^2.5.0", - "pify": "^3.0.0", - "semver": "^5.5.0" + "clone-deep": "2.0.2", + "loader-utils": "1.2.3", + "lodash.tail": "4.1.1", + "neo-async": "2.6.0", + "pify": "3.0.0", + "semver": "5.5.0" } }, "saucelabs": { @@ -12664,7 +12693,7 @@ "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", "dev": true, "requires": { - "https-proxy-agent": "^2.2.1" + "https-proxy-agent": "2.2.1" } }, "sax": { @@ -12679,9 +12708,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.9.1", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.4.0" } }, "scss-tokenizer": { @@ -12690,8 +12719,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" + "js-base64": "2.4.8", + "source-map": "0.4.4" }, "dependencies": { "source-map": { @@ -12700,7 +12729,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -12717,10 +12746,10 @@ "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, "requires": { - "jszip": "^3.1.3", - "rimraf": "^2.5.4", + "jszip": "3.1.5", + "rimraf": "2.6.2", "tmp": "0.0.30", - "xml2js": "^0.4.17" + "xml2js": "0.4.19" }, "dependencies": { "tmp": { @@ -12729,7 +12758,7 @@ "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", "dev": true, "requires": { - "os-tmpdir": "~1.0.1" + "os-tmpdir": "1.0.2" } } } @@ -12755,7 +12784,7 @@ "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", "dev": true, "requires": { - "semver": "^5.0.3" + "semver": "5.5.0" } }, "semver-dsl": { @@ -12764,7 +12793,7 @@ "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, "requires": { - "semver": "^5.3.0" + "semver": "5.5.0" } }, "semver-greatest-satisfied-range": { @@ -12773,7 +12802,7 @@ "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=", "dev": true, "requires": { - "sver-compat": "^1.5.0" + "sver-compat": "1.5.0" } }, "semver-intersect": { @@ -12782,7 +12811,7 @@ "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", "dev": true, "requires": { - "semver": "^5.0.0" + "semver": "5.5.0" } }, "send": { @@ -12792,18 +12821,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", + "http-errors": "1.6.3", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.4.0" }, "dependencies": { "mime": { @@ -12826,13 +12855,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.5", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.18", + "parseurl": "1.3.2" } }, "serve-static": { @@ -12841,9 +12870,9 @@ "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.2", "send": "0.16.2" } }, @@ -12859,7 +12888,7 @@ "integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=", "dev": true, "requires": { - "to-object-path": "^0.3.0" + "to-object-path": "0.3.0" } }, "set-immediate-shim": { @@ -12872,10 +12901,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -12883,7 +12912,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -12906,8 +12935,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.3", + "safe-buffer": "5.1.2" } }, "shallow-clone": { @@ -12916,9 +12945,9 @@ "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" + "is-extendable": "0.1.1", + "kind-of": "5.1.0", + "mixin-object": "2.0.1" }, "dependencies": { "kind-of": { @@ -12935,7 +12964,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -12950,10 +12979,10 @@ "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", "dev": true, "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" + "array-filter": "0.0.1", + "array-map": "0.0.0", + "array-reduce": "0.0.0", + "jsonify": "0.0.0" } }, "shelljs": { @@ -12977,7 +13006,7 @@ "formatio": "1.1.1", "lolex": "1.3.2", "samsam": "1.1.2", - "util": ">=0.10.3 <1" + "util": "0.10.3" } }, "slash": { @@ -13003,14 +13032,14 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.6", + "source-map-resolve": "0.5.2", + "use": "3.1.0" }, "dependencies": { "define-property": { @@ -13018,7 +13047,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -13026,7 +13055,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -13036,9 +13065,9 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -13046,7 +13075,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -13054,7 +13083,7 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-data-descriptor": { @@ -13062,7 +13091,7 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.2" } }, "is-descriptor": { @@ -13070,9 +13099,9 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.2" } } } @@ -13082,7 +13111,7 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -13090,7 +13119,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -13101,12 +13130,12 @@ "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", + "debug": "3.1.0", + "engine.io": "3.2.1", + "has-binary2": "1.0.3", + "socket.io-adapter": "1.1.1", "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" + "socket.io-parser": "3.2.0" }, "dependencies": { "debug": { @@ -13136,15 +13165,15 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", + "debug": "3.1.0", + "engine.io-client": "3.2.1", + "has-binary2": "1.0.3", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", + "socket.io-parser": "3.2.0", "to-array": "0.1.4" }, "dependencies": { @@ -13166,7 +13195,7 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "~3.1.0", + "debug": "3.1.0", "isarray": "2.0.1" }, "dependencies": { @@ -13193,8 +13222,8 @@ "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", "dev": true, "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "faye-websocket": "0.10.0", + "uuid": "3.2.1" } }, "sockjs-client": { @@ -13203,12 +13232,12 @@ "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", "dev": true, "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" + "debug": "3.2.6", + "eventsource": "1.0.7", + "faye-websocket": "0.11.1", + "inherits": "2.0.3", + "json3": "3.3.2", + "url-parse": "1.4.4" }, "dependencies": { "debug": { @@ -13217,7 +13246,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "faye-websocket": { @@ -13226,7 +13255,7 @@ "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.7.0" } }, "ms": { @@ -13243,7 +13272,7 @@ "integrity": "sha512-+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA==", "dev": true, "requires": { - "ip": "^1.1.5", + "ip": "1.1.5", "smart-buffer": "4.0.2" } }, @@ -13253,8 +13282,8 @@ "integrity": "sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==", "dev": true, "requires": { - "agent-base": "~4.2.0", - "socks": "~2.2.0" + "agent-base": "4.2.0", + "socks": "2.2.3" } }, "source-list-map": { @@ -13274,8 +13303,8 @@ "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", "dev": true, "requires": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" + "async": "2.6.2", + "loader-utils": "1.2.3" }, "dependencies": { "async": { @@ -13284,7 +13313,7 @@ "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "dev": true, "requires": { - "lodash": "^4.17.11" + "lodash": "4.17.11" } }, "lodash": { @@ -13300,11 +13329,11 @@ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.1", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -13313,8 +13342,8 @@ "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.0", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -13348,8 +13377,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.0" } }, "spdx-exceptions": { @@ -13364,8 +13393,8 @@ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.0" } }, "spdx-license-ids": { @@ -13380,11 +13409,11 @@ "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==", "dev": true, "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" + "debug": "4.1.1", + "handle-thing": "2.0.0", + "http-deceiver": "1.2.7", + "select-hose": "2.0.0", + "spdy-transport": "3.0.0" }, "dependencies": { "debug": { @@ -13393,7 +13422,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -13410,12 +13439,12 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "debug": "4.1.1", + "detect-node": "2.0.4", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "3.1.1", + "wbuf": "1.7.3" }, "dependencies": { "debug": { @@ -13424,7 +13453,7 @@ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -13439,9 +13468,9 @@ "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "inherits": "2.0.3", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -13452,7 +13481,7 @@ "integrity": "sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==", "dev": true, "requires": { - "chalk": "^2.0.1" + "chalk": "2.2.2" } }, "split": { @@ -13461,7 +13490,7 @@ "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", "dev": true, "requires": { - "through": "2" + "through": "2.3.8" } }, "split-string": { @@ -13469,7 +13498,7 @@ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { @@ -13484,14 +13513,14 @@ "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "tweetnacl": "~0.14.0" + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" } }, "ssri": { @@ -13500,7 +13529,7 @@ "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "dev": true, "requires": { - "safe-buffer": "^5.1.1" + "safe-buffer": "5.1.2" } }, "stack-trace": { @@ -13520,7 +13549,7 @@ "integrity": "sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg==", "requires": { "source-map": "0.5.6", - "stackframe": "^1.0.4" + "stackframe": "1.0.4" } }, "static-extend": { @@ -13528,8 +13557,8 @@ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -13537,7 +13566,7 @@ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -13563,7 +13592,7 @@ "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.3.6" } }, "stealthy-require": { @@ -13577,7 +13606,7 @@ "resolved": "https://registry.npmjs.org/stratos-angular6-json-schema-form/-/stratos-angular6-json-schema-form-7.0.6.tgz", "integrity": "sha512-S/yasSZ+1YNPsiTARCqaPOW8+5ob+9jfOO0XxJ/myDlSTtgoNb4nGnl3LWlEFwMUWiOjkOUVyyVlBsiK5vIBTg==", "requires": { - "tslib": "^1.9.0" + "tslib": "1.9.3" } }, "stratos-merge-dirs": { @@ -13586,10 +13615,10 @@ "integrity": "sha512-4StuTlfzL6LXdx+/r0zIm+ayxyPKP0+8338OBn448WursU5njivXu29Av2WXcqmjzcHH48hmmmfHFeBTPsuJCQ==", "dev": true, "requires": { - "inquirer": "^0.11.0", - "minimist": "^1.2.0", - "node-fs": "~0.1.7", - "path": "^0.12.7" + "inquirer": "0.11.4", + "minimist": "1.2.0", + "node-fs": "0.1.7", + "path": "0.12.7" }, "dependencies": { "ansi-styles": { @@ -13604,11 +13633,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "cli-width": { @@ -13623,19 +13652,19 @@ "integrity": "sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=", "dev": true, "requires": { - "ansi-escapes": "^1.1.0", - "ansi-regex": "^2.0.0", - "chalk": "^1.0.0", - "cli-cursor": "^1.0.1", - "cli-width": "^1.0.1", - "figures": "^1.3.5", - "lodash": "^3.3.1", - "readline2": "^1.0.1", - "run-async": "^0.1.0", - "rx-lite": "^3.1.2", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.0", - "through": "^2.3.6" + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "1.1.1", + "figures": "1.7.0", + "lodash": "3.10.1", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" } }, "lodash": { @@ -13664,11 +13693,11 @@ "integrity": "sha512-e87eX4LB+KLVOfEF/TeWpNYM9aQFJTO+jsslym7zCZLYd8xlNWZUjmUf00J0DWn7YpoNGdjv0wzkKPcXJ2c5uw==", "dev": true, "requires": { - "circular-json": "^0.3.1", - "fs-extra": "^3.0.1", - "klaw-sync": "^2.1.0", - "mkdirp": "~0.3.5", - "underscore": "~1.6.0" + "circular-json": "0.3.3", + "fs-extra": "3.0.1", + "klaw-sync": "2.1.0", + "mkdirp": "0.3.5", + "underscore": "1.6.0" }, "dependencies": { "circular-json": { @@ -13691,8 +13720,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.3", + "readable-stream": "2.3.6" } }, "stream-combiner": { @@ -13701,7 +13730,7 @@ "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "dev": true, "requires": { - "duplexer": "~0.1.1" + "duplexer": "0.1.1" } }, "stream-each": { @@ -13710,8 +13739,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" } }, "stream-exhaust": { @@ -13726,11 +13755,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" } }, "stream-shift": { @@ -13745,10 +13774,10 @@ "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==", "dev": true, "requires": { - "date-format": "^1.2.0", - "debug": "^3.1.0", - "mkdirp": "^0.5.1", - "readable-stream": "^2.3.0" + "date-format": "1.2.0", + "debug": "3.2.6", + "mkdirp": "0.5.1", + "readable-stream": "2.3.6" }, "dependencies": { "debug": { @@ -13757,7 +13786,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "ms": { @@ -13774,9 +13803,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "string.prototype.padend": { @@ -13785,9 +13814,9 @@ "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.4.3", - "function-bind": "^1.0.2" + "define-properties": "1.1.2", + "es-abstract": "1.12.0", + "function-bind": "1.1.1" } }, "string_decoder": { @@ -13795,7 +13824,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -13804,7 +13833,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "strip-bom": { @@ -13813,7 +13842,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -13828,7 +13857,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -13843,8 +13872,8 @@ "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" + "loader-utils": "1.2.3", + "schema-utils": "1.0.0" } }, "stylus": { @@ -13853,12 +13882,12 @@ "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { - "css-parse": "1.7.x", - "debug": "*", - "glob": "7.0.x", - "mkdirp": "0.5.x", - "sax": "0.5.x", - "source-map": "0.1.x" + "css-parse": "1.7.0", + "debug": "2.6.9", + "glob": "7.0.6", + "mkdirp": "0.5.1", + "sax": "0.5.8", + "source-map": "0.1.43" }, "dependencies": { "glob": { @@ -13867,12 +13896,12 @@ "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "source-map": { @@ -13881,7 +13910,7 @@ "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -13892,9 +13921,9 @@ "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" + "loader-utils": "1.2.3", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" } }, "supports-color": { @@ -13903,7 +13932,7 @@ "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "sver-compat": { @@ -13912,8 +13941,8 @@ "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=", "dev": true, "requires": { - "es6-iterator": "^2.0.1", - "es6-symbol": "^3.1.1" + "es6-iterator": "2.0.3", + "es6-symbol": "3.1.1" } }, "symbol-observable": { @@ -13933,7 +13962,7 @@ "chalk": "1.1.3", "lodash": "4.17.11", "slice-ansi": "0.0.4", - "string-width": "^2.0.0" + "string-width": "2.1.1" }, "dependencies": { "ajv": { @@ -13942,8 +13971,8 @@ "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", "dev": true, "requires": { - "co": "^4.6.0", - "json-stable-stringify": "^1.0.1" + "co": "4.6.0", + "json-stable-stringify": "1.0.1" } }, "ajv-keywords": { @@ -13970,11 +13999,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "is-fullwidth-code-point": { @@ -13989,8 +14018,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "strip-ansi": { @@ -13999,7 +14028,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -14018,7 +14047,7 @@ "integrity": "sha1-BEHPzhallIFoTCfRtaZ/8VpDx7A=", "dev": true, "requires": { - "connected-domain": "^1.0.0" + "connected-domain": "1.0.0" } }, "tapable": { @@ -14033,9 +14062,9 @@ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" } }, "temp": { @@ -14050,7 +14079,7 @@ "integrity": "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=", "dev": true, "requires": { - "rimraf": "~2.5.2" + "rimraf": "2.5.4" }, "dependencies": { "rimraf": { @@ -14059,7 +14088,7 @@ "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "7.1.2" } } } @@ -14070,7 +14099,7 @@ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "execa": "^0.7.0" + "execa": "0.7.0" } }, "terser": { @@ -14079,9 +14108,9 @@ "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==", "dev": true, "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1", - "source-map-support": "~0.5.9" + "commander": "2.17.1", + "source-map": "0.6.1", + "source-map-support": "0.5.10" }, "dependencies": { "commander": { @@ -14104,14 +14133,14 @@ "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==", "dev": true, "requires": { - "cacache": "^11.0.2", - "find-cache-dir": "^2.0.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "terser": "^3.16.1", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" + "cacache": "11.3.2", + "find-cache-dir": "2.0.0", + "schema-utils": "1.0.0", + "serialize-javascript": "1.6.1", + "source-map": "0.6.1", + "terser": "3.16.1", + "webpack-sources": "1.3.0", + "worker-farm": "1.6.0" }, "dependencies": { "bluebird": { @@ -14126,20 +14155,20 @@ "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", "dev": true, "requires": { - "bluebird": "^3.5.3", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.2", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" } }, "find-cache-dir": { @@ -14148,9 +14177,9 @@ "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^1.0.0", - "pkg-dir": "^3.0.0" + "commondir": "1.0.1", + "make-dir": "1.3.0", + "pkg-dir": "3.0.0" } }, "find-up": { @@ -14159,7 +14188,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "glob": { @@ -14168,12 +14197,12 @@ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "graceful-fs": { @@ -14188,8 +14217,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "lru-cache": { @@ -14198,7 +14227,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "3.0.3" } }, "mississippi": { @@ -14207,16 +14236,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.3" } }, "p-limit": { @@ -14225,7 +14254,7 @@ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.0.0" } }, "p-locate": { @@ -14234,7 +14263,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.1.0" } }, "p-try": { @@ -14249,7 +14278,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "3.0.0" } }, "pump": { @@ -14258,8 +14287,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "source-map": { @@ -14274,7 +14303,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "figgy-pudding": "3.5.1" } }, "yallist": { @@ -14303,8 +14332,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "^2.1.5", - "xtend": "~4.0.1" + "readable-stream": "2.3.6", + "xtend": "4.0.1" } }, "through2-filter": { @@ -14313,8 +14342,8 @@ "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "dev": true, "requires": { - "through2": "~2.0.0", - "xtend": "~4.0.0" + "through2": "2.0.3", + "xtend": "4.0.1" } }, "thunky": { @@ -14341,7 +14370,7 @@ "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", "dev": true, "requires": { - "setimmediate": "^1.0.4" + "setimmediate": "1.0.5" } }, "tmp": { @@ -14350,7 +14379,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-absolute-glob": { @@ -14359,8 +14388,8 @@ "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=", "dev": true, "requires": { - "is-absolute": "^1.0.0", - "is-negated-glob": "^1.0.0" + "is-absolute": "1.0.0", + "is-negated-glob": "1.0.0" } }, "to-array": { @@ -14386,7 +14415,7 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -14394,7 +14423,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -14404,10 +14433,10 @@ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -14415,8 +14444,8 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "to-through": { @@ -14425,7 +14454,7 @@ "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=", "dev": true, "requires": { - "through2": "^2.0.3" + "through2": "2.0.3" } }, "tough-cookie": { @@ -14434,8 +14463,8 @@ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "1.1.31", + "punycode": "1.4.1" }, "dependencies": { "punycode": { @@ -14470,7 +14499,7 @@ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, "requires": { - "glob": "^6.0.4" + "glob": "6.0.4" }, "dependencies": { "glob": { @@ -14479,11 +14508,11 @@ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "dev": true, "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } } } @@ -14499,16 +14528,16 @@ "integrity": "sha1-u9KOOK9Kqj6WB2xGbhsiAZfBo84=", "dev": true, "requires": { - "arrify": "^1.0.0", - "chalk": "^2.0.0", - "diff": "^3.1.0", - "make-error": "^1.1.1", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.0", - "tsconfig": "^6.0.0", - "v8flags": "^3.0.0", - "yn": "^2.0.0" + "arrify": "1.0.1", + "chalk": "2.2.2", + "diff": "3.5.0", + "make-error": "1.3.4", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "source-map-support": "0.4.18", + "tsconfig": "6.0.0", + "v8flags": "3.1.0", + "yn": "2.0.0" }, "dependencies": { "minimist": { @@ -14523,7 +14552,7 @@ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", "dev": true, "requires": { - "source-map": "^0.5.6" + "source-map": "0.5.6" } } } @@ -14534,8 +14563,8 @@ "integrity": "sha1-aw6DdgA9evGGT434+J3QBZ/80DI=", "dev": true, "requires": { - "strip-bom": "^3.0.0", - "strip-json-comments": "^2.0.0" + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1" }, "dependencies": { "strip-bom": { @@ -14588,19 +14617,19 @@ "integrity": "sha512-ECOOQRxXCYnUUePG5h/+Z1Zouobk3KFpIHA9aKBB/nnMxs97S1JJPDGt5J4cGm1y9U9VmVlfboOxA8n1kSNzGw==", "dev": true, "requires": { - "babel-code-frame": "^6.22.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^3.2.0", - "glob": "^7.1.1", - "js-yaml": "^3.7.0", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.27.2" + "babel-code-frame": "6.26.0", + "builtin-modules": "1.1.1", + "chalk": "2.4.2", + "commander": "2.15.1", + "diff": "3.5.0", + "glob": "7.1.2", + "js-yaml": "3.11.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "resolve": "1.7.1", + "semver": "5.5.0", + "tslib": "1.9.3", + "tsutils": "2.29.0" }, "dependencies": { "chalk": { @@ -14609,9 +14638,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" } }, "tsutils": { @@ -14620,7 +14649,7 @@ "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "tslib": "^1.8.1" + "tslib": "1.9.3" } } } @@ -14631,7 +14660,7 @@ "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==", "dev": true, "requires": { - "tslib": "^1.8.1" + "tslib": "1.9.3" } }, "tty-browserify": { @@ -14646,7 +14675,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -14662,7 +14691,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-is": { @@ -14672,7 +14701,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "2.1.18" } }, "typedarray": { @@ -14693,8 +14722,8 @@ "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", "dev": true, "requires": { - "commander": "~2.17.1", - "source-map": "~0.6.1" + "commander": "2.17.1", + "source-map": "0.6.1" }, "dependencies": { "commander": { @@ -14735,15 +14764,15 @@ "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=", "dev": true, "requires": { - "arr-flatten": "^1.0.1", - "arr-map": "^2.0.0", - "bach": "^1.0.0", - "collection-map": "^1.0.0", - "es6-weak-map": "^2.0.1", - "last-run": "^1.1.0", - "object.defaults": "^1.0.0", - "object.reduce": "^1.0.0", - "undertaker-registry": "^1.0.0" + "arr-flatten": "1.1.0", + "arr-map": "2.0.2", + "bach": "1.2.0", + "collection-map": "1.0.0", + "es6-weak-map": "2.0.2", + "last-run": "1.1.1", + "object.defaults": "1.1.0", + "object.reduce": "1.0.1", + "undertaker-registry": "1.0.1" } }, "undertaker-registry": { @@ -14757,10 +14786,10 @@ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "0.4.3" }, "dependencies": { "extend-shallow": { @@ -14768,7 +14797,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "set-value": { @@ -14776,10 +14805,10 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "to-object-path": "0.3.0" } } } @@ -14790,7 +14819,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "^2.0.0" + "unique-slug": "2.0.1" } }, "unique-slug": { @@ -14799,7 +14828,7 @@ "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", "dev": true, "requires": { - "imurmurhash": "^0.1.4" + "imurmurhash": "0.1.4" } }, "unique-stream": { @@ -14808,8 +14837,8 @@ "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "dev": true, "requires": { - "json-stable-stringify": "^1.0.0", - "through2-filter": "^2.0.0" + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" } }, "unique-string": { @@ -14818,7 +14847,7 @@ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "crypto-random-string": "^1.0.0" + "crypto-random-string": "1.0.0" } }, "universalify": { @@ -14837,8 +14866,8 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -14846,9 +14875,9 @@ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -14885,16 +14914,16 @@ "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" + "boxen": "1.3.0", + "chalk": "2.2.2", + "configstore": "3.1.2", + "import-lazy": "2.1.0", + "is-ci": "1.2.1", + "is-installed-globally": "0.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" } }, "uri-js": { @@ -14903,7 +14932,7 @@ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } }, "urix": { @@ -14935,8 +14964,8 @@ "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==", "dev": true, "requires": { - "querystringify": "^2.0.0", - "requires-port": "^1.0.0" + "querystringify": "2.1.0", + "requires-port": "1.0.0" } }, "url-parse-lax": { @@ -14945,7 +14974,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "^1.0.1" + "prepend-http": "1.0.4" } }, "urlgrey": { @@ -14959,7 +14988,7 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.2" } }, "user-home": { @@ -14968,7 +14997,7 @@ "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", "dev": true, "requires": { - "os-homedir": "^1.0.0" + "os-homedir": "1.0.2" } }, "useragent": { @@ -14977,8 +15006,8 @@ "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" + "lru-cache": "4.1.3", + "tmp": "0.0.33" } }, "util": { @@ -15021,7 +15050,7 @@ "integrity": "sha512-0m69VIK2dudEf2Ub0xwLQhZkDZu85OmiOpTw+UGDt56ibviYICHziM/3aE+oVg7IjGPp0c83w3eSVqa+lYZ9UQ==", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.1" } }, "validate-npm-package-license": { @@ -15030,8 +15059,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" } }, "validate-npm-package-name": { @@ -15040,7 +15069,7 @@ "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", "dev": true, "requires": { - "builtins": "^1.0.3" + "builtins": "1.0.3" } }, "value-or-function": { @@ -15061,9 +15090,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "vinyl": { @@ -15072,12 +15101,12 @@ "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", "dev": true, "requires": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.1.2", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" } }, "vinyl-fs": { @@ -15086,23 +15115,23 @@ "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==", "dev": true, "requires": { - "fs-mkdirp-stream": "^1.0.0", - "glob-stream": "^6.1.0", - "graceful-fs": "^4.0.0", - "is-valid-glob": "^1.0.0", - "lazystream": "^1.0.0", - "lead": "^1.0.0", - "object.assign": "^4.0.4", - "pumpify": "^1.3.5", - "readable-stream": "^2.3.3", - "remove-bom-buffer": "^3.0.0", - "remove-bom-stream": "^1.2.0", - "resolve-options": "^1.1.0", - "through2": "^2.0.0", - "to-through": "^2.0.0", - "value-or-function": "^3.0.0", - "vinyl": "^2.0.0", - "vinyl-sourcemap": "^1.1.0" + "fs-mkdirp-stream": "1.0.0", + "glob-stream": "6.1.0", + "graceful-fs": "4.1.11", + "is-valid-glob": "1.0.0", + "lazystream": "1.0.0", + "lead": "1.0.0", + "object.assign": "4.1.0", + "pumpify": "1.5.1", + "readable-stream": "2.3.6", + "remove-bom-buffer": "3.0.0", + "remove-bom-stream": "1.2.0", + "resolve-options": "1.1.0", + "through2": "2.0.3", + "to-through": "2.0.0", + "value-or-function": "3.0.0", + "vinyl": "2.1.0", + "vinyl-sourcemap": "1.1.0" }, "dependencies": { "is-valid-glob": { @@ -15119,13 +15148,13 @@ "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=", "dev": true, "requires": { - "append-buffer": "^1.0.2", - "convert-source-map": "^1.5.0", - "graceful-fs": "^4.1.6", - "normalize-path": "^2.1.1", - "now-and-later": "^2.0.0", - "remove-bom-buffer": "^3.0.0", - "vinyl": "^2.0.0" + "append-buffer": "1.0.2", + "convert-source-map": "1.5.1", + "graceful-fs": "4.1.11", + "normalize-path": "2.1.1", + "now-and-later": "2.0.0", + "remove-bom-buffer": "3.0.0", + "vinyl": "2.1.0" } }, "viz.js": { @@ -15155,9 +15184,9 @@ "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "chokidar": "2.0.3", + "graceful-fs": "4.1.11", + "neo-async": "2.6.0" } }, "wbuf": { @@ -15166,7 +15195,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "1.0.1" } }, "web-animations-js": { @@ -15180,8 +15209,8 @@ "integrity": "sha512-fbyKiVu3azzIc5d4+26YfuPQcFTlgFQV5yQ/0OQj4Ybkl4g1YQuIPskf5v5wqwRJhHJnPHthB6tqCjWHOKLWag==", "dev": true, "requires": { - "@types/selenium-webdriver": "^3.0.0", - "selenium-webdriver": "^3.0.1" + "@types/selenium-webdriver": "3.0.10", + "selenium-webdriver": "3.6.0" } }, "webpack": { @@ -15194,26 +15223,26 @@ "@webassemblyjs/helper-module-context": "1.7.11", "@webassemblyjs/wasm-edit": "1.7.11", "@webassemblyjs/wasm-parser": "1.7.11", - "acorn": "^6.0.5", - "acorn-dynamic-import": "^4.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.1.0", - "terser-webpack-plugin": "^1.1.0", - "watchpack": "^1.5.0", - "webpack-sources": "^1.3.0" + "acorn": "6.1.0", + "acorn-dynamic-import": "4.0.0", + "ajv": "6.9.1", + "ajv-keywords": "3.4.0", + "chrome-trace-event": "1.0.0", + "enhanced-resolve": "4.1.0", + "eslint-scope": "4.0.0", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.4.0", + "loader-utils": "1.2.3", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.1", + "neo-async": "2.6.0", + "node-libs-browser": "2.2.0", + "schema-utils": "0.4.7", + "tapable": "1.1.1", + "terser-webpack-plugin": "1.2.2", + "watchpack": "1.6.0", + "webpack-sources": "1.3.0" }, "dependencies": { "acorn": { @@ -15228,8 +15257,8 @@ "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.9.1", + "ajv-keywords": "3.4.0" } } } @@ -15240,8 +15269,8 @@ "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, "requires": { - "source-list-map": "~0.1.7", - "source-map": "~0.4.1" + "source-list-map": "0.1.8", + "source-map": "0.4.4" }, "dependencies": { "source-list-map": { @@ -15256,7 +15285,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -15267,10 +15296,10 @@ "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==", "dev": true, "requires": { - "memory-fs": "~0.4.1", - "mime": "^2.3.1", - "range-parser": "^1.0.3", - "webpack-log": "^2.0.0" + "memory-fs": "0.4.1", + "mime": "2.4.0", + "range-parser": "1.2.0", + "webpack-log": "2.0.0" }, "dependencies": { "mime": { @@ -15288,34 +15317,34 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.0.0", - "compression": "^1.5.2", - "connect-history-api-fallback": "^1.3.0", - "debug": "^3.1.0", - "del": "^3.0.0", - "express": "^4.16.2", - "html-entities": "^1.2.0", - "http-proxy-middleware": "~0.18.0", - "import-local": "^2.0.0", - "internal-ip": "^3.0.1", - "ip": "^1.1.5", - "killable": "^1.0.0", - "loglevel": "^1.4.1", - "opn": "^5.1.0", - "portfinder": "^1.0.9", - "schema-utils": "^1.0.0", - "selfsigned": "^1.9.1", - "semver": "^5.6.0", - "serve-index": "^1.7.2", + "bonjour": "3.5.0", + "chokidar": "2.0.3", + "compression": "1.7.3", + "connect-history-api-fallback": "1.6.0", + "debug": "3.2.6", + "del": "3.0.0", + "express": "4.16.4", + "html-entities": "1.2.1", + "http-proxy-middleware": "0.18.0", + "import-local": "2.0.0", + "internal-ip": "3.0.1", + "ip": "1.1.5", + "killable": "1.0.1", + "loglevel": "1.6.1", + "opn": "5.3.0", + "portfinder": "1.0.20", + "schema-utils": "1.0.0", + "selfsigned": "1.10.4", + "semver": "5.6.0", + "serve-index": "1.9.1", "sockjs": "0.3.19", "sockjs-client": "1.3.0", - "spdy": "^4.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^5.1.0", - "url": "^0.11.0", + "spdy": "4.0.0", + "strip-ansi": "3.0.1", + "supports-color": "5.4.0", + "url": "0.11.0", "webpack-dev-middleware": "3.4.0", - "webpack-log": "^2.0.0", + "webpack-log": "2.0.0", "yargs": "12.0.2" }, "dependencies": { @@ -15342,9 +15371,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" }, "dependencies": { "strip-ansi": { @@ -15353,7 +15382,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -15364,11 +15393,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.6.0", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "debug": { @@ -15377,7 +15406,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.1" } }, "decamelize": { @@ -15395,13 +15424,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "6.0.5", + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" } }, "find-up": { @@ -15410,7 +15439,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "get-stream": { @@ -15419,7 +15448,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "invert-kv": { @@ -15440,7 +15469,7 @@ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "^2.0.0" + "invert-kv": "2.0.0" } }, "locate-path": { @@ -15449,8 +15478,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "mime": { @@ -15471,9 +15500,9 @@ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", "dev": true, "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" + "execa": "1.0.0", + "lcid": "2.0.0", + "mem": "4.0.0" } }, "p-limit": { @@ -15482,7 +15511,7 @@ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.0.0" } }, "p-locate": { @@ -15491,7 +15520,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.1.0" } }, "p-try": { @@ -15506,8 +15535,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.1", + "once": "1.4.0" } }, "semver": { @@ -15522,8 +15551,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "strip-ansi": { @@ -15532,7 +15561,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -15543,10 +15572,10 @@ "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==", "dev": true, "requires": { - "memory-fs": "~0.4.1", - "mime": "^2.3.1", - "range-parser": "^1.0.3", - "webpack-log": "^2.0.0" + "memory-fs": "0.4.1", + "mime": "2.4.0", + "range-parser": "1.2.0", + "webpack-log": "2.0.0" } }, "which-module": { @@ -15561,18 +15590,18 @@ "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^2.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^10.1.0" + "cliui": "4.1.0", + "decamelize": "2.0.0", + "find-up": "3.0.0", + "get-caller-file": "1.0.2", + "os-locale": "3.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "10.1.0" } }, "yargs-parser": { @@ -15581,7 +15610,7 @@ "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", "dev": true, "requires": { - "camelcase": "^4.1.0" + "camelcase": "4.1.0" } } } @@ -15592,8 +15621,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" + "ansi-colors": "3.2.3", + "uuid": "3.3.2" }, "dependencies": { "ansi-colors": { @@ -15625,8 +15654,8 @@ "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", "dev": true, "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" + "source-list-map": "2.0.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -15643,7 +15672,7 @@ "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==", "dev": true, "requires": { - "webpack-core": "^0.6.8" + "webpack-core": "0.6.9" } }, "websocket-driver": { @@ -15652,8 +15681,8 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": ">=0.4.0", - "websocket-extensions": ">=0.1.1" + "http-parser-js": "0.5.0", + "websocket-extensions": "0.1.3" } }, "websocket-extensions": { @@ -15674,7 +15703,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -15689,7 +15718,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "1.0.2" } }, "widest-line": { @@ -15698,7 +15727,7 @@ "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", "dev": true, "requires": { - "string-width": "^2.1.1" + "string-width": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -15719,8 +15748,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" } }, "strip-ansi": { @@ -15729,11 +15758,18 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", @@ -15746,7 +15782,7 @@ "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", "dev": true, "requires": { - "errno": "~0.1.7" + "errno": "0.1.7" } }, "wrap-ansi": { @@ -15755,8 +15791,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "string-width": "1.0.2", + "strip-ansi": "3.0.1" } }, "wrappy": { @@ -15771,7 +15807,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.1" } }, "write-file-atomic": { @@ -15780,9 +15816,9 @@ "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" } }, "ws": { @@ -15791,9 +15827,9 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" } }, "xdg-basedir": { @@ -15813,8 +15849,8 @@ "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", "dev": true, "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" + "sax": "1.2.4", + "xmlbuilder": "9.0.7" }, "dependencies": { "sax": { @@ -15865,7 +15901,7 @@ "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", "dev": true, "requires": { - "cuint": "^0.2.2" + "cuint": "0.2.2" } }, "y18n": { @@ -15887,8 +15923,10 @@ "dev": true, "optional": true, "requires": { + "camelcase": "1.2.1", "cliui": "2.1.0", - "decamelize": "1.2.0" + "decamelize": "1.2.0", + "window-size": "0.1.0" } }, "yargs-parser": { @@ -15897,7 +15935,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "3.0.0" }, "dependencies": { "camelcase": { @@ -15914,7 +15952,7 @@ "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=", "dev": true, "requires": { - "buffer-crc32": "~0.2.3" + "buffer-crc32": "0.2.13" } }, "yeast": { From b84affcc708eed8433dbc73413557789b2e26b3e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 2 May 2019 09:51:41 +0100 Subject: [PATCH 47/98] Hide second apps side nav item --- custom-src/frontend/app/custom/custom-routing.module.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts index 15c127b164..2fda68b015 100644 --- a/custom-src/frontend/app/custom/custom-routing.module.ts +++ b/custom-src/frontend/app/custom/custom-routing.module.ts @@ -1,5 +1,6 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; +import { of } from 'rxjs'; const customRoutes: Routes = [ { @@ -9,7 +10,8 @@ const customRoutes: Routes = [ stratosNavigation: { text: 'Applications', matIcon: 'apps', - position: 20 + position: 20, + hidden: of(true) } }, }, From 5deba74ecfa380effe4976345163c95a8ea5075e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 2 May 2019 17:24:21 +0100 Subject: [PATCH 48/98] Fix stepper - Ensure that data is correctly supplied to each step - Use common service to contain data (we can't yet extend the base AppState required to do this properly) - Move common step functionality into base step --- .../custom/autoscaler/app-autoscaler.types.ts | 2 +- .../autoscaler-helpers/autoscaler-util.ts | 16 +---- .../custom/autoscaler/autoscaler.effects.ts | 2 +- .../edit-autoscaler-policy-base-step.ts | 29 +++++++++ .../edit-autoscaler-policy-service.ts | 64 +++++++++++++++++++ .../edit-autoscaler-policy-step1.component.ts | 63 +++++------------- ...dit-autoscaler-policy-step2.component.html | 4 +- .../edit-autoscaler-policy-step2.component.ts | 31 ++++----- ...dit-autoscaler-policy-step3.component.html | 5 +- .../edit-autoscaler-policy-step3.component.ts | 24 +++---- ...dit-autoscaler-policy-step4.component.html | 5 +- .../edit-autoscaler-policy-step4.component.ts | 31 ++++----- .../edit-autoscaler-policy.component.html | 8 +-- .../edit-autoscaler-policy.component.ts | 4 +- .../packages/core/src/core/utils.service.ts | 4 ++ 15 files changed, 163 insertions(+), 129 deletions(-) create mode 100644 custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts create mode 100644 custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts index 9bdbc4969a..153a5b32ad 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts @@ -2,7 +2,7 @@ export interface AppAutoscalerPolicy { instance_min_count: number; instance_max_count: number; scaling_rules_form: any; - scaling_rules: any[]; + scaling_rules: any[]; // TODO: RC Typing schedules: { timezone: string, recurring_schedule: any[], diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts index 1eb2ac39f0..eff5bde149 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts @@ -2,6 +2,8 @@ import * as moment from 'moment-timezone'; import { AppAutoscalerPolicy } from '../app-autoscaler.types'; +// TODO: RC This feels like it should be wrapped in a helper class, which avoids lots of global consts + export const MetricTypes = ['memoryused', 'memoryutil', 'responsetime', 'throughput', 'cpu']; export const MetricPercentageTypes = ['memoryutil']; export const ScaleTypes = ['upper', 'lower']; @@ -30,17 +32,6 @@ export const PolicyDefaultSetting = { cool_down_secs_min: 60, cool_down_secs_max: 3600, }; -export const PolicyDefault: AppAutoscalerPolicy = { - instance_min_count: 1, - instance_max_count: 10, - scaling_rules: [], - scaling_rules_form: [], - schedules: { - timezone: moment.tz.guess(), - recurring_schedule: [], - specific_date: [] - } -}; export const PolicyDefaultTrigger = { metric_type: 'memoryused', breach_duration_secs: PolicyDefaultSetting.breach_duration_secs_default, @@ -254,6 +245,3 @@ export function shiftArray(array, step) { return days; } -export function cloneObject(obj) { - return JSON.parse(JSON.stringify(obj)); -} diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index f37b6d41a9..1830fe3fab 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -46,7 +46,7 @@ const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; // const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; // const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; -export function createAutoscalerRequestMessage(requestType: string, error: { status: string, _body: string }) { +function createAutoscalerRequestMessage(requestType: string, error: { status: string, _body: string }) { return `Unable to ${requestType}: ${error.status} ${error._body}`; } diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts new file mode 100644 index 0000000000..53d4e53130 --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts @@ -0,0 +1,29 @@ +import { OnInit } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; +import { AppAutoscalerPolicy } from '../app-autoscaler.types'; +import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; + + +export abstract class EditAutoscalerPolicy implements OnInit { + public currentPolicy: AppAutoscalerPolicy; + protected appAutoscalerPolicy$: Observable; + + constructor(protected service: EditAutoscalerPolicyService) { } + + ngOnInit() { + this.appAutoscalerPolicy$ = this.service.getState().pipe( + map(state => { + this.currentPolicy = state; + return this.currentPolicy; + }) + ); + } + + onNext: StepOnNextFunction = () => { + this.service.setState(this.currentPolicy); + return of({ success: true }); + } +} diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts new file mode 100644 index 0000000000..1a947f4e47 --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts @@ -0,0 +1,64 @@ +import { Injectable } from '@angular/core'; +import * as moment from 'moment-timezone'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { filter, first } from 'rxjs/operators'; + +import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { EntityInfo } from '../../../../../store/src/types/api.types'; +import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; +import { cloneObject } from '../../../core/utils.service'; +import { GetAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; +import { AppAutoscalerPolicy } from '../app-autoscaler.types'; +import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; + +@Injectable() +export class EditAutoscalerPolicyService { + + private initialState: AppAutoscalerPolicy = { + instance_min_count: 1, + instance_max_count: 10, + scaling_rules: [], + scaling_rules_form: [], + schedules: { + timezone: moment.tz.guess(), + recurring_schedule: [], + specific_date: [] + } + }; + + private stateSubject = new BehaviorSubject(this.initialState); + + + constructor(private entityServiceFactory: EntityServiceFactory) { } + + updateFromStore(appGuid: string, cfGuid: string) { + const appAutoscalerPolicyService = this.entityServiceFactory.create>( + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), + appGuid, + new GetAppAutoscalerPolicyAction(appGuid, cfGuid), + false + ); + + appAutoscalerPolicyService.entityObs$.pipe( + // Stop if we've failed to fetch a policy or we've finished fetching a policy + filter(({ entity, entityRequestInfo }) => + entityRequestInfo && + (entityRequestInfo.error || (!entityRequestInfo.fetching && !!entity))), + first(), + ).subscribe((({ entity }) => { + if (entity && entity.entity) { + this.stateSubject.next(entity.entity); + } + })); + } + + setState(state: AppAutoscalerPolicy) { + this.stateSubject.next(cloneObject(state)); + } + + getState(): Observable { + return this.stateSubject.asObservable(); + } + +} diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts index 8e9533576b..e8b0bd5deb 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -1,23 +1,17 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { Store } from '@ngrx/store'; import * as moment from 'moment-timezone'; -import { Observable, of as observableOf, Subscription } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; +import { of as observableOf } from 'rxjs'; +import { map } from 'rxjs/operators'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { EntityService } from '../../../../core/entity-service'; -import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { GetAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { autoscalerTransformArrayToMap } from '../../autoscaler-helpers/autoscaler-transform-policy'; -import { PolicyAlert, PolicyDefault } from '../../autoscaler-helpers/autoscaler-util'; +import { PolicyAlert } from '../../autoscaler-helpers/autoscaler-util'; import { numberWithFractionOrExceedRange } from '../../autoscaler-helpers/autoscaler-validation'; -import { appAutoscalerPolicySchemaKey } from '../../autoscaler.store.module'; +import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @Component({ selector: 'app-edit-autoscaler-policy-step1', @@ -27,24 +21,20 @@ import { appAutoscalerPolicySchemaKey } from '../../autoscaler.store.module'; { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { +export class EditAutoscalerPolicyStep1Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; timezoneOptions = moment.tz.names(); editLimitForm: FormGroup; - appAutoscalerPolicy$: Observable; private editLimitValid = true; - private appAutoscalerPolicyErrorSub: Subscription; - private appAutoscalerPolicyService: EntityService; - private currentPolicy: AppAutoscalerPolicy; constructor( public applicationService: ApplicationService, - private store: Store, private fb: FormBuilder, - private entityServiceFactory: EntityServiceFactory, + service: EditAutoscalerPolicyService ) { + super(service); this.editLimitForm = this.fb.group({ instance_min_count: [0, [Validators.required, this.validateGlobalLimitMin()]], instance_max_count: [0, [Validators.required, this.validateGlobalLimitMax()]], @@ -53,21 +43,10 @@ export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { } ngOnInit() { - this.appAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerPolicySchemaKey, - entityFactory(appAutoscalerPolicySchemaKey), - this.applicationService.appGuid, - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid), - false - ); - this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - filter(({ entityRequestInfo }) => entityRequestInfo && entityRequestInfo.fetching === false), - map(({ entity }) => { - if (entity && entity.entity) { - this.currentPolicy = entity.entity; - } else { - this.currentPolicy = PolicyDefault; - } + this.service.updateFromStore(this.applicationService.appGuid, this.applicationService.cfGuid); + this.appAutoscalerPolicy$ = this.service.getState().pipe( + map(policy => { + this.currentPolicy = policy; if (!this.currentPolicy.scaling_rules_form) { this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); } @@ -81,22 +60,12 @@ export class EditAutoscalerPolicyStep1Component implements OnInit, OnDestroy { ); } - ngOnDestroy(): void { - if (this.appAutoscalerPolicyErrorSub) { - this.appAutoscalerPolicyErrorSub.unsubscribe(); - } - } - - finishLimit: StepOnNextFunction = () => { + onNext: StepOnNextFunction = () => { this.currentPolicy.instance_min_count = Math.floor(this.editLimitForm.get('instance_min_count').value); this.currentPolicy.instance_max_count = Math.floor(this.editLimitForm.get('instance_max_count').value); this.currentPolicy.schedules.timezone = this.editLimitForm.get('timezone').value; - return observableOf({ - success: true, - data: { - ...this.currentPolicy - } - }); + this.service.setState(this.currentPolicy); + return observableOf({ success: true }); } validateGlobalLimitMin(): ValidatorFn { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index 1c3f8bb6d2..a559996ca7 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -1,6 +1,6 @@ -
+
- + diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index e97495bc48..1aba679b79 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -1,13 +1,12 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { of as observableOf } from 'rxjs'; +import { Observable } from 'rxjs'; +import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - cloneObject, getAdjustmentType, getScaleType, LowerOperators, @@ -23,6 +22,8 @@ import { getThresholdMin, numberWithFractionOrExceedRange, } from '../../autoscaler-helpers/autoscaler-validation'; +import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @Component({ selector: 'app-edit-autoscaler-policy-step2', @@ -32,12 +33,13 @@ import { { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep2Component { +export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; metricTypes = MetricTypes; operatorTypes = UpperOperators.concat(LowerOperators); editTriggerForm: FormGroup; + appAutoscalerPolicy$: Observable; public currentPolicy: AppAutoscalerPolicy; public testing = false; @@ -48,7 +50,9 @@ export class EditAutoscalerPolicyStep2Component { constructor( public applicationService: ApplicationService, private fb: FormBuilder, + service: EditAutoscalerPolicyService ) { + super(service) this.editTriggerForm = this.fb.group({ metric_type: [0, this.validateTriggerMetricType()], operator: [0, this.validateTriggerOperator()], @@ -66,10 +70,6 @@ export class EditAutoscalerPolicyStep2Component { }); } - onEnter = (data: AppAutoscalerPolicy) => { - this.currentPolicy = data; - } - addTrigger = () => { this.currentPolicy.scaling_rules_form.push(cloneObject(PolicyDefaultTrigger)); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); @@ -98,13 +98,13 @@ export class EditAutoscalerPolicyStep2Component { } finishTrigger() { - const adjustmentp = this.editTriggerForm.get('adjustment_type').value === 'value' ? '' : '%'; - const adjustmenti = this.editTriggerForm.get('adjustment').value; - const adjustmentm = this.editScaleType === 'upper' ? `+${adjustmenti}${adjustmentp}` : `-${adjustmenti}${adjustmentp}`; + const adjustmentP = this.editTriggerForm.get('adjustment_type').value === 'value' ? '' : '%'; + const adjustmentI = this.editTriggerForm.get('adjustment').value; + const adjustmentM = this.editScaleType === 'upper' ? `+${adjustmentI}${adjustmentP}` : `-${adjustmentI}${adjustmentP}`; this.currentPolicy.scaling_rules_form[this.editIndex].metric_type = this.editTriggerForm.get('metric_type').value; this.currentPolicy.scaling_rules_form[this.editIndex].operator = this.editTriggerForm.get('operator').value; this.currentPolicy.scaling_rules_form[this.editIndex].threshold = this.editTriggerForm.get('threshold').value; - this.currentPolicy.scaling_rules_form[this.editIndex].adjustment = adjustmentm; + this.currentPolicy.scaling_rules_form[this.editIndex].adjustment = adjustmentM; if (this.editTriggerForm.get('breach_duration_secs').value) { this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = this.editTriggerForm.get('breach_duration_secs').value; @@ -119,11 +119,6 @@ export class EditAutoscalerPolicyStep2Component { this.editIndex = -1; } - onNext: StepOnNextFunction = () => observableOf({ - success: true, - data: { ...this.currentPolicy } - }) - validateTriggerMetricType(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (this.editTriggerForm) { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index 8cb26d1c4f..25e5db9a72 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -1,7 +1,6 @@ -
+
- + diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index dfd7b25565..fd59932791 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -1,14 +1,13 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import * as moment from 'moment-timezone'; -import { Observable, of as observableOf } from 'rxjs'; +import { Observable } from 'rxjs'; +import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; import { - cloneObject, MomentFormateDate, MonthdayOptions, PolicyAlert, @@ -22,6 +21,8 @@ import { recurringSchedulesOverlapping, timeIsSameOrAfter, } from '../../autoscaler-helpers/autoscaler-validation'; +import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; import { validateRecurringSpecificMax, validateRecurringSpecificMin, @@ -35,13 +36,13 @@ import { { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep3Component { +export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; weekdayOptions = WeekdayOptions; monthdayOptions = MonthdayOptions; editRecurringScheduleForm: FormGroup; - appAutoscalerPolicy$: Observable; + appAutoscalerPolicy$: Observable; public currentPolicy: AppAutoscalerPolicy; private editIndex = -1; @@ -56,7 +57,9 @@ export class EditAutoscalerPolicyStep3Component { constructor( public applicationService: ApplicationService, private fb: FormBuilder, + service: EditAutoscalerPolicyService ) { + super(service); this.editRecurringScheduleForm = this.fb.group({ days_of_week: [0], days_of_month: [0], @@ -72,10 +75,6 @@ export class EditAutoscalerPolicyStep3Component { }); } - onEnter = (data: AppAutoscalerPolicy) => { - this.currentPolicy = data; - } - addRecurringSchedule = () => { this.currentPolicy.schedules.recurring_schedule.push(cloneObject(PolicyDefaultRecurringSchedule)); this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); @@ -166,11 +165,6 @@ export class EditAutoscalerPolicyStep3Component { this.editIndex = -1; } - onNext: StepOnNextFunction = () => observableOf({ - success: true, - data: { ...this.currentPolicy } - }) - validateRecurringScheduleGlobal(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (this.editRecurringScheduleForm) { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index 08d52117e2..2d08f154cf 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -1,7 +1,6 @@ -
+
- + diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index f4efa2d78b..d1b13c996e 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -1,31 +1,29 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; import * as moment from 'moment-timezone'; -import { Observable, Subscription } from 'rxjs'; +import { Observable } from 'rxjs'; import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; import { AppState } from '../../../../../../store/src/app-state'; import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; import { EntityService } from '../../../../core/entity-service'; import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; +import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; -import { - cloneObject, - MomentFormateDateTimeT, - PolicyAlert, - PolicyDefaultSpecificDate, -} from '../../autoscaler-helpers/autoscaler-util'; +import { MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate } from '../../autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, numberWithFractionOrExceedRange, specificDateRangeOverlapping, } from '../../autoscaler-helpers/autoscaler-validation'; import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.module'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; +import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; @Component({ selector: 'app-edit-autoscaler-policy-step4', @@ -35,13 +33,13 @@ import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.modu { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } ] }) -export class EditAutoscalerPolicyStep4Component implements OnDestroy { +export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; editSpecificDateForm: FormGroup; + appAutoscalerPolicy$: Observable; private updateAppAutoscalerPolicyService: EntityService; - private appAutoscalerPolicyErrorSub: Subscription; public currentPolicy: AppAutoscalerPolicy; private editIndex = -1; private editMutualValidation = { @@ -54,7 +52,9 @@ export class EditAutoscalerPolicyStep4Component implements OnDestroy { private store: Store, private fb: FormBuilder, private entityServiceFactory: EntityServiceFactory, + service: EditAutoscalerPolicyService ) { + super(service); this.editSpecificDateForm = this.fb.group({ instance_min_count: [0], instance_max_count: [0], @@ -65,6 +65,7 @@ export class EditAutoscalerPolicyStep4Component implements OnDestroy { } ngOnInit() { + super.ngOnInit(); this.updateAppAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerUpdatedPolicySchemaKey, entityFactory(appAutoscalerUpdatedPolicySchemaKey), @@ -74,16 +75,6 @@ export class EditAutoscalerPolicyStep4Component implements OnDestroy { ); } - onEnter = (data: AppAutoscalerPolicy) => { - this.currentPolicy = data; - } - - ngOnDestroy(): void { - if (this.appAutoscalerPolicyErrorSub) { - this.appAutoscalerPolicyErrorSub.unsubscribe(); - } - } - updatePolicy: StepOnNextFunction = () => { this.store.dispatch( new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html index 4fccb7e1e2..adc4db13ee 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html @@ -8,16 +8,16 @@

Edit AutoScaler Policy: {{ (applicationService.application$ | async)?.app.en

- + - + - + - diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index b4b2cc3727..09483f6920 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -2,13 +2,15 @@ import { Component } from '@angular/core'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { ApplicationService } from '../../../features/applications/application.service'; +import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; @Component({ selector: 'app-edit-autoscaler-policy', templateUrl: './edit-autoscaler-policy.component.html', styleUrls: ['./edit-autoscaler-policy.component.scss'], providers: [ - { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher } + { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher }, + EditAutoscalerPolicyService ] }) export class EditAutoscalerPolicyComponent { diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts index d1272517cd..46a063a85e 100644 --- a/src/frontend/packages/core/src/core/utils.service.ts +++ b/src/frontend/packages/core/src/core/utils.service.ts @@ -280,3 +280,7 @@ export const sortStringify = (obj: { [key: string]: string }): string => { return res += `${key}-${obj[key]},`; }, ''); }; + +export function cloneObject(obj: any) { + return JSON.parse(JSON.stringify(obj)); +} From e8126da9f65a307dda1bee8fd724a4bcf05d4052 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 3 May 2019 14:51:04 +0100 Subject: [PATCH 49/98] Tweaks - Make listConfig required in list data source - disable sorting for autoscaler events table (see todo) --- .../custom/autoscaler/app-autoscaler.types.ts | 12 ++++++++ ...cf-app-autoscaler-events-config.service.ts | 29 ++++++++++++++----- .../cf-app-autoscaler-events-data-source.ts | 7 ++++- ...app-autoscaler-metric-chart-data-source.ts | 5 +++- ...scaler-metric-chart-list-config.service.ts | 11 +++---- .../list-data-source-config.ts | 6 +++- .../list-data-source.ts | 4 +-- .../app-event/cf-app-events-config.service.ts | 5 ++-- .../app-event/cf-app-events-data-source.ts | 3 ++ .../cf-user-service-instances-list-config.ts | 2 +- 10 files changed, 63 insertions(+), 21 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts index 153a5b32ad..4ba20c9b6d 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts @@ -28,3 +28,15 @@ export interface AppAutoscalerInsMetric { total_results: number; } +export interface AutoscalerEvent { + app_id: string; + error: string; + message: string; + new_instances: number; + old_instances: number; + reason: string; + scaling_type: number; + status: number; + timestamp: number; +} + diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 7db45fe818..4c4e5d1a14 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,12 +1,14 @@ +import { DatePipe } from '@angular/common'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { DatePipe } from '@angular/common'; + import { AppState } from '../../../../../../../store/src/app-state'; import { APIResource } from '../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; -import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../../../../shared/components/list/list.component.types'; +import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; +import { AutoscalerEvent } from '../../../app-autoscaler.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; import { TableCellAutoscalerEventChangeComponent, @@ -16,16 +18,27 @@ import { } from './table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; @Injectable() -export class CfAppAutoscalerEventsConfigService extends ListConfig implements IListConfig { +export class CfAppAutoscalerEventsConfigService + extends ListConfig> + implements IListConfig> { autoscalerEventSource: CfAppAutoscalerEventsDataSource; - columns: Array> = [ + columns: Array>> = [ { columnId: 'timestamp', headerCell: () => 'Timestamp', cellDefinition: { getValue: row => this.datePipe.transform(row.entity.timestamp / 1000000, 'medium') }, - sort: true, + // TODO: RC Sort is broken for non-local lists that use the metrics date selector + // metrics date selector works on an action that's dispatched in list data source when date changes OR refresh occurrs + // for non-local lists a change of sort means pagination is reset. the pagination observable then fires off the initial action sans + // metrics date + sort: false, + // sort: { + // type: 'sort', + // orderKey: 'timestamp', + // field: 'entity.timestamp' + // }, cellFlex: '3' }, { @@ -65,7 +78,7 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig columnId: 'error', headerCell: () => 'Error', cellDefinition: { - getValue: row => row.entity.error + valuePath: 'entity.error' }, cellFlex: '4' }, @@ -73,8 +86,9 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig viewType = ListViewTypes.TABLE_ONLY; text = { title: null, - noEntries: 'There are no scale events' + noEntries: 'There are no scaling events' }; + isLocal = true; showMetricsRange = true; pollInterval = 120000; @@ -107,6 +121,7 @@ export class CfAppAutoscalerEventsConfigService extends ListConfig this.store, this.appService.cfGuid, this.appService.appGuid, + this ); } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 8c8f357e35..0e689fde8b 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -5,15 +5,18 @@ import { entityFactory } from '../../../../../../../store/src/helpers/entity-fac import { APIResource } from '../../../../../../../store/src/types/api.types'; import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../shared/components/list/list.component.types'; import { GetAppAutoscalerScalingHistoryAction } from '../../../app-autoscaler.actions'; +import { AutoscalerEvent } from '../../../app-autoscaler.types'; import { appAutoscalerScalingHistorySchemaKey } from '../../../autoscaler.store.module'; -export class CfAppAutoscalerEventsDataSource extends ListDataSource { +export class CfAppAutoscalerEventsDataSource extends ListDataSource> { action: any; constructor( store: Store, cfGuid: string, appGuid: string, + listConfig: IListConfig> ) { const paginationKey = `app-autoscaler-events:${cfGuid}${appGuid}`; const action = new GetAppAutoscalerScalingHistoryAction(paginationKey, appGuid, cfGuid); @@ -24,6 +27,8 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource schema: entityFactory(appAutoscalerScalingHistorySchemaKey), getRowUniqueId: getRowMetadata, paginationKey, + isLocal: true, + listConfig } ); } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index e8be6b078d..cee86ccffb 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -5,6 +5,7 @@ import { entityFactory } from '../../../../../../../store/src/helpers/entity-fac import { APIResource } from '../../../../../../../store/src/types/api.types'; import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../shared/components/list/list.component.types'; import { GetAppAutoscalerPolicyTriggerAction } from '../../../app-autoscaler.actions'; export class AppAutoscalerMetricChartDataSource extends ListDataSource { @@ -13,6 +14,7 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource, cfGuid: string, appGuid: string, + listConfig: IListConfig ) { const paginationKey = `app-autoscaler-policy-triggers:${cfGuid}${appGuid}`; const action = new GetAppAutoscalerPolicyTriggerAction(paginationKey, appGuid, cfGuid); @@ -23,7 +25,8 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource> = [ + columns: Array> = [ { columnId: 'name', headerCell: () => 'Metric type', cellDefinition: { - getValue: (row: any) => row.metadata.guid + valuePath: 'metadata.guid' }, cellFlex: '2' } @@ -66,6 +66,7 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< this.store, this.appService.cfGuid, this.appService.appGuid, + this ); } diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts index 0b47f12bd7..8ac333aa4e 100644 --- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts +++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source-config.ts @@ -91,14 +91,18 @@ export interface IListDataSourceConfig { /** * Optional list configuration */ - listConfig?: IListConfig; + listConfig: IListConfig; /** * A function that will be called when the list is destroyed. */ destroy?: () => void; + /** + * A function that will be called instead of the default refresh + */ refresh?: () => void; + /** * A function which fetches an observable containing a specific row's state * diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts index ff192a68dc..fe04f82883 100644 --- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts @@ -450,9 +450,7 @@ export abstract class ListDataSource extends DataSource implements field: pag.params['order-direction-field'] })), filter(x => !!x), - distinctUntilChanged((x, y) => { - return x.direction === y.direction && x.field === y.field; - }), + distinctUntilChanged((x, y) => x.direction === y.direction && x.field === y.field), tag('list-sort') ); } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts index bdab26cea5..a4fc8ce123 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-config.service.ts @@ -1,6 +1,8 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; +import { AppState } from '../../../../../../../store/src/app-state'; +import { APIResource } from '../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../features/applications/application.service'; import { ITableColumn } from '../../list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../list.component.types'; @@ -9,8 +11,6 @@ import { TableCellEventActionComponent } from './table-cell-event-action/table-c import { TableCellEventDetailComponent } from './table-cell-event-detail/table-cell-event-detail.component'; import { TableCellEventTimestampComponent } from './table-cell-event-timestamp/table-cell-event-timestamp.component'; import { TableCellEventTypeComponent } from './table-cell-event-type/table-cell-event-type.component'; -import { EntityInfo, APIResource } from '../../../../../../../store/src/types/api.types'; -import { AppState } from '../../../../../../../store/src/app-state'; @Injectable() export class CfAppEventsConfigService extends ListConfig implements IListConfig { @@ -42,6 +42,7 @@ export class CfAppEventsConfigService extends ListConfig implements this.store, this.appService.cfGuid, this.appService.appGuid, + this ); } diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts index c7e234ae05..b92d6539fa 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/app-event/cf-app-events-data-source.ts @@ -8,6 +8,7 @@ import { APIResource } from '../../../../../../../store/src/types/api.types'; import { PaginationEntityState, QParam } from '../../../../../../../store/src/types/pagination.types'; import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../data-sources-controllers/list-data-source'; +import { IListConfig } from '../../list.component.types'; export class CfAppEventsDataSource extends ListDataSource { @@ -36,6 +37,7 @@ export class CfAppEventsDataSource extends ListDataSource { store: Store, cfGuid: string, appGuid: string, + listConfig: IListConfig ) { const paginationKey = `app-events:${cfGuid}${appGuid}`; const action = new GetAllAppEvents(paginationKey, appGuid, cfGuid); @@ -47,6 +49,7 @@ export class CfAppEventsDataSource extends ListDataSource { schema: entityFactory(appEventSchemaKey), getRowUniqueId: getRowMetadata, paginationKey, + listConfig } ); diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts index 3df865ecea..c0053902e0 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts @@ -41,7 +41,7 @@ interface CanCache { export class CfUserServiceInstancesListConfigBase implements IListConfig> { viewType = ListViewTypes.TABLE_ONLY; pageSizeOptions = defaultPaginationPageSizeOptionsTable; - dataSource: ListDataSource; + dataSource: ListDataSource>; defaultView = 'table' as ListView; text = { title: null, From 6b7c926f582bbfdb52ae72aafaf3157af1484da8 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 3 May 2019 15:53:58 +0100 Subject: [PATCH 50/98] Fix scaling events table - Use non-local list as originally intended - Ensure non-local lists with metrics style date's work (store state in store such that they're used after changes to sort/page change) --- .../app/custom/autoscaler/autoscaler.effects.ts | 8 ++++++-- .../cf-app-autoscaler-events-config.service.ts | 13 ++----------- .../cf-app-autoscaler-events-data-source.ts | 2 +- .../data-sources-controllers/list-data-source.ts | 16 ++++++++++++++-- .../packages/store/src/types/pagination.types.ts | 2 ++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index 1830fe3fab..4a62908d4f 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -178,7 +178,8 @@ export class AutoscalerEffects { paginatedAction.pageNumber = paginationState ? paginationState.currentPage : 1; - options.params = this.buildParams(action.initialParams, paginationParams, action.params); + const { metricConfig, ...trimmedPaginationParams } = paginationParams; + options.params = this.buildParams(action.initialParams, trimmedPaginationParams, action.params); if (!options.params.has(resultPerPageParam)) { options.params.set( resultPerPageParam, @@ -192,7 +193,10 @@ export class AutoscalerEffects { options.params.set('order', options.params.get('order-direction')); options.params.delete('order-direction'); } - if (action.query && action.query.params) { + if (metricConfig && metricConfig.params) { + options.params.set('start-time', metricConfig.params.start + '000000000'); + options.params.set('end-time', metricConfig.params.end + '000000000'); + } else if (action.query && action.query.params) { options.params.set('start-time', action.query.params.start + '000000000'); options.params.set('end-time', action.query.params.end + '000000000'); } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 4c4e5d1a14..1a4772ea3d 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -29,16 +29,7 @@ export class CfAppAutoscalerEventsConfigService cellDefinition: { getValue: row => this.datePipe.transform(row.entity.timestamp / 1000000, 'medium') }, - // TODO: RC Sort is broken for non-local lists that use the metrics date selector - // metrics date selector works on an action that's dispatched in list data source when date changes OR refresh occurrs - // for non-local lists a change of sort means pagination is reset. the pagination observable then fires off the initial action sans - // metrics date - sort: false, - // sort: { - // type: 'sort', - // orderKey: 'timestamp', - // field: 'entity.timestamp' - // }, + sort: true, cellFlex: '3' }, { @@ -88,7 +79,7 @@ export class CfAppAutoscalerEventsConfigService title: null, noEntries: 'There are no scaling events' }; - isLocal = true; + isLocal = false; showMetricsRange = true; pollInterval = 120000; diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 0e689fde8b..8feee95774 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -27,7 +27,7 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource extends DataSource implements public updateMetricsAction(newAction: MetricsAction) { this.metricsAction = newAction; - this.store.dispatch(newAction); + + if (this.isLocal) { + this.store.dispatch(newAction); + } else { + this.pagination$.pipe( + first() + ).subscribe(pag => { + this.store.dispatch(new SetParams(newAction.entityKey, this.paginationKey, { + ...pag.params, + metricConfig: newAction.query + }, false, true)); + }); + } } private createSortObservable(): Observable { diff --git a/src/frontend/packages/store/src/types/pagination.types.ts b/src/frontend/packages/store/src/types/pagination.types.ts index 55c76821dc..0f3fa22b30 100644 --- a/src/frontend/packages/store/src/types/pagination.types.ts +++ b/src/frontend/packages/store/src/types/pagination.types.ts @@ -1,6 +1,7 @@ import { RequestMethod } from '@angular/http'; import { Action } from '@ngrx/store'; +import { MetricQueryConfig } from '../actions/metrics.actions'; import { ListActionState } from '../reducers/api-request-reducer/types'; import { IRequestAction } from './request.types'; @@ -14,6 +15,7 @@ export class QParam { export interface PaginationParam { q?: QParam[]; + metricConfig?: MetricQueryConfig; [entityKey: string]: any; } From 07d97ab6d974c86325319f4e00130d840c9956b6 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 3 May 2019 16:08:32 +0100 Subject: [PATCH 51/98] Stop many events requests --- .../autoscaler-tab-extension.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 1e5d15a333..33b3db090e 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -171,7 +171,9 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { false ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( - map(({ entity }) => entity && entity.entity) + map(({ entity }) => entity && entity.entity), + publishReplay(1), + refCount() ); this.initErrorSub(); } From 79ba2dd6194939758caeb77870ccf124e574a7bf Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 3 May 2019 16:13:47 +0100 Subject: [PATCH 52/98] First round of improving typing --- .../autoscaler/app-autoscaler.actions.ts | 42 +++++++++++------ .../custom/autoscaler/app-autoscaler.types.ts | 45 +++++++++++++++++-- .../autoscaler-transform-policy.ts | 19 ++++---- .../autoscaler-tab-extension.component.ts | 26 ++++++----- .../custom/autoscaler/autoscaler.effects.ts | 5 ++- .../card-autoscaler-default.component.ts | 3 +- .../edit-autoscaler-policy-base-step.ts | 6 +-- .../edit-autoscaler-policy-service.ts | 13 +++--- .../edit-autoscaler-policy-step2.component.ts | 4 +- .../edit-autoscaler-policy-step3.component.ts | 10 ++--- .../edit-autoscaler-policy-step4.component.ts | 10 ++--- ...-autoscaler-metric-chart-card.component.ts | 6 +-- 12 files changed, 126 insertions(+), 63 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index bd2d479185..ebd0453022 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -3,6 +3,7 @@ import { RequestOptions } from '@angular/http'; import { entityFactory } from '../../../../store/src/helpers/entity-factory'; import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { IRequestAction } from '../../../../store/src/types/request.types'; +import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, @@ -78,7 +79,7 @@ export class UpdateAppAutoscalerPolicyAction implements IRequestAction { constructor( public guid: string, public endpointGuid: string, - public policy: any, + public policy: AppAutoscalerPolicyLocal, ) { } type = UPDATE_APP_AUTOSCALER_POLICY; entityKey = appAutoscalerUpdatedPolicySchemaKey; @@ -101,9 +102,6 @@ export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { public endpointGuid: string, public normalFormat?, ) { - this.query = { - metric: 'policy' - }; } actions = [ AppAutoscalerPolicyTriggerEvents.GET_APP_AUTOSCALER_POLICY, @@ -114,10 +112,29 @@ export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { entity = [entityFactory(appAutoscalerPolicyTriggerSchemaKey)]; entityKey = appAutoscalerPolicyTriggerSchemaKey; options: RequestOptions; - query: any; + query: AutoscalerQuery = { + metric: 'policy' + }; windowValue: string; } +export interface AutoscalerPaginationParams { + 'order-direction-field'?: string; + 'order-direction': 'asc' | 'desc'; + 'results-per-page': string; + 'start-time': string; + 'end-time': string; + 'page'?: string; +} + +export interface AutoscalerQuery { + metric: string; + params?: { + start: number; + end: number + }; +} + export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { private static sortField = 'timestamp'; constructor( @@ -127,9 +144,6 @@ export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { public normalFormat?, public params?, ) { - this.query = { - metric: 'history' - }; } actions = [ AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, @@ -140,14 +154,16 @@ export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { entity = [entityFactory(appAutoscalerScalingHistorySchemaKey)]; entityKey = appAutoscalerScalingHistorySchemaKey; options: RequestOptions; - initialParams = { + initialParams: AutoscalerPaginationParams = { 'order-direction-field': GetAppAutoscalerScalingHistoryAction.sortField, 'order-direction': 'desc', - 'results-per-page': 5, - 'start-time': 0, - 'end-time': 0, + 'results-per-page': '5', + 'start-time': '0', + 'end-time': '0', + }; + query: AutoscalerQuery = { + metric: 'history' }; - query: any; windowValue: string; } diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts index 4ba20c9b6d..553823cb83 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts @@ -1,12 +1,49 @@ export interface AppAutoscalerPolicy { + enabled: boolean; instance_min_count: number; instance_max_count: number; - scaling_rules_form: any; - scaling_rules: any[]; // TODO: RC Typing + scaling_rules: AppScalingRule[]; schedules: { timezone: string, - recurring_schedule: any[], - specific_date: any[] + recurring_schedule: AppRecurringSchedule[], + specific_date: AppSpecificDate[] + }; +} + +export interface AppSpecificDate { + end_date_time: string; + initial_min_instance_count: number; + instance_max_count: number; + instance_min_count: number; + start_date_time: string; +} + +export interface AppScalingRule { + adjustment: string; + metric_type: string; + operator: string; + threshold: number; +} + +export interface AppRecurringSchedule { + initial_min_instance_count: number; + instance_min_count: number; + instance_max_count: number; + start_time: string; + end_time: string; + days_of_month: number[]; + days_of_week: number[]; + start_date: string; + end_date: string; +} + +export interface AppAutoscalerPolicyLocal extends AppAutoscalerPolicy { + scaling_rules_form: any; // TODO: RC Typing + scaling_rules_map: { + [metricName: string]: { + upper: { threshold: number }[], + lower: { threshold: number }[], + } }; } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts index e998c71bd8..31aae9500b 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts @@ -1,16 +1,15 @@ import * as moment from 'moment-timezone'; -import { - getScaleType, - PolicyDefaultSetting, - ScaleTypes, - isEqual -} from './autoscaler-util'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; +import { getScaleType, isEqual, PolicyDefaultSetting, ScaleTypes } from './autoscaler-util'; -export function autoscalerTransformArrayToMap(newPolicy) { - newPolicy.enabled = true; - newPolicy.scaling_rules_map = {}; - newPolicy.scaling_rules_form = []; +export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { + const newPolicy: AppAutoscalerPolicyLocal = { + ...policy, + enabled: true, + scaling_rules_map: {}, + scaling_rules_form: [] + }; initIfUndefined(newPolicy, 'scaling_rules', []); newPolicy.scaling_rules.map((trigger) => { pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 33b3db090e..1a9778e952 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -20,6 +20,7 @@ import { ConfirmationDialogConfig } from '../../../shared/components/confirmatio import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; import { + AutoscalerPaginationParams, DetachAppAutoscalerPolicyAction, GetAppAutoscalerAppMetricAction, GetAppAutoscalerHealthAction, @@ -27,7 +28,12 @@ import { GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, } from '../app-autoscaler.actions'; -import { AppAutoscalerAppMetric, AppAutoscalerPolicy, AppAutoscalerScalingHistory } from '../app-autoscaler.types'; +import { + AppAutoscalerAppMetric, + AppAutoscalerPolicy, + AppAutoscalerPolicyLocal, + AppAutoscalerScalingHistory, +} from '../app-autoscaler.types'; import { MetricTypes } from '../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey, @@ -42,7 +48,7 @@ import { icon: 'meter', iconFont: 'stratos-icons', hidden: (store: Store, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => { - // TODO: RC Fix + // TODO: RC Improve const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2]; const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3]; const action = new GetAppAutoscalerHealthAction(appGuid, endpointGuid); @@ -83,19 +89,19 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerInsMetrics = {}; appAutoscalerAppMetricNames = []; - paramsMetrics = { - 'start-time': 0, + paramsMetrics: AutoscalerPaginationParams = { + 'start-time': '0', 'end-time': (new Date()).getTime().toString() + '000000', page: '1', 'results-per-page': '1', - order: 'desc' + 'order-direction': 'desc' }; - paramsHistory = { - 'start-time': 0, + paramsHistory: AutoscalerPaginationParams = { + 'start-time': '0', 'end-time': (new Date()).getTime().toString() + '000000', page: '1', 'results-per-page': '5', - order: 'desc' + 'order-direction': 'desc' }; ngOnDestroy(): void { @@ -191,7 +197,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { }, false).entities$; } - loadLatestMetricsUponPolicy(policyEntity) { + loadLatestMetricsUponPolicy(policyEntity: AppAutoscalerPolicyLocal) { if (policyEntity.scaling_rules_map) { this.appAutoscalerAppMetrics = {}; Object.keys(policyEntity.scaling_rules_map).map((metricName) => { @@ -225,7 +231,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { }); } - diableAutoscaler() { + disableAutoscaler() { const confirmation = new ConfirmationDialogConfig( 'Detach And Delete Policy', 'Are you sure you want to detach and delete the policy?', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index 4a62908d4f..12bf8bfc2b 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -233,6 +233,10 @@ export class AutoscalerEffects { options.method = 'get'; options.headers = this.addHeaders(action.endpointGuid); options.params = this.buildParams(action.initialParams, action.params); + if (options.params.has('order-direction')) { + options.params.set('order', options.params.get('order-direction')); + options.params.delete('order-direction'); + } return this.http .request(new Request(options)).pipe( mergeMap(response => { @@ -281,7 +285,6 @@ export class AutoscalerEffects { result: [] } as NormalizedResponse; this.transformTriggerData(getPolicyTriggerAction.entityKey, mappedPolicyData, policyInfo, getPolicyTriggerAction.query); - // TODO: RC handle failure res.push( new WrapperRequestActionSuccess( mappedPolicyData, diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts index 93f3ef2edc..b9081bf730 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts @@ -15,6 +15,7 @@ import { StratosStatus } from '../../../shared/shared.types'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; @Component({ selector: 'app-card-autoscaler-default', @@ -42,7 +43,7 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { appAutoscalerPolicyUpdateService: EntityService; public appAutoscalerPolicy$: Observable; - currentPolicy: any; + currentPolicy: AppAutoscalerPolicyLocal; public isEditing = false; public instanceMinCountCurrent: number; public instanceMinCountEdit: number; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts index 53d4e53130..e84d690fe5 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts @@ -3,13 +3,13 @@ import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; -import { AppAutoscalerPolicy } from '../app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; export abstract class EditAutoscalerPolicy implements OnInit { - public currentPolicy: AppAutoscalerPolicy; - protected appAutoscalerPolicy$: Observable; + public currentPolicy: AppAutoscalerPolicyLocal; + public appAutoscalerPolicy$: Observable; constructor(protected service: EditAutoscalerPolicyService) { } diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts index 1a947f4e47..5632b4fc0c 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts @@ -8,23 +8,24 @@ import { EntityInfo } from '../../../../../store/src/types/api.types'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; import { cloneObject } from '../../../core/utils.service'; import { GetAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; +import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; @Injectable() export class EditAutoscalerPolicyService { - private initialState: AppAutoscalerPolicy = { + private initialState: AppAutoscalerPolicyLocal = autoscalerTransformArrayToMap({ + enabled: true, instance_min_count: 1, instance_max_count: 10, scaling_rules: [], - scaling_rules_form: [], schedules: { timezone: moment.tz.guess(), recurring_schedule: [], specific_date: [] } - }; + }); private stateSubject = new BehaviorSubject(this.initialState); @@ -32,7 +33,7 @@ export class EditAutoscalerPolicyService { constructor(private entityServiceFactory: EntityServiceFactory) { } updateFromStore(appGuid: string, cfGuid: string) { - const appAutoscalerPolicyService = this.entityServiceFactory.create>( + const appAutoscalerPolicyService = this.entityServiceFactory.create>( appAutoscalerPolicySchemaKey, entityFactory(appAutoscalerPolicySchemaKey), appGuid, @@ -57,7 +58,7 @@ export class EditAutoscalerPolicyService { this.stateSubject.next(cloneObject(state)); } - getState(): Observable { + getState(): Observable { return this.stateSubject.asObservable(); } diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 1aba679b79..6f95b631bd 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; import { getAdjustmentType, getScaleType, @@ -41,7 +41,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp editTriggerForm: FormGroup; appAutoscalerPolicy$: Observable; - public currentPolicy: AppAutoscalerPolicy; + public currentPolicy: AppAutoscalerPolicyLocal; public testing = false; private editIndex = -1; private editScaleType = 'upper'; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index fd59932791..a718281b99 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs'; import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; -import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; import { MomentFormateDate, MonthdayOptions, @@ -44,7 +44,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp editRecurringScheduleForm: FormGroup; appAutoscalerPolicy$: Observable; - public currentPolicy: AppAutoscalerPolicy; + public currentPolicy: AppAutoscalerPolicyLocal; private editIndex = -1; private editEffectiveType = 'always'; private editRepeatType = 'week'; @@ -235,17 +235,17 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp }; } - resetEffectiveType(key) { + resetEffectiveType(key: string) { this.editEffectiveType = key; this.setRecurringScheduleValidator(); } - resetRepeatType(key) { + resetRepeatType(key: string) { this.editRepeatType = key; this.setRecurringScheduleValidator(); } - mutualValidate(inputName, lastValid, currentValid) { + mutualValidate(inputName: string, lastValid: boolean, currentValid: boolean) { if (this.editRecurringScheduleForm && lastValid !== currentValid) { this.editRecurringScheduleForm.controls[inputName].updateValueAndValidity(); } diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index d1b13c996e..9fd9d4e511 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -14,7 +14,7 @@ import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; -import { AppAutoscalerPolicy } from '../../app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; import { MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate } from '../../autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, @@ -22,8 +22,8 @@ import { specificDateRangeOverlapping, } from '../../autoscaler-helpers/autoscaler-validation'; import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.module'; -import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @Component({ selector: 'app-edit-autoscaler-policy-step4', @@ -40,7 +40,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp appAutoscalerPolicy$: Observable; private updateAppAutoscalerPolicyService: EntityService; - public currentPolicy: AppAutoscalerPolicy; + public currentPolicy: AppAutoscalerPolicyLocal; private editIndex = -1; private editMutualValidation = { limit: true, @@ -118,14 +118,14 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } - removeSpecificDate(index) { + removeSpecificDate(index: number) { if (this.editIndex === index) { this.editIndex = -1; } this.currentPolicy.schedules.specific_date.splice(index, 1); } - editSpecificDate(index) { + editSpecificDate(index: number) { this.editIndex = index; this.editSpecificDateForm.setValue({ instance_min_count: this.currentPolicy.schedules.specific_date[index].instance_min_count, diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 285b0c609a..8182e99eee 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -12,7 +12,7 @@ import { APIResource } from '../../../../../../../../store/src/types/api.types'; import { ApplicationService } from '../../../../../../features/applications/application.service'; import { CardCell, IListRowCell } from '../../../../../../shared/components/list/list.types'; import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { GetAppAutoscalerAppMetricAction } from '../../../../app-autoscaler.actions'; +import { AutoscalerPaginationParams, GetAppAutoscalerAppMetricAction } from '../../../../app-autoscaler.actions'; import { AppAutoscalerAppMetric } from '../../../../app-autoscaler.types'; import { buildLegendData } from '../../../../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey } from '../../../../autoscaler.store.module'; @@ -47,12 +47,12 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell Date: Fri, 3 May 2019 17:37:33 +0100 Subject: [PATCH 53/98] Improve/Standardize pagination keys --- .../autoscaler/app-autoscaler.actions.ts | 7 +++++-- .../autoscaler-tab-extension.component.ts | 20 +++++++++++++------ .../cf-app-autoscaler-events-data-source.ts | 5 ++--- ...app-autoscaler-metric-chart-data-source.ts | 5 ++--- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index ebd0453022..d7bd93af84 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -1,6 +1,7 @@ import { RequestOptions } from '@angular/http'; -import { entityFactory } from '../../../../store/src/helpers/entity-factory'; +import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpers/entity-factory'; +import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { IRequestAction } from '../../../../store/src/types/request.types'; import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; @@ -102,6 +103,7 @@ export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { public endpointGuid: string, public normalFormat?, ) { + this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid); } actions = [ AppAutoscalerPolicyTriggerEvents.GET_APP_AUTOSCALER_POLICY, @@ -144,6 +146,7 @@ export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { public normalFormat?, public params?, ) { + this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid); } actions = [ AppAutoscalerScalingHistoryEvents.GET_APP_AUTOSCALER_SCALING_HISTORY, @@ -176,7 +179,7 @@ export abstract class GetAppAutoscalerMetricAction implements PaginatedAction { public trigger, public params ) { - this.paginationKey = guid + '-' + metricName; + this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid, metricName); } actions = [ AppAutoscalerMetricEvents.GET_APP_AUTOSCALER_METRIC, diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 1a9778e952..620ee0ff92 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -7,10 +7,12 @@ import { distinctUntilChanged, filter, first, map, publishReplay, refCount, star import { RouterNav } from '../../../../../store/src/actions/router.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { applicationSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { createEntityRelationPaginationKey } from '../../../../../store/src/helpers/entity-relations/entity-relations.types'; import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; +import { APIResource } from '../../../../../store/src/types/api.types'; import { EntityService } from '../../../core/entity-service'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; import { StratosTab, StratosTabType } from '../../../core/extension/extension-service'; @@ -71,9 +73,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { scalingHistoryColumns: string[] = ['event', 'trigger', 'date', 'error']; metricTypes: string[] = MetricTypes; - appAutoscalerHealthService: EntityService; - appAutoscalerPolicyService: EntityService; - appAutoscalerScalingHistoryService: EntityService; + appAutoscalerPolicyService: EntityService>; + appAutoscalerScalingHistoryService: EntityService; // TODO: RC typing appAutoscalerEnablement$: Observable; appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; @@ -168,12 +169,19 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { publishReplay(1), refCount() ); + // TODO: RC add a refresh button to dispatch this action + const scalingHistoryAction = new GetAppAutoscalerScalingHistoryAction( + createEntityRelationPaginationKey(applicationSchemaKey, this.applicationService.appGuid, 'latest'), + this.applicationService.appGuid, + this.applicationService.cfGuid, + true, + this.paramsHistory + ); this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create( appAutoscalerScalingHistorySchemaKey, entityFactory(appAutoscalerScalingHistorySchemaKey), this.applicationService.appGuid, - new GetAppAutoscalerScalingHistoryAction('', this.applicationService.appGuid, - this.applicationService.cfGuid, true, this.paramsHistory), + scalingHistoryAction, false ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 8feee95774..a5b6467c58 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -18,15 +18,14 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource> ) { - const paginationKey = `app-autoscaler-events:${cfGuid}${appGuid}`; - const action = new GetAppAutoscalerScalingHistoryAction(paginationKey, appGuid, cfGuid); + const action = new GetAppAutoscalerScalingHistoryAction(null, appGuid, cfGuid); super( { store, action, schema: entityFactory(appAutoscalerScalingHistorySchemaKey), getRowUniqueId: getRowMetadata, - paginationKey, + paginationKey: action.paginationKey, isLocal: false, listConfig } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index cee86ccffb..127884aef0 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -16,15 +16,14 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource ) { - const paginationKey = `app-autoscaler-policy-triggers:${cfGuid}${appGuid}`; - const action = new GetAppAutoscalerPolicyTriggerAction(paginationKey, appGuid, cfGuid); + const action = new GetAppAutoscalerPolicyTriggerAction(null, appGuid, cfGuid); super( { store, action, schema: entityFactory(action.entityKey), getRowUniqueId: getRowMetadata, - paginationKey, + paginationKey: action.paginationKey, isLocal: true, listConfig } From d3f80749cb64fcafae965c9da8cd750fbb236ce5 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 3 May 2019 17:40:51 +0100 Subject: [PATCH 54/98] Fix typo after refactor --- .../autoscaler-tab-extension.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 5b1607b6f4..8510eaeadf 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -51,9 +51,9 @@
Enabled + (click)="disableAutoscaler()">Enabled Enabled + (click)="disableAutoscaler()">Enabled Disabled Policy From 302668d9f7df1a3e0b6e49b9b4730dc30cd36fba Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Sat, 4 May 2019 16:22:28 +0800 Subject: [PATCH 55/98] [autoscaler] fix the timeline and barchart mismatch issue in metric chart --- .../combo-chart/combo-chart.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts index a4e44cfaa5..11c13e351d 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts @@ -406,7 +406,7 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { this.xDomain = this.getXDomain(); const spacing = this.xDomain.length / (this.dims.width / this.barPadding + 1); return scaleBand() - .rangeRound([0, this.dims.width]) + .range([0, this.dims.width]) .paddingInner(spacing) .domain(this.xDomain); } From c1690010373b4b14f8bfcddeb6f2e0770a4b47bb Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Sun, 5 May 2019 19:04:17 +0800 Subject: [PATCH 56/98] [autoscaler] add unit tests for autoscaler helpers --- .../custom/autoscaler/app-autoscaler.types.ts | 66 ++- .../autoscaler-transform-metric.spec.ts | 461 +++++++++++++++++- .../autoscaler-transform-metric.ts | 37 +- .../autoscaler-transform-policy.spec.ts | 172 ++++--- .../autoscaler-transform-policy.ts | 32 +- .../autoscaler-util.spec.ts | 73 +++ .../autoscaler-helpers/autoscaler-util.ts | 200 ++++---- .../autoscaler-validation.spec.ts | 115 +++++ .../autoscaler-validation.ts | 74 +-- .../autoscaler-tab-extension.component.ts | 42 +- .../card-autoscaler-default.component.spec.ts | 8 +- .../card-autoscaler-default.component.ts | 2 +- .../edit-autoscaler-policy-base-step.ts | 1 - .../edit-autoscaler-policy-step2.component.ts | 31 +- .../edit-autoscaler-policy-step3.component.ts | 21 +- .../edit-autoscaler-policy-step4.component.ts | 27 +- ...p-autoscaler-events-config.service.spec.ts | 2 +- ...cf-app-autoscaler-events-config.service.ts | 8 +- .../cf-app-autoscaler-events-data-source.ts | 6 +- 19 files changed, 1043 insertions(+), 335 deletions(-) create mode 100644 custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts create mode 100644 custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts index 553823cb83..0ff115459a 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts @@ -2,17 +2,17 @@ export interface AppAutoscalerPolicy { enabled: boolean; instance_min_count: number; instance_max_count: number; - scaling_rules: AppScalingRule[]; - schedules: { + scaling_rules?: AppScalingRule[]; + schedules?: { timezone: string, - recurring_schedule: AppRecurringSchedule[], - specific_date: AppSpecificDate[] + recurring_schedule?: AppRecurringSchedule[], + specific_date?: AppSpecificDate[] }; } export interface AppSpecificDate { end_date_time: string; - initial_min_instance_count: number; + initial_min_instance_count?: number; instance_max_count: number; instance_min_count: number; start_date_time: string; @@ -20,30 +20,35 @@ export interface AppSpecificDate { export interface AppScalingRule { adjustment: string; + breach_duration_secs?: number; + color?: string; + cool_down_secs?: number; metric_type: string; operator: string; threshold: number; } +export interface AppScalingTrigger { + upper?: AppScalingRule[]; + lower?: AppScalingRule[]; +} + export interface AppRecurringSchedule { - initial_min_instance_count: number; + initial_min_instance_count?: number; instance_min_count: number; instance_max_count: number; start_time: string; end_time: string; - days_of_month: number[]; - days_of_week: number[]; - start_date: string; - end_date: string; + days_of_month?: number[]; + days_of_week?: number[]; + start_date?: string; + end_date?: string; } export interface AppAutoscalerPolicyLocal extends AppAutoscalerPolicy { - scaling_rules_form: any; // TODO: RC Typing + scaling_rules_form: AppScalingRule[]; scaling_rules_map: { - [metricName: string]: { - upper: { threshold: number }[], - lower: { threshold: number }[], - } + [metricName: string]: AppScalingTrigger }; } @@ -54,18 +59,15 @@ export interface AppAutoscalerHealth { } export interface AppAutoscalerScalingHistory { + next_url: string; + prev_url: string; + page: number; + resources: AppAutoscalerEvent[]; + total_pages: number; total_results: number; } -export interface AppAutoscalerAppMetric { - total_results: number; -} - -export interface AppAutoscalerInsMetric { - total_results: number; -} - -export interface AutoscalerEvent { +export interface AppAutoscalerEvent { app_id: string; error: string; message: string; @@ -77,3 +79,19 @@ export interface AutoscalerEvent { timestamp: number; } +export interface AppAutoscalerAppMetric { + next_url: string; + prev_url: string; + page: number; + resources: AppAutoscalerMetric[]; + total_pages: number; + total_results: number; +} + +export interface AppAutoscalerMetric { + app_id: string; + name: string; + timestamp: number; + unit: string; + value: string; +} diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts index 3165b1bd46..d3721aed1d 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts @@ -2,7 +2,7 @@ import { isEqual } from './autoscaler-util'; import { - insertEmptyMetrics + insertEmptyMetrics, buildMetricData } from './autoscaler-transform-metric'; describe('Autoscaler Transform Metric Helper', () => { @@ -26,4 +26,463 @@ describe('Autoscaler Transform Metric Helper', () => { expect(isEqual(item.time, ascTarget[index])).toBe(true); }); }); + it('buildMetricData', () => { + const metricName = 'throughput'; + const data = { + total_results: 12, + total_pages: 1, + page: 1, + prev_url: null, + next_url: null, + resources: [ + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '6', + unit: 'rps', + timestamp: 1557026418641445600 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '5', + unit: 'rps', + timestamp: 1557026457387453200 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '5', + unit: 'rps', + timestamp: 1557026497600111000 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '5', + unit: 'rps', + timestamp: 1557026538904853200 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '6', + unit: 'rps', + timestamp: 1557026577882890500 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '8', + unit: 'rps', + timestamp: 1557026616931637000 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '12', + unit: 'rps', + timestamp: 1557026657849241600 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '18', + unit: 'rps', + timestamp: 1557026697503883000 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '21', + unit: 'rps', + timestamp: 1557026737224771000 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '18', + unit: 'rps', + timestamp: 1557026778997745700 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '16', + unit: 'rps', + timestamp: 1557026817953504800 + }, + { + app_id: '2bd98ff4-99f4-422a-a037-172298277c8b', + name: 'throughput', + value: '14', + unit: 'rps', + timestamp: 1557026857236819500 + } + ] + }; + const startTime = 1557026400000000000; + const endTime = 1557026880000000000; + const skipFormat = false; + const trigger = { + lower: [ + { + adjustment: '-1', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '<=', + threshold: 5, + color: 'rgba(51, 204, 255, 0.6)' + } + ], + upper: [ + { + adjustment: '+2', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '>', + threshold: 20, + color: 'rgba(255, 0, 0, 0.6)' + }, + { + adjustment: '+1', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '>', + threshold: 10, + color: 'rgba(255, 128, 0, 0.6)' + } + ], + query: { + metric: 'policy', + params: { + start: 1557026400, + end: 1557026880, + step: 9.6 + } + } + }; + const expectedResult = { + latest: { + target: [ + { + name: 'throughput', + value: 14 + } + ], + colorTarget: [ + { + name: 'throughput', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: 'upper threshold: > 20', + value: 'rgba(255, 0, 0, 0.6)' + }, + { + name: 'upper threshold: > 10', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: 'lower threshold: <= 5', + value: 'rgba(51, 204, 255, 0.6)' + } + ] + }, + formated: { + target: [ + { + time: 1557026419, + name: '11:20:19', + value: 6 + }, + { + time: 1557026458, + name: '11:20:58', + value: 5 + }, + { + time: 1557026497, + name: '11:21:37', + value: 5 + }, + { + time: 1557026536, + name: '11:22:16', + value: 5 + }, + { + time: 1557026575, + name: '11:22:55', + value: 6 + }, + { + time: 1557026614, + name: '11:23:34', + value: 8 + }, + { + time: 1557026653, + name: '11:24:13', + value: 12 + }, + { + time: 1557026692, + name: '11:24:52', + value: 18 + }, + { + time: 1557026731, + name: '11:25:31', + value: 21 + }, + { + time: 1557026770, + name: '11:26:10', + value: 18 + }, + { + time: 1557026809, + name: '11:26:49', + value: 16 + }, + { + time: 1557026848, + name: '11:27:28', + value: 14 + } + ], + colorTarget: [ + { + name: '11:20:19', + value: 'rgba(90,167,0,0.6)' + }, + { + name: '11:20:58', + value: 'rgba(51, 204, 255, 0.6)' + }, + { + name: '11:21:37', + value: 'rgba(51, 204, 255, 0.6)' + }, + { + name: '11:22:16', + value: 'rgba(51, 204, 255, 0.6)' + }, + { + name: '11:22:55', + value: 'rgba(90,167,0,0.6)' + }, + { + name: '11:23:34', + value: 'rgba(90,167,0,0.6)' + }, + { + name: '11:24:13', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: '11:24:52', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: '11:25:31', + value: 'rgba(255, 0, 0, 0.6)' + }, + { + name: '11:26:10', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: '11:26:49', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: '11:27:28', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: 'upper threshold: > 20', + value: 'rgba(255, 0, 0, 0.6)' + }, + { + name: 'upper threshold: > 10', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: 'lower threshold: <= 5', + value: 'rgba(51, 204, 255, 0.6)' + } + ] + }, + markline: [ + { + name: 'upper threshold: > 20', + series: [ + { + name: '11:20:19', + value: 20 + }, + { + name: '11:20:58', + value: 20 + }, + { + name: '11:21:37', + value: 20 + }, + { + name: '11:22:16', + value: 20 + }, + { + name: '11:22:55', + value: 20 + }, + { + name: '11:23:34', + value: 20 + }, + { + name: '11:24:13', + value: 20 + }, + { + name: '11:24:52', + value: 20 + }, + { + name: '11:25:31', + value: 20 + }, + { + name: '11:26:10', + value: 20 + }, + { + name: '11:26:49', + value: 20 + }, + { + name: '11:27:28', + value: 20 + } + ] + }, + { + name: 'upper threshold: > 10', + series: [ + { + name: '11:20:19', + value: 10 + }, + { + name: '11:20:58', + value: 10 + }, + { + name: '11:21:37', + value: 10 + }, + { + name: '11:22:16', + value: 10 + }, + { + name: '11:22:55', + value: 10 + }, + { + name: '11:23:34', + value: 10 + }, + { + name: '11:24:13', + value: 10 + }, + { + name: '11:24:52', + value: 10 + }, + { + name: '11:25:31', + value: 10 + }, + { + name: '11:26:10', + value: 10 + }, + { + name: '11:26:49', + value: 10 + }, + { + name: '11:27:28', + value: 10 + } + ] + }, + { + name: 'lower threshold: <= 5', + series: [ + { + name: '11:20:19', + value: 5 + }, + { + name: '11:20:58', + value: 5 + }, + { + name: '11:21:37', + value: 5 + }, + { + name: '11:22:16', + value: 5 + }, + { + name: '11:22:55', + value: 5 + }, + { + name: '11:23:34', + value: 5 + }, + { + name: '11:24:13', + value: 5 + }, + { + name: '11:24:52', + value: 5 + }, + { + name: '11:25:31', + value: 5 + }, + { + name: '11:26:10', + value: 5 + }, + { + name: '11:26:49', + value: 5 + }, + { + name: '11:27:28', + value: 5 + } + ] + } + ], + unit: 'rps', + chartMaxValue: 30 + }; + const result = buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger); + expect(isEqual(expectedResult, result)).toBe(true); + }); }); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts index 341105ca2b..18c79af7b4 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts @@ -1,6 +1,7 @@ import * as moment from 'moment'; -import { getScaleType, metricMap, MetricPercentageTypes, MomentFormateTimeS, normalColor, S2NS } from './autoscaler-util'; +import { getScaleType, AutoscalerConstants } from './autoscaler-util'; +import { AppAutoscalerAppMetric, AppScalingTrigger, AppScalingRule } from '../app-autoscaler.types'; function initMeticData(metricName) { return { @@ -21,20 +22,20 @@ function initMeticData(metricName) { colorTarget: [] }, markline: [], - unit: metricMap[metricName].unit_internal, + unit: AutoscalerConstants.metricMap[metricName].unit_internal, chartMaxValue: 0, }; } -export function buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger) { +export function buildMetricData(metricName, data: AppAutoscalerAppMetric, startTime, endTime, skipFormat, trigger: AppScalingTrigger) { const result = initMeticData(metricName); if (data.resources.length > 0) { const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); result.unit = basicInfo.unit; result.chartMaxValue = basicInfo.chartMaxValue; if (!skipFormat) { - startTime = Math.round(startTime / S2NS); - endTime = Math.round(endTime / S2NS); + startTime = Math.round(startTime / AutoscalerConstants.S2NS); + endTime = Math.round(endTime / AutoscalerConstants.S2NS); const target = transformMetricData(data.resources, basicInfo.interval, startTime, endTime); const colorTarget = buildMetricColorData(target, trigger); result.formated = { @@ -68,7 +69,7 @@ export function insertEmptyMetrics(data, startTime, endTime, interval) { function buildSingleMetricData(timestamp, value) { return { time: timestamp, - name: moment(timestamp * 1000).format(MomentFormateTimeS), + name: moment(timestamp * 1000).format(AutoscalerConstants.MomentFormateTimeS), value }; } @@ -79,7 +80,7 @@ function transformMetricData(source, interval, startTime, endTime) { } const scope = Math.round(interval / 2); const target = []; - let targetTimestamp = Math.round(source[0].timestamp / S2NS); + let targetTimestamp = Math.round(source[0].timestamp / AutoscalerConstants.S2NS); let targetIndex = insertEmptyMetrics(target, targetTimestamp - interval, startTime, -interval).length; let sourceIndex = 0; while (sourceIndex < source.length) { @@ -87,7 +88,7 @@ function transformMetricData(source, interval, startTime, endTime) { target[targetIndex] = buildSingleMetricData(targetTimestamp, 0); } const metric = source[sourceIndex]; - const sourceTimestamp = Math.round(metric.timestamp / S2NS); + const sourceTimestamp = Math.round(metric.timestamp / AutoscalerConstants.S2NS); if (sourceTimestamp < targetTimestamp - scope) { sourceIndex++; } else if (sourceTimestamp > targetTimestamp + scope) { @@ -101,7 +102,7 @@ function transformMetricData(source, interval, startTime, endTime) { return insertEmptyMetrics(target, target[targetIndex].time + interval, endTime, interval); } -function buildMetricColorData(metricData, trigger) { +function buildMetricColorData(metricData, trigger: AppScalingTrigger) { const colorTarget = []; metricData.map((item) => { colorTarget.push({ @@ -144,7 +145,7 @@ function buildTriggerName(item) { return `${type} threshold: ${item.operator} ${item.threshold}`; } -function buildSingleMarkLine(lineChartSeries, metricData, ul) { +function buildSingleMarkLine(lineChartSeries, metricData, ul: AppScalingRule[]) { ul.map((item) => { const lineData = { name: buildTriggerName(item), @@ -173,8 +174,8 @@ function executeCompare(val1, operator, val2) { } } -function getColor(trigger, value) { - let color = normalColor; +function getColor(trigger: AppScalingTrigger, value) { + let color = AutoscalerConstants.normalColor; if (Number.isNaN(value)) { return color; } @@ -194,17 +195,17 @@ function getColor(trigger, value) { return color; } -function getMetricBasicInfo(metricName, source, trigger) { +function getMetricBasicInfo(metricName, source, trigger: AppScalingTrigger) { const map = {}; - let interval = metricMap[metricName].interval; + let interval = AutoscalerConstants.metricMap[metricName].interval; let maxCount = 1; let preTimestamp = 0; let maxValue = -1; - const unit = metricMap[metricName].unit_internal; + const unit = AutoscalerConstants.metricMap[metricName].unit_internal; map[interval] = 1; for (const item of source) { maxValue = Math.max(Number(item.value), maxValue); - const thisTimestamp = Math.round(parseInt(item.timestamp, 10) / S2NS); + const thisTimestamp = Math.round(parseInt(item.timestamp, 10) / AutoscalerConstants.S2NS); const currentInterval = thisTimestamp - preTimestamp; map[currentInterval] = map[currentInterval] ? map[currentInterval] + 1 : 1; if (map[currentInterval] > maxCount) { @@ -221,7 +222,7 @@ function getMetricBasicInfo(metricName, source, trigger) { }; } -function getChartMax(trigger, maxValue) { +function getChartMax(trigger: AppScalingTrigger, maxValue) { let thresholdCount = 0; let maxThreshold = 0; let thresholdmax = 0; @@ -236,7 +237,7 @@ function getChartMax(trigger, maxValue) { maxThreshold = Math.max(trigger.lower[0].threshold, maxThreshold); metricType = trigger.lower[0].metric_type; } - if (MetricPercentageTypes.indexOf(metricType) >= 0) { + if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricType) >= 0) { return 100; } if (maxThreshold > 0) { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts index cdebeecdd1..95cfaa0825 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts @@ -1,21 +1,19 @@ -import { - isEqual -} from './autoscaler-util'; +import { isEqual } from './autoscaler-util'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, - isPolicyMapEqual } from './autoscaler-transform-policy'; describe('Autoscaler Transform Policy Helper', () => { it('Test policy transformation', () => { - const arrayPolicy = { + const arrayPolicy: AppAutoscalerPolicy = { + enabled: true, instance_min_count: 1, instance_max_count: 10, scaling_rules: [ { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 10, operator: '<=', @@ -24,7 +22,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 30, operator: '<', @@ -33,7 +30,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 120, operator: '>', @@ -42,7 +38,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', @@ -51,7 +46,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 200, operator: '>=', @@ -60,7 +54,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 20, operator: '<', @@ -69,7 +62,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 50, operator: '>=', @@ -78,7 +70,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 40, operator: '<', @@ -87,7 +78,6 @@ describe('Autoscaler Transform Policy Helper', () => { }, { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', @@ -121,8 +111,7 @@ describe('Autoscaler Transform Policy Helper', () => { 25 ], instance_min_count: 3, - instance_max_count: 10, - initial_min_instance_count: 5 + instance_max_count: 10 } ], specific_date: [ @@ -137,15 +126,98 @@ describe('Autoscaler Transform Policy Helper', () => { start_date_time: '2099-01-04T20:00', end_date_time: '2099-02-19T23:15', instance_min_count: 2, - instance_max_count: 5, - initial_min_instance_count: 3 + instance_max_count: 5 } ] } }; - const mapPolicy = { + const mapPolicy: AppAutoscalerPolicyLocal = { + enabled: true, instance_min_count: 1, instance_max_count: 10, + scaling_rules: [ + { + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 10, + operator: '<=', + cool_down_secs: 300, + adjustment: '-2', + color: 'rgba(51, 136, 255, 0.6)' + }, + { + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 30, + operator: '<', + cool_down_secs: 300, + adjustment: '-1', + color: 'rgba(51, 204, 255, 0.6)' + }, + { + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 120, + operator: '>', + cool_down_secs: 300, + adjustment: '+3', + color: 'rgba(255, 85, 0, 0.6)' + }, + { + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 90, + operator: '>=', + cool_down_secs: 300, + adjustment: '+2', + color: 'rgba(255, 170, 0, 0.6)' + }, + { + metric_type: 'memoryused', + breach_duration_secs: 600, + threshold: 200, + operator: '>=', + cool_down_secs: 300, + adjustment: '+4', + color: 'rgba(255, 0, 0, 0.6)' + }, + { + metric_type: 'memoryutil', + breach_duration_secs: 600, + threshold: 20, + operator: '<', + cool_down_secs: 300, + adjustment: '-3', + color: 'rgba(51, 204, 255, 0.6)' + }, + { + metric_type: 'responsetime', + breach_duration_secs: 600, + threshold: 50, + operator: '>=', + cool_down_secs: 300, + adjustment: '+4', + color: 'rgba(255, 0, 0, 0.6)' + }, + { + metric_type: 'responsetime', + breach_duration_secs: 600, + threshold: 40, + operator: '<', + cool_down_secs: 300, + adjustment: '-5', + color: 'rgba(51, 204, 255, 0.6)' + }, + { + metric_type: 'memoryutil', + breach_duration_secs: 600, + threshold: 90, + operator: '>=', + cool_down_secs: 300, + adjustment: '+6', + color: 'rgba(255, 0, 0, 0.6)' + } + ], schedules: { timezone: 'Asia/Shanghai', recurring_schedule: [ @@ -172,8 +244,7 @@ describe('Autoscaler Transform Policy Helper', () => { 25 ], instance_min_count: 3, - instance_max_count: 10, - initial_min_instance_count: 5 + instance_max_count: 10 } ], specific_date: [ @@ -188,8 +259,7 @@ describe('Autoscaler Transform Policy Helper', () => { start_date_time: '2099-01-04T20:00', end_date_time: '2099-02-19T23:15', instance_min_count: 2, - instance_max_count: 5, - initial_min_instance_count: 3 + instance_max_count: 5 } ] }, @@ -198,55 +268,50 @@ describe('Autoscaler Transform Policy Helper', () => { lower: [ { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 30, operator: '<', cool_down_secs: 300, adjustment: '-1', - expand: false + color: 'rgba(51, 204, 255, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 10, operator: '<=', cool_down_secs: 300, adjustment: '-2', - expand: false + color: 'rgba(51, 136, 255, 0.6)' } ], upper: [ { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 200, operator: '>=', cool_down_secs: 300, adjustment: '+4', - expand: false + color: 'rgba(255, 0, 0, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 120, operator: '>', cool_down_secs: 300, adjustment: '+3', - expand: false + color: 'rgba(255, 85, 0, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', cool_down_secs: 300, adjustment: '+2', - expand: false + color: 'rgba(255, 170, 0, 0.6)' } ] }, @@ -254,25 +319,23 @@ describe('Autoscaler Transform Policy Helper', () => { lower: [ { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 20, operator: '<', cool_down_secs: 300, adjustment: '-3', - expand: false + color: 'rgba(51, 204, 255, 0.6)' } ], upper: [ { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', cool_down_secs: 300, adjustment: '+6', - expand: false + color: 'rgba(255, 0, 0, 0.6)' } ] }, @@ -280,25 +343,23 @@ describe('Autoscaler Transform Policy Helper', () => { upper: [ { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 50, operator: '>=', cool_down_secs: 300, adjustment: '+4', - expand: false + color: 'rgba(255, 0, 0, 0.6)' } ], lower: [ { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 40, operator: '<', cool_down_secs: 300, adjustment: '-5', - expand: false + color: 'rgba(51, 204, 255, 0.6)' } ] } @@ -306,93 +367,84 @@ describe('Autoscaler Transform Policy Helper', () => { scaling_rules_form: [ { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 200, operator: '>=', cool_down_secs: 300, adjustment: '+4', - expand: false + color: 'rgba(255, 0, 0, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 120, operator: '>', cool_down_secs: 300, adjustment: '+3', - expand: false + color: 'rgba(255, 85, 0, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', cool_down_secs: 300, adjustment: '+2', - expand: false + color: 'rgba(255, 170, 0, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 30, operator: '<', cool_down_secs: 300, adjustment: '-1', - expand: false + color: 'rgba(51, 204, 255, 0.6)' }, { metric_type: 'memoryused', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 10, operator: '<=', cool_down_secs: 300, adjustment: '-2', - expand: false + color: 'rgba(51, 136, 255, 0.6)' }, { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 90, operator: '>=', cool_down_secs: 300, adjustment: '+6', - expand: false + color: 'rgba(255, 0, 0, 0.6)' }, { metric_type: 'memoryutil', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 20, operator: '<', cool_down_secs: 300, adjustment: '-3', - expand: false + color: 'rgba(51, 204, 255, 0.6)' }, { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 50, operator: '>=', cool_down_secs: 300, adjustment: '+4', - expand: false + color: 'rgba(255, 0, 0, 0.6)' }, { metric_type: 'responsetime', - stat_window_secs: 300, breach_duration_secs: 600, threshold: 40, operator: '<', cool_down_secs: 300, adjustment: '-5', - expand: false + color: 'rgba(51, 204, 255, 0.6)' } ] }; @@ -401,7 +453,7 @@ describe('Autoscaler Transform Policy Helper', () => { expect(isEqual(mapPolicyFromArray, mapPolicy)).toBe(true); expect(isEqual(arrayPolicyFromMap, autoscalerTransformMapToArray(autoscalerTransformArrayToMap(arrayPolicy)))).toBe(true); delete arrayPolicy.scaling_rules; - expect(isPolicyMapEqual(arrayPolicy, autoscalerTransformArrayToMap(arrayPolicy))).toBe(true); + delete mapPolicy.scaling_rules; delete mapPolicy.scaling_rules_map; delete mapPolicy.scaling_rules_form; expect(isEqual(mapPolicy, autoscalerTransformMapToArray(mapPolicy))).toBe(true); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts index 31aae9500b..768412a5cf 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts @@ -1,7 +1,7 @@ import * as moment from 'moment-timezone'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; -import { getScaleType, isEqual, PolicyDefaultSetting, ScaleTypes } from './autoscaler-util'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppScalingRule, AppScalingTrigger } from '../app-autoscaler.types'; +import { getScaleType, isEqual, AutoscalerConstants } from './autoscaler-util'; export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { const newPolicy: AppAutoscalerPolicyLocal = { @@ -32,7 +32,7 @@ export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { return newPolicy; } -function setUpperColor(array) { +function setUpperColor(array: AppScalingRule[]) { // from FF0000 to FFFF00 // from rgba(255,0,0,0.6) to rgba(255,255,0,0.6) const max = 255; // parseInt('FF', 16) @@ -52,7 +52,7 @@ function setUpperColor(array) { } } -function setLowerColor(array) { +function setLowerColor(array: AppScalingRule[]) { // from 3344ff to 33ccff // from rgba(51,68,255,0.6) to rgba(51,204,255,0.6) const max = 204; // parseInt('CC', 16) @@ -72,12 +72,14 @@ function setLowerColor(array) { } } -export function autoscalerTransformMapToArray(newPolicy) { +export function autoscalerTransformMapToArray(newPolicy: AppAutoscalerPolicyLocal) { + newPolicy = JSON.parse(JSON.stringify(newPolicy)); const scalingRules = []; if (newPolicy.scaling_rules_form) { newPolicy.scaling_rules_form.map((trigger) => { - deleteIf(trigger, 'breach_duration_secs', trigger.breach_duration_secs === PolicyDefaultSetting.breach_duration_secs_default); - deleteIf(trigger, 'cool_down_secs', trigger.cool_down_secs === PolicyDefaultSetting.cool_down_secs_default); + deleteIf(trigger, 'breach_duration_secs', + trigger.breach_duration_secs === AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); + deleteIf(trigger, 'cool_down_secs', trigger.cool_down_secs === AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); delete trigger.color; scalingRules.push(trigger); }); @@ -99,10 +101,10 @@ export function autoscalerTransformMapToArray(newPolicy) { return newPolicy; } -function pushAndSortTrigger(map, metricName, newTrigger) { +function pushAndSortTrigger(map: { [metricName: string]: AppScalingTrigger }, metricName: string, newTrigger: AppScalingRule) { const scaleType = getScaleType(newTrigger.operator); - initIfUndefined(newTrigger, 'breach_duration_secs', PolicyDefaultSetting.breach_duration_secs_default); - initIfUndefined(newTrigger, 'cool_down_secs', PolicyDefaultSetting.cool_down_secs_default); + initIfUndefined(newTrigger, 'breach_duration_secs', AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); + initIfUndefined(newTrigger, 'cool_down_secs', AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); if (!map[metricName]) { map[metricName] = {}; } @@ -118,8 +120,8 @@ function pushAndSortTrigger(map, metricName, newTrigger) { map[metricName][scaleType].push(newTrigger); } -function buildFormUponMap(newPolicy, metricName) { - ScaleTypes.map((triggerType) => { +function buildFormUponMap(newPolicy: AppAutoscalerPolicyLocal, metricName: string) { + AutoscalerConstants.ScaleTypes.map((triggerType) => { if (newPolicy.scaling_rules_map[metricName][triggerType]) { newPolicy.scaling_rules_map[metricName][triggerType].map((trigger) => { newPolicy.scaling_rules_form.push(trigger); @@ -128,18 +130,18 @@ function buildFormUponMap(newPolicy, metricName) { }); } -function initIfUndefined(fatherEntity, childName, defaultData) { +function initIfUndefined(fatherEntity: any, childName: string, defaultData: any) { if (fatherEntity[childName] === undefined || fatherEntity[childName] === '') { fatherEntity[childName] = defaultData; } } -function deleteIf(fatherEntity, childName, condition) { +function deleteIf(fatherEntity: any, childName: string, condition: boolean) { if (condition) { delete fatherEntity[childName]; } } -export function isPolicyMapEqual(a, b) { +export function isPolicyMapEqual(a: AppAutoscalerPolicyLocal, b: AppAutoscalerPolicyLocal) { return isEqual(autoscalerTransformMapToArray(a), autoscalerTransformMapToArray(b)); } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts new file mode 100644 index 0000000000..9d62652ac1 --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts @@ -0,0 +1,73 @@ +import { + isEqual, buildLegendData, shiftArray +} from './autoscaler-util'; + +describe('Autoscaler Util Helper', () => { + it('buildLegendData', () => { + const trigger = { + lower: [ + { + adjustment: '-1', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '<=', + threshold: 5, + color: 'rgba(51, 204, 255, 0.6)' + } + ], + upper: [ + { + adjustment: '+2', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '>', + threshold: 20, + color: 'rgba(255, 0, 0, 0.6)' + }, + { + adjustment: '+1', + breach_duration_secs: 60, + cool_down_secs: 60, + metric_type: 'throughput', + operator: '>', + threshold: 10, + color: 'rgba(255, 128, 0, 0.6)' + } + ], + query: { + metric: 'policy', + params: { + start: 1557026400, + end: 1557026880, + step: 9.6 + } + } + }; + const expectedLegend = [ + { + name: 'throughput > 20', + value: 'rgba(255, 0, 0, 0.6)' + }, + { + name: '10 < throughput <= 20', + value: 'rgba(255, 128, 0, 0.6)' + }, + { + name: '5 < throughput <= 10', + value: 'rgba(90,167,0,0.6)' + }, + { + name: 'throughput <= 5', + value: 'rgba(51, 204, 255, 0.6)' + } + ]; + const legend = buildLegendData(trigger); + expect(isEqual(expectedLegend, legend)).toBe(true); + }); + it('shiftArray', () => { + expect(shiftArray([0, 2, 3], 1)).toEqual([1, 3, 4]); + expect(shiftArray([1, 6, 9], -1)).toEqual([0, 5, 8]); + }); +}); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts index eff5bde149..26c75a9c8b 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts @@ -1,87 +1,86 @@ import * as moment from 'moment-timezone'; -import { AppAutoscalerPolicy } from '../app-autoscaler.types'; - -// TODO: RC This feels like it should be wrapped in a helper class, which avoids lots of global consts - -export const MetricTypes = ['memoryused', 'memoryutil', 'responsetime', 'throughput', 'cpu']; -export const MetricPercentageTypes = ['memoryutil']; -export const ScaleTypes = ['upper', 'lower']; -export const UpperOperators = ['>', '>=']; -export const LowerOperators = ['<', '<=']; -export const WeekdayOptions = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; -export const MonthdayOptions = (() => { - const days = []; - for (let i = 0; i < 31; i++) { - days[i] = i + 1; - } - return days; -})(); - -export const normalColor = 'rgba(90,167,0,0.6)'; -export const MomentFormateDate = 'YYYY-MM-DD'; -export const MomentFormateDateTimeT = 'YYYY-MM-DDTHH:mm'; -export const MomentFormateTime = 'HH:mm'; -export const MomentFormateTimeS = 'HH:mm:ss'; - -export const PolicyDefaultSetting = { - breach_duration_secs_default: 120, - breach_duration_secs_min: 60, - breach_duration_secs_max: 3600, - cool_down_secs_default: 300, - cool_down_secs_min: 60, - cool_down_secs_max: 3600, -}; -export const PolicyDefaultTrigger = { - metric_type: 'memoryused', - breach_duration_secs: PolicyDefaultSetting.breach_duration_secs_default, - threshold: 10, - operator: '<=', - cool_down_secs: PolicyDefaultSetting.cool_down_secs_default, - adjustment: '-1' -}; -export const PolicyDefaultRecurringSchedule = { - start_time: '10:00', - end_time: '18:00', - days_of_week: [ - 1, 2, 3 - ], - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 -}; -export const PolicyDefaultSpecificDate = { - start_date_time: moment().add(1, 'days').set('hour', 10).set('minute', 0).format(MomentFormateDateTimeT), - end_date_time: moment().add(1, 'days').set('hour', 18).set('minute', 0).format(MomentFormateDateTimeT), - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 -}; - -export const metricMap = { - memoryused: { - unit_internal: 'MB', - interval: 40, - }, - memoryutil: { - unit_internal: ' % ', - interval: 40, - }, - responsetime: { - unit_internal: 'ms', - interval: 40, - }, - throughput: { - unit_internal: 'rps', - interval: 40, - }, - cpu: { - unit_internal: ' % ', - interval: 40, - } -}; - -export const S2NS = 1000000000; +import { AppScalingRule, AppScalingTrigger } from '../app-autoscaler.types'; + +export class AutoscalerConstants { + public static S2NS = 1000000000; + public static MetricTypes = ['memoryused', 'memoryutil', 'responsetime', 'throughput', 'cpu']; + public static MetricPercentageTypes = ['memoryutil']; + public static ScaleTypes = ['upper', 'lower']; + public static UpperOperators = ['>', '>=']; + public static LowerOperators = ['<', '<=']; + public static WeekdayOptions = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + public static MonthdayOptions = (() => { + const days = []; + for (let i = 0; i < 31; i++) { + days[i] = i + 1; + } + return days; + })(); + + public static normalColor = 'rgba(90,167,0,0.6)'; + public static MomentFormateDate = 'YYYY-MM-DD'; + public static MomentFormateDateTimeT = 'YYYY-MM-DDTHH:mm'; + public static MomentFormateTime = 'HH:mm'; + public static MomentFormateTimeS = 'HH:mm:ss'; + + public static PolicyDefaultSetting = { + breach_duration_secs_default: 120, + breach_duration_secs_min: 60, + breach_duration_secs_max: 3600, + cool_down_secs_default: 300, + cool_down_secs_min: 60, + cool_down_secs_max: 3600, + }; + public static PolicyDefaultTrigger = { + metric_type: 'memoryused', + breach_duration_secs: AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default, + threshold: 10, + operator: '<=', + cool_down_secs: AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default, + adjustment: '-1' + }; + public static PolicyDefaultRecurringSchedule = { + start_time: '10:00', + end_time: '18:00', + days_of_week: [ + 1, 2, 3 + ], + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }; + public static PolicyDefaultSpecificDate = { + start_date_time: moment().add(1, 'days').set('hour', 10).set('minute', 0).format(AutoscalerConstants.MomentFormateDateTimeT), + end_date_time: moment().add(1, 'days').set('hour', 18).set('minute', 0).format(AutoscalerConstants.MomentFormateDateTimeT), + instance_min_count: 1, + instance_max_count: 10, + initial_min_instance_count: 5 + }; + + public static metricMap = { + memoryused: { + unit_internal: 'MB', + interval: 40, + }, + memoryutil: { + unit_internal: ' % ', + interval: 40, + }, + responsetime: { + unit_internal: 'ms', + interval: 40, + }, + throughput: { + unit_internal: 'rps', + interval: 40, + }, + cpu: { + unit_internal: ' % ', + interval: 40, + } + }; +} export const PolicyAlert = { alertInvalidPolicyMinimumRange: 'The Minimum Instance Count must be a integer less than the Maximum Instance Count.', @@ -94,11 +93,11 @@ export const PolicyAlert = { alertInvalidPolicyTriggerStepPercentageRange: 'The Instance Step Up/Down percentage must be a integer greater than 1.', alertInvalidPolicyTriggerStepRange: 'The Instance Step Up/Down value must be a integer in the range of 1 to (Maximum Instance-1).', alertInvalidPolicyTriggerBreachDurationRange: - `The breach duration value must be an integer in the range of ${PolicyDefaultSetting.breach_duration_secs_min} to - ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`, + `The breach duration value must be an integer in the range of ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_min} to + ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_max} seconds.`, alertInvalidPolicyTriggerCooldownRange: - `The cooldown period value must be an integer in the range of ${PolicyDefaultSetting.cool_down_secs_min} to - ${PolicyDefaultSetting.breach_duration_secs_max} seconds.`, + `The cooldown period value must be an integer in the range of ${AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_min} to + ${AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_max} seconds.`, alertInvalidPolicyScheduleDateBeforeNow: 'Start/End date should be after or equal to current date.', alertInvalidPolicyScheduleEndDateBeforeStartDate: 'Start date must be earlier than the end date.', alertInvalidPolicyScheduleEndTimeBeforeStartTime: 'Start time must be earlier than the end time.', @@ -110,7 +109,7 @@ export const PolicyAlert = { alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.', }; -export function isEqual(a, b) { +export function isEqual(a: any, b: any) { if (typeof (a) !== typeof (b)) { return false; } else { @@ -129,21 +128,21 @@ export function isEqual(a, b) { } } -export function getScaleType(operator) { - if (LowerOperators.indexOf(operator) >= 0) { +export function getScaleType(operator: string) { + if (AutoscalerConstants.LowerOperators.indexOf(operator) >= 0) { return 'lower'; } else { return 'upper'; } } -export function getAdjustmentType(adjustment) { +export function getAdjustmentType(adjustment: string) { return adjustment.indexOf('%') >= 0 ? 'percentage' : 'value'; } -export function buildLegendData(trigger) { +export function buildLegendData(trigger: AppScalingTrigger) { const legendData = []; - let latestUl = {}; + let latestUl = null; if (trigger.upper && trigger.upper.length > 0) { latestUl = buildUpperLegendData(legendData, trigger.upper, !trigger.lower || trigger.lower.length === 0); } @@ -153,7 +152,7 @@ export function buildLegendData(trigger) { return legendData; } -function buildUpperLegendData(legendData, upper, nolower) { +function buildUpperLegendData(legendData: any, upper: AppScalingRule[], nolower: boolean) { let latestUl: any = {}; upper.map((item, index) => { let name = ''; @@ -172,13 +171,13 @@ function buildUpperLegendData(legendData, upper, nolower) { if (nolower) { legendData.push({ name: `${upper[0].metric_type} ${getOppositeOperator(latestUl.operator)} ${latestUl.threshold}`, - value: normalColor + value: AutoscalerConstants.normalColor }); } return latestUl; } -function buildLowerLegendData(legendData, lower, latestUl) { +function buildLowerLegendData(legendData: any, lower: AppScalingRule[], latestUl: AppScalingRule) { lower.map((item, index) => { let name = ''; if (!latestUl.threshold) { @@ -189,7 +188,7 @@ function buildLowerLegendData(legendData, lower, latestUl) { } legendData.push({ name, - value: index === 0 ? normalColor : latestUl.color + value: index === 0 ? AutoscalerConstants.normalColor : latestUl.color }); latestUl = item; }); @@ -200,7 +199,7 @@ function buildLowerLegendData(legendData, lower, latestUl) { return {}; } -function getOppositeOperator(operator) { +function getOppositeOperator(operator: string) { switch (operator) { case '>': return '<='; @@ -213,7 +212,7 @@ function getOppositeOperator(operator) { } } -function getRightOperator(operator) { +function getRightOperator(operator: string) { switch (operator) { case '>': return '<='; @@ -224,7 +223,7 @@ function getRightOperator(operator) { } } -function getLeftOperator(operator) { +function getLeftOperator(operator: string) { switch (operator) { case '>': return '<'; @@ -237,11 +236,10 @@ function getLeftOperator(operator) { } } -export function shiftArray(array, step) { +export function shiftArray(array: number[], step: number) { const days = []; for (let i = 0; i < array.length; i++) { days[i] = array[i] + step; } return days; } - diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts new file mode 100644 index 0000000000..eea231d2e9 --- /dev/null +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts @@ -0,0 +1,115 @@ +import { + numberWithFractionOrExceedRange, + timeIsSameOrAfter, + dateIsAfter, + dateTimeIsSameOrAfter, + recurringSchedulesInvalidRepeatOn, + recurringSchedulesOverlapping, + specificDateRangeOverlapping +} from './autoscaler-validation'; +import { AppRecurringSchedule, AppSpecificDate } from '../app-autoscaler.types'; + +describe('Autoscaler Util Helper', () => { + it('numberWithFractionOrExceedRange', () => { + expect(numberWithFractionOrExceedRange(undefined, 1, 10, false)).toBe(false); + expect(numberWithFractionOrExceedRange(undefined, 1, 10, true)).toBe(true); + expect(numberWithFractionOrExceedRange(5, 1, 10, true)).toBe(false); + expect(numberWithFractionOrExceedRange(1, 5, 10, true)).toBe(true); + }); + it('timeIsSameOrAfter', () => { + expect(timeIsSameOrAfter('10:00', '12:00')).toBe(false); + expect(timeIsSameOrAfter('10:00', '10:00')).toBe(true); + expect(timeIsSameOrAfter('10:00', '08:00')).toBe(true); + }); + it('dateIsAfter', () => { + expect(dateIsAfter('2020-01-01', '2020-01-02')).toBe(false); + expect(dateIsAfter('2020-01-01', '2020-01-01')).toBe(false); + expect(dateIsAfter('2020-01-01', '2019-12-31')).toBe(true); + }); + it('dateTimeIsSameOrAfter', () => { + expect(dateTimeIsSameOrAfter('2020-01-01 10:00', '2020-01-01 12:00')).toBe(false); + expect(dateTimeIsSameOrAfter('2020-01-01 10:00', '2020-01-01 10:00')).toBe(true); + expect(dateTimeIsSameOrAfter('2020-01-01 10:00', '2020-01-01 08:00')).toBe(true); + }); + it('recurringSchedulesInvalidRepeatOn', () => { + const recurring1: AppRecurringSchedule = { + days_of_month: [1, 2], + days_of_week: [3, 4], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + const recurring2: AppRecurringSchedule = { + days_of_week: [3, 4], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + const recurring3: AppRecurringSchedule = { + days_of_month: [1, 2], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + const recurring4: AppRecurringSchedule = { + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + expect(recurringSchedulesInvalidRepeatOn(recurring1)).toBe(true); + expect(recurringSchedulesInvalidRepeatOn(recurring2)).toBe(false); + expect(recurringSchedulesInvalidRepeatOn(recurring3)).toBe(false); + expect(recurringSchedulesInvalidRepeatOn(recurring4)).toBe(true); + }); + it('recurringSchedulesOverlapping', () => { + const recurring1: AppRecurringSchedule = { + days_of_week: [1, 2], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + const recurring2: AppRecurringSchedule = { + days_of_month: [3, 4], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }; + const recurrings: AppRecurringSchedule[] = [{ + days_of_month: [4, 5], + instance_min_count: 1, + instance_max_count: 2, + start_time: '10:00', + end_time: '18:00' + }, recurring1, recurring2]; + expect(recurringSchedulesOverlapping(recurring1, 1, recurrings, 'days_of_week')).toBe(false); + expect(recurringSchedulesOverlapping(recurring2, 2, recurrings, 'days_of_month')).toBe(true); + }); + it('specificDateRangeOverlapping', () => { + const specific: AppSpecificDate = { + instance_min_count: 1, + instance_max_count: 2, + start_date_time: '2020-01-01T10:00', + end_date_time: '2020-01-01T20:00' + }; + const specifics1: AppSpecificDate[] = [{ + instance_min_count: 1, + instance_max_count: 2, + start_date_time: '2020-01-01T08:00', + end_date_time: '2020-01-01T18:00' + }, specific]; + const specifics2: AppSpecificDate[] = [{ + instance_min_count: 1, + instance_max_count: 2, + start_date_time: '2020-02-01T08:00', + end_date_time: '2020-02-01T18:00' + }, specific]; + expect(specificDateRangeOverlapping(specific, 1, specifics1)).toBe(true); + expect(specificDateRangeOverlapping(specific, 1, specifics2)).toBe(false); + }); +}); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts index 417cb04d6d..0a6fca85fb 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts @@ -1,13 +1,9 @@ import * as intersect from 'intersect'; import * as moment from 'moment-timezone'; -import { - LowerOperators, - UpperOperators, - MomentFormateDateTimeT, - MomentFormateDate -} from './autoscaler-util'; +import { AutoscalerConstants } from './autoscaler-util'; +import { AppRecurringSchedule, AppSpecificDate, AppScalingRule } from '../app-autoscaler.types'; -export function numberWithFractionOrExceedRange(value, min, max, required) { +export function numberWithFractionOrExceedRange(value: any, min: number, max: number, required: boolean) { if ((!value || isNaN(value)) && !required) { return false; } @@ -17,27 +13,29 @@ export function numberWithFractionOrExceedRange(value, min, max, required) { return value.toString().indexOf('.') > -1 || value > max || value < min; } -export function timeIsSameOrAfter(startTime, endTime) { - startTime = moment('2000-01-01T' + startTime, MomentFormateDateTimeT); - endTime = moment('2000-01-01T' + endTime, MomentFormateDateTimeT); - return startTime.isSameOrAfter(endTime); +export function timeIsSameOrAfter(startTime: string, endTime: string) { + const startTimeMoment = moment('2000-01-01T' + startTime, AutoscalerConstants.MomentFormateDateTimeT); + const endTimeMoment = moment('2000-01-01T' + endTime, AutoscalerConstants.MomentFormateDateTimeT); + return startTimeMoment.isSameOrAfter(endTimeMoment); } -export function dateIsAfter(startDate, endDate) { - return moment(startDate, MomentFormateDate).isAfter(moment(endDate, MomentFormateDate)); +export function dateIsAfter(startDate: string, endDate: string) { + return moment(startDate, AutoscalerConstants.MomentFormateDate).isAfter(moment(endDate, AutoscalerConstants.MomentFormateDate)); } -export function dateTimeIsSameOrAfter(startDateTime, endDateTime) { +export function dateTimeIsSameOrAfter(startDateTime: string, endDateTime: string) { return moment(startDateTime).isSameOrAfter(moment(endDateTime)); } -export function recurringSchedulesInvalidRepeatOn(inputRecurringSchedules) { +export function recurringSchedulesInvalidRepeatOn(inputRecurringSchedules: AppRecurringSchedule) { const weekdayCount = inputRecurringSchedules.hasOwnProperty('days_of_week') ? inputRecurringSchedules.days_of_week.length : 0; const monthdayCount = inputRecurringSchedules.hasOwnProperty('days_of_month') ? inputRecurringSchedules.days_of_month.length : 0; return (weekdayCount > 0 && monthdayCount > 0) || (weekdayCount === 0 && monthdayCount === 0); } -export function recurringSchedulesOverlapping(newSchedule, index, inputRecurringSchedules, property) { +export function recurringSchedulesOverlapping( + newSchedule: AppRecurringSchedule, index: number, + inputRecurringSchedules: AppRecurringSchedule[], property: string) { for (let i = 0; inputRecurringSchedules && i < inputRecurringSchedules.length; i++) { if (index === i || !inputRecurringSchedules[i].hasOwnProperty(property) || inputRecurringSchedules[i].start_date && newSchedule.start_date && !dateOverlaps(inputRecurringSchedules[i], newSchedule)) { @@ -51,14 +49,14 @@ export function recurringSchedulesOverlapping(newSchedule, index, inputRecurring return false; } -export function specificDateRangeOverlapping(newSchedule, index, inputSpecificDates) { +export function specificDateRangeOverlapping(newSchedule: AppSpecificDate, index: number, inputSpecificDates: AppSpecificDate[]) { const dateRangeList = []; - const start = moment(newSchedule.start_date_time, MomentFormateDateTimeT); - const end = moment(newSchedule.end_date_time, MomentFormateDateTimeT); + const start = moment(newSchedule.start_date_time, AutoscalerConstants.MomentFormateDateTimeT); + const end = moment(newSchedule.end_date_time, AutoscalerConstants.MomentFormateDateTimeT); for (let i = 0; inputSpecificDates && i < inputSpecificDates.length; i++) { if (i !== index) { - const starti = moment(inputSpecificDates[i].start_date_time, MomentFormateDateTimeT); - const endi = moment(inputSpecificDates[i].end_date_time, MomentFormateDateTimeT); + const starti = moment(inputSpecificDates[i].start_date_time, AutoscalerConstants.MomentFormateDateTimeT); + const endi = moment(inputSpecificDates[i].end_date_time, AutoscalerConstants.MomentFormateDateTimeT); dateRangeList.push({ start: starti, end: endi @@ -73,23 +71,25 @@ export function specificDateRangeOverlapping(newSchedule, index, inputSpecificDa return false; } -function timeOverlaps(timeI, tiemJ) { - const startDateTimeI = moment('1970-01-01T' + timeI.start_time, MomentFormateDateTimeT); - const endDateTimeI = moment('1970-01-01T' + timeI.end_time, MomentFormateDateTimeT); - const startDateTimeJ = moment('1970-01-01T' + tiemJ.start_time, MomentFormateDateTimeT); - const endDateTimeJ = moment('1970-01-01T' + tiemJ.end_time, MomentFormateDateTimeT); +function timeOverlaps(timeI: AppRecurringSchedule, tiemJ: AppRecurringSchedule) { + const startDateTimeI = moment('1970-01-01T' + timeI.start_time, AutoscalerConstants.MomentFormateDateTimeT); + const endDateTimeI = moment('1970-01-01T' + timeI.end_time, AutoscalerConstants.MomentFormateDateTimeT); + const startDateTimeJ = moment('1970-01-01T' + tiemJ.start_time, AutoscalerConstants.MomentFormateDateTimeT); + const endDateTimeJ = moment('1970-01-01T' + tiemJ.end_time, AutoscalerConstants.MomentFormateDateTimeT); return dateTimeOverlaps(startDateTimeI, endDateTimeI, startDateTimeJ, endDateTimeJ); } -function dateOverlaps(dateI, dateJ) { - const startDateTimeI = moment(dateI.start_date + 'T00:00', MomentFormateDateTimeT); - const endDateTimeI = moment(dateI.end_date + 'T23:59', MomentFormateDateTimeT); - const startDateTimeJ = moment(dateJ.start_date + 'T00:00', MomentFormateDateTimeT); - const endDateTimeJ = moment(dateJ.end_date + 'T23:59', MomentFormateDateTimeT); +function dateOverlaps(dateI: AppRecurringSchedule, dateJ: AppRecurringSchedule) { + const startDateTimeI = moment(dateI.start_date + 'T00:00', AutoscalerConstants.MomentFormateDateTimeT); + const endDateTimeI = moment(dateI.end_date + 'T23:59', AutoscalerConstants.MomentFormateDateTimeT); + const startDateTimeJ = moment(dateJ.start_date + 'T00:00', AutoscalerConstants.MomentFormateDateTimeT); + const endDateTimeJ = moment(dateJ.end_date + 'T23:59', AutoscalerConstants.MomentFormateDateTimeT); return dateTimeOverlaps(startDateTimeI, endDateTimeI, startDateTimeJ, endDateTimeJ); } -function dateTimeOverlaps(startDateTimeI, endDateTimeI, startDateTimeJ, endDateTimeJ) { +function dateTimeOverlaps( + startDateTimeI: moment.Moment, endDateTimeI: moment.Moment, + startDateTimeJ: moment.Moment, endDateTimeJ: moment.Moment) { if (startDateTimeJ.isAfter(startDateTimeI)) { return endDateTimeI.isAfter(startDateTimeJ); } else { @@ -97,11 +97,12 @@ function dateTimeOverlaps(startDateTimeI, endDateTimeI, startDateTimeJ, endDateT } } -export function getThresholdMin(policyTriggers, metricType, scaleType, index) { +export function getThresholdMin(policyTriggers: AppScalingRule[], metricType: string, scaleType: string, index: number) { let thresholdMin = 1; if (scaleType === 'upper') { policyTriggers.map((trigger, triggerIndex) => { - if (triggerIndex !== index && trigger.metric_type === metricType && LowerOperators.indexOf(trigger.operator) >= 0) { + if (triggerIndex !== index && trigger.metric_type === metricType && + AutoscalerConstants.LowerOperators.indexOf(trigger.operator) >= 0) { thresholdMin = Math.max(trigger.threshold + 1, thresholdMin); } }); @@ -109,11 +110,12 @@ export function getThresholdMin(policyTriggers, metricType, scaleType, index) { return thresholdMin; } -export function getThresholdMax(policyTriggers, metricType, scaleType, index) { +export function getThresholdMax(policyTriggers: AppScalingRule[], metricType: string, scaleType: string, index: number) { let thresholdMax = Number.MAX_VALUE; if (scaleType === 'lower') { policyTriggers.map((trigger, triggerIndex) => { - if (triggerIndex !== index && trigger.metric_type === metricType && UpperOperators.indexOf(trigger.operator) >= 0) { + if (triggerIndex !== index && trigger.metric_type === metricType && + AutoscalerConstants.UpperOperators.indexOf(trigger.operator) >= 0) { thresholdMax = Math.min(trigger.threshold - 1, thresholdMax); } }); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 620ee0ff92..dae9914a64 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -32,11 +32,10 @@ import { } from '../app-autoscaler.actions'; import { AppAutoscalerAppMetric, - AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory, } from '../app-autoscaler.types'; -import { MetricTypes } from '../autoscaler-helpers/autoscaler-util'; +import { AutoscalerConstants } from '../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerPolicySchemaKey, @@ -71,12 +70,12 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max']; recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max']; scalingHistoryColumns: string[] = ['event', 'trigger', 'date', 'error']; - metricTypes: string[] = MetricTypes; + metricTypes: string[] = AutoscalerConstants.MetricTypes; appAutoscalerPolicyService: EntityService>; - appAutoscalerScalingHistoryService: EntityService; // TODO: RC typing + appAutoscalerScalingHistoryService: EntityService>; appAutoscalerEnablement$: Observable; - appAutoscalerPolicy$: Observable; + appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; private appAutoscalerPolicyErrorSub: Subscription; @@ -131,26 +130,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { ) { } ngOnInit() { - // this.appAutoscalerHealthService = this.entityServiceFactory.create( - // appAutoscalerHealthSchemaKey, - // entityFactory(appAutoscalerHealthSchemaKey), - // this.applicationService.appGuid, - // new GetAppAutoscalerHealthAction(this.applicationService.appGuid, this.applicationService.cfGuid), - // false - // ); - // this.appAutoscalerEnablement$ = this.appAutoscalerHealthService.entityObs$.pipe( - // map(({ entity }) => { - // if (entity && entity.entity && entity.entity.uptime > 0) { - // console.log(true) - // return true; - // } else { - // console.log(false) - // return false; - // } - // }), - // publishReplay(1), - // refCount() - // ); this.appAutoscalerPolicyService = this.entityServiceFactory.create( appAutoscalerPolicySchemaKey, entityFactory(appAutoscalerPolicySchemaKey), @@ -164,6 +143,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); this.loadLatestMetricsUponPolicy(entity.entity); } + this.initErrorSub(); return entity && entity.entity; }), publishReplay(1), @@ -185,7 +165,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { false ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( - map(({ entity }) => entity && entity.entity), + map(({ entity }) => { + this.initErrorSub(); + return entity && entity.entity; + }), publishReplay(1), refCount() ); @@ -218,7 +201,12 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { initErrorSub() { this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( filter(request => !!request.error), - map(request => request.message), + map(request => { + const msg = request.message; + request.error = false; + request.message = ''; + return msg; + }), distinctUntilChanged(), ).subscribe(errorMessage => { if (this.appAutoscalerPolicySnackBarRef) { diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts index 3c2360a69c..011436bc65 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -3,12 +3,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component'; import { CoreModule } from '../../../core/core.module'; import { ApplicationService } from '../../../features/applications/application.service'; -import { ApplicationServiceMock } from '../../../test-framework/application-service-helper'; -import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper'; -import { ApplicationStateService } from '../../application-state/application-state.service'; +import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../..//test-framework/store-test-helper'; +import { ApplicationStateService } from '../../../../../core/src/shared/components/application-state/application-state.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { CommonModule } from '@angular/common'; -import { MetadataItemComponent } from '../../metadata-item/metadata-item.component'; +import { MetadataItemComponent } from '../../../shared/components/metadata-item/metadata-item.component'; describe('CardAutoscalerDefaultComponent', () => { let component: CardAutoscalerDefaultComponent; diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts index b9081bf730..5776bb8cea 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts @@ -15,7 +15,7 @@ import { StratosStatus } from '../../../shared/shared.types'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; +import { AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; @Component({ selector: 'app-card-autoscaler-default', diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts index e84d690fe5..b4c2b62b4a 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts @@ -6,7 +6,6 @@ import { StepOnNextFunction } from '../../../shared/components/stepper/step/step import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; - export abstract class EditAutoscalerPolicy implements OnInit { public currentPolicy: AppAutoscalerPolicyLocal; public appAutoscalerPolicy$: Observable; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 6f95b631bd..8eb53f39ef 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -9,13 +9,8 @@ import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autosca import { getAdjustmentType, getScaleType, - LowerOperators, - MetricPercentageTypes, - MetricTypes, + AutoscalerConstants, PolicyAlert, - PolicyDefaultSetting, - PolicyDefaultTrigger, - UpperOperators, } from '../../autoscaler-helpers/autoscaler-util'; import { getThresholdMax, @@ -36,8 +31,8 @@ import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; - metricTypes = MetricTypes; - operatorTypes = UpperOperators.concat(LowerOperators); + metricTypes = AutoscalerConstants.MetricTypes; + operatorTypes = AutoscalerConstants.UpperOperators.concat(AutoscalerConstants.LowerOperators); editTriggerForm: FormGroup; appAutoscalerPolicy$: Observable; @@ -52,26 +47,26 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp private fb: FormBuilder, service: EditAutoscalerPolicyService ) { - super(service) + super(service); this.editTriggerForm = this.fb.group({ metric_type: [0, this.validateTriggerMetricType()], operator: [0, this.validateTriggerOperator()], threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]], adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]], breach_duration_secs: [0, [ - Validators.min(PolicyDefaultSetting.breach_duration_secs_min), - Validators.max(PolicyDefaultSetting.breach_duration_secs_max) + Validators.min(AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_min), + Validators.max(AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_max) ]], cool_down_secs: [0, [ - Validators.min(PolicyDefaultSetting.cool_down_secs_min), - Validators.max(PolicyDefaultSetting.cool_down_secs_max) + Validators.min(AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_min), + Validators.max(AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_max) ]], adjustment_type: [0] }); } addTrigger = () => { - this.currentPolicy.scaling_rules_form.push(cloneObject(PolicyDefaultTrigger)); + this.currentPolicy.scaling_rules_form.push(cloneObject(AutoscalerConstants.PolicyDefaultTrigger)); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); } @@ -109,12 +104,14 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = this.editTriggerForm.get('breach_duration_secs').value; } else { - this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = PolicyDefaultSetting.breach_duration_secs_default; + this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs = + AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default; } if (this.editTriggerForm.get('cool_down_secs').value) { this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = this.editTriggerForm.get('cool_down_secs').value; } else { - this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = PolicyDefaultSetting.cool_down_secs_default; + this.currentPolicy.scaling_rules_form[this.editIndex].cool_down_secs = + AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default; } this.editIndex = -1; } @@ -146,7 +143,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp const metricType = this.editTriggerForm.get('metric_type').value; this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; const errors: any = {}; - if (MetricPercentageTypes.indexOf(metricType) >= 0) { + if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricType) >= 0) { if (numberWithFractionOrExceedRange(control.value, 1, 100, true)) { errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; } diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index a718281b99..f469a199c4 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -7,14 +7,7 @@ import { Observable } from 'rxjs'; import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; -import { - MomentFormateDate, - MonthdayOptions, - PolicyAlert, - PolicyDefaultRecurringSchedule, - shiftArray, - WeekdayOptions, -} from '../../autoscaler-helpers/autoscaler-util'; +import { PolicyAlert, shiftArray, AutoscalerConstants } from '../../autoscaler-helpers/autoscaler-util'; import { dateIsAfter, numberWithFractionOrExceedRange, @@ -39,8 +32,8 @@ import { export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy implements OnInit { policyAlert = PolicyAlert; - weekdayOptions = WeekdayOptions; - monthdayOptions = MonthdayOptions; + weekdayOptions = AutoscalerConstants.WeekdayOptions; + monthdayOptions = AutoscalerConstants.MonthdayOptions; editRecurringScheduleForm: FormGroup; appAutoscalerPolicy$: Observable; @@ -76,7 +69,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp } addRecurringSchedule = () => { - this.currentPolicy.schedules.recurring_schedule.push(cloneObject(PolicyDefaultRecurringSchedule)); + this.currentPolicy.schedules.recurring_schedule.push(cloneObject(AutoscalerConstants.PolicyDefaultRecurringSchedule)); this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); } @@ -115,8 +108,8 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp if (this.editEffectiveType === 'custom') { if (!this.currentPolicy.schedules.recurring_schedule[this.editIndex].start_date && !this.editRecurringScheduleForm.get('start_date').value) { - this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); - this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(MomentFormateDate)); + this.editRecurringScheduleForm.controls.start_date.setValue(moment().add(1, 'days').format(AutoscalerConstants.MomentFormateDate)); + this.editRecurringScheduleForm.controls.end_date.setValue(moment().add(1, 'days').format(AutoscalerConstants.MomentFormateDate)); } this.editRecurringScheduleForm.controls.start_date.setValidators([Validators.required, this.validateRecurringScheduleDate('end_date'), this.validateRecurringScheduleGlobal()]); @@ -193,7 +186,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp return null; } const errors: any = {}; - if (dateIsAfter(moment().format(MomentFormateDate), control.value)) { + if (dateIsAfter(moment().format(AutoscalerConstants.MomentFormateDate), control.value)) { errors.alertInvalidPolicyScheduleDateBeforeNow = { value: control.value }; } const lastValid = this.editMutualValidation.date; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index 9fd9d4e511..467e812bba 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -14,8 +14,8 @@ import { cloneObject } from '../../../../core/utils.service'; import { ApplicationService } from '../../../../features/applications/application.service'; import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; -import { MomentFormateDateTimeT, PolicyAlert, PolicyDefaultSpecificDate } from '../../autoscaler-helpers/autoscaler-util'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppSpecificDate } from '../../app-autoscaler.types'; +import { AutoscalerConstants, PolicyAlert } from '../../autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, numberWithFractionOrExceedRange, @@ -114,7 +114,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp } addSpecificDate = () => { - this.currentPolicy.schedules.specific_date.push(cloneObject(PolicyDefaultSpecificDate)); + this.currentPolicy.schedules.specific_date.push(cloneObject(AutoscalerConstants.PolicyDefaultSpecificDate)); this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } @@ -170,10 +170,16 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp return null; } const errors: any = {}; - const newSchedule = { start_date_time: control.value, end_date_time: this.editSpecificDateForm.get('end_date_time').value }; + const newSchedule: AppSpecificDate = { + instance_min_count: 0, + instance_max_count: 0, + start_date_time: control.value, + end_date_time: this.editSpecificDateForm.get('end_date_time').value + }; const lastValid = this.editMutualValidation.datetime; this.editMutualValidation.datetime = true; - if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { + if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone) + .format(AutoscalerConstants.MomentFormateDateTimeT), control.value)) { errors.alertInvalidPolicyScheduleStartDateTimeBeforeNow = { value: control.value }; } if (dateTimeIsSameOrAfter(control.value, this.editSpecificDateForm.get('end_date_time').value)) { @@ -197,10 +203,16 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp return null; } const errors: any = {}; - const newSchedule = { start_date_time: this.editSpecificDateForm.get('start_date_time').value, end_date_time: control.value }; + const newSchedule = { + instance_min_count: 0, + instance_max_count: 0, + start_date_time: this.editSpecificDateForm.get('start_date_time').value, + end_date_time: control.value + }; const lastValid = this.editMutualValidation.datetime; this.editMutualValidation.datetime = true; - if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone).format(MomentFormateDateTimeT), control.value)) { + if (dateTimeIsSameOrAfter(moment().tz(this.currentPolicy.schedules.timezone). + format(AutoscalerConstants.MomentFormateDateTimeT), control.value)) { errors.alertInvalidPolicyScheduleEndDateTimeBeforeNow = { value: control.value }; } if (dateTimeIsSameOrAfter(this.editSpecificDateForm.get('start_date_time').value, control.value)) { @@ -231,7 +243,6 @@ export function validateRecurringSpecificMin(editForm, editMutualValidation): Va if (editForm) { editForm.controls.initial_min_instance_count.updateValueAndValidity(); } - console.log(invalid); return invalid ? { alertInvalidPolicyMinimumRange: { value: control.value } } : null; }; } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index 971a788228..b92265f77b 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -11,7 +11,7 @@ import { endpointStoreNames } from '../../../../../../../store/src/types/endpoin 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 { SharedModule } from '../../../../shared.module'; +import { SharedModule } from '../../../../../shared/shared.module'; import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 1a4772ea3d..b66ec1bc3a 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -8,7 +8,7 @@ import { ApplicationService } from '../../../../../features/applications/applica import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../../../../shared/components/list/list.component.types'; import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; -import { AutoscalerEvent } from '../../../app-autoscaler.types'; +import { AppAutoscalerEvent } from '../../../app-autoscaler.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; import { TableCellAutoscalerEventChangeComponent, @@ -19,10 +19,10 @@ import { @Injectable() export class CfAppAutoscalerEventsConfigService - extends ListConfig> - implements IListConfig> { + extends ListConfig> + implements IListConfig> { autoscalerEventSource: CfAppAutoscalerEventsDataSource; - columns: Array>> = [ + columns: Array>> = [ { columnId: 'timestamp', headerCell: () => 'Timestamp', diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index a5b6467c58..ed62171a27 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -7,16 +7,16 @@ import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../../shared/components/list/list.component.types'; import { GetAppAutoscalerScalingHistoryAction } from '../../../app-autoscaler.actions'; -import { AutoscalerEvent } from '../../../app-autoscaler.types'; +import { AppAutoscalerEvent } from '../../../app-autoscaler.types'; import { appAutoscalerScalingHistorySchemaKey } from '../../../autoscaler.store.module'; -export class CfAppAutoscalerEventsDataSource extends ListDataSource> { +export class CfAppAutoscalerEventsDataSource extends ListDataSource> { action: any; constructor( store: Store, cfGuid: string, appGuid: string, - listConfig: IListConfig> + listConfig: IListConfig> ) { const action = new GetAppAutoscalerScalingHistoryAction(null, appGuid, cfGuid); super( From 8b467a5f1c169f604da6333bda7516af18c47b19 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Mon, 6 May 2019 15:30:33 +0800 Subject: [PATCH 57/98] [autoscaler] fix small issue when testing autoscaler components --- .../autoscaler-transform-metric.spec.ts | 122 +++++++++--------- .../autoscaler-transform-metric.ts | 59 +++++---- .../autoscaler-metric-page.component.spec.ts | 7 +- .../card-autoscaler-default.component.spec.ts | 6 + ...p-autoscaler-events-config.service.spec.ts | 8 +- ...-autoscaler-event-status.component.spec.ts | 4 +- .../frontend/app/custom/custom.module.ts | 2 - 7 files changed, 115 insertions(+), 93 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts index d3721aed1d..4ad5bb4cb2 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts @@ -196,112 +196,112 @@ describe('Autoscaler Transform Metric Helper', () => { target: [ { time: 1557026419, - name: '11:20:19', + name: '03:20:19', value: 6 }, { time: 1557026458, - name: '11:20:58', + name: '03:20:58', value: 5 }, { time: 1557026497, - name: '11:21:37', + name: '03:21:37', value: 5 }, { time: 1557026536, - name: '11:22:16', + name: '03:22:16', value: 5 }, { time: 1557026575, - name: '11:22:55', + name: '03:22:55', value: 6 }, { time: 1557026614, - name: '11:23:34', + name: '03:23:34', value: 8 }, { time: 1557026653, - name: '11:24:13', + name: '03:24:13', value: 12 }, { time: 1557026692, - name: '11:24:52', + name: '03:24:52', value: 18 }, { time: 1557026731, - name: '11:25:31', + name: '03:25:31', value: 21 }, { time: 1557026770, - name: '11:26:10', + name: '03:26:10', value: 18 }, { time: 1557026809, - name: '11:26:49', + name: '03:26:49', value: 16 }, { time: 1557026848, - name: '11:27:28', + name: '03:27:28', value: 14 } ], colorTarget: [ { - name: '11:20:19', + name: '03:20:19', value: 'rgba(90,167,0,0.6)' }, { - name: '11:20:58', + name: '03:20:58', value: 'rgba(51, 204, 255, 0.6)' }, { - name: '11:21:37', + name: '03:21:37', value: 'rgba(51, 204, 255, 0.6)' }, { - name: '11:22:16', + name: '03:22:16', value: 'rgba(51, 204, 255, 0.6)' }, { - name: '11:22:55', + name: '03:22:55', value: 'rgba(90,167,0,0.6)' }, { - name: '11:23:34', + name: '03:23:34', value: 'rgba(90,167,0,0.6)' }, { - name: '11:24:13', + name: '03:24:13', value: 'rgba(255, 128, 0, 0.6)' }, { - name: '11:24:52', + name: '03:24:52', value: 'rgba(255, 128, 0, 0.6)' }, { - name: '11:25:31', + name: '03:25:31', value: 'rgba(255, 0, 0, 0.6)' }, { - name: '11:26:10', + name: '03:26:10', value: 'rgba(255, 128, 0, 0.6)' }, { - name: '11:26:49', + name: '03:26:49', value: 'rgba(255, 128, 0, 0.6)' }, { - name: '11:27:28', + name: '03:27:28', value: 'rgba(255, 128, 0, 0.6)' }, { @@ -323,51 +323,51 @@ describe('Autoscaler Transform Metric Helper', () => { name: 'upper threshold: > 20', series: [ { - name: '11:20:19', + name: '03:20:19', value: 20 }, { - name: '11:20:58', + name: '03:20:58', value: 20 }, { - name: '11:21:37', + name: '03:21:37', value: 20 }, { - name: '11:22:16', + name: '03:22:16', value: 20 }, { - name: '11:22:55', + name: '03:22:55', value: 20 }, { - name: '11:23:34', + name: '03:23:34', value: 20 }, { - name: '11:24:13', + name: '03:24:13', value: 20 }, { - name: '11:24:52', + name: '03:24:52', value: 20 }, { - name: '11:25:31', + name: '03:25:31', value: 20 }, { - name: '11:26:10', + name: '03:26:10', value: 20 }, { - name: '11:26:49', + name: '03:26:49', value: 20 }, { - name: '11:27:28', + name: '03:27:28', value: 20 } ] @@ -376,51 +376,51 @@ describe('Autoscaler Transform Metric Helper', () => { name: 'upper threshold: > 10', series: [ { - name: '11:20:19', + name: '03:20:19', value: 10 }, { - name: '11:20:58', + name: '03:20:58', value: 10 }, { - name: '11:21:37', + name: '03:21:37', value: 10 }, { - name: '11:22:16', + name: '03:22:16', value: 10 }, { - name: '11:22:55', + name: '03:22:55', value: 10 }, { - name: '11:23:34', + name: '03:23:34', value: 10 }, { - name: '11:24:13', + name: '03:24:13', value: 10 }, { - name: '11:24:52', + name: '03:24:52', value: 10 }, { - name: '11:25:31', + name: '03:25:31', value: 10 }, { - name: '11:26:10', + name: '03:26:10', value: 10 }, { - name: '11:26:49', + name: '03:26:49', value: 10 }, { - name: '11:27:28', + name: '03:27:28', value: 10 } ] @@ -429,51 +429,51 @@ describe('Autoscaler Transform Metric Helper', () => { name: 'lower threshold: <= 5', series: [ { - name: '11:20:19', + name: '03:20:19', value: 5 }, { - name: '11:20:58', + name: '03:20:58', value: 5 }, { - name: '11:21:37', + name: '03:21:37', value: 5 }, { - name: '11:22:16', + name: '03:22:16', value: 5 }, { - name: '11:22:55', + name: '03:22:55', value: 5 }, { - name: '11:23:34', + name: '03:23:34', value: 5 }, { - name: '11:24:13', + name: '03:24:13', value: 5 }, { - name: '11:24:52', + name: '03:24:52', value: 5 }, { - name: '11:25:31', + name: '03:25:31', value: 5 }, { - name: '11:26:10', + name: '03:26:10', value: 5 }, { - name: '11:26:49', + name: '03:26:49', value: 5 }, { - name: '11:27:28', + name: '03:27:28', value: 5 } ] @@ -482,7 +482,7 @@ describe('Autoscaler Transform Metric Helper', () => { unit: 'rps', chartMaxValue: 30 }; - const result = buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger); + const result = buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger, 'UTC'); expect(isEqual(expectedResult, result)).toBe(true); }); }); diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts index 18c79af7b4..f1da8e1dc6 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts @@ -1,9 +1,9 @@ -import * as moment from 'moment'; +import * as moment from 'moment-timezone'; import { getScaleType, AutoscalerConstants } from './autoscaler-util'; -import { AppAutoscalerAppMetric, AppScalingTrigger, AppScalingRule } from '../app-autoscaler.types'; +import { AppAutoscalerAppMetric, AppScalingTrigger, AppScalingRule, AppAutoscalerMetric } from '../app-autoscaler.types'; -function initMeticData(metricName) { +function initMeticData(metricName: string) { return { latest: { target: [{ @@ -27,7 +27,9 @@ function initMeticData(metricName) { }; } -export function buildMetricData(metricName, data: AppAutoscalerAppMetric, startTime, endTime, skipFormat, trigger: AppScalingTrigger) { +export function buildMetricData( + metricName: string, data: AppAutoscalerAppMetric, startTime: number, endTime: number, + skipFormat: boolean, trigger: AppScalingTrigger, timezone?: string) { const result = initMeticData(metricName); if (data.resources.length > 0) { const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); @@ -36,7 +38,7 @@ export function buildMetricData(metricName, data: AppAutoscalerAppMetric, startT if (!skipFormat) { startTime = Math.round(startTime / AutoscalerConstants.S2NS); endTime = Math.round(endTime / AutoscalerConstants.S2NS); - const target = transformMetricData(data.resources, basicInfo.interval, startTime, endTime); + const target = transformMetricData(data.resources, basicInfo.interval, startTime, endTime, timezone); const colorTarget = buildMetricColorData(target, trigger); result.formated = { target, @@ -53,10 +55,10 @@ export function buildMetricData(metricName, data: AppAutoscalerAppMetric, startT return result; } -export function insertEmptyMetrics(data, startTime, endTime, interval) { +export function insertEmptyMetrics(data: any[], startTime: number, endTime: number, interval: number, timezone?: string) { const insertEmptyNumber = Math.floor((endTime - startTime) / interval) + 1; for (let i = 0; i < insertEmptyNumber; i++) { - const emptyMetric = buildSingleMetricData(startTime + i * interval, 0); + const emptyMetric = buildSingleMetricData(startTime + i * interval, 0, timezone); if (interval < 0) { data.unshift(emptyMetric); } else { @@ -66,26 +68,35 @@ export function insertEmptyMetrics(data, startTime, endTime, interval) { return data; } -function buildSingleMetricData(timestamp, value) { +function buildSingleMetricData(timestamp: number, value: number, timezone: string) { + const name = (() => { + if (timezone) { + return moment(timestamp * 1000).tz(timezone).format(AutoscalerConstants.MomentFormateTimeS); + } else { + return moment(timestamp * 1000).format(AutoscalerConstants.MomentFormateTimeS); + } + })(); return { time: timestamp, - name: moment(timestamp * 1000).format(AutoscalerConstants.MomentFormateTimeS), + name, value }; } -function transformMetricData(source, interval, startTime, endTime) { +function transformMetricData( + source: AppAutoscalerMetric[], interval: number, + startTime: number, endTime: number, timezone: string) { if (source.length === 0) { return []; } const scope = Math.round(interval / 2); const target = []; let targetTimestamp = Math.round(source[0].timestamp / AutoscalerConstants.S2NS); - let targetIndex = insertEmptyMetrics(target, targetTimestamp - interval, startTime, -interval).length; + let targetIndex = insertEmptyMetrics(target, targetTimestamp - interval, startTime, -interval, timezone).length; let sourceIndex = 0; while (sourceIndex < source.length) { if (!target[targetIndex]) { - target[targetIndex] = buildSingleMetricData(targetTimestamp, 0); + target[targetIndex] = buildSingleMetricData(targetTimestamp, 0, timezone); } const metric = source[sourceIndex]; const sourceTimestamp = Math.round(metric.timestamp / AutoscalerConstants.S2NS); @@ -99,10 +110,10 @@ function transformMetricData(source, interval, startTime, endTime) { sourceIndex++; } } - return insertEmptyMetrics(target, target[targetIndex].time + interval, endTime, interval); + return insertEmptyMetrics(target, target[targetIndex].time + interval, endTime, interval, timezone); } -function buildMetricColorData(metricData, trigger: AppScalingTrigger) { +function buildMetricColorData(metricData: any[], trigger: AppScalingTrigger) { const colorTarget = []; metricData.map((item) => { colorTarget.push({ @@ -119,7 +130,7 @@ function buildMetricColorData(metricData, trigger: AppScalingTrigger) { return colorTarget; } -function buildSingleColor(lineChartSeries, ul) { +function buildSingleColor(lineChartSeries: any[], ul: AppScalingRule[]) { ul.map((item) => { const lineData = { name: buildTriggerName(item), @@ -129,7 +140,7 @@ function buildSingleColor(lineChartSeries, ul) { }); } -function buildMarkLineData(metricData, trigger) { +function buildMarkLineData(metricData: AppAutoscalerMetric[], trigger: AppScalingTrigger) { const lineChartSeries = []; if (trigger.upper && trigger.upper.length > 0) { buildSingleMarkLine(lineChartSeries, metricData, trigger.upper); @@ -140,12 +151,12 @@ function buildMarkLineData(metricData, trigger) { return lineChartSeries; } -function buildTriggerName(item) { +function buildTriggerName(item: AppScalingRule) { const type = getScaleType(item.operator); return `${type} threshold: ${item.operator} ${item.threshold}`; } -function buildSingleMarkLine(lineChartSeries, metricData, ul: AppScalingRule[]) { +function buildSingleMarkLine(lineChartSeries: any[], metricData: AppAutoscalerMetric[], ul: AppScalingRule[]) { ul.map((item) => { const lineData = { name: buildTriggerName(item), @@ -161,7 +172,7 @@ function buildSingleMarkLine(lineChartSeries, metricData, ul: AppScalingRule[]) }); } -function executeCompare(val1, operator, val2) { +function executeCompare(val1: number, operator: string, val2: number) { switch (operator) { case '>': return val1 > val2; @@ -174,7 +185,7 @@ function executeCompare(val1, operator, val2) { } } -function getColor(trigger: AppScalingTrigger, value) { +function getColor(trigger: AppScalingTrigger, value: any) { let color = AutoscalerConstants.normalColor; if (Number.isNaN(value)) { return color; @@ -195,7 +206,7 @@ function getColor(trigger: AppScalingTrigger, value) { return color; } -function getMetricBasicInfo(metricName, source, trigger: AppScalingTrigger) { +function getMetricBasicInfo(metricName: string, source: AppAutoscalerMetric[], trigger: AppScalingTrigger) { const map = {}; let interval = AutoscalerConstants.metricMap[metricName].interval; let maxCount = 1; @@ -205,7 +216,7 @@ function getMetricBasicInfo(metricName, source, trigger: AppScalingTrigger) { map[interval] = 1; for (const item of source) { maxValue = Math.max(Number(item.value), maxValue); - const thisTimestamp = Math.round(parseInt(item.timestamp, 10) / AutoscalerConstants.S2NS); + const thisTimestamp = Math.round(item.timestamp / AutoscalerConstants.S2NS); const currentInterval = thisTimestamp - preTimestamp; map[currentInterval] = map[currentInterval] ? map[currentInterval] + 1 : 1; if (map[currentInterval] > maxCount) { @@ -222,7 +233,7 @@ function getMetricBasicInfo(metricName, source, trigger: AppScalingTrigger) { }; } -function getChartMax(trigger: AppScalingTrigger, maxValue) { +function getChartMax(trigger: AppScalingTrigger, maxValue: number) { let thresholdCount = 0; let maxThreshold = 0; let thresholdmax = 0; @@ -248,7 +259,7 @@ function getChartMax(trigger: AppScalingTrigger, maxValue) { return thresholdmax; } -function getTrimedInteger(thresholdmax) { +function getTrimedInteger(thresholdmax: number) { for (let i = 10; i < Number.MAX_VALUE && i < thresholdmax; i = i * 10) { if (thresholdmax / i >= 1 && thresholdmax / i < 10 && thresholdmax > 100) { thresholdmax = (Math.ceil(thresholdmax / i * 10)) * i / 10; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts index d5fb3f1a04..95dc62f4ec 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts @@ -7,6 +7,9 @@ import { CoreModule } from '../../../core/core.module'; import { SharedModule } from '../../../shared/shared.module'; import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component'; +import { ApplicationService } from '../../../features/applications/application.service'; +import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; +import { TabNavService } from '../../../../tab-nav.service'; describe('AutoscalerMetricPageComponent', () => { let component: AutoscalerMetricPageComponent; @@ -23,7 +26,9 @@ describe('AutoscalerMetricPageComponent', () => { RouterTestingModule, ], providers: [ - DatePipe + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService ] }) .compileComponents(); diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts index 011436bc65..521733dfe2 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -9,6 +9,9 @@ import { ApplicationStateService } from '../../../../../core/src/shared/componen import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { CommonModule } from '@angular/common'; import { MetadataItemComponent } from '../../../shared/components/metadata-item/metadata-item.component'; +import { RunningInstancesComponent } from '../../../shared/components/running-instances/running-instances.component'; +import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; describe('CardAutoscalerDefaultComponent', () => { let component: CardAutoscalerDefaultComponent; @@ -19,6 +22,7 @@ describe('CardAutoscalerDefaultComponent', () => { declarations: [ CardAutoscalerDefaultComponent, MetadataItemComponent, + RunningInstancesComponent, ], imports: [ CoreModule, @@ -29,6 +33,8 @@ describe('CardAutoscalerDefaultComponent', () => { providers: [ { provide: ApplicationService, useClass: ApplicationServiceMock }, ApplicationStateService, + EntityMonitorFactory, + PaginationMonitorFactory, ] }) .compileComponents(); diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index b92265f77b..1b1439a1cd 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -1,6 +1,7 @@ import { CommonModule } from '@angular/common'; import { inject, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { MockBackend } from '@angular/http/testing'; import { CoreModule } from '../../../../../core/core.module'; import { EntityServiceFactory } from '../../../../../core/entity-service-factory.service'; @@ -13,8 +14,7 @@ import { generateTestEntityServiceProvider } from '../../../../../../test-framew import { createBasicStoreModule, getInitialTestStoreState } from '../../../../../../test-framework/store-test-helper'; import { SharedModule } from '../../../../../shared/shared.module'; import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; - - +import { Http, ConnectionBackend } from '@angular/http'; describe('CfAppAutoscalerEventsConfigService', () => { const initialState = getInitialTestStoreState(); @@ -31,7 +31,9 @@ describe('CfAppAutoscalerEventsConfigService', () => { entityFactory(applicationSchemaKey), new GetApplication(appGuid, cfGuid) ), - generateTestApplicationServiceProvider(appGuid, cfGuid) + generateTestApplicationServiceProvider(appGuid, cfGuid), + Http, + { provide: ConnectionBackend, useClass: MockBackend }, ], imports: [ CommonModule, diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts index b411c1381e..6e2bb1895e 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts @@ -1,5 +1,5 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - +import { MatIcon } from '@angular/material'; import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status.component'; import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; @@ -9,7 +9,7 @@ describe('TableCellAutoscalerEventStatusComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TableCellAutoscalerEventStatusComponent] + declarations: [TableCellAutoscalerEventStatusComponent, MatIcon] }) .compileComponents(); })); diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts index a9a8702241..02c3518935 100644 --- a/custom-src/frontend/app/custom/custom.module.ts +++ b/custom-src/frontend/app/custom/custom.module.ts @@ -6,7 +6,6 @@ import { MDAppModule } from '../core/md.module'; import { CoreModule } from '../core/core.module'; import { AutoscalerModule } from './autoscaler/autoscaler.module'; import { AutoscalerTabExtensionComponent } from './autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component'; -// import { CardAutoscalerDefaultComponent } from './autoscaler/card-autoscaler-default/card-autoscaler-default.component'; @NgModule({ imports: [ @@ -19,7 +18,6 @@ import { AutoscalerTabExtensionComponent } from './autoscaler/autoscaler-tab-ext ], declarations: [ AutoscalerTabExtensionComponent, - // CardAutoscalerDefaultComponent ], entryComponents: [AutoscalerTabExtensionComponent] }) From eb4258c08b1ce118773e3c6407f172939b25a817 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 13:47:45 +0100 Subject: [PATCH 58/98] Second round of improving typing, also ensure unique metadata guid --- .../autoscaler/app-autoscaler.actions.ts | 3 +- .../custom/autoscaler/app-autoscaler.types.ts | 57 +++++++++++--- .../autoscaler-transform-metric.ts | 76 ++++++++++++------- .../autoscaler-helpers/autoscaler-util.ts | 49 +++++++----- .../autoscaler-tab-extension.component.ts | 8 +- .../custom/autoscaler/autoscaler.effects.ts | 61 +++++++++++---- .../autoscaler/autoscaler.store.module.ts | 1 - ...utoscaler-metric-chart-card.component.html | 4 +- ...-autoscaler-metric-chart-card.component.ts | 18 +++-- ...app-autoscaler-metric-chart-data-source.ts | 5 +- ...scaler-metric-chart-list-config.service.ts | 8 +- .../packages/store/src/types/api.types.ts | 7 +- 12 files changed, 202 insertions(+), 95 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index d7bd93af84..e6edf4a6de 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -101,7 +101,7 @@ export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { public paginationKey: string, public guid: string, public endpointGuid: string, - public normalFormat?, + public normalFormat?: boolean ) { this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid); } @@ -208,6 +208,7 @@ export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricActio entityKey = appAutoscalerAppMetricSchemaKey; } +// TODO: RC Check - is this being used? export class GetAppAutoscalerInsMetricAction extends GetAppAutoscalerMetricAction implements PaginatedAction { constructor( public guid: string, diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts index 0ff115459a..d2b71d06a1 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts @@ -1,3 +1,5 @@ +import { AutoscalerQuery } from './app-autoscaler.actions'; + export interface AppAutoscalerPolicy { enabled: boolean; instance_min_count: number; @@ -31,6 +33,7 @@ export interface AppScalingRule { export interface AppScalingTrigger { upper?: AppScalingRule[]; lower?: AppScalingRule[]; + query?: AutoscalerQuery; } export interface AppRecurringSchedule { @@ -79,19 +82,53 @@ export interface AppAutoscalerEvent { timestamp: number; } -export interface AppAutoscalerAppMetric { - next_url: string; - prev_url: string; - page: number; - resources: AppAutoscalerMetric[]; - total_pages: number; - total_results: number; -} - -export interface AppAutoscalerMetric { +export interface AppAutoscalerMetricData { app_id: string; name: string; timestamp: number; unit: string; value: string; + chartMaxValue?: string; } + +export interface AppAutoscalerMetricDataLocal { + latest: { + target: AppAutoscalerMetricDataPoint[], + colorTarget: AppAutoscalerMetricDataPoint[] + }; + formated: { + target: AppAutoscalerMetricDataPoint[], + colorTarget: AppAutoscalerMetricDataPoint[] + }; + markline: AppAutoscalerMetricDataLine[]; + unit: string; + chartMaxValue: number; +} + +export interface AppAutoscalerMetricDataPoint { + name: string; + value: number | string; + time?: number; +} + +export interface AppAutoscalerMetricLegend { + name: string; + value: string; +} + +export interface AppAutoscalerMetricDataLine { + name: string; + series: AppAutoscalerMetricDataPoint[]; +} + +export interface AppAutoscalerMetricMapInfo { + unit_internal: string; + interval: number; +} + +export interface AppAutoscalerMetricBasicInfo { + interval: number; + unit: string; + chartMaxValue: number; +} + diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts index f1da8e1dc6..d85788f98e 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts @@ -1,9 +1,18 @@ import * as moment from 'moment-timezone'; -import { getScaleType, AutoscalerConstants } from './autoscaler-util'; -import { AppAutoscalerAppMetric, AppScalingTrigger, AppScalingRule, AppAutoscalerMetric } from '../app-autoscaler.types'; +import { PaginationResponse } from '../../../../../store/src/types/api.types'; +import { + AppScalingRule, + AppScalingTrigger, + AppAutoscalerMetricData, + AppAutoscalerMetricDataLine, + AppAutoscalerMetricDataLocal, + AppAutoscalerMetricDataPoint, + AppAutoscalerMetricBasicInfo, +} from '../app-autoscaler.types'; +import { AutoscalerConstants, getScaleType } from './autoscaler-util'; -function initMeticData(metricName: string) { +function initMetricData(metricName: string): AppAutoscalerMetricDataLocal { return { latest: { target: [{ @@ -28,9 +37,15 @@ function initMeticData(metricName: string) { } export function buildMetricData( - metricName: string, data: AppAutoscalerAppMetric, startTime: number, endTime: number, - skipFormat: boolean, trigger: AppScalingTrigger, timezone?: string) { - const result = initMeticData(metricName); + metricName: string, + data: PaginationResponse, + startTime: number, + endTime: number, + skipFormat: boolean, + trigger: AppScalingTrigger, + timezone?: string + ): AppAutoscalerMetricDataLocal { + const result = initMetricData(metricName); if (data.resources.length > 0) { const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); result.unit = basicInfo.unit; @@ -55,7 +70,13 @@ export function buildMetricData( return result; } -export function insertEmptyMetrics(data: any[], startTime: number, endTime: number, interval: number, timezone?: string) { +export function insertEmptyMetrics( + data: AppAutoscalerMetricDataPoint[], + startTime: number, + endTime: number, + interval: number, + timezone?: string + ): AppAutoscalerMetricDataPoint[] { const insertEmptyNumber = Math.floor((endTime - startTime) / interval) + 1; for (let i = 0; i < insertEmptyNumber; i++) { const emptyMetric = buildSingleMetricData(startTime + i * interval, 0, timezone); @@ -68,7 +89,7 @@ export function insertEmptyMetrics(data: any[], startTime: number, endTime: numb return data; } -function buildSingleMetricData(timestamp: number, value: number, timezone: string) { +function buildSingleMetricData(timestamp: number, value: number | string, timezone: string): AppAutoscalerMetricDataPoint { const name = (() => { if (timezone) { return moment(timestamp * 1000).tz(timezone).format(AutoscalerConstants.MomentFormateTimeS); @@ -84,13 +105,16 @@ function buildSingleMetricData(timestamp: number, value: number, timezone: strin } function transformMetricData( - source: AppAutoscalerMetric[], interval: number, - startTime: number, endTime: number, timezone: string) { + source: AppAutoscalerMetricData[], + interval: number, + startTime: number, + endTime: number, + timezone: string): AppAutoscalerMetricDataPoint[] { if (source.length === 0) { return []; } const scope = Math.round(interval / 2); - const target = []; + const target: AppAutoscalerMetricDataPoint[] = []; let targetTimestamp = Math.round(source[0].timestamp / AutoscalerConstants.S2NS); let targetIndex = insertEmptyMetrics(target, targetTimestamp - interval, startTime, -interval, timezone).length; let sourceIndex = 0; @@ -113,8 +137,8 @@ function transformMetricData( return insertEmptyMetrics(target, target[targetIndex].time + interval, endTime, interval, timezone); } -function buildMetricColorData(metricData: any[], trigger: AppScalingTrigger) { - const colorTarget = []; +function buildMetricColorData(metricData: AppAutoscalerMetricDataPoint[], trigger: AppScalingTrigger): AppAutoscalerMetricDataPoint[] { + const colorTarget: AppAutoscalerMetricDataPoint[] = []; metricData.map((item) => { colorTarget.push({ name: item.name, @@ -130,8 +154,8 @@ function buildMetricColorData(metricData: any[], trigger: AppScalingTrigger) { return colorTarget; } -function buildSingleColor(lineChartSeries: any[], ul: AppScalingRule[]) { - ul.map((item) => { +function buildSingleColor(lineChartSeries: AppAutoscalerMetricDataPoint[], ul: AppScalingRule[]) { + ul.forEach((item) => { const lineData = { name: buildTriggerName(item), value: item.color @@ -140,8 +164,8 @@ function buildSingleColor(lineChartSeries: any[], ul: AppScalingRule[]) { }); } -function buildMarkLineData(metricData: AppAutoscalerMetric[], trigger: AppScalingTrigger) { - const lineChartSeries = []; +function buildMarkLineData(metricData, trigger: AppScalingTrigger): AppAutoscalerMetricDataLine[] { + const lineChartSeries: AppAutoscalerMetricDataLine[] = []; if (trigger.upper && trigger.upper.length > 0) { buildSingleMarkLine(lineChartSeries, metricData, trigger.upper); } @@ -151,13 +175,13 @@ function buildMarkLineData(metricData: AppAutoscalerMetric[], trigger: AppScalin return lineChartSeries; } -function buildTriggerName(item: AppScalingRule) { +function buildTriggerName(item: AppScalingRule): string { const type = getScaleType(item.operator); return `${type} threshold: ${item.operator} ${item.threshold}`; } -function buildSingleMarkLine(lineChartSeries: any[], metricData: AppAutoscalerMetric[], ul: AppScalingRule[]) { - ul.map((item) => { +function buildSingleMarkLine(lineChartSeries: AppAutoscalerMetricDataLine[], metricData: AppAutoscalerMetricData[], ul: AppScalingRule[]) { + ul.forEach(item => { const lineData = { name: buildTriggerName(item), series: [] @@ -172,7 +196,7 @@ function buildSingleMarkLine(lineChartSeries: any[], metricData: AppAutoscalerMe }); } -function executeCompare(val1: number, operator: string, val2: number) { +function executeCompare(val1: number, operator: string, val2: number): boolean { switch (operator) { case '>': return val1 > val2; @@ -185,7 +209,7 @@ function executeCompare(val1: number, operator: string, val2: number) { } } -function getColor(trigger: AppScalingTrigger, value: any) { +function getColor(trigger: AppScalingTrigger, value: any): string { let color = AutoscalerConstants.normalColor; if (Number.isNaN(value)) { return color; @@ -206,7 +230,7 @@ function getColor(trigger: AppScalingTrigger, value: any) { return color; } -function getMetricBasicInfo(metricName: string, source: AppAutoscalerMetric[], trigger: AppScalingTrigger) { +function getMetricBasicInfo(metricName: string, source: AppAutoscalerMetricData[], trigger: AppScalingTrigger): AppAutoscalerMetricBasicInfo { const map = {}; let interval = AutoscalerConstants.metricMap[metricName].interval; let maxCount = 1; @@ -233,7 +257,7 @@ function getMetricBasicInfo(metricName: string, source: AppAutoscalerMetric[], t }; } -function getChartMax(trigger: AppScalingTrigger, maxValue: number) { +function getChartMax(trigger: AppScalingTrigger, maxValue: number): number { let thresholdCount = 0; let maxThreshold = 0; let thresholdmax = 0; @@ -255,11 +279,11 @@ function getChartMax(trigger: AppScalingTrigger, maxValue: number) { thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); } thresholdmax = Math.max(maxValue, thresholdmax, 10); - thresholdmax = getTrimedInteger(thresholdmax); + thresholdmax = getTrimmedInteger(thresholdmax); return thresholdmax; } -function getTrimedInteger(thresholdmax: number) { +function getTrimmedInteger(thresholdmax: number): number { for (let i = 10; i < Number.MAX_VALUE && i < thresholdmax; i = i * 10) { if (thresholdmax / i >= 1 && thresholdmax / i < 10 && thresholdmax > 100) { thresholdmax = (Math.ceil(thresholdmax / i * 10)) * i / 10; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts index 26c75a9c8b..ba471ed496 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts @@ -1,6 +1,11 @@ import * as moment from 'moment-timezone'; -import { AppScalingRule, AppScalingTrigger } from '../app-autoscaler.types'; +import { + AppScalingRule, + AppScalingTrigger, + AppAutoscalerMetricDataPoint, + AppAutoscalerMetricLegend, + AppAutoscalerMetricMapInfo } from '../app-autoscaler.types'; export class AutoscalerConstants { public static S2NS = 1000000000; @@ -58,7 +63,7 @@ export class AutoscalerConstants { initial_min_instance_count: 5 }; - public static metricMap = { + public static metricMap: { [metricName: string]: AppAutoscalerMetricMapInfo } = { memoryused: { unit_internal: 'MB', interval: 40, @@ -80,6 +85,14 @@ export class AutoscalerConstants { interval: 40, } }; + + public static createMetricId(appGuid: string, metricType: string): string { + return appGuid + ':' + metricType; + } + + public static getMetricFromMetricId(metricId: string): string { + return metricId.slice(metricId.indexOf(':') + 1, metricId.length); + } } export const PolicyAlert = { @@ -109,7 +122,7 @@ export const PolicyAlert = { alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.', }; -export function isEqual(a: any, b: any) { +export function isEqual(a: any, b: any): boolean { if (typeof (a) !== typeof (b)) { return false; } else { @@ -128,7 +141,7 @@ export function isEqual(a: any, b: any) { } } -export function getScaleType(operator: string) { +export function getScaleType(operator: string): string { if (AutoscalerConstants.LowerOperators.indexOf(operator) >= 0) { return 'lower'; } else { @@ -136,13 +149,13 @@ export function getScaleType(operator: string) { } } -export function getAdjustmentType(adjustment: string) { +export function getAdjustmentType(adjustment: string): string { return adjustment.indexOf('%') >= 0 ? 'percentage' : 'value'; } -export function buildLegendData(trigger: AppScalingTrigger) { - const legendData = []; - let latestUl = null; +export function buildLegendData(trigger: AppScalingTrigger): AppAutoscalerMetricLegend[] { + const legendData: AppAutoscalerMetricLegend[] = []; + let latestUl: AppScalingRule = null; if (trigger.upper && trigger.upper.length > 0) { latestUl = buildUpperLegendData(legendData, trigger.upper, !trigger.lower || trigger.lower.length === 0); } @@ -152,8 +165,8 @@ export function buildLegendData(trigger: AppScalingTrigger) { return legendData; } -function buildUpperLegendData(legendData: any, upper: AppScalingRule[], nolower: boolean) { - let latestUl: any = {}; +function buildUpperLegendData(legendData: any, upper: AppScalingRule[], noLower: boolean): AppScalingRule { + let latestUl: AppScalingRule; upper.map((item, index) => { let name = ''; if (index === 0) { @@ -168,7 +181,7 @@ function buildUpperLegendData(legendData: any, upper: AppScalingRule[], nolower: }); latestUl = item; }); - if (nolower) { + if (noLower) { legendData.push({ name: `${upper[0].metric_type} ${getOppositeOperator(latestUl.operator)} ${latestUl.threshold}`, value: AutoscalerConstants.normalColor @@ -177,10 +190,10 @@ function buildUpperLegendData(legendData: any, upper: AppScalingRule[], nolower: return latestUl; } -function buildLowerLegendData(legendData: any, lower: AppScalingRule[], latestUl: AppScalingRule) { +function buildLowerLegendData(legendData: AppAutoscalerMetricDataPoint[], lower: AppScalingRule[], latestUl: AppScalingRule): AppScalingRule { lower.map((item, index) => { let name = ''; - if (!latestUl.threshold) { + if (!latestUl || !latestUl.threshold) { name = `${item.metric_type} ${getOppositeOperator(item.operator)} ${item.threshold}`; } else { name = `${item.threshold} ${getLeftOperator(item.operator)} ${item. @@ -196,10 +209,10 @@ function buildLowerLegendData(legendData: any, lower: AppScalingRule[], latestUl name: `${lower[0].metric_type} ${latestUl.operator} ${latestUl.threshold}`, value: latestUl.color }); - return {}; + return latestUl; } -function getOppositeOperator(operator: string) { +function getOppositeOperator(operator: string): string { switch (operator) { case '>': return '<='; @@ -212,7 +225,7 @@ function getOppositeOperator(operator: string) { } } -function getRightOperator(operator: string) { +function getRightOperator(operator: string): string { switch (operator) { case '>': return '<='; @@ -223,7 +236,7 @@ function getRightOperator(operator: string) { } } -function getLeftOperator(operator: string) { +function getLeftOperator(operator: string): string { switch (operator) { case '>': return '<'; @@ -236,7 +249,7 @@ function getLeftOperator(operator: string) { } } -export function shiftArray(array: number[], step: number) { +export function shiftArray(array: number[], step: number): number[] { const days = []; for (let i = 0; i < array.length; i++) { days[i] = array[i] + step; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index dae9914a64..314dbc5b57 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -30,11 +30,7 @@ import { GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, } from '../app-autoscaler.actions'; -import { - AppAutoscalerAppMetric, - AppAutoscalerPolicyLocal, - AppAutoscalerScalingHistory, -} from '../app-autoscaler.types'; +import { AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory, AppAutoscalerMetricData } from '../app-autoscaler.types'; import { AutoscalerConstants } from '../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey, @@ -178,7 +174,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { getAppMetric(metricName: string, trigger: any, params: any) { const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, this.applicationService.cfGuid, metricName, true, trigger, params); - return getPaginationObservables({ + return getPaginationObservables({ store: this.store, action, paginationMonitor: this.paginationMonitorFactory.create( diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index 12bf8bfc2b..2499f644fe 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -11,7 +11,7 @@ import { resultPerPageParamDefault, } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors'; -import { NormalizedResponse } from '../../../../store/src/types/api.types'; +import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types'; import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../store/src/types/pagination.types'; import { StartRequestAction, @@ -24,6 +24,7 @@ import { APP_AUTOSCALER_POLICY, APP_AUTOSCALER_POLICY_TRIGGER, APP_AUTOSCALER_SCALING_HISTORY, + AutoscalerQuery, DETACH_APP_AUTOSCALER_POLICY, DetachAppAutoscalerPolicyAction, FETCH_APP_AUTOSCALER_METRIC, @@ -35,11 +36,13 @@ import { UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, } from './app-autoscaler.actions'; +import { AppAutoscalerMetricDataLocal, AppScalingTrigger } from './app-autoscaler.types'; import { buildMetricData } from './autoscaler-helpers/autoscaler-transform-metric'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, } from './autoscaler-helpers/autoscaler-transform-policy'; +import { AutoscalerConstants } from './autoscaler-helpers/autoscaler-util'; const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; @@ -284,7 +287,13 @@ export class AutoscalerEffects { entities: { [getPolicyTriggerAction.entityKey]: {} }, result: [] } as NormalizedResponse; - this.transformTriggerData(getPolicyTriggerAction.entityKey, mappedPolicyData, policyInfo, getPolicyTriggerAction.query); + this.transformTriggerData( + getPolicyTriggerAction.entityKey, + mappedPolicyData, + policyInfo, + getPolicyTriggerAction.query, + getPolicyAction.guid + ); res.push( new WrapperRequestActionSuccess( mappedPolicyData, @@ -309,11 +318,27 @@ export class AutoscalerEffects { })); } - addMetric(schemaKey: string, mappedData: NormalizedResponse, appid, metricName, data, startTime, endTime, skipFormat, trigger) { - const id = appid + '-' + metricName; + addMetric( + schemaKey: string, + mappedData: NormalizedResponse>, + appId: string, + metricName: string, + data, + startTime: number, + endTime: number, + skipFormat: boolean, + trigger: AppScalingTrigger + ) { + const id = AutoscalerConstants.createMetricId(appId, metricName); + mappedData.entities[schemaKey][id] = { entity: buildMetricData(metricName, data, startTime, endTime, skipFormat, trigger), - metadata: {} + metadata: { + guid: id, + created_at: null, + updated_at: null, + url: null + } }; mappedData.result.push(id); } @@ -321,19 +346,22 @@ export class AutoscalerEffects { transformData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) { mappedData.entities[key][appGuid] = { entity: data, - metadata: {} + metadata: { + guid: appGuid + } }; mappedData.result.push(appGuid); } transformEventData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) { mappedData.entities[key] = []; - data.resources.map((item) => { - mappedData.entities[key][item.timestamp] = { + data.resources.forEach((item) => { + const id = AutoscalerConstants.createMetricId(appGuid, item.timestamp); + mappedData.entities[key][id] = { entity: item, metadata: { created_at: item.timestamp, - guid: item.timestamp, + guid: id, updated_at: item.timestamp } }; @@ -341,14 +369,15 @@ export class AutoscalerEffects { mappedData.result = Object.keys(mappedData.entities[key]); } - transformTriggerData(key: string, mappedData: NormalizedResponse, data: any, query: any) { + transformTriggerData(key: string, mappedData: NormalizedResponse, data: any, query: AutoscalerQuery, appGuid: string) { mappedData.entities[key] = []; - Object.keys(data.scaling_rules_map).map((metricType) => { + Object.keys(data.scaling_rules_map).forEach((metricType) => { + const id = AutoscalerConstants.createMetricId(appGuid, metricType); data.scaling_rules_map[metricType].query = query; - mappedData.entities[key][metricType] = { + mappedData.entities[key][id] = { entity: data.scaling_rules_map[metricType], metadata: { - guid: metricType + guid: id } }; }); @@ -366,17 +395,17 @@ export class AutoscalerEffects { buildParams(initialParams, params?, paginationParams?) { const searchParams = new URLSearchParams(); if (initialParams) { - Object.keys(initialParams).map((key) => { + Object.keys(initialParams).forEach((key) => { searchParams.set(key, initialParams[key]); }); } if (params) { - Object.keys(params).map((key) => { + Object.keys(params).forEach((key) => { searchParams.set(key, params[key]); }); } if (paginationParams) { - Object.keys(paginationParams).map((key) => { + Object.keys(paginationParams).forEach((key) => { searchParams.set(key, paginationParams[key]); }); } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts index 5165940f93..7e68d75724 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts @@ -13,7 +13,6 @@ export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory'; export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric'; export const appAutoscalerInsMetricSchemaKey = 'autoscalerInsMetric'; -// TODO: RC check all getAPIResourceGuids export const autoscalerEntities: ExtensionEntitySchema[] = [ { entityKey: appAutoscalerPolicySchemaKey, diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html index 3d922de3ca..0e45de3666 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -1,7 +1,7 @@ - {{row.metadata.guid}}
+ {{metricType}}
{{paramsMetrics['start-time'] / 1000000 | date:'medium'}} ~ {{paramsMetrics['end-time'] / 1000000 | date:'medium'}} @@ -24,7 +24,7 @@ [animations]="true" [lineChart]="metricData[0].entity.markline" [tooltipDisabled]="false" [yLeftAxisScaleFactor]="yLeftAxisScale" [gradient]="false" [xAxis]="true" [yAxis]="true" [legend]="false" [showGridLines]="true" [showXAxisLabel]="true" [showYAxisLabel]="true" - [yAxisLabel]="metricData[0].entity.unit" [metricName]="row.metadata.guid" + [yAxisLabel]="metricData[0].entity.unit" [metricName]="metricType" [yScaleMax]="metricData[0].entity.chartMaxValue" (select)="onSelect($event)">
diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 8182e99eee..86f56feeac 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -13,8 +13,8 @@ import { ApplicationService } from '../../../../../../features/applications/appl import { CardCell, IListRowCell } from '../../../../../../shared/components/list/list.types'; import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; import { AutoscalerPaginationParams, GetAppAutoscalerAppMetricAction } from '../../../../app-autoscaler.actions'; -import { AppAutoscalerAppMetric } from '../../../../app-autoscaler.types'; -import { buildLegendData } from '../../../../autoscaler-helpers/autoscaler-util'; +import { AppScalingTrigger, AppAutoscalerMetricData, AppAutoscalerMetricDataPoint } from '../../../../app-autoscaler.types'; +import { buildLegendData, AutoscalerConstants } from '../../../../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey } from '../../../../autoscaler.store.module'; @Component({ @@ -54,6 +54,7 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell; public appAutoscalerAppMetricLegend; - getLegend2(trigger) { + getLegend2(trigger: AppScalingTrigger) { const legendColor = buildLegendData(trigger); - const legendValue = []; + const legendValue: AppAutoscalerMetricDataPoint[] = []; legendColor.map((item) => { legendValue.push({ name: item.name, @@ -87,14 +88,15 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell { const action = new GetAppAutoscalerAppMetricAction(this.appService.appGuid, this.appService.cfGuid, metricName, false, trigger, params); this.store.dispatch(action); - return getPaginationObservables({ + return getPaginationObservables({ store: this.store, action, paginationMonitor: this.paginationMonitorFactory.create( diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index 127884aef0..0963dd45f0 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -7,14 +7,15 @@ import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../../shared/components/list/list.component.types'; import { GetAppAutoscalerPolicyTriggerAction } from '../../../app-autoscaler.actions'; +import { AppScalingTrigger } from '../../../app-autoscaler.types'; -export class AppAutoscalerMetricChartDataSource extends ListDataSource { +export class AppAutoscalerMetricChartDataSource extends ListDataSource> { action: any; constructor( store: Store, cfGuid: string, appGuid: string, - listConfig: IListConfig + listConfig: IListConfig> ) { const action = new GetAppAutoscalerPolicyTriggerAction(null, appGuid, cfGuid); super( diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index c5b2232132..ddd0a1fd29 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -9,23 +9,25 @@ import { ITableColumn } from '../../../../../shared/components/list/list-table/t import { BaseCfListConfig } from '../../../../../shared/components/list/list-types/base-cf/base-cf-list-config'; import { ListViewTypes } from '../../../../../shared/components/list/list.component.types'; import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; +import { AppScalingTrigger } from '../../../app-autoscaler.types'; +import { AutoscalerConstants } from '../../../autoscaler-helpers/autoscaler-util'; import { AppAutoscalerMetricChartCardComponent, } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; import { AppAutoscalerMetricChartDataSource } from './app-autoscaler-metric-chart-data-source'; @Injectable() -export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig { +export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig> { autoscalerMetricSource: AppAutoscalerMetricChartDataSource; cardComponent = AppAutoscalerMetricChartCardComponent; viewType = ListViewTypes.CARD_ONLY; defaultView = 'cards' as ListView; - columns: Array> = [ + columns: Array>> = [ { columnId: 'name', headerCell: () => 'Metric type', cellDefinition: { - valuePath: 'metadata.guid' + getValue: (row) => AutoscalerConstants.getMetricFromMetricId(row.metadata.guid) }, cellFlex: '2' } diff --git a/src/frontend/packages/store/src/types/api.types.ts b/src/frontend/packages/store/src/types/api.types.ts index f38936561e..f198032cf2 100644 --- a/src/frontend/packages/store/src/types/api.types.ts +++ b/src/frontend/packages/store/src/types/api.types.ts @@ -51,10 +51,13 @@ export function createEmptyCfResponse(): CFResponse { }; } -export interface CFResponse { +export interface CFResponse extends PaginationResponse> { +} + +export interface PaginationResponse { total_results: number; total_pages: number; prev_url: string; next_url: string; - resources: APIResource[]; + resources: T[]; } From 2e3b16d659c394ead64de5df5ad8d75b70045eb1 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 14:06:44 +0100 Subject: [PATCH 59/98] Add refresh button to the recent autoscale events table --- .../autoscaler-tab-extension.component.html | 10 +++-- .../autoscaler-tab-extension.component.scss | 40 +++++++++++++++++++ .../autoscaler-tab-extension.component.ts | 15 ++++--- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 8510eaeadf..d880bf97f6 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -230,12 +230,16 @@
-
+
- - Latest Events + + Latest Events +
diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index e4f3dc0b9d..2eb0ced5de 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -65,3 +65,43 @@ table { flex: 0 0 16.78%; } } + +.autoscaler-tile-events { + &__header { + display: flex; + flex: 1; + height: 40px; + justify-content: space-between; + padding-top: 0; + + mat-card-title { + margin-bottom: 0; + } + + .refresh-icon { + animation: spin .4s infinite linear; + animation-play-state: paused; + transform: rotate(0deg); + transition: transform 1s linear; + } + + .refreshing { + animation-play-state: running; + } + + @keyframes spin { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(359deg); + } + } + + button { + margin-right: -10px; + margin-top: -10px; + } + } +} diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 314dbc5b57..70dd5f776a 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -30,7 +30,7 @@ import { GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, } from '../app-autoscaler.actions'; -import { AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory, AppAutoscalerMetricData } from '../app-autoscaler.types'; +import { AppAutoscalerMetricData, AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory } from '../app-autoscaler.types'; import { AutoscalerConstants } from '../autoscaler-helpers/autoscaler-util'; import { appAutoscalerAppMetricSchemaKey, @@ -45,7 +45,6 @@ import { icon: 'meter', iconFont: 'stratos-icons', hidden: (store: Store, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => { - // TODO: RC Improve const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2]; const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3]; const action = new GetAppAutoscalerHealthAction(appGuid, endpointGuid); @@ -69,7 +68,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { metricTypes: string[] = AutoscalerConstants.MetricTypes; appAutoscalerPolicyService: EntityService>; - appAutoscalerScalingHistoryService: EntityService>; + public appAutoscalerScalingHistoryService: EntityService>; appAutoscalerEnablement$: Observable; appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; @@ -78,6 +77,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { private appAutoscalerScalingHistoryErrorSub: Subscription; private appAutoscalerPolicySnackBarRef: MatSnackBarRef; private appAutoscalerScalingHistorySnackBarRef: MatSnackBarRef; + private scalingHistoryAction: GetAppAutoscalerScalingHistoryAction; private detachConfirmOk = 0; @@ -145,8 +145,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { publishReplay(1), refCount() ); - // TODO: RC add a refresh button to dispatch this action - const scalingHistoryAction = new GetAppAutoscalerScalingHistoryAction( + this.scalingHistoryAction = new GetAppAutoscalerScalingHistoryAction( createEntityRelationPaginationKey(applicationSchemaKey, this.applicationService.appGuid, 'latest'), this.applicationService.appGuid, this.applicationService.cfGuid, @@ -157,7 +156,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerScalingHistorySchemaKey, entityFactory(appAutoscalerScalingHistorySchemaKey), this.applicationService.appGuid, - scalingHistoryAction, + this.scalingHistoryAction, false ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( @@ -287,4 +286,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { ] })); } + + fetchScalingHistory() { + this.store.dispatch(this.scalingHistoryAction); + } } From 071e3dbc037843fa3a370f305be9e86aa17f31a6 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 14:20:14 +0100 Subject: [PATCH 60/98] Fix lazy added/tweaked git scm tab item --- .../application-tabs-base.component.ts | 7 ------- .../dashboard/page-side-nav/page-side-nav.component.ts | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts index d8885e0a91..c95beef6ad 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts @@ -117,14 +117,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy { // Add any tabs from extensions const tabs = getTabsFromExtensions(StratosTabType.Application); tabs.map((extensionTab) => { - // if (extensionTab.action) { - // extensionTab.action.onSucceed = () => { - // this.tabLinks.push(extensionTab); - // }; - // this.store.dispatch(extensionTab.action); - // } else { this.tabLinks.push(extensionTab); - // } }); // Ensure Git SCM tab gets updated if the app is redeployed from a different SCM Type diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts index b2baea50b1..66c4e1adac 100644 --- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts +++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.ts @@ -23,7 +23,7 @@ export class PageSideNavComponent implements OnInit { pTabs: IPageSideNavTab[]; @Input() set tabs(tabs: IPageSideNavTab[]) { - if (!tabs || this.pTabs) { + if (!tabs || (this.pTabs && tabs.length === this.pTabs.length)) { return; } this.pTabs = tabs.map(tab => ({ From a319e23d2ec860514bb179e1e5c84ba3fe4cdb27 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 15:12:48 +0100 Subject: [PATCH 61/98] Ensure we don't over sub to error handlers --- .../autoscaler-tab-extension.component.html | 5 ++++- .../autoscaler-tab-extension.component.ts | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html index d880bf97f6..4d14e8fa23 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -42,6 +42,7 @@ + @@ -237,7 +238,9 @@ Latest Events diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 70dd5f776a..50fe3c4bdb 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -139,7 +139,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); this.loadLatestMetricsUponPolicy(entity.entity); } - this.initErrorSub(); return entity && entity.entity; }), publishReplay(1), @@ -160,10 +159,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { false ); this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe( - map(({ entity }) => { - this.initErrorSub(); - return entity && entity.entity; - }), + map(({ entity }) => entity && entity.entity), publishReplay(1), refCount() ); @@ -194,6 +190,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { } initErrorSub() { + if (this.appAutoscalerPolicyErrorSub) { + this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); + } + this.appAutoscalerPolicyErrorSub = this.appAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( filter(request => !!request.error), map(request => { @@ -210,6 +210,9 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.appAutoscalerPolicySnackBarRef = this.appAutoscalerPolicySnackBar.open(errorMessage, 'Dismiss'); }); + if (this.appAutoscalerScalingHistoryErrorSub) { + this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); + } this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe( filter(request => !!request.error), map(request => request.message), From 3295efaded6871e32dc1c64fec15820f5a05c58e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 15:13:51 +0100 Subject: [PATCH 62/98] Ensure policy us deleted from store on delete - Includes fix for when entity is deleted and stale entity served up in observable --- .../frontend/app/custom/autoscaler/app-autoscaler.actions.ts | 2 ++ .../frontend/app/custom/autoscaler/autoscaler.effects.ts | 2 +- src/frontend/packages/core/src/core/entity-service.ts | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts index e6edf4a6de..b0fc6210c8 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts @@ -2,6 +2,7 @@ import { RequestOptions } from '@angular/http'; import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpers/entity-factory'; import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; +import { ApiRequestTypes } from '../../../../store/src/reducers/api-request-reducer/request-helpers'; import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { IRequestAction } from '../../../../store/src/types/request.types'; import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; @@ -94,6 +95,7 @@ export class DetachAppAutoscalerPolicyAction implements IRequestAction { ) { } type = DETACH_APP_AUTOSCALER_POLICY; entityKey = appAutoscalerPolicySchemaKey; + requestType: ApiRequestTypes = 'delete'; } export class GetAppAutoscalerPolicyTriggerAction implements PaginatedAction { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts index 2499f644fe..e941a1e402 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts @@ -131,7 +131,7 @@ export class AutoscalerEffects { detachAppAutoscalerPolicy$ = this.actions$.pipe( ofType(DETACH_APP_AUTOSCALER_POLICY), mergeMap(action => { - const actionType = 'update'; + const actionType = 'delete'; this.store.dispatch(new StartRequestAction(action, actionType)); const options = new RequestOptions(); options.url = `${commonPrefix}/apps/${action.guid}/policy`; diff --git a/src/frontend/packages/core/src/core/entity-service.ts b/src/frontend/packages/core/src/core/entity-service.ts index af81987c98..3d370ac5d0 100644 --- a/src/frontend/packages/core/src/core/entity-service.ts +++ b/src/frontend/packages/core/src/core/entity-service.ts @@ -127,7 +127,8 @@ export class EntityService { }), map(([entityRequestInfo, entity]) => ({ entityRequestInfo, - entity + // If the entity is deleted ensure that we don't pass through a stale state + entity: entityRequestInfo.deleting && entityRequestInfo.deleting.deleted ? null : entity })) ); } From 65fdc8f0d157453cb0434703cb7e746bb19c281f Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 16:06:35 +0100 Subject: [PATCH 63/98] First step in moving (with git mv) code into package of it's own --- angular.json | 31 ++++++ .../custom/autoscaler/autoscaler.module.ts | 95 ------------------ .../cf-app-autoscaler-events-data-source.ts | 34 ------- ...-cell-autoscaler-event-status.component.ts | 9 -- ...app-autoscaler-metric-chart-data-source.ts | 33 ------- .../app/custom/custom-routing.module.ts | 26 ----- .../frontend/app/custom/custom.module.spec.ts | 13 --- .../frontend/app/custom/custom.module.ts | 24 ----- package-lock.json | 2 +- package.json | 1 + .../packages/cf-autoscaler/karma.conf.js | 8 ++ .../packages/cf-autoscaler/ng-package.json | 7 ++ .../packages/cf-autoscaler/package.json | 8 ++ .../cf-autoscaler/src/cf-autoscaler.module.ts | 43 +++++++++ .../autoscaler-transform-metric.spec.ts | 0 .../autoscaler-transform-metric.ts | 20 ++-- .../autoscaler-transform-policy.spec.ts | 2 +- .../autoscaler-transform-policy.ts | 9 +- .../autoscaler-util.spec.ts | 0 .../autoscaler-helpers/autoscaler-util.ts | 16 +++- .../autoscaler-validation.spec.ts | 8 +- .../autoscaler-validation.ts | 3 +- .../src/core/autoscaler.module.ts | 96 +++++++++++++++++++ .../src/core}/autoscaler.routing.ts | 19 ++-- .../features}/autoscaler-base.component.html | 0 .../features}/autoscaler-base.component.scss | 0 .../features}/autoscaler-base.component.ts | 7 +- .../autoscaler-metric-page.component.html | 0 .../autoscaler-metric-page.component.scss | 0 .../autoscaler-metric-page.component.spec.ts | 13 +-- .../autoscaler-metric-page.component.ts | 7 +- ...toscaler-scale-history-page.component.html | 0 ...toscaler-scale-history-page.component.scss | 0 ...autoscaler-scale-history-page.component.ts | 7 +- .../autoscaler-tab-extension.component.html | 0 .../autoscaler-tab-extension.component.scss | 0 .../autoscaler-tab-extension.component.ts | 44 +++++---- .../edit-autoscaler-policy-base-step.ts | 4 +- .../edit-autoscaler-policy-service.ts | 17 ++-- ...dit-autoscaler-policy-step1.component.html | 0 ...dit-autoscaler-policy-step1.component.scss | 0 .../edit-autoscaler-policy-step1.component.ts | 10 +- ...dit-autoscaler-policy-step2.component.html | 0 ...dit-autoscaler-policy-step2.component.scss | 0 .../edit-autoscaler-policy-step2.component.ts | 12 +-- ...dit-autoscaler-policy-step3.component.html | 0 ...dit-autoscaler-policy-step3.component.scss | 0 .../edit-autoscaler-policy-step3.component.ts | 10 +- ...dit-autoscaler-policy-step4.component.html | 0 ...dit-autoscaler-policy-step4.component.scss | 0 .../edit-autoscaler-policy-step4.component.ts | 24 ++--- .../edit-autoscaler-policy.component.html | 0 .../edit-autoscaler-policy.component.scss | 0 .../edit-autoscaler-policy.component.ts | 2 +- .../packages/cf-autoscaler/src/public_api.ts | 6 ++ .../card-autoscaler-default.component.html | 0 .../card-autoscaler-default.component.scss | 0 .../card-autoscaler-default.component.spec.ts | 24 ++--- .../card-autoscaler-default.component.ts | 25 ++--- ...p-autoscaler-events-config.service.spec.ts | 24 ++--- ...cf-app-autoscaler-events-config.service.ts | 14 +-- .../cf-app-autoscaler-events-data-source.ts | 35 +++++++ ...-cell-autoscaler-event-change-icon.pipe.ts | 0 ...ell-autoscaler-event-change.component.html | 0 ...ell-autoscaler-event-change.component.scss | 0 ...-cell-autoscaler-event-change.component.ts | 5 +- ...-cell-autoscaler-event-status-icon.pipe.ts | 0 ...ell-autoscaler-event-status.component.html | 0 ...ell-autoscaler-event-status.component.scss | 0 ...-autoscaler-event-status.component.spec.ts | 9 +- ...-cell-autoscaler-event-status.component.ts | 11 +++ ...p-autoscaler-metric-card.component.spec.ts | 20 ++-- ...utoscaler-metric-chart-card.component.html | 0 ...utoscaler-metric-chart-card.component.scss | 0 ...-autoscaler-metric-chart-card.component.ts | 27 +++--- .../combo-chart/combo-chart.component.scss | 0 .../combo-chart/combo-chart.component.ts | 34 +++---- .../combo-series-vertical.component.ts | 18 +--- ...app-autoscaler-metric-chart-data-source.ts | 34 +++++++ ...r-metric-chart-list-config.service.spec.ts | 8 +- ...scaler-metric-chart-list-config.service.ts | 20 ++-- .../src/store}/app-autoscaler.actions.ts | 10 +- .../src/store}/app-autoscaler.types.ts | 0 .../src/store}/autoscaler.effects.ts | 26 ++--- .../src/store}/autoscaler.store.module.ts | 9 +- .../packages/cf-autoscaler/src/test.ts | 36 +++++++ .../packages/cf-autoscaler/tsconfig.lib.json | 10 ++ .../packages/cf-autoscaler/tsconfig.spec.json | 17 ++++ .../packages/cf-autoscaler/tslint.json | 17 ++++ src/frontend/packages/core/src/app.module.ts | 4 +- 90 files changed, 628 insertions(+), 479 deletions(-) delete mode 100644 custom-src/frontend/app/custom/autoscaler/autoscaler.module.ts delete mode 100644 custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts delete mode 100644 custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts delete mode 100644 custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts delete mode 100644 custom-src/frontend/app/custom/custom-routing.module.ts delete mode 100644 custom-src/frontend/app/custom/custom.module.spec.ts delete mode 100644 custom-src/frontend/app/custom/custom.module.ts create mode 100644 src/frontend/packages/cf-autoscaler/karma.conf.js create mode 100644 src/frontend/packages/cf-autoscaler/ng-package.json create mode 100644 src/frontend/packages/cf-autoscaler/package.json create mode 100644 src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-transform-metric.spec.ts (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-transform-metric.ts (96%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-transform-policy.spec.ts (99%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-transform-policy.ts (96%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-util.spec.ts (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-util.ts (97%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-validation.spec.ts (97%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler-helpers/autoscaler-validation.ts (98%) create mode 100644 src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/core}/autoscaler.routing.ts (57%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-base.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-base.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-base.component.ts (65%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-metric-page/autoscaler-metric-page.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-metric-page/autoscaler-metric-page.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts (70%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-metric-page/autoscaler-metric-page.component.ts (67%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts (68%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-tab-extension/autoscaler-tab-extension.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-tab-extension/autoscaler-tab-extension.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/autoscaler-tab-extension/autoscaler-tab-extension.component.ts (85%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts (85%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-service.ts (73%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts (89%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts (95%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts (96%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts (92%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/features}/edit-autoscaler-policy/edit-autoscaler-policy.component.ts (88%) create mode 100644 src/frontend/packages/cf-autoscaler/src/public_api.ts rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/shared}/card-autoscaler-default/card-autoscaler-default.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/shared}/card-autoscaler-default/card-autoscaler-default.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/shared}/card-autoscaler-default/card-autoscaler-default.component.spec.ts (57%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/shared}/card-autoscaler-default/card-autoscaler-default.component.ts (79%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts (68%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts (85%) create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts (58%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts (78%) create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts (61%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts (73%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss (100%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts (97%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts (95%) create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts (74%) rename {custom-src/frontend/app/custom/autoscaler/list => src/frontend/packages/cf-autoscaler/src/shared}/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts (69%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/store}/app-autoscaler.actions.ts (94%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/store}/app-autoscaler.types.ts (100%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/store}/autoscaler.effects.ts (95%) rename {custom-src/frontend/app/custom/autoscaler => src/frontend/packages/cf-autoscaler/src/store}/autoscaler.store.module.ts (83%) create mode 100644 src/frontend/packages/cf-autoscaler/src/test.ts create mode 100644 src/frontend/packages/cf-autoscaler/tsconfig.lib.json create mode 100644 src/frontend/packages/cf-autoscaler/tsconfig.spec.json create mode 100644 src/frontend/packages/cf-autoscaler/tslint.json diff --git a/angular.json b/angular.json index dbe106cb45..acb0cc844c 100644 --- a/angular.json +++ b/angular.json @@ -285,6 +285,37 @@ } } } + }, + "cf-autoscaler": { + "root": "src/frontend/packages/cf-autoscaler", + "sourceRoot": "src/frontend/packages/cf-autoscaler/src", + "projectType": "library", + "prefix": "lib", + "architect": { + "build": { + "builder": "@angular-devkit/build-ng-packagr:build", + "options": { + "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json", + "project": "src/frontend/packages/cf-autoscaler/ng-package.json" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/frontend/packages/cf-autoscaler/src/test.ts", + "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.spec.json", + "karmaConfig": "src/frontend/packages/cf-autoscaler/karma.conf.js" + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": ["src/tsconfig.json"], + "tslintConfig": "src/frontend/packages/cf-autoscaler/tslint.json", + "files": ["src/frontend/packages/cf-autoscaler/src/**/*.ts"] + } + } + } } }, "defaultProject": "stratos", diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.module.ts b/custom-src/frontend/app/custom/autoscaler/autoscaler.module.ts deleted file mode 100644 index 3a8cf843aa..0000000000 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.module.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { NgModule } from '@angular/core'; -import { EffectsModule } from '@ngrx/effects'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; - -import { CoreModule } from '../../core/core.module'; -import { ApplicationService } from '../../features/applications/application.service'; -import { SharedModule } from '../../shared/shared.module'; -import { AutoscalerBaseComponent } from './autoscaler-base.component'; -import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; -import { - AutoscalerScaleHistoryPageComponent, -} from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; -import { AutoscalerEffects } from './autoscaler.effects'; -import { AutoscalerRoutingModule } from './autoscaler.routing'; -import { AutoscalerStoreModule } from './autoscaler.store.module'; -import { CardAutoscalerDefaultComponent } from './card-autoscaler-default/card-autoscaler-default.component'; -import { - EditAutoscalerPolicyStep1Component, -} from './edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component'; -import { - EditAutoscalerPolicyStep2Component, -} from './edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component'; -import { - EditAutoscalerPolicyStep3Component, -} from './edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component'; -import { - EditAutoscalerPolicyStep4Component, -} from './edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; -import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { - TableCellAutoscalerEventChangeIconPipe, -} from './list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe'; -import { - TableCellAutoscalerEventChangeComponent, -} from './list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; -import { - TableCellAutoscalerEventStatusIconPipe, -} from './list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; -import { - TableCellAutoscalerEventStatusComponent, -} from './list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; -import { - AppAutoscalerMetricChartCardComponent, -} from './list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; -import { - AppAutoscalerComboChartComponent, -} from './list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component'; -import { - AppAutoscalerComboSeriesVerticalComponent, -} from './list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component'; - -@NgModule({ - imports: [ - CoreModule, - SharedModule, - AutoscalerRoutingModule, - AutoscalerStoreModule, - NgxChartsModule, - EffectsModule.forFeature([ - AutoscalerEffects - ]) - ], - declarations: [ - AutoscalerBaseComponent, - AutoscalerMetricPageComponent, - AutoscalerScaleHistoryPageComponent, - EditAutoscalerPolicyComponent, - EditAutoscalerPolicyStep1Component, - EditAutoscalerPolicyStep2Component, - EditAutoscalerPolicyStep3Component, - EditAutoscalerPolicyStep4Component, - CardAutoscalerDefaultComponent, - AppAutoscalerMetricChartCardComponent, - AppAutoscalerComboChartComponent, - AppAutoscalerComboSeriesVerticalComponent, - TableCellAutoscalerEventChangeComponent, - TableCellAutoscalerEventStatusComponent, - TableCellAutoscalerEventStatusIconPipe, - TableCellAutoscalerEventChangeIconPipe, - ], - exports: [ - CardAutoscalerDefaultComponent - ], - providers: [ - ApplicationService - ], - entryComponents: [ - AppAutoscalerMetricChartCardComponent, - AppAutoscalerComboChartComponent, - AppAutoscalerComboSeriesVerticalComponent, - TableCellAutoscalerEventChangeComponent, - TableCellAutoscalerEventStatusComponent - ] -}) -export class AutoscalerModule { } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts deleted file mode 100644 index ed62171a27..0000000000 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; -import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; -import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../../shared/components/list/list.component.types'; -import { GetAppAutoscalerScalingHistoryAction } from '../../../app-autoscaler.actions'; -import { AppAutoscalerEvent } from '../../../app-autoscaler.types'; -import { appAutoscalerScalingHistorySchemaKey } from '../../../autoscaler.store.module'; - -export class CfAppAutoscalerEventsDataSource extends ListDataSource> { - action: any; - constructor( - store: Store, - cfGuid: string, - appGuid: string, - listConfig: IListConfig> - ) { - const action = new GetAppAutoscalerScalingHistoryAction(null, appGuid, cfGuid); - super( - { - store, - action, - schema: entityFactory(appAutoscalerScalingHistorySchemaKey), - getRowUniqueId: getRowMetadata, - paginationKey: action.paginationKey, - isLocal: false, - listConfig - } - ); - } -} diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts deleted file mode 100644 index 9eafa8f0be..0000000000 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { TableCellCustom } from '../../../../../../shared/components/list/list.types'; - -@Component({ - selector: 'app-table-cell-autoscaler-event-status', - templateUrl: './table-cell-autoscaler-event-status.component.html', - styleUrls: ['./table-cell-autoscaler-event-status.component.scss'] -}) -export class TableCellAutoscalerEventStatusComponent extends TableCellCustom { } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts deleted file mode 100644 index 0963dd45f0..0000000000 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Store } from '@ngrx/store'; - -import { AppState } from '../../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../../store/src/helpers/entity-factory'; -import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers'; -import { ListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source'; -import { IListConfig } from '../../../../../shared/components/list/list.component.types'; -import { GetAppAutoscalerPolicyTriggerAction } from '../../../app-autoscaler.actions'; -import { AppScalingTrigger } from '../../../app-autoscaler.types'; - -export class AppAutoscalerMetricChartDataSource extends ListDataSource> { - action: any; - constructor( - store: Store, - cfGuid: string, - appGuid: string, - listConfig: IListConfig> - ) { - const action = new GetAppAutoscalerPolicyTriggerAction(null, appGuid, cfGuid); - super( - { - store, - action, - schema: entityFactory(action.entityKey), - getRowUniqueId: getRowMetadata, - paginationKey: action.paginationKey, - isLocal: true, - listConfig - } - ); - } -} diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts deleted file mode 100644 index 2fda68b015..0000000000 --- a/custom-src/frontend/app/custom/custom-routing.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { of } from 'rxjs'; - -const customRoutes: Routes = [ - { - path: 'autoscaler', - loadChildren: './autoscaler/autoscaler.module#AutoscalerModule', - data: { - stratosNavigation: { - text: 'Applications', - matIcon: 'apps', - position: 20, - hidden: of(true) - } - }, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forRoot(customRoutes), - ], - declarations: [] -}) -export class CustomRoutingModule { } diff --git a/custom-src/frontend/app/custom/custom.module.spec.ts b/custom-src/frontend/app/custom/custom.module.spec.ts deleted file mode 100644 index cef2dc7211..0000000000 --- a/custom-src/frontend/app/custom/custom.module.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { CustomModule } from './custom.module'; - -describe('CustomModule', () => { - let customModule: CustomModule; - - beforeEach(() => { - customModule = new CustomModule(); - }); - - it('should create an instance', () => { - expect(customModule).toBeTruthy(); - }); -}); diff --git a/custom-src/frontend/app/custom/custom.module.ts b/custom-src/frontend/app/custom/custom.module.ts deleted file mode 100644 index 02c3518935..0000000000 --- a/custom-src/frontend/app/custom/custom.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { SharedModule } from '../shared/shared.module'; -import { MDAppModule } from '../core/md.module'; -import { CoreModule } from '../core/core.module'; -import { AutoscalerModule } from './autoscaler/autoscaler.module'; -import { AutoscalerTabExtensionComponent } from './autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component'; - -@NgModule({ - imports: [ - CoreModule, - CommonModule, - SharedModule, - MDAppModule, - NgxChartsModule, - AutoscalerModule, - ], - declarations: [ - AutoscalerTabExtensionComponent, - ], - entryComponents: [AutoscalerTabExtensionComponent] -}) -export class CustomModule { } diff --git a/package-lock.json b/package-lock.json index 358676f9a3..6ed96804c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7066,7 +7066,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } }, "uglify-js": { diff --git a/package.json b/package.json index bc5810f62d..22c7d60c60 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "test-frontend:core": "ng test core --code-coverage --watch=false", "test-frontend:store": "ng test store --code-coverage --watch=false", "test-frontend:cloud-foundry": "ng test cloud-foundry --code-coverage --watch=false", + "test-frontend:cf-autoscaler": "ng test cf-autoscaler --code-coverage --watch=false", "posttest": "istanbul report json && node build/combine-coverage.js", "codecov": "codecov -f coverage/coverage-final.json", "lint": "ng lint --format stylish", diff --git a/src/frontend/packages/cf-autoscaler/karma.conf.js b/src/frontend/packages/cf-autoscaler/karma.conf.js new file mode 100644 index 0000000000..aa31921f71 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/karma.conf.js @@ -0,0 +1,8 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + ...require('../../../../build/karma.conf.creator.js')('cf-autoscaler')(config) + }) +} diff --git a/src/frontend/packages/cf-autoscaler/ng-package.json b/src/frontend/packages/cf-autoscaler/ng-package.json new file mode 100644 index 0000000000..dc5592ade4 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/ng-package.json @@ -0,0 +1,7 @@ +{ + "$schema": "../../../../node_modules/ng-packagr/ng-package.schema.json", + "dest": "../../../../dist/cf-autoscaler", + "lib": { + "entryFile": "src/public_api.ts" + } +} diff --git a/src/frontend/packages/cf-autoscaler/package.json b/src/frontend/packages/cf-autoscaler/package.json new file mode 100644 index 0000000000..5258e6ebc3 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/package.json @@ -0,0 +1,8 @@ +{ + "name": "cf-autoscaler", + "version": "0.0.1", + "peerDependencies": { + "@angular/common": "^6.0.0-rc.0 || ^6.0.0", + "@angular/core": "^6.0.0-rc.0 || ^6.0.0" + } +} diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts new file mode 100644 index 0000000000..8f4badd13e --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts @@ -0,0 +1,43 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; +import { of } from 'rxjs'; + +import { CoreModule } from '../../core/src/core/core.module'; +import { MDAppModule } from '../../core/src/core/md.module'; +import { SharedModule } from '../../core/src/shared/shared.module'; +import { AutoscalerModule } from './core/autoscaler.module'; +import { AutoscalerTabExtensionComponent } from './features/autoscaler-tab-extension/autoscaler-tab-extension.component'; + +const customRoutes: Routes = [ + { + path: 'autoscaler', + loadChildren: './core/autoscaler.module#AutoscalerModule', + data: { + stratosNavigation: { + text: 'Applications', + matIcon: 'apps', + position: 20, + hidden: of(true) + } + }, + }, +]; + +@NgModule({ + imports: [ + CoreModule, + CommonModule, + SharedModule, + MDAppModule, + NgxChartsModule, + AutoscalerModule, + RouterModule.forRoot(customRoutes), + ], + declarations: [ + AutoscalerTabExtensionComponent + ], + entryComponents: [AutoscalerTabExtensionComponent] +}) +export class CfAutoscalerModule { } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.spec.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.spec.ts diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts similarity index 96% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts index d85788f98e..06c7ddf3bb 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts @@ -1,15 +1,15 @@ import * as moment from 'moment-timezone'; -import { PaginationResponse } from '../../../../../store/src/types/api.types'; +import { PaginationResponse } from '../../../../store/src/types/api.types'; import { - AppScalingRule, - AppScalingTrigger, + AppAutoscalerMetricBasicInfo, AppAutoscalerMetricData, AppAutoscalerMetricDataLine, AppAutoscalerMetricDataLocal, AppAutoscalerMetricDataPoint, - AppAutoscalerMetricBasicInfo, -} from '../app-autoscaler.types'; + AppScalingRule, + AppScalingTrigger, +} from '../../store/app-autoscaler.types'; import { AutoscalerConstants, getScaleType } from './autoscaler-util'; function initMetricData(metricName: string): AppAutoscalerMetricDataLocal { @@ -44,7 +44,7 @@ export function buildMetricData( skipFormat: boolean, trigger: AppScalingTrigger, timezone?: string - ): AppAutoscalerMetricDataLocal { +): AppAutoscalerMetricDataLocal { const result = initMetricData(metricName); if (data.resources.length > 0) { const basicInfo = getMetricBasicInfo(metricName, data.resources, trigger); @@ -76,7 +76,7 @@ export function insertEmptyMetrics( endTime: number, interval: number, timezone?: string - ): AppAutoscalerMetricDataPoint[] { +): AppAutoscalerMetricDataPoint[] { const insertEmptyNumber = Math.floor((endTime - startTime) / interval) + 1; for (let i = 0; i < insertEmptyNumber; i++) { const emptyMetric = buildSingleMetricData(startTime + i * interval, 0, timezone); @@ -230,7 +230,11 @@ function getColor(trigger: AppScalingTrigger, value: any): string { return color; } -function getMetricBasicInfo(metricName: string, source: AppAutoscalerMetricData[], trigger: AppScalingTrigger): AppAutoscalerMetricBasicInfo { +function getMetricBasicInfo( + metricName: string, + source: AppAutoscalerMetricData[], + trigger: AppScalingTrigger +): AppAutoscalerMetricBasicInfo { const map = {}; let interval = AutoscalerConstants.metricMap[metricName].interval; let maxCount = 1; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts similarity index 99% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts index 95cfaa0825..9ab676fab9 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts @@ -1,9 +1,9 @@ import { isEqual } from './autoscaler-util'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; import { autoscalerTransformArrayToMap, autoscalerTransformMapToArray, } from './autoscaler-transform-policy'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; describe('Autoscaler Transform Policy Helper', () => { it('Test policy transformation', () => { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts similarity index 96% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts index 768412a5cf..eb5ce51b35 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts @@ -1,7 +1,12 @@ import * as moment from 'moment-timezone'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppScalingRule, AppScalingTrigger } from '../app-autoscaler.types'; -import { getScaleType, isEqual, AutoscalerConstants } from './autoscaler-util'; +import { + AppAutoscalerPolicy, + AppAutoscalerPolicyLocal, + AppScalingRule, + AppScalingTrigger, +} from '../../store/app-autoscaler.types'; +import { AutoscalerConstants, getScaleType, isEqual } from './autoscaler-util'; export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { const newPolicy: AppAutoscalerPolicyLocal = { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.spec.ts similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.spec.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.spec.ts diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts similarity index 97% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index ba471ed496..aa67cc9945 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -1,11 +1,13 @@ - import * as moment from 'moment-timezone'; + import { - AppScalingRule, - AppScalingTrigger, AppAutoscalerMetricDataPoint, AppAutoscalerMetricLegend, - AppAutoscalerMetricMapInfo } from '../app-autoscaler.types'; + AppAutoscalerMetricMapInfo, + AppScalingRule, + AppScalingTrigger, +} from '../../store/app-autoscaler.types'; + export class AutoscalerConstants { public static S2NS = 1000000000; @@ -190,7 +192,11 @@ function buildUpperLegendData(legendData: any, upper: AppScalingRule[], noLower: return latestUl; } -function buildLowerLegendData(legendData: AppAutoscalerMetricDataPoint[], lower: AppScalingRule[], latestUl: AppScalingRule): AppScalingRule { +function buildLowerLegendData( + legendData: AppAutoscalerMetricDataPoint[], + lower: AppScalingRule[], + latestUl: AppScalingRule +): AppScalingRule { lower.map((item, index) => { let name = ''; if (!latestUl || !latestUl.threshold) { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.spec.ts similarity index 97% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.spec.ts index eea231d2e9..90c63b9e4e 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.spec.ts @@ -1,13 +1,13 @@ +import { AppRecurringSchedule, AppSpecificDate } from '../../store/app-autoscaler.types'; import { - numberWithFractionOrExceedRange, - timeIsSameOrAfter, dateIsAfter, dateTimeIsSameOrAfter, + numberWithFractionOrExceedRange, recurringSchedulesInvalidRepeatOn, recurringSchedulesOverlapping, - specificDateRangeOverlapping + specificDateRangeOverlapping, + timeIsSameOrAfter, } from './autoscaler-validation'; -import { AppRecurringSchedule, AppSpecificDate } from '../app-autoscaler.types'; describe('Autoscaler Util Helper', () => { it('numberWithFractionOrExceedRange', () => { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts similarity index 98% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts index 0a6fca85fb..0e4085c963 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-helpers/autoscaler-validation.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts @@ -1,7 +1,8 @@ import * as intersect from 'intersect'; import * as moment from 'moment-timezone'; + +import { AppRecurringSchedule, AppScalingRule, AppSpecificDate } from '../../store/app-autoscaler.types'; import { AutoscalerConstants } from './autoscaler-util'; -import { AppRecurringSchedule, AppSpecificDate, AppScalingRule } from '../app-autoscaler.types'; export function numberWithFractionOrExceedRange(value: any, min: number, max: number, required: boolean) { if ((!value || isNaN(value)) && !required) { diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts new file mode 100644 index 0000000000..ff6272debd --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts @@ -0,0 +1,96 @@ +import { NgModule } from '@angular/core'; +import { EffectsModule } from '@ngrx/effects'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +import { CoreModule } from '../../../core/src/core/core.module'; +import { ApplicationService } from '../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../core/src/shared/shared.module'; +import { AutoscalerBaseComponent } from '../features/autoscaler-base.component'; +import { AutoscalerMetricPageComponent } from '../features/autoscaler-metric-page/autoscaler-metric-page.component'; +import { + AutoscalerScaleHistoryPageComponent, +} from '../features/autoscaler-scale-history-page/autoscaler-scale-history-page.component'; +import { + EditAutoscalerPolicyStep1Component, +} from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component'; +import { + EditAutoscalerPolicyStep2Component, +} from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component'; +import { + EditAutoscalerPolicyStep3Component, +} from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component'; +import { + EditAutoscalerPolicyStep4Component, +} from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; +import { EditAutoscalerPolicyComponent } from '../features/edit-autoscaler-policy/edit-autoscaler-policy.component'; +import { CardAutoscalerDefaultComponent } from '../shared/card-autoscaler-default/card-autoscaler-default.component'; +import { + TableCellAutoscalerEventChangeIconPipe, +} from '../shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe'; +import { + TableCellAutoscalerEventChangeComponent, +} from '../shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component'; +import { + TableCellAutoscalerEventStatusIconPipe, +} from '../shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe'; +import { + TableCellAutoscalerEventStatusComponent, +} from '../shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component'; +import { + AppAutoscalerMetricChartCardComponent, +} from '../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; +import { + AppAutoscalerComboChartComponent, +} from '../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component'; +import { + AppAutoscalerComboSeriesVerticalComponent, +} from '../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component'; +import { AutoscalerEffects } from '../store/autoscaler.effects'; +import { AutoscalerStoreModule } from '../store/autoscaler.store.module'; +import { AutoscalerRoutingModule } from './autoscaler.routing'; + + +@NgModule({ + imports: [ + CoreModule, + SharedModule, + AutoscalerRoutingModule, + AutoscalerStoreModule, + NgxChartsModule, + EffectsModule.forFeature([ + AutoscalerEffects + ]) + ], + declarations: [ + AutoscalerBaseComponent, + AutoscalerMetricPageComponent, + AutoscalerScaleHistoryPageComponent, + EditAutoscalerPolicyComponent, + EditAutoscalerPolicyStep1Component, + EditAutoscalerPolicyStep2Component, + EditAutoscalerPolicyStep3Component, + EditAutoscalerPolicyStep4Component, + CardAutoscalerDefaultComponent, + AppAutoscalerMetricChartCardComponent, + AppAutoscalerComboChartComponent, + AppAutoscalerComboSeriesVerticalComponent, + TableCellAutoscalerEventChangeComponent, + TableCellAutoscalerEventStatusComponent, + TableCellAutoscalerEventStatusIconPipe, + TableCellAutoscalerEventChangeIconPipe, + ], + exports: [ + CardAutoscalerDefaultComponent + ], + providers: [ + ApplicationService + ], + entryComponents: [ + AppAutoscalerMetricChartCardComponent, + AppAutoscalerComboChartComponent, + AppAutoscalerComboSeriesVerticalComponent, + TableCellAutoscalerEventChangeComponent, + TableCellAutoscalerEventStatusComponent + ] +}) +export class AutoscalerModule { } diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.routing.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts similarity index 57% rename from custom-src/frontend/app/custom/autoscaler/autoscaler.routing.ts rename to src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts index 16c237adae..f4a0685688 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.routing.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts @@ -1,12 +1,17 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DynamicExtensionRoutes } from '../../core/extension/dynamic-extension-routes'; -import { StratosActionType } from '../../core/extension/extension-service'; -import { PageNotFoundComponentComponent } from '../../core/page-not-found-component/page-not-found-component.component'; -import { AutoscalerBaseComponent } from './autoscaler-base.component'; -import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy/edit-autoscaler-policy.component'; -import { AutoscalerMetricPageComponent } from './autoscaler-metric-page/autoscaler-metric-page.component'; -import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page/autoscaler-scale-history-page.component'; + +import { DynamicExtensionRoutes } from '../../../core/src/core/extension/dynamic-extension-routes'; +import { StratosActionType } from '../../../core/src/core/extension/extension-service'; +import { + PageNotFoundComponentComponent, +} from '../../../core/src/core/page-not-found-component/page-not-found-component.component'; +import { AutoscalerBaseComponent } from '../features/autoscaler-base.component'; +import { AutoscalerMetricPageComponent } from '../features/autoscaler-metric-page/autoscaler-metric-page.component'; +import { + AutoscalerScaleHistoryPageComponent, +} from '../features/autoscaler-scale-history-page/autoscaler-scale-history-page.component'; +import { EditAutoscalerPolicyComponent } from '../features/edit-autoscaler-policy/edit-autoscaler-policy.component'; const autoscalerRoutes: Routes = [ { diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.html rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.ts similarity index 65% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.ts index 3a1de7d8c7..3f81cc895e 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-base.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.ts @@ -1,8 +1,9 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { APP_GUID, CF_GUID } from '../../shared/entity.tokens'; -import { ApplicationService } from '../../features/applications/application.service'; -import { getGuids } from '../../features/applications/application/application-base.component'; + +import { ApplicationService } from '../../../core/src/features/applications/application.service'; +import { getGuids } from '../../../core/src/features/applications/application/application-base.component'; +import { APP_GUID, CF_GUID } from '../../../core/src/shared/entity.tokens'; @Component({ selector: 'app-autoscaler-base', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.html rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts similarity index 70% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts index 95dc62f4ec..e4f92ff286 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts @@ -3,13 +3,14 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { CoreModule } from '../../../core/core.module'; -import { SharedModule } from '../../../shared/shared.module'; -import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component'; -import { ApplicationService } from '../../../features/applications/application.service'; -import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; -import { TabNavService } from '../../../../tab-nav.service'; + describe('AutoscalerMetricPageComponent', () => { let component: AutoscalerMetricPageComponent; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.ts similarity index 67% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.ts index 304d5fe179..1a9d01e7f4 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-metric-page/autoscaler-metric-page.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { ListConfig } from '../../../shared/components/list/list.component.types'; -import { ApplicationService } from '../../../features/applications/application.service'; + +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { ListConfig } from '../../../../core/src/shared/components/list/list.component.types'; import { AppAutoscalerMetricChartListConfigService, -} from '../list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service'; +} from '../../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service'; @Component({ selector: 'app-autoscaler-metric-page', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts similarity index 68% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts index 89adbc80e9..49767bbca6 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { ApplicationService } from '../../../features/applications/application.service'; + +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { ListConfig } from '../../../../core/src/shared/components/list/list.component.types'; import { CfAppAutoscalerEventsConfigService, -} from '../list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; -import { ListConfig } from '../../../shared/components/list/list.component.types'; +} from '../../shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service'; @Component({ selector: 'app-autoscaler-scale-history-page', diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.html rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts similarity index 85% rename from custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 50fe3c4bdb..bd0ec2585c 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -5,22 +5,23 @@ import { Store } from '@ngrx/store'; import { Observable, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators'; -import { RouterNav } from '../../../../../store/src/actions/router.actions'; -import { AppState } from '../../../../../store/src/app-state'; -import { applicationSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { createEntityRelationPaginationKey } from '../../../../../store/src/helpers/entity-relations/entity-relations.types'; -import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; -import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; -import { APIResource } from '../../../../../store/src/types/api.types'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { StratosTab, StratosTabType } from '../../../core/extension/extension-service'; -import { ApplicationService } from '../../../features/applications/application.service'; -import { getGuids } from '../../../features/applications/application/application-base.component'; -import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; -import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; +import { EntityService } from '../../../../core/src/core/entity-service'; +import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; +import { StratosTab, StratosTabType } from '../../../../core/src/core/extension/extension-service'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { getGuids } from '../../../../core/src/features/applications/application/application-base.component'; +import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config'; +import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service'; +import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory'; +import { RouterNav } from '../../../../store/src/actions/router.actions'; +import { AppState } from '../../../../store/src/app-state'; +import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpers/entity-factory'; +import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; +import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; +import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'; +import { APIResource } from '../../../../store/src/types/api.types'; +import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util'; import { AutoscalerPaginationParams, DetachAppAutoscalerPolicyAction, @@ -29,14 +30,17 @@ import { GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, -} from '../app-autoscaler.actions'; -import { AppAutoscalerMetricData, AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory } from '../app-autoscaler.types'; -import { AutoscalerConstants } from '../autoscaler-helpers/autoscaler-util'; +} from '../../store/app-autoscaler.actions'; +import { + AppAutoscalerMetricData, + AppAutoscalerPolicyLocal, + AppAutoscalerScalingHistory, +} from '../../store/app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerScalingHistorySchemaKey, -} from '../autoscaler.store.module'; +} from '../../store/autoscaler.store.module'; @StratosTab({ type: StratosTabType.Application, diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts similarity index 85% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts index b4c2b62b4a..1a0f24e54a 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-base-step.ts @@ -2,8 +2,8 @@ import { OnInit } from '@angular/core'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; +import { StepOnNextFunction } from '../../../../core/src/shared/components/stepper/step/step.component'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; export abstract class EditAutoscalerPolicy implements OnInit { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts similarity index 73% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts index 5632b4fc0c..04fa186e06 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-service.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts @@ -3,14 +3,15 @@ import * as moment from 'moment-timezone'; import { BehaviorSubject, Observable } from 'rxjs'; import { filter, first } from 'rxjs/operators'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { EntityInfo } from '../../../../../store/src/types/api.types'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { cloneObject } from '../../../core/utils.service'; -import { GetAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; -import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; -import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; +import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; +import { cloneObject } from '../../../../core/src/core/utils.service'; +import { entityFactory } from '../../../../store/src/helpers/entity-factory'; +import { EntityInfo } from '../../../../store/src/types/api.types'; +import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy'; +import { GetAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; +import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module'; + @Injectable() export class EditAutoscalerPolicyService { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts similarity index 89% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts index e8b0bd5deb..877a402a4a 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -5,11 +5,11 @@ import * as moment from 'moment-timezone'; import { of as observableOf } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ApplicationService } from '../../../../features/applications/application.service'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { autoscalerTransformArrayToMap } from '../../autoscaler-helpers/autoscaler-transform-policy'; -import { PolicyAlert } from '../../autoscaler-helpers/autoscaler-util'; -import { numberWithFractionOrExceedRange } from '../../autoscaler-helpers/autoscaler-validation'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component'; +import { autoscalerTransformArrayToMap } from '../../../core/autoscaler-helpers/autoscaler-transform-policy'; +import { PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { numberWithFractionOrExceedRange } from '../../../core/autoscaler-helpers/autoscaler-validation'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts similarity index 95% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 8eb53f39ef..46c375a814 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -3,20 +3,20 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Observable } from 'rxjs'; -import { cloneObject } from '../../../../core/utils.service'; -import { ApplicationService } from '../../../../features/applications/application.service'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; +import { cloneObject } from '../../../../../core/src/core/utils.service'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { + AutoscalerConstants, getAdjustmentType, getScaleType, - AutoscalerConstants, PolicyAlert, -} from '../../autoscaler-helpers/autoscaler-util'; +} from '../../../core/autoscaler-helpers/autoscaler-util'; import { getThresholdMax, getThresholdMin, numberWithFractionOrExceedRange, -} from '../../autoscaler-helpers/autoscaler-validation'; +} from '../../../core/autoscaler-helpers/autoscaler-validation'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts similarity index 96% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index f469a199c4..cc994fde69 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -4,16 +4,16 @@ import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/materi import * as moment from 'moment-timezone'; import { Observable } from 'rxjs'; -import { cloneObject } from '../../../../core/utils.service'; -import { ApplicationService } from '../../../../features/applications/application.service'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../app-autoscaler.types'; -import { PolicyAlert, shiftArray, AutoscalerConstants } from '../../autoscaler-helpers/autoscaler-util'; +import { cloneObject } from '../../../../../core/src/core/utils.service'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { AutoscalerConstants, PolicyAlert, shiftArray } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateIsAfter, numberWithFractionOrExceedRange, recurringSchedulesOverlapping, timeIsSameOrAfter, -} from '../../autoscaler-helpers/autoscaler-validation'; +} from '../../../core/autoscaler-helpers/autoscaler-validation'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; import { diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts similarity index 92% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index 467e812bba..502cbf288e 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -6,22 +6,22 @@ import * as moment from 'moment-timezone'; import { Observable } from 'rxjs'; import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; -import { AppState } from '../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; -import { EntityService } from '../../../../core/entity-service'; -import { EntityServiceFactory } from '../../../../core/entity-service-factory.service'; -import { cloneObject } from '../../../../core/utils.service'; -import { ApplicationService } from '../../../../features/applications/application.service'; -import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppSpecificDate } from '../../app-autoscaler.types'; -import { AutoscalerConstants, PolicyAlert } from '../../autoscaler-helpers/autoscaler-util'; +import { EntityService } from '../../../../../core/src/core/entity-service'; +import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service'; +import { cloneObject } from '../../../../../core/src/core/utils.service'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component'; +import { AppState } from '../../../../../store/src/app-state'; +import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { AutoscalerConstants, PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, numberWithFractionOrExceedRange, specificDateRangeOverlapping, -} from '../../autoscaler-helpers/autoscaler-validation'; -import { appAutoscalerUpdatedPolicySchemaKey } from '../../autoscaler.store.module'; +} from '../../../core/autoscaler-helpers/autoscaler-validation'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../store/app-autoscaler.actions'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppSpecificDate } from '../../../store/app-autoscaler.types'; +import { appAutoscalerUpdatedPolicySchemaKey } from '../../../store/autoscaler.store.module'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.html rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.scss rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts similarity index 88% rename from custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts rename to src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 09483f6920..0c4d19651a 100644 --- a/custom-src/frontend/app/custom/autoscaler/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; -import { ApplicationService } from '../../../features/applications/application.service'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; @Component({ diff --git a/src/frontend/packages/cf-autoscaler/src/public_api.ts b/src/frontend/packages/cf-autoscaler/src/public_api.ts new file mode 100644 index 0000000000..24160374d0 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/public_api.ts @@ -0,0 +1,6 @@ +/* + * Public API Surface of cloud-foundry + */ + +// export * from './lib/cloud-foundry.service'; +export * from './lib/cf-autoscaler.module'; diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.html rename to src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.scss rename to src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts similarity index 57% rename from custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts index 521733dfe2..f9573a73c8 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -1,17 +1,19 @@ +import { CommonModule } from '@angular/common'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { CoreModule } from '../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { ApplicationStateService } from '../../../../core/src/shared/components/application-state/application-state.service'; +import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component'; +import { + RunningInstancesComponent, +} from '../../../../core/src/shared/components/running-instances/running-instances.component'; +import { EntityMonitorFactory } from '../../../../core/src/shared/monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory'; +import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component'; -import { CoreModule } from '../../../core/core.module'; -import { ApplicationService } from '../../../features/applications/application.service'; -import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper'; -import { createBasicStoreModule } from '../../../..//test-framework/store-test-helper'; -import { ApplicationStateService } from '../../../../../core/src/shared/components/application-state/application-state.service'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CommonModule } from '@angular/common'; -import { MetadataItemComponent } from '../../../shared/components/metadata-item/metadata-item.component'; -import { RunningInstancesComponent } from '../../../shared/components/running-instances/running-instances.component'; -import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../shared/monitors/pagination-monitor.factory'; describe('CardAutoscalerDefaultComponent', () => { let component: CardAutoscalerDefaultComponent; diff --git a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts similarity index 79% rename from custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts rename to src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts index 5776bb8cea..3fac739c50 100644 --- a/custom-src/frontend/app/custom/autoscaler/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts @@ -4,18 +4,19 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; -import { AppState } from '../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types'; -import { selectUpdateInfo } from '../../../../../store/src/selectors/api.selectors'; -import { EntityService } from '../../../core/entity-service'; -import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; -import { ApplicationService } from '../../../features/applications/application.service'; -import { StratosStatus } from '../../../shared/shared.types'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../app-autoscaler.actions'; -import { autoscalerTransformArrayToMap } from '../autoscaler-helpers/autoscaler-transform-policy'; -import { appAutoscalerPolicySchemaKey } from '../autoscaler.store.module'; -import { AppAutoscalerPolicyLocal } from '../app-autoscaler.types'; +import { EntityService } from '../../../../core/src/core/entity-service'; +import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { StratosStatus } from '../../../../core/src/shared/shared.types'; +import { AppState } from '../../../../store/src/app-state'; +import { entityFactory } from '../../../../store/src/helpers/entity-factory'; +import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; +import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'; +import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy'; +import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; +import { AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; +import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module'; + @Component({ selector: 'app-card-autoscaler-default', diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts similarity index 68% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index 1b1439a1cd..9a8b840c41 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -1,20 +1,20 @@ import { CommonModule } from '@angular/common'; import { inject, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; +import { ConnectionBackend, Http } from '@angular/http'; import { MockBackend } from '@angular/http/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 { SharedModule } from '../../../../../shared/shared.module'; +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service'; +import { ApplicationsModule } from '../../../../../core/src/features/applications/applications.module'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; +import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper'; +import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper'; +import { createBasicStoreModule, getInitialTestStoreState } from '../../../../../core/test-framework/store-test-helper'; +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 { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; -import { Http, ConnectionBackend } from '@angular/http'; describe('CfAppAutoscalerEventsConfigService', () => { const initialState = getInitialTestStoreState(); diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts similarity index 85% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index b66ec1bc3a..623f52fe31 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { AppState } from '../../../../../../../store/src/app-state'; -import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { ApplicationService } from '../../../../../features/applications/application.service'; -import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; -import { IListConfig, ListConfig, ListViewTypes } from '../../../../../shared/components/list/list.component.types'; -import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; -import { AppAutoscalerEvent } from '../../../app-autoscaler.types'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; +import { IListConfig, ListConfig, ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types'; +import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types'; +import { AppState } from '../../../../../store/src/app-state'; +import { APIResource } from '../../../../../store/src/types/api.types'; +import { AppAutoscalerEvent } from '../../../store/app-autoscaler.types'; import { CfAppAutoscalerEventsDataSource } from './cf-app-autoscaler-events-data-source'; import { TableCellAutoscalerEventChangeComponent, diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts new file mode 100644 index 0000000000..725eb78707 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -0,0 +1,35 @@ +import { Store } from '@ngrx/store'; + +import { getRowMetadata } from '../../../../../core/src/features/cloud-foundry/cf.helpers'; +import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; +import { AppState } from '../../../../../store/src/app-state'; +import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { APIResource } from '../../../../../store/src/types/api.types'; +import { GetAppAutoscalerScalingHistoryAction } from '../../../store/app-autoscaler.actions'; +import { AppAutoscalerEvent } from '../../../store/app-autoscaler.types'; +import { appAutoscalerScalingHistorySchemaKey } from '../../../store/autoscaler.store.module'; + + +export class CfAppAutoscalerEventsDataSource extends ListDataSource> { + action: any; + constructor( + store: Store, + cfGuid: string, + appGuid: string, + listConfig: IListConfig> + ) { + const action = new GetAppAutoscalerScalingHistoryAction(null, appGuid, cfGuid); + super( + { + store, + action, + schema: entityFactory(appAutoscalerScalingHistorySchemaKey), + getRowUniqueId: getRowMetadata, + paginationKey: action.paginationKey, + isLocal: false, + listConfig + } + ); + } +} diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change-icon.pipe.ts diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts similarity index 58% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts index a74a45f3ab..284ee793f1 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { TableCellCustom } from '../../../../../../shared/components/list/list.types'; + +import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types'; @Component({ selector: 'app-table-cell-autoscaler-event-change', templateUrl: './table-cell-autoscaler-event-change.component.html', styleUrls: ['./table-cell-autoscaler-event-change.component.scss'] }) -export class TableCellAutoscalerEventChangeComponent extends TableCellCustom { } +export class TableCellAutoscalerEventChangeComponent extends TableCellCustom { } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status-icon.pipe.ts diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts similarity index 78% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts index 6e2bb1895e..a2adf13aa5 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts @@ -1,11 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIcon } from '@angular/material'; + +import { EntityInfo } from '../../../../../../store/src/types/api.types'; import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status.component'; -import { EntityInfo } from '../../../../../../../../store/src/types/api.types'; describe('TableCellAutoscalerEventStatusComponent', () => { - let component: TableCellAutoscalerEventStatusComponent; - let fixture: ComponentFixture>; + let component: TableCellAutoscalerEventStatusComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -15,7 +16,7 @@ describe('TableCellAutoscalerEventStatusComponent', () => { })); beforeEach(() => { - fixture = TestBed.createComponent>(TableCellAutoscalerEventStatusComponent); + fixture = TestBed.createComponent(TableCellAutoscalerEventStatusComponent); component = fixture.componentInstance; component.row = { entity: { diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts new file mode 100644 index 0000000000..ab8cf4d7e7 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +import { TableCellCustom } from '../../../../../../core/src/shared/components/list/list.types'; +import { EntityInfo } from '../../../../../../store/src/types/api.types'; + +@Component({ + selector: 'app-table-cell-autoscaler-event-status', + templateUrl: './table-cell-autoscaler-event-status.component.html', + styleUrls: ['./table-cell-autoscaler-event-status.component.scss'] +}) +export class TableCellAutoscalerEventStatusComponent extends TableCellCustom { } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts similarity index 61% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts index 8dce887eb2..8e54822e43 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts @@ -3,15 +3,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ApplicationEnvVarsHelper, -} from '../../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; -import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper'; -import { BaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; -import { createBasicStoreModule } from '../../../../../../../test-framework/store-test-helper'; -import { ServiceActionHelperService } from '../../../../../../shared/data-services/service-action-helper.service'; -import { EntityMonitorFactory } from '../../../../../../shared/monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { ApplicationStateService } from '../../../../../../shared/components/application-state/application-state.service'; -import { ConfirmationDialogService } from '../../../../../../shared/components/confirmation-dialog.service'; +} from '../../../../../../core/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; +import { + ApplicationStateService, +} from '../../../../../../core/src/shared/components/application-state/application-state.service'; +import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service'; +import { ServiceActionHelperService } from '../../../../../../core/src/shared/data-services/service-action-helper.service'; +import { EntityMonitorFactory } from '../../../../../../core/src/shared/monitors/entity-monitor.factory.service'; +import { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory'; +import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper'; +import { BaseTestModules } from '../../../../../../core/test-framework/cloud-foundry-endpoint-service.helper'; +import { createBasicStoreModule } from '../../../../../../core/test-framework/store-test-helper'; import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component'; describe('AppServiceBindingCardComponent', () => { diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts similarity index 73% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 86f56feeac..f6facf520b 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -3,19 +3,22 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; -import { AppState } from '../../../../../../../../store/src/app-state'; -import { entityFactory } from '../../../../../../../../store/src/helpers/entity-factory'; +import { ApplicationService } from '../../../../../../core/src/features/applications/application.service'; +import { CardCell, IListRowCell } from '../../../../../../core/src/shared/components/list/list.types'; +import { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory'; +import { AppState } from '../../../../../../store/src/app-state'; +import { entityFactory } from '../../../../../../store/src/helpers/entity-factory'; +import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { APIResource } from '../../../../../../store/src/types/api.types'; +import { AutoscalerConstants, buildLegendData } from '../../../../core/autoscaler-helpers/autoscaler-util'; +import { AutoscalerPaginationParams, GetAppAutoscalerAppMetricAction } from '../../../../store/app-autoscaler.actions'; import { - getPaginationObservables, -} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { APIResource } from '../../../../../../../../store/src/types/api.types'; -import { ApplicationService } from '../../../../../../features/applications/application.service'; -import { CardCell, IListRowCell } from '../../../../../../shared/components/list/list.types'; -import { PaginationMonitorFactory } from '../../../../../../shared/monitors/pagination-monitor.factory'; -import { AutoscalerPaginationParams, GetAppAutoscalerAppMetricAction } from '../../../../app-autoscaler.actions'; -import { AppScalingTrigger, AppAutoscalerMetricData, AppAutoscalerMetricDataPoint } from '../../../../app-autoscaler.types'; -import { buildLegendData, AutoscalerConstants } from '../../../../autoscaler-helpers/autoscaler-util'; -import { appAutoscalerAppMetricSchemaKey } from '../../../../autoscaler.store.module'; + AppAutoscalerMetricData, + AppAutoscalerMetricDataPoint, + AppScalingTrigger, +} from '../../../../store/app-autoscaler.types'; +import { appAutoscalerAppMetricSchemaKey } from '../../../../store/autoscaler.store.module'; + @Component({ selector: 'app-app-autoscaler-metric-chart-card', diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts similarity index 97% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts index 11c13e351d..eeff1a25c7 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts @@ -1,31 +1,23 @@ import { Component, + ContentChild, + EventEmitter, + HostListener, Input, - ViewEncapsulation, Output, - EventEmitter, - ChangeDetectionStrategy, + TemplateRef, ViewChild, - HostListener, - OnInit, - OnChanges, - ContentChild, - TemplateRef + ViewEncapsulation, } from '@angular/core'; import { - trigger, - state, - style, - animate, - transition -} from '@angular/animations'; - -import { - NgxChartsModule, BaseChartComponent, LineComponent, LineSeriesComponent, - calculateViewDimensions, ViewDimensions, ColorHelper + BaseChartComponent, + calculateViewDimensions, + ColorHelper, + LineSeriesComponent, + ViewDimensions, } from '@swimlane/ngx-charts'; -import { area, line, curveLinear } from 'd3-shape'; import { scaleBand, scaleLinear, scalePoint, scaleTime } from 'd3-scale'; +import { curveLinear } from 'd3-shape'; @Component({ selector: 'app-autoscaler-combo-chart-component', @@ -352,10 +344,10 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { domain.push(d.value); } if (d.min !== undefined && domain.indexOf(d.min) < 0) { - domain.push(d.min); + domain.push(d.min); } if (d.max !== undefined && domain.indexOf(d.max) < 0) { - domain.push(d.max); + domain.push(d.max); } } } diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts similarity index 95% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts index 393b74ad99..8c03b39d94 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts @@ -1,18 +1,5 @@ -import { - Component, - Input, - Output, - EventEmitter, - OnChanges, - ChangeDetectionStrategy -} from '@angular/core'; -import { - trigger, - state, - style, - animate, - transition -} from '@angular/animations'; +import { animate, style, transition, trigger } from '@angular/animations'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; function formatLabel(label: any): string { if (label instanceof Date) { @@ -24,6 +11,7 @@ function formatLabel(label: any): string { return label; } +/* tslint:disable:component-selector */ @Component({ selector: 'g[ngx-combo-charts-series-vertical]', template: ` diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts new file mode 100644 index 0000000000..04c91657f8 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -0,0 +1,34 @@ +import { Store } from '@ngrx/store'; + +import { getRowMetadata } from '../../../../../core/src/features/cloud-foundry/cf.helpers'; +import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; +import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; +import { AppState } from '../../../../../store/src/app-state'; +import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { APIResource } from '../../../../../store/src/types/api.types'; +import { GetAppAutoscalerPolicyTriggerAction } from '../../../store/app-autoscaler.actions'; +import { AppScalingTrigger } from '../../../store/app-autoscaler.types'; + + +export class AppAutoscalerMetricChartDataSource extends ListDataSource> { + action: any; + constructor( + store: Store, + cfGuid: string, + appGuid: string, + listConfig: IListConfig> + ) { + const action = new GetAppAutoscalerPolicyTriggerAction(null, appGuid, cfGuid); + super( + { + store, + action, + schema: entityFactory(action.entityKey), + getRowUniqueId: getRowMetadata, + paginationKey: action.paginationKey, + isLocal: true, + listConfig + } + ); + } +} diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts similarity index 74% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts index 4bcb83d53e..17d2cc2857 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts @@ -1,12 +1,12 @@ +import { DatePipe } from '@angular/common'; import { inject, TestBed } from '@angular/core/testing'; import { ApplicationEnvVarsHelper, -} from '../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; -import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper'; -import { BaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper'; +} from '../../../../../core/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; +import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper'; +import { BaseTestModules } from '../../../../../core/test-framework/cloud-foundry-endpoint-service.helper'; import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service'; -import { DatePipe } from '@angular/common'; describe('AppAutoscalerMetricChartListConfigService', () => { beforeEach(() => { diff --git a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts similarity index 69% rename from custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index ddd0a1fd29..01e77925fb 100644 --- a/custom-src/frontend/app/custom/autoscaler/list/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { ListView } from '../../../../../../../store/src/actions/list.actions'; -import { AppState } from '../../../../../../../store/src/app-state'; -import { APIResource } from '../../../../../../../store/src/types/api.types'; -import { ApplicationService } from '../../../../../features/applications/application.service'; -import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; -import { BaseCfListConfig } from '../../../../../shared/components/list/list-types/base-cf/base-cf-list-config'; -import { ListViewTypes } from '../../../../../shared/components/list/list.component.types'; -import { ITimeRange, MetricQueryType } from '../../../../../shared/services/metrics-range-selector.types'; -import { AppScalingTrigger } from '../../../app-autoscaler.types'; -import { AutoscalerConstants } from '../../../autoscaler-helpers/autoscaler-util'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; +import { BaseCfListConfig } from '../../../../../core/src/shared/components/list/list-types/base-cf/base-cf-list-config'; +import { ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types'; +import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types'; +import { ListView } from '../../../../../store/src/actions/list.actions'; +import { AppState } from '../../../../../store/src/app-state'; +import { APIResource } from '../../../../../store/src/types/api.types'; +import { AutoscalerConstants } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { AppScalingTrigger } from '../../../store/app-autoscaler.types'; import { AppAutoscalerMetricChartCardComponent, } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts similarity index 94% rename from custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts rename to src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts index b0fc6210c8..a34caf4da3 100644 --- a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -1,10 +1,10 @@ import { RequestOptions } from '@angular/http'; -import { applicationSchemaKey, entityFactory } from '../../../../store/src/helpers/entity-factory'; -import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types'; -import { ApiRequestTypes } from '../../../../store/src/reducers/api-request-reducer/request-helpers'; -import { PaginatedAction } from '../../../../store/src/types/pagination.types'; -import { IRequestAction } from '../../../../store/src/types/request.types'; +import { applicationSchemaKey, entityFactory } from '../../../store/src/helpers/entity-factory'; +import { createEntityRelationPaginationKey } from '../../../store/src/helpers/entity-relations/entity-relations.types'; +import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers'; +import { PaginatedAction } from '../../../store/src/types/pagination.types'; +import { IRequestAction } from '../../../store/src/types/request.types'; import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, diff --git a/custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts similarity index 100% rename from custom-src/frontend/app/custom/autoscaler/app-autoscaler.types.ts rename to src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts similarity index 95% rename from custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts rename to src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts index e941a1e402..23b4c3646c 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.effects.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts @@ -5,20 +5,26 @@ import { Action, Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; -import { AppState } from '../../../../store/src/app-state'; +import { environment } from '../../../core/src/environments/environment'; +import { AppState } from '../../../store/src/app-state'; import { resultPerPageParam, resultPerPageParamDefault, -} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; -import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors'; -import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types'; -import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../../store/src/types/pagination.types'; +} from '../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; +import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors'; +import { APIResource, NormalizedResponse } from '../../../store/src/types/api.types'; +import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../../store/src/types/pagination.types'; import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess, -} from '../../../../store/src/types/request.types'; -import { environment } from '../../environments/environment.prod'; +} from '../../../store/src/types/request.types'; +import { buildMetricData } from '../core/autoscaler-helpers/autoscaler-transform-metric'; +import { + autoscalerTransformArrayToMap, + autoscalerTransformMapToArray, +} from '../core/autoscaler-helpers/autoscaler-transform-policy'; +import { AutoscalerConstants } from '../core/autoscaler-helpers/autoscaler-util'; import { APP_AUTOSCALER_HEALTH, APP_AUTOSCALER_POLICY, @@ -37,12 +43,6 @@ import { UpdateAppAutoscalerPolicyAction, } from './app-autoscaler.actions'; import { AppAutoscalerMetricDataLocal, AppScalingTrigger } from './app-autoscaler.types'; -import { buildMetricData } from './autoscaler-helpers/autoscaler-transform-metric'; -import { - autoscalerTransformArrayToMap, - autoscalerTransformMapToArray, -} from './autoscaler-helpers/autoscaler-transform-policy'; -import { AutoscalerConstants } from './autoscaler-helpers/autoscaler-util'; const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; diff --git a/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts similarity index 83% rename from custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts rename to src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts index 7e68d75724..6ff8726983 100644 --- a/custom-src/frontend/app/custom/autoscaler/autoscaler.store.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts @@ -1,9 +1,10 @@ import { NgModule } from '@angular/core'; -import { getAPIResourceGuid } from '../../../../store/src/selectors/api.selectors'; -import { CoreModule } from '../../core/core.module'; -import { StratosExtension } from '../../core/extension/extension-service'; -import { ExtensionEntitySchema } from '../../core/extension/extension-types'; +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 appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; diff --git a/src/frontend/packages/cf-autoscaler/src/test.ts b/src/frontend/packages/cf-autoscaler/src/test.ts new file mode 100644 index 0000000000..18653a67a2 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/test.ts @@ -0,0 +1,36 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files +import 'core-js/es7/reflect'; +import 'zone.js/dist/zone'; +import 'zone.js/dist/zone-testing'; + +import { APP_BASE_HREF } from '@angular/common'; +import { getTestBed } from '@angular/core/testing'; +import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; + + +declare const require: any; + +// First, initialize the Angular testing environment. +const testBed = getTestBed(); +testBed.initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); + +beforeEach(() => { + testBed.configureTestingModule({ + providers: [{ provide: APP_BASE_HREF, useValue: '/' }] + }); +}); + +/** + * Bump up the Jasmine timeout from 5 seconds + */ +beforeAll(() => { + jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000; +}); + +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); diff --git a/src/frontend/packages/cf-autoscaler/tsconfig.lib.json b/src/frontend/packages/cf-autoscaler/tsconfig.lib.json new file mode 100644 index 0000000000..29e640092d --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/tsconfig.lib.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../tsconfig.lib.json", + "compilerOptions": { + "outDir": "../../../../out-tsc/lib", + }, + "exclude": [ + "./src/test.ts", + "**/*.spec.ts", + ] +} diff --git a/src/frontend/packages/cf-autoscaler/tsconfig.spec.json b/src/frontend/packages/cf-autoscaler/tsconfig.spec.json new file mode 100644 index 0000000000..cb4a7be918 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/tsconfig.spec.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../tsconfig.spec.json", + "compilerOptions": { + "outDir": "../../../../out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "src/test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/src/frontend/packages/cf-autoscaler/tslint.json b/src/frontend/packages/cf-autoscaler/tslint.json new file mode 100644 index 0000000000..a097b9ebb4 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/tslint.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + ["app", "lib"], + "camelCase" + ], + "component-selector": [ + true, + "element", + ["app", "lib"], + "kebab-case" + ] + } +} diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts index b193482fa2..7ec920f955 100644 --- a/src/frontend/packages/core/src/app.module.ts +++ b/src/frontend/packages/core/src/app.module.ts @@ -57,6 +57,7 @@ import { FavoriteConfig, favoritesConfigMapper } from './shared/components/favor import { SharedModule } from './shared/shared.module'; import { XSRFModule } from './xsrf.module'; import { GlobalEventService, GlobalEventData } from './shared/global-events.service'; +import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module'; // Create action for router navigation. See // - https://github.com/ngrx/platform/issues/68 @@ -113,7 +114,8 @@ export class CustomRouterStateSerializer AboutModule, CustomImportModule, XSRFModule, - CloudFoundryModule + CloudFoundryModule, + CfAutoscalerModule ], providers: [ TabNavService, From 422fbecbf39fe0c38f124122415d250d2470ede7 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 7 May 2019 17:07:02 +0100 Subject: [PATCH 64/98] Small bit of typing --- .../card-autoscaler-default.component.ts | 5 +++-- .../app-autoscaler-metric-chart-card.component.ts | 2 +- .../combo-chart/combo-series-vertical.component.ts | 10 +++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts index 3fac739c50..845de7e719 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts @@ -12,6 +12,7 @@ import { AppState } from '../../../../store/src/app-state'; import { entityFactory } from '../../../../store/src/helpers/entity-factory'; import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'; +import { APIResource } from '../../../../store/src/types/api.types'; import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; import { AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; @@ -42,7 +43,7 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { status$: Observable; appAutoscalerPolicyService: EntityService; appAutoscalerPolicyUpdateService: EntityService; - public appAutoscalerPolicy$: Observable; + public appAutoscalerPolicy$: Observable>; currentPolicy: AppAutoscalerPolicyLocal; public isEditing = false; @@ -57,7 +58,7 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { onUpdate: () => void = () => { } ngOnInit() { - this.appAutoscalerPolicyService = this.entityServiceFactory.create( + this.appAutoscalerPolicyService = this.entityServiceFactory.create>( appAutoscalerPolicySchemaKey, entityFactory(appAutoscalerPolicySchemaKey), this.applicationService.appGuid, diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index f6facf520b..2918120261 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -26,7 +26,7 @@ import { appAutoscalerAppMetricSchemaKey } from '../../../../store/autoscaler.st styleUrls: ['./app-autoscaler-metric-chart-card.component.scss'] }) -export class AppAutoscalerMetricChartCardComponent extends CardCell> implements OnInit, IListRowCell { +export class AppAutoscalerMetricChartCardComponent extends CardCell> implements OnInit, IListRowCell { static columns = 1; listData: { label: string; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts index 8c03b39d94..5c049fe3f1 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.ts @@ -1,6 +1,8 @@ import { animate, style, transition, trigger } from '@angular/animations'; import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; +import { AppAutoscalerMetricDataLine, AppAutoscalerMetricDataPoint } from '../../../../../store/app-autoscaler.types'; + function formatLabel(label: any): string { if (label instanceof Date) { label = label.toLocaleDateString(); @@ -63,7 +65,7 @@ export class AppAutoscalerComboSeriesVerticalComponent implements OnChanges { @Input() colors; @Input() tooltipDisabled = false; @Input() gradient: boolean; - @Input() activeEntries: any[]; + @Input() activeEntries: AppAutoscalerMetricDataLine[]; @Input() seriesName: string; @Input() animations = true; @@ -180,12 +182,14 @@ export class AppAutoscalerComboSeriesVerticalComponent implements OnChanges { return bar; }); } - getSeriesTooltips(seriesLine, index) { + + getSeriesTooltips(seriesLine: AppAutoscalerMetricDataLine[], index): AppAutoscalerMetricDataPoint[] { return seriesLine.map(d => { return d.series[index]; }); } - isActive(entry): boolean { + + isActive(entry: AppAutoscalerMetricDataLine): boolean { if (!this.activeEntries) { return false; } From 228aa6f81036011a887dbfe3178031a45cc0ff99 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 8 May 2019 13:07:39 +0100 Subject: [PATCH 65/98] Fix lint error --- src/frontend/packages/store/src/types/api.types.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/packages/store/src/types/api.types.ts b/src/frontend/packages/store/src/types/api.types.ts index f198032cf2..bc0b46cdad 100644 --- a/src/frontend/packages/store/src/types/api.types.ts +++ b/src/frontend/packages/store/src/types/api.types.ts @@ -51,9 +51,6 @@ export function createEmptyCfResponse(): CFResponse { }; } -export interface CFResponse extends PaginationResponse> { -} - export interface PaginationResponse { total_results: number; total_pages: number; @@ -61,3 +58,6 @@ export interface PaginationResponse { next_url: string; resources: T[]; } + +export interface CFResponse extends PaginationResponse> { +} From cf23f2991907cdf66ed1aaf7560b63a608fda886 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 9 May 2019 18:47:00 +0800 Subject: [PATCH 66/98] [autoscaler] show app-usage when no triggers are defined; add global validate --- angular.json | 1 + .../autoscaler-helpers/autoscaler-util.ts | 1 + .../autoscaler-tab-extension.component.html | 3 +- .../autoscaler-tab-extension.component.ts | 5 ++- .../edit-autoscaler-policy-step4.component.ts | 14 +++++++- ...utoscaler-metric-chart-card.component.scss | 18 ++++++++++ .../src/store/app-autoscaler.actions.ts | 18 ---------- .../src/store/autoscaler.store.module.ts | 7 ---- .../packages/cf-autoscaler/src/styles.scss | 33 +++++++++++++++++++ .../packages/core/src/shared/shared.module.ts | 3 +- 10 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 src/frontend/packages/cf-autoscaler/src/styles.scss diff --git a/angular.json b/angular.json index acb0cc844c..ba5ae288f1 100644 --- a/angular.json +++ b/angular.json @@ -28,6 +28,7 @@ ], "styles": [ "src/frontend/packages/core/src/styles.scss", + "src/frontend/packages/cf-autoscaler/src/styles.scss", "node_modules/xterm/dist/xterm.css" ], "scripts": [] diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index aa67cc9945..baa83a8c86 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -122,6 +122,7 @@ export const PolicyAlert = { alertInvalidPolicyScheduleEndDateTimeBeforeNow: 'End date and time must be after or equal the current date and time.', alertInvalidPolicyScheduleRecurringConflict: 'Recurring schedule configuration conflict occurs.', alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.', + alertInvalidPolicyTriggerScheduleEmpty: 'At least one trigger rule or schedule should be defined.', }; export function isEqual(a: any, b: any): boolean { diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 4d14e8fa23..a4afb4f7fb 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -71,7 +71,8 @@ - + + Latest Metrics diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index bd0ec2585c..f6b13e225b 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -9,6 +9,7 @@ import { EntityService } from '../../../../core/src/core/entity-service'; import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; import { StratosTab, StratosTabType } from '../../../../core/src/core/extension/extension-service'; import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { ApplicationMonitorService } from '../../../../core/src/features/applications/application-monitor.service'; import { getGuids } from '../../../../core/src/features/applications/application/application-base.component'; import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service'; @@ -62,6 +63,9 @@ import { selector: 'app-autoscaler-tab-extension', templateUrl: './autoscaler-tab-extension.component.html', styleUrls: ['./autoscaler-tab-extension.component.scss'], + providers: [ + ApplicationMonitorService + ] }) export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { @@ -86,7 +90,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { private detachConfirmOk = 0; appAutoscalerAppMetrics = {}; - appAutoscalerInsMetrics = {}; appAutoscalerAppMetricNames = []; paramsMetrics: AutoscalerPaginationParams = { diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index 502cbf288e..cfeaf516dc 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -3,7 +3,7 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Store } from '@ngrx/store'; import * as moment from 'moment-timezone'; -import { Observable } from 'rxjs'; +import { Observable, of as observableOf } from 'rxjs'; import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; import { EntityService } from '../../../../../core/src/core/entity-service'; @@ -76,6 +76,12 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp } updatePolicy: StepOnNextFunction = () => { + if (this.validateGlobalSetting()) { + return observableOf({ + success: false, + message: `Could not update policy: ${PolicyAlert.alertInvalidPolicyTriggerScheduleEmpty}`, + }); + } this.store.dispatch( new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) ); @@ -229,6 +235,12 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp return Object.keys(errors).length === 0 ? null : errors; }; } + + validateGlobalSetting() { + return this.currentPolicy.scaling_rules_form.length === 0 + && this.currentPolicy.schedules.recurring_schedule.length === 0 + && this.currentPolicy.schedules.specific_date.length === 0; + } } export function validateRecurringSpecificMin(editForm, editMutualValidation): ValidatorFn { diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index 1ea3e3cc63..ee6cde7d1d 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -75,3 +75,21 @@ app-tile-grid { font-size: .9em; margin-top: .3em; } + +.autoscaler-chart-bar-legend { + ngx-charts-bar-vertical { + ngx-charts-chart { + .ngx-charts { + display: none; + } + ngx-charts-legend { + .legend-wrap { + width: unset; + .legend-labels { + width: unset; + } + } + } + } + } +} 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 index a34caf4da3..a72445f349 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -9,7 +9,6 @@ import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, - appAutoscalerInsMetricSchemaKey, appAutoscalerPolicySchemaKey, appAutoscalerPolicyTriggerSchemaKey, appAutoscalerScalingHistorySchemaKey, @@ -209,20 +208,3 @@ export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricActio } entityKey = appAutoscalerAppMetricSchemaKey; } - -// TODO: RC Check - is this being used? -export class GetAppAutoscalerInsMetricAction extends GetAppAutoscalerMetricAction implements PaginatedAction { - constructor( - public guid: string, - public endpointGuid: string, - public metricName: string, - public skipFormat: boolean, - public trigger, - public params - ) { - super(guid, endpointGuid, metricName, skipFormat, trigger, params); - this.url = `apps/${guid}/metric_histories/${metricName}`; - } - entityKey = appAutoscalerInsMetricSchemaKey; -} - 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 index 6ff8726983..87d58a8ecd 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts @@ -5,14 +5,12 @@ import { StratosExtension } from '../../../core/src/core/extension/extension-ser import { ExtensionEntitySchema } from '../../../core/src/core/extension/extension-types'; import { getAPIResourceGuid } from '../../../store/src/selectors/api.selectors'; - export const appAutoscalerHealthSchemaKey = 'autoscalerHealth'; export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; export const appAutoscalerPolicyTriggerSchemaKey = 'autoscalerPolicyTrigger'; export const appAutoscalerUpdatedPolicySchemaKey = 'autoscalerUpdatedPolicy'; export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory'; export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric'; -export const appAutoscalerInsMetricSchemaKey = 'autoscalerInsMetric'; export const autoscalerEntities: ExtensionEntitySchema[] = [ { @@ -45,11 +43,6 @@ export const autoscalerEntities: ExtensionEntitySchema[] = [ definition: {}, options: { idAttribute: getAPIResourceGuid } }, - { - entityKey: appAutoscalerInsMetricSchemaKey, - definition: {}, - options: { idAttribute: getAPIResourceGuid } - } ]; @StratosExtension({ diff --git a/src/frontend/packages/cf-autoscaler/src/styles.scss b/src/frontend/packages/cf-autoscaler/src/styles.scss new file mode 100644 index 0000000000..61f01b970b --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/styles.scss @@ -0,0 +1,33 @@ +.autoscaler-chart-bar-legend { + ngx-charts-bar-vertical { + ngx-charts-chart { + .ngx-charts { + display: none; + } + ngx-charts-legend { + .legend-wrap { + width: unset; + .legend-labels { + width: unset; + } + } + } + } + } +} + +.autoscaler-metric-page .cards__columns-3 app-card { + width: 100%; +} + +app-edit-autoscaler-policy { + .steppers__contents { + display: unset; + height: unset; + } + .autoscaler-policy-edit-specific-left { + .mat-form-field-infix { + width: unset; + } + } +} diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index b9a8ff15cf..77a4c2a701 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -407,7 +407,8 @@ import { UserPermissionDirective } from './user-permission.directive'; TileSelectorComponent, AddServiceInstanceBaseStepComponent, AppNameUniqueDirective, - RunningInstancesComponent + RunningInstancesComponent, + CardAppUsageComponent, ], entryComponents: [ DialogConfirmComponent, From 43c3278629b4fdb03bcdf07ed04c2a0de9e6d966 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 9 May 2019 16:34:01 +0100 Subject: [PATCH 67/98] Allow custom time window validation and apply to autoscaler metrics list --- ...cf-app-autoscaler-events-config.service.ts | 2 +- ...scaler-metric-chart-list-config.service.ts | 17 +++++- .../components/list/list.component.html | 6 +- .../components/list/list.component.types.ts | 11 ++++ .../metrics-range-selector.component.html | 18 ++++-- .../metrics-range-selector.component.ts | 12 ++-- .../start-end-date.component.html | 2 +- .../start-end-date.component.ts | 59 +++++++++++-------- 8 files changed, 86 insertions(+), 41 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 623f52fe31..130e5e7556 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -84,7 +84,7 @@ export class CfAppAutoscalerEventsConfigService showMetricsRange = true; pollInterval = 120000; selectedTimeValue = '1:week'; - times: ITimeRange[] = [ + customTimeWindows: ITimeRange[] = [ { value: '1:day', label: 'The past day', diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index 01e77925fb..3bf8183909 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; +import * as moment from 'moment'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; @@ -16,6 +17,7 @@ import { } from './app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component'; import { AppAutoscalerMetricChartDataSource } from './app-autoscaler-metric-chart-data-source'; + @Injectable() export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig> { autoscalerMetricSource: AppAutoscalerMetricChartDataSource; @@ -40,7 +42,7 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< showMetricsRange = true; pollInterval = 60000; selectedTimeValue = '30:minute'; - times: ITimeRange[] = [ + customTimeWindows: ITimeRange[] = [ { value: '30:minute', label: 'The past 30 minutes', @@ -62,6 +64,19 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< } ]; + private twoHours = 1000 * 60 * 60 * 2; + customTimeValidation = (start: moment.Moment, end: moment.Moment) => { + if (!end || !start) { + return null; + } + if (!start.isBefore(end)) { + return 'Start date must be before end date.'; + } + if (end.diff(start) > this.twoHours) { + return 'Time window must be two hours or less'; + } + } + constructor(private store: Store, private appService: ApplicationService) { super(); this.autoscalerMetricSource = new AppAutoscalerMetricChartDataSource( diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html index 7b87bb6d89..fe978a74fb 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list.component.html @@ -16,8 +16,10 @@
+ (metricsAction)="config.getDataSource().updateMetricsAction($event)" [times]="config.customTimeWindows" + [selectedTimeValue]="config.selectedTimeValue" [pollInterval]="config.pollInterval" + [validate]="config.customTimeValidation"> +
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts index 5278a347de..c886cc0004 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts +++ b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts @@ -1,3 +1,4 @@ +import * as moment from 'moment'; import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; @@ -6,6 +7,7 @@ import { ActionState } from '../../../../../store/src/reducers/api-request-reduc import { defaultClientPaginationPageSize, } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination'; +import { ITimeRange } from '../../services/metrics-range-selector.types'; import { ListDataSource } from './data-sources-controllers/list-data-source'; import { IListDataSource } from './data-sources-controllers/list-data-source-types'; import { CardTypes } from './list-cards/card/card.component'; @@ -91,6 +93,15 @@ export interface IListConfig { * For metrics based data show a metrics range selector */ showMetricsRange?: boolean; + + /** + * Custom time window to show in metrics range selector + */ + customTimeWindows?: ITimeRange[]; + /** + * Custom time window validation for metrics range selector + */ + customTimeValidation?: (start: moment.Moment, end: moment.Moment) => string; } export interface IListMultiFilterConfig { diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.html b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.html index e655b5cac5..c1243f8f80 100644 --- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.html +++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.html @@ -1,11 +1,14 @@
-

Choose time window

- +
-
@@ -19,8 +22,10 @@

Choose time window

-
-
+
+
{{ rangeSelectorManager.committedStartEnd[0] | amDateFormat:'Do MMM YYYY, HH:mm' }} @@ -32,6 +37,7 @@

Choose time window

No dates selected - Change + Change
\ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts index e798fb855b..584eccaf5b 100644 --- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts +++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts @@ -1,13 +1,14 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import * as moment from 'moment'; import { Subscription } from 'rxjs'; +import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'; +import { entityFactory, metricSchemaKey } from '../../../../../store/src/helpers/entity-factory'; +import { IMetrics } from '../../../../../store/src/types/base-metric.types'; import { EntityMonitor } from '../../monitors/entity-monitor'; import { EntityMonitorFactory } from '../../monitors/entity-monitor.factory.service'; import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service'; -import { MetricQueryType, ITimeRange } from '../../services/metrics-range-selector.types'; -import { IMetrics } from '../../../../../store/src/types/base-metric.types'; -import { MetricsAction } from '../../../../../store/src/actions/metrics.actions'; -import { metricSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory'; +import { ITimeRange, MetricQueryType } from '../../services/metrics-range-selector.types'; @Component({ selector: 'app-metrics-range-selector', @@ -83,6 +84,9 @@ export class MetricsRangeSelectorComponent implements OnDestroy { } } + @Input() + public validate: (start: moment.Moment, end: moment.Moment) => string; + set showOverlay(show: boolean) { this.showOverlayValue = show; } diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html index e1df11c40b..c1e7423a2a 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html @@ -10,5 +10,5 @@
- Start date must be before end date. + {{ validMessage }}
\ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts index 61af3a2852..16e9ca967d 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts @@ -7,13 +7,6 @@ import * as moment from 'moment'; styleUrls: ['./start-end-date.component.scss'] }) export class StartEndDateComponent { - @Output() - public endChange = new EventEmitter(); - @Output() - public startChange = new EventEmitter(); - - @Output() - public isValid = new EventEmitter(); get valid() { return this.validValue; @@ -24,23 +17,6 @@ export class StartEndDateComponent { this.isValid.emit(this.validValue); } - public validValue = true; - - private startValue: moment.Moment; - private endValue: moment.Moment; - - - private isDifferentDate(oldDate: moment.Moment, newDate: moment.Moment) { - return !oldDate || !newDate || !oldDate.isSame(newDate); - } - - private isStartEndValid(start: moment.Moment, end: moment.Moment) { - if (!end || !start) { - return true; - } - return start.isBefore(end); - } - @Input() set start(start: moment.Moment) { this.valid = true; @@ -49,7 +25,7 @@ export class StartEndDateComponent { return; } if (start.isValid()) { - if (!this.isStartEndValid(start, this.end)) { + if (!this.pValidate(start, this.end)) { this.valid = false; return; } @@ -73,7 +49,7 @@ export class StartEndDateComponent { return; } if (end && end.isValid()) { - if (!this.isStartEndValid(this.start, end)) { + if (!this.pValidate(this.start, end)) { this.valid = false; return; } @@ -88,4 +64,35 @@ export class StartEndDateComponent { get end() { return this.endValue; } + @Output() + public endChange = new EventEmitter(); + @Output() + public startChange = new EventEmitter(); + + @Output() + public isValid = new EventEmitter(); + + public validValue = true; + public validMessage: string; + + private startValue: moment.Moment; + private endValue: moment.Moment; + + @Input() + public validate: (start: moment.Moment, end: moment.Moment) => string = (start: moment.Moment, end: moment.Moment): string => { + if (!end || !start) { + return null; + } + return start.isBefore(end) ? 'Start date must be before end date.' : null; + } + + private pValidate(start: moment.Moment, end: moment.Moment): boolean { + this.validMessage = this.validate(start, end); + return !this.validMessage; + } + + + private isDifferentDate(oldDate: moment.Moment, newDate: moment.Moment) { + return !oldDate || !newDate || !oldDate.isSame(newDate); + } } From bc6bbc61834ed4d40e50a46f536deaadbfc1f3ef Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 14 May 2019 19:35:53 +0800 Subject: [PATCH 68/98] [autoscaler] fix style issue for metric charts --- .../autoscaler-tab-extension.component.ts | 2 +- .../edit-autoscaler-policy.component.scss | 8 +++++ ...utoscaler-metric-chart-card.component.html | 29 +++++---------- ...utoscaler-metric-chart-card.component.scss | 36 ++----------------- .../combo-chart/combo-chart.component.scss | 13 +++++++ .../combo-chart/combo-chart.component.ts | 35 ++++++++++++++++-- .../packages/cf-autoscaler/src/styles.scss | 26 ++------------ 7 files changed, 67 insertions(+), 82 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index f6b13e225b..7224cc7884 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -93,7 +93,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerAppMetricNames = []; paramsMetrics: AutoscalerPaginationParams = { - 'start-time': '0', + 'start-time': ((new Date()).getTime() - 60000).toString() + '000000', 'end-time': (new Date()).getTime().toString() + '000000', page: '1', 'results-per-page': '1', diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss index 0ff5ad5899..a3102ee793 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.scss @@ -13,3 +13,11 @@ width: 100%; } } + +.autoscaler-policy-edit-specific-left { + mat-form-field { + .mat-form-field-infix { + width: unset; + } + } +} diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html index 0e45de3666..a1918305c4 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -17,26 +17,15 @@ (select)="select($event)">
-
-
- - -
-
- - -
+
+ +
\ No newline at end of file diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index ee6cde7d1d..227058fd1a 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -49,25 +49,11 @@ app-tile-grid { width: 20%; } -.autoscaler-chart-bar { +.autoscaler-chart-combo { display: inline-block; height: 250px; margin-top: 1em; - width: 80%; - - &-combo { - display: inline-block; - height: 250px; - margin-top: 1em; - width: 75%; - } - - &-legend { - display: inline-block; - margin-left: 1.75em; - margin-top: 1em; - position: absolute; - } + width: 62.5%; } .autoscaler-metric-subtitle { @@ -75,21 +61,3 @@ app-tile-grid { font-size: .9em; margin-top: .3em; } - -.autoscaler-chart-bar-legend { - ngx-charts-bar-vertical { - ngx-charts-chart { - .ngx-charts { - display: none; - } - ngx-charts-legend { - .legend-wrap { - width: unset; - .legend-labels { - width: unset; - } - } - } - } - } -} diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss index 8ab2dec933..b1a7d15caa 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss @@ -82,5 +82,18 @@ } } } +} +ngx-charts-legend { + display: inline-block; + margin-left: 1.75em; + margin-top: 1em; + position: absolute; + right: 3em; + .legend-wrap { + width: unset; + .legend-labels { + width: unset; + } + } } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts index eeff1a25c7..23cd134746 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts @@ -123,6 +123,14 @@ import { curveLinear } from 'd3-shape'; + + `, styleUrls: ['./combo-chart.component.scss'], encapsulation: ViewEncapsulation.None @@ -157,6 +165,7 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { @Input() animations = true; @Input() yScaleMax: number; @Input() metricName: string; + @Input() legendData: any[]; @Output() activate: EventEmitter = new EventEmitter(); @Output() deactivate: EventEmitter = new EventEmitter(); @@ -172,10 +181,12 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { transform: string; colors: ColorHelper; colorsLine: ColorHelper; + colorsExtra: ColorHelper; margin: any[] = [10, 20, 10, 20]; xAxisHeight = 0; yAxisWidth = 0; legendOptions: any; + legendOptionsExtra: any; scaleType = 'linear'; xScaleLine; yScaleLine; @@ -235,6 +246,7 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { this.setColors(); this.legendOptions = this.getLegendOptions(); + this.legendOptionsExtra = this.getLegendOptionsExtra(); this.transform = `translate(${this.dims.xOffset} , ${this.margin[0]})`; } @@ -442,27 +454,44 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { } this.colors = new ColorHelper(this.scheme, this.schemeType, domain, this.customColors); this.colorsLine = new ColorHelper(this.colorSchemeLine, this.schemeType, domain, this.customColors); + this.colorsExtra = new ColorHelper(this.scheme, this.schemeType, domain, this.customColors); } getLegendOptions() { const opts = { scaleType: this.schemeType, colors: undefined, - domain: [], + domain: this.seriesDomain, title: undefined, position: this.legendPosition }; if (opts.scaleType === 'ordinal') { - opts.domain = this.seriesDomain; opts.colors = this.colorsLine; opts.title = this.legendTitle; } else { - opts.domain = this.seriesDomain; opts.colors = this.colors.scale; } return opts; } + getLegendOptionsExtra() { + const opts = { + scaleType: this.schemeType, + colors: this.colorsExtra, + domain: [], + title: this.legendTitle, + position: this.legendPosition + }; + opts.colors.colorDomain = []; + opts.colors.customColors = this.legendData; + this.legendData.map((item) => { + opts.colors.colorDomain.push(item.value); + opts.colors.domain.push(item.name); + opts.domain.push(item.name); + }); + return opts; + } + updateLineWidth(width): void { this.bandwidth = width; } diff --git a/src/frontend/packages/cf-autoscaler/src/styles.scss b/src/frontend/packages/cf-autoscaler/src/styles.scss index 61f01b970b..2a22450d68 100644 --- a/src/frontend/packages/cf-autoscaler/src/styles.scss +++ b/src/frontend/packages/cf-autoscaler/src/styles.scss @@ -1,31 +1,9 @@ -.autoscaler-chart-bar-legend { - ngx-charts-bar-vertical { - ngx-charts-chart { - .ngx-charts { - display: none; - } - ngx-charts-legend { - .legend-wrap { - width: unset; - .legend-labels { - width: unset; - } - } - } - } - } -} - .autoscaler-metric-page .cards__columns-3 app-card { width: 100%; } -app-edit-autoscaler-policy { - .steppers__contents { - display: unset; - height: unset; - } - .autoscaler-policy-edit-specific-left { +.autoscaler-policy-edit-specific-left { + mat-form-field { .mat-form-field-infix { width: unset; } From 100fac6fab0de6c597e3d73de9c4d23edf489d8c Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 15 May 2019 16:39:09 +0800 Subject: [PATCH 69/98] [autoscaler] refix -> snackBar 'policy not found' is shown even if new policy is attached --- .../autoscaler-tab-extension.component.html | 28 ++----------------- .../autoscaler-tab-extension.component.ts | 1 - .../edit-autoscaler-policy-step4.component.ts | 18 +++++++----- .../src/store/app-autoscaler.actions.ts | 3 +- .../src/store/autoscaler.effects.ts | 13 ++++----- .../src/store/autoscaler.store.module.ts | 6 ---- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index a4afb4f7fb..6d66d3df52 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -1,24 +1,3 @@ -
@@ -30,8 +9,7 @@
- Policy - undefined + Disabled
@@ -57,8 +35,8 @@ (click)="disableAutoscaler()">Enabled Disabled - Policy - undefined + Disabled +
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 7224cc7884..a16d9609a1 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -77,7 +77,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerPolicyService: EntityService>; public appAutoscalerScalingHistoryService: EntityService>; - appAutoscalerEnablement$: Observable; appAutoscalerPolicy$: Observable; appAutoscalerScalingHistory$: Observable; diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index cfeaf516dc..c34101d37d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -21,7 +21,7 @@ import { } from '../../../core/autoscaler-helpers/autoscaler-validation'; import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../store/app-autoscaler.actions'; import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppSpecificDate } from '../../../store/app-autoscaler.types'; -import { appAutoscalerUpdatedPolicySchemaKey } from '../../../store/autoscaler.store.module'; +import { appAutoscalerPolicySchemaKey } from '../../../store/autoscaler.store.module'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @@ -67,8 +67,8 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp ngOnInit() { super.ngOnInit(); this.updateAppAutoscalerPolicyService = this.entityServiceFactory.create( - appAutoscalerUpdatedPolicySchemaKey, - entityFactory(appAutoscalerUpdatedPolicySchemaKey), + appAutoscalerPolicySchemaKey, + entityFactory(appAutoscalerPolicySchemaKey), this.applicationService.appGuid, new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy), false @@ -87,7 +87,14 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp ); let waitForAppAutoscalerUpdateStatus$: Observable; waitForAppAutoscalerUpdateStatus$ = this.updateAppAutoscalerPolicyService.entityMonitor.entityRequest$.pipe( - filter(request => !!request.error || !!request.response), + filter(request => { + if (request.message && request.message.indexOf('fetch policy') >= 0) { + request.message = ''; + return false; + } else { + return !!request.error || !!request.response; + } + }), map(request => { const msg = request.message; request.error = false; @@ -110,9 +117,6 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp } })); return waitForAppAutoscalerUpdateStatus$.pipe(take(1), map(res => { - this.store.dispatch( - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) - ); return { ...res, }; 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 index a72445f349..42d9229bed 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -12,7 +12,6 @@ import { appAutoscalerPolicySchemaKey, appAutoscalerPolicyTriggerSchemaKey, appAutoscalerScalingHistorySchemaKey, - appAutoscalerUpdatedPolicySchemaKey, } from './autoscaler.store.module'; export const AppAutoscalerPolicyEvents = { @@ -83,7 +82,7 @@ export class UpdateAppAutoscalerPolicyAction implements IRequestAction { public policy: AppAutoscalerPolicyLocal, ) { } type = UPDATE_APP_AUTOSCALER_POLICY; - entityKey = appAutoscalerUpdatedPolicySchemaKey; + entityKey = appAutoscalerPolicySchemaKey; } export class DetachAppAutoscalerPolicyAction implements IRequestAction { diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts index 23b4c3646c..a158abd075 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts @@ -150,7 +150,7 @@ export class AutoscalerEffects { ]; }), catchError(err => [ - new WrapperRequestActionFailed(createAutoscalerRequestMessage('update policy', err), action, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('detach policy', err), action, actionType) ])); })); @@ -307,14 +307,11 @@ export class AutoscalerEffects { }), catchError(err => { if (err.status === 404 && err._body === '{}') { - return [ - new WrapperRequestActionFailed('No policy is defined for this application.', getPolicyAction, actionType) - ]; - } else { - return [ - new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), getPolicyAction, actionType) - ]; + err._body = 'No policy is defined for this application.'; } + return [ + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), getPolicyAction, actionType) + ]; })); } 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 index 87d58a8ecd..702c816075 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.store.module.ts @@ -8,7 +8,6 @@ import { getAPIResourceGuid } from '../../../store/src/selectors/api.selectors'; export const appAutoscalerHealthSchemaKey = 'autoscalerHealth'; export const appAutoscalerPolicySchemaKey = 'autoscalerPolicy'; export const appAutoscalerPolicyTriggerSchemaKey = 'autoscalerPolicyTrigger'; -export const appAutoscalerUpdatedPolicySchemaKey = 'autoscalerUpdatedPolicy'; export const appAutoscalerScalingHistorySchemaKey = 'autoscalerScalingHistory'; export const appAutoscalerAppMetricSchemaKey = 'autoscalerAppMetric'; @@ -23,11 +22,6 @@ export const autoscalerEntities: ExtensionEntitySchema[] = [ definition: {}, options: { idAttribute: getAPIResourceGuid } }, - { - entityKey: appAutoscalerUpdatedPolicySchemaKey, - definition: {}, - options: { idAttribute: getAPIResourceGuid } - }, { entityKey: appAutoscalerHealthSchemaKey, definition: {}, From 15793fc800a0d3ca29c9d91801e147d29e9af6a5 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 10 May 2019 13:08:21 +0100 Subject: [PATCH 70/98] Charts: Avoid multiple metrics requests by skipping initial blank state --- .../autoscaler-helpers/autoscaler-util.ts | 2 +- ...-autoscaler-metric-chart-card.component.ts | 28 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index baa83a8c86..dd2e0db6cc 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -122,7 +122,7 @@ export const PolicyAlert = { alertInvalidPolicyScheduleEndDateTimeBeforeNow: 'End date and time must be after or equal the current date and time.', alertInvalidPolicyScheduleRecurringConflict: 'Recurring schedule configuration conflict occurs.', alertInvalidPolicyScheduleSpecificConflict: 'Specific date configuration conflict occurs.', - alertInvalidPolicyTriggerScheduleEmpty: 'At least one trigger rule or schedule should be defined.', + alertInvalidPolicyTriggerScheduleEmpty: 'At least one Scaling Rule or Schedule should be defined.', }; export function isEqual(a: any, b: any): boolean { diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 2918120261..5669799bfa 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter } from 'rxjs/operators'; @@ -26,7 +26,7 @@ import { appAutoscalerAppMetricSchemaKey } from '../../../../store/autoscaler.st styleUrls: ['./app-autoscaler-metric-chart-card.component.scss'] }) -export class AppAutoscalerMetricChartCardComponent extends CardCell> implements OnInit, IListRowCell { +export class AppAutoscalerMetricChartCardComponent extends CardCell> implements IListRowCell { static columns = 1; listData: { label: string; @@ -59,6 +59,20 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell) { + if (row) { + if (row.entity.query && row.entity.query.params) { + this.paramsMetrics['start-time'] = row.entity.query.params.start + '000000000'; + this.paramsMetrics['end-time'] = row.entity.query.params.end + '000000000'; + + this.appAutoscalerAppMetricLegend = this.getLegend2(row.entity); + this.metricType = AutoscalerConstants.getMetricFromMetricId(row.metadata.guid); + this.metricData$ = this.getAppMetric(this.metricType, row.entity, this.paramsMetrics); + } + } + } + constructor( private appService: ApplicationService, private store: Store, @@ -85,16 +99,6 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell { const action = new GetAppAutoscalerAppMetricAction(this.appService.appGuid, this.appService.cfGuid, metricName, false, trigger, params); From dae1f89a9ebb258a7901c45462ba564225103b95 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 10 May 2019 14:06:57 +0100 Subject: [PATCH 71/98] Tidy up metrics/custom time window params --- ...cf-app-autoscaler-events-config.service.ts | 6 ++--- ...scaler-metric-chart-list-config.service.ts | 6 ++--- .../list-types/base-cf/base-cf-list-config.ts | 2 +- .../cf-cell-health-list-config.service.ts | 24 +++++++++++-------- .../components/list/list.component.html | 4 ++-- .../components/list/list.component.types.ts | 11 +++++++-- 6 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 130e5e7556..c8b3d54ba0 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -81,9 +81,9 @@ export class CfAppAutoscalerEventsConfigService }; isLocal = false; - showMetricsRange = true; - pollInterval = 120000; - selectedTimeValue = '1:week'; + showCustomTime = true; + customTimePollingInterval = 120000; + customTimeInitialValue = '1:week'; customTimeWindows: ITimeRange[] = [ { value: '1:day', diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index 3bf8183909..ba9bfb04b3 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -39,9 +39,9 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< noEntries: 'There are no metrics defined in the policy' }; - showMetricsRange = true; - pollInterval = 60000; - selectedTimeValue = '30:minute'; + showCustomTime = true; + customTimePollingInterval = 6000000; + customTimeInitialValue = '1:minute'; customTimeWindows: ITimeRange[] = [ { value: '30:minute', diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts index 747de07e5a..a2156d434d 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/base-cf/base-cf-list-config.ts @@ -11,7 +11,7 @@ export class BaseCfListConfig implements IListConfig { defaultView = 'cards' as ListView; cardComponent: CardTypes; enableTextFilter = false; - showMetricsRange = false; + showCustomTime = false; getColumns = () => []; getGlobalActions = () => []; getMultiActions = () => []; diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts index bf58bf31fa..df3c6d6fe0 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts @@ -1,22 +1,26 @@ import { DatePipe } from '@angular/common'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; -import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source'; -import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; + import { ListView } from '../../../../../../../store/src/actions/list.actions'; -import { ListViewTypes } from '../../list.component.types'; import { - TableCellBooleanIndicatorComponentConfig, - TableCellBooleanIndicatorComponent -} from '../../list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component'; -import { BooleanIndicatorType } from '../../../boolean-indicator/boolean-indicator.component'; + FetchCFCellMetricsPaginatedAction, + MetricQueryConfig, +} from '../../../../../../../store/src/actions/metrics.actions'; import { AppState } from '../../../../../../../store/src/app-state'; import { - CloudFoundryCellService + CloudFoundryCellService, } from '../../../../../features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service'; -import { FetchCFCellMetricsPaginatedAction, MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions'; import { MetricQueryType } from '../../../../services/metrics-range-selector.types'; +import { BooleanIndicatorType } from '../../../boolean-indicator/boolean-indicator.component'; +import { + TableCellBooleanIndicatorComponent, + TableCellBooleanIndicatorComponentConfig, +} from '../../list-table/table-cell-boolean-indicator/table-cell-boolean-indicator.component'; import { ITableColumn } from '../../list-table/table.types'; +import { ListViewTypes } from '../../list.component.types'; +import { BaseCfListConfig } from '../base-cf/base-cf-list-config'; +import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source'; @Injectable() export class CfCellHealthListConfigService extends BaseCfListConfig { @@ -42,7 +46,7 @@ export class CfCellHealthListConfigService extends BaseCfListConfig
+ *ngIf="config.showCustomTime && !(isAddingOrSelecting$ | async)">
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts index c886cc0004..8c0775fb64 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts +++ b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts @@ -92,8 +92,7 @@ export interface IListConfig { /** * For metrics based data show a metrics range selector */ - showMetricsRange?: boolean; - + showCustomTime?: boolean; /** * Custom time window to show in metrics range selector */ @@ -102,6 +101,14 @@ export interface IListConfig { * Custom time window validation for metrics range selector */ customTimeValidation?: (start: moment.Moment, end: moment.Moment) => string; + /** + * Custom time polling interval. Falsy for disabled. + */ + customTimePollingInterval?: number; + /** + * When enabled set the initial value + */ + customTimeInitialValue?: string; } export interface IListMultiFilterConfig { From 00e32858856cb31da23255dab171ea0247b93076 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 15 May 2019 14:55:14 +0100 Subject: [PATCH 72/98] Remove unrequired styles - styles.scss - autoscaler-policy-edit-specific-left --- angular.json | 1 - .../edit-autoscaler-policy-step4.component.html | 2 +- .../edit-autoscaler-policy-step4.component.scss | 5 ----- .../edit-autoscaler-policy.component.scss | 7 ------- src/frontend/packages/cf-autoscaler/src/styles.scss | 10 ---------- 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/angular.json b/angular.json index ba5ae288f1..9575655395 100644 --- a/angular.json +++ b/angular.json @@ -27,7 +27,6 @@ "src/frontend/packages/core/favicon.ico" ], "styles": [ - "src/frontend/packages/core/src/styles.scss", "src/frontend/packages/cf-autoscaler/src/styles.scss", "node_modules/xterm/dist/xterm.css" ], diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index 2d08f154cf..ad91ec6080 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -19,7 +19,7 @@
-
+
Date: Wed, 15 May 2019 18:22:34 +0100 Subject: [PATCH 73/98] Tweak comb-chart legend - fix & use built in legend (resolves H shrinkage issue) - Removed adding the legendSpacing to View, added remove from calc'd width - tweak spacing - need a treatement for wrapping charts on H shrink --- ...utoscaler-metric-chart-card.component.html | 4 +- ...utoscaler-metric-chart-card.component.scss | 71 +++------- .../combo-chart/combo-chart.component.html | 42 ++++++ .../combo-chart/combo-chart.component.scss | 14 -- .../combo-chart/combo-chart.component.ts | 126 ++---------------- 5 files changed, 69 insertions(+), 188 deletions(-) create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.html diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html index a1918305c4..1ac8ea849c 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -21,10 +21,10 @@ + [yScaleMax]="metricData[0].entity.chartMaxValue">
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss index 227058fd1a..db872d0597 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.scss @@ -1,63 +1,26 @@ -.app-service-card { - &__title { - align-content: center; - align-items: center; - display: flex; - flex-direction: row; - justify-content: space-between; - padding-right: 20px; - width: 100%; - } - &__env-link { - cursor: pointer; +mat-card-header { + .autoscaler-metric-subtitle { + color: rgba(0, 0, 0, .54); + font-size: .9em; + margin-top: .3em; } } -app-tile-grid { - width: 100%; -} - -.autoscaler-metric-page { +mat-card-content { display: flex; - position: relative; + height: 250px; width: 100%; - &__actions { - bottom: 24px; - padding-top: 0; - position: absolute; - right: 24px; - text-align: right; - } -} -.app-metadata { - display: flex; - flex-direction: row; - &__two-cols { - flex: 1; - margin-right: 3em; - app-metadata-item:first-child { - margin-top: 0; + .autoscaler-chart-gauge { + height: 200px; + margin: 40px 20px 0 0; + width: 20%; + ngx-charts-gauge { + width: 100%; } } -} - -.autoscaler-chart-gauge { - display: inline-block; - height: 250px; - margin-top: 1em; - width: 20%; -} - -.autoscaler-chart-combo { - display: inline-block; - height: 250px; - margin-top: 1em; - width: 62.5%; -} - -.autoscaler-metric-subtitle { - color: rgba(0, 0, 0, .54); - font-size: .9em; - margin-top: .3em; + .autoscaler-chart-combo { + margin-top: 1em; + width: 80%; + } } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.html new file mode 100644 index 0000000000..e2605ee693 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.html @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss index b1a7d15caa..345a3802c0 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.scss @@ -83,17 +83,3 @@ } } } - -ngx-charts-legend { - display: inline-block; - margin-left: 1.75em; - margin-top: 1em; - position: absolute; - right: 3em; - .legend-wrap { - width: unset; - .legend-labels { - width: unset; - } - } -} diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts index 23cd134746..99c5c596c9 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts @@ -21,117 +21,7 @@ import { curveLinear } from 'd3-shape'; @Component({ selector: 'app-autoscaler-combo-chart-component', - template: ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - `, + templateUrl: './combo-chart.component.html', styleUrls: ['./combo-chart.component.scss'], encapsulation: ViewEncapsulation.None }) @@ -210,8 +100,14 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { update(): void { super.update(); + if (!this.yAxis) { + this.legendSpacing = 0; + } else { + this.legendSpacing = 50; + } + this.dims = calculateViewDimensions({ - width: this.width, + width: this.legend ? this.width - this.legendSpacing : this.width, height: this.height, margins: this.margin, showXAxis: this.xAxis, @@ -224,11 +120,6 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { legendType: this.schemeType, }); - if (!this.yAxis) { - this.legendSpacing = 0; - } else { - this.legendSpacing = 30; - } this.xScale = this.getXScale(); this.yScale = this.getYScale(); @@ -495,7 +386,6 @@ export class AppAutoscalerComboChartComponent extends BaseChartComponent { updateLineWidth(width): void { this.bandwidth = width; } - updateYAxisWidth({ width }): void { this.yAxisWidth = width + 20; this.update(); From e8582968d08440e320f4ce6b387dff6e173ae2af Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 16 May 2019 14:26:48 +0100 Subject: [PATCH 74/98] Bring back autoscaler-policy-edit-specific-left --- angular.json | 4 +++- .../edit-autoscaler-policy-step4.component.html | 2 +- src/frontend/packages/cf-autoscaler/src/styles.scss | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index 9575655395..b4f9cb83c6 100644 --- a/angular.json +++ b/angular.json @@ -27,6 +27,7 @@ "src/frontend/packages/core/favicon.ico" ], "styles": [ + "src/frontend/packages/core/src/styles.scss", "src/frontend/packages/cf-autoscaler/src/styles.scss", "node_modules/xterm/dist/xterm.css" ], @@ -114,7 +115,8 @@ } ], "styles": [ - "src/frontend/packages/core/src/styles.css" + "src/frontend/packages/core/src/styles.css", + "src/frontend/packages/cf-autoscaler/src/styles.css" ], "scripts": [] }, diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index ad91ec6080..2d08f154cf 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -19,7 +19,7 @@
-
+
Date: Thu, 16 May 2019 14:47:19 +0100 Subject: [PATCH 75/98] Fix autoscaler unit tests --- .../src/cf-autoscaler-testing.module.ts | 26 +++++++++++++++++++ .../autoscaler-metric-page.component.spec.ts | 3 ++- .../card-autoscaler-default.component.spec.ts | 4 ++- ...p-autoscaler-events-config.service.spec.ts | 4 ++- ...-autoscaler-event-status.component.spec.ts | 3 ++- ...p-autoscaler-metric-card.component.spec.ts | 19 +++++++------- ...r-metric-chart-list-config.service.spec.ts | 3 ++- 7 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts new file mode 100644 index 0000000000..0060c49e7f --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts @@ -0,0 +1,26 @@ +import { CfAutoscalerModule } from './cf-autoscaler.module'; +import { registerEntitiesForTesting } from '../../core/test-framework/store-test-helper'; +import { autoscalerEntities, AutoscalerStoreModule } from './store/autoscaler.store.module'; +import { NgModule } from '@angular/core'; + +@NgModule({ + imports: [ + AutoscalerStoreModule + ] +}) +export class CfAutoscalerTestingModule { + + constructor() { + registerEntitiesForTesting(autoscalerEntities); + } +} + +// export const KubernetesBaseTestModules = [ +// KubernetesTestingModule, +// RouterTestingModule, +// CoreModule, +// createBasicStoreModule(), +// NoopAnimationsModule, +// HttpModule, +// SharedModule, +// ]; \ No newline at end of file diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts index e4f92ff286..0972987d63 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts @@ -9,9 +9,9 @@ import { SharedModule } from '../../../../core/src/shared/shared.module'; import { TabNavService } from '../../../../core/tab-nav.service'; import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component'; - describe('AutoscalerMetricPageComponent', () => { let component: AutoscalerMetricPageComponent; let fixture: ComponentFixture; @@ -25,6 +25,7 @@ describe('AutoscalerMetricPageComponent', () => { CoreModule, SharedModule, RouterTestingModule, + CfAutoscalerTestingModule ], providers: [ DatePipe, diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts index f9573a73c8..b21958943d 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -13,6 +13,7 @@ import { EntityMonitorFactory } from '../../../../core/src/shared/monitors/entit import { PaginationMonitorFactory } from '../../../../core/src/shared/monitors/pagination-monitor.factory'; import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component'; describe('CardAutoscalerDefaultComponent', () => { @@ -30,7 +31,8 @@ describe('CardAutoscalerDefaultComponent', () => { CoreModule, CommonModule, BrowserAnimationsModule, - createBasicStoreModule() + createBasicStoreModule(), + CfAutoscalerTestingModule ], providers: [ { provide: ApplicationService, useClass: ApplicationServiceMock }, diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index 9a8b840c41..651ce2e852 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -14,6 +14,7 @@ import { createBasicStoreModule, getInitialTestStoreState } from '../../../../.. 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 { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service'; describe('CfAppAutoscalerEventsConfigService', () => { @@ -41,7 +42,8 @@ describe('CfAppAutoscalerEventsConfigService', () => { SharedModule, ApplicationsModule, createBasicStoreModule(), - RouterTestingModule + RouterTestingModule, + CfAutoscalerTestingModule ] }); }); diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts index a2adf13aa5..08e1647b35 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.spec.ts @@ -2,6 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIcon } from '@angular/material'; import { EntityInfo } from '../../../../../../store/src/types/api.types'; +import { TableCellAutoscalerEventStatusIconPipe } from './table-cell-autoscaler-event-status-icon.pipe'; import { TableCellAutoscalerEventStatusComponent } from './table-cell-autoscaler-event-status.component'; describe('TableCellAutoscalerEventStatusComponent', () => { @@ -10,7 +11,7 @@ describe('TableCellAutoscalerEventStatusComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TableCellAutoscalerEventStatusComponent, MatIcon] + declarations: [TableCellAutoscalerEventStatusComponent, MatIcon, TableCellAutoscalerEventStatusIconPipe] }) .compileComponents(); })); diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts index 8e54822e43..d02fd9e598 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts @@ -1,5 +1,6 @@ import { DatePipe } from '@angular/common'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; import { ApplicationEnvVarsHelper, @@ -13,8 +14,9 @@ import { EntityMonitorFactory } from '../../../../../../core/src/shared/monitors import { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory'; import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper'; import { BaseTestModules } from '../../../../../../core/test-framework/cloud-foundry-endpoint-service.helper'; -import { createBasicStoreModule } from '../../../../../../core/test-framework/store-test-helper'; import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component'; +import { AppAutoscalerComboChartComponent } from './combo-chart/combo-chart.component'; +import { AppAutoscalerComboSeriesVerticalComponent } from './combo-chart/combo-series-vertical.component'; describe('AppServiceBindingCardComponent', () => { let component: AppAutoscalerMetricChartCardComponent; @@ -22,9 +24,14 @@ describe('AppServiceBindingCardComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + declarations: [ + AppAutoscalerMetricChartCardComponent, + AppAutoscalerComboChartComponent, + AppAutoscalerComboSeriesVerticalComponent + ], imports: [ ...BaseTestModules, - createBasicStoreModule(), + NgxChartsModule ], providers: [ EntityMonitorFactory, @@ -45,14 +52,6 @@ describe('AppServiceBindingCardComponent', () => { component = fixture.componentInstance; component.row = { entity: { - app_guid: '', - service_instance_guid: '', - credentials: {}, - binding_options: {}, - gateway_name: '', - volume_mounts: [], - app_url: '', - service_instance_url: '', }, metadata: { guid: '', diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts index 17d2cc2857..a3de2640d4 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts @@ -6,6 +6,7 @@ import { } from '../../../../../core/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper'; import { BaseTestModules } from '../../../../../core/test-framework/cloud-foundry-endpoint-service.helper'; +import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service'; describe('AppAutoscalerMetricChartListConfigService', () => { @@ -17,7 +18,7 @@ describe('AppAutoscalerMetricChartListConfigService', () => { ApplicationEnvVarsHelper, DatePipe ], - imports: [...BaseTestModules] + imports: [...BaseTestModules, CfAutoscalerTestingModule] }); }); From 479fb0e9df405ddad940245fe39d21a76650796a Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 16 May 2019 14:56:15 +0100 Subject: [PATCH 76/98] Fix core unit tests --- .../dashboard/page-side-nav/page-side-nav.component.spec.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts index 70ff27cf1e..cc537fe56e 100644 --- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts +++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts @@ -2,9 +2,10 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { TabNavService } from '../../../../tab-nav.service'; import { BaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper'; +import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service'; import { PageSideNavComponent } from './page-side-nav.component'; -describe('PageSideNavComponent', () => { +fdescribe('PageSideNavComponent', () => { let component: PageSideNavComponent; let fixture: ComponentFixture; @@ -12,7 +13,7 @@ describe('PageSideNavComponent', () => { TestBed.configureTestingModule({ imports: [BaseTestModulesNoShared], declarations: [PageSideNavComponent], - providers: [TabNavService] + providers: [TabNavService, EntityMonitorFactory] }) .compileComponents(); })); From d60d3218593b4230a15f901073d07f64f0b23350 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 16 May 2019 14:58:30 +0100 Subject: [PATCH 77/98] Remove fdescribe --- .../dashboard/page-side-nav/page-side-nav.component.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts index cc537fe56e..8ada83ed4d 100644 --- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts +++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.spec.ts @@ -5,7 +5,7 @@ import { BaseTestModulesNoShared } from '../../../../test-framework/cloud-foundr import { EntityMonitorFactory } from '../../../shared/monitors/entity-monitor.factory.service'; import { PageSideNavComponent } from './page-side-nav.component'; -fdescribe('PageSideNavComponent', () => { +describe('PageSideNavComponent', () => { let component: PageSideNavComponent; let fixture: ComponentFixture; From bee95a017e54f5c9d173d786a82eab2bbbd77bd3 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 28 May 2019 15:59:49 +0800 Subject: [PATCH 78/98] [autoscaler] add validation for scaling history query --- .../src/cf-autoscaler-testing.module.ts | 2 +- .../cf-app-autoscaler-events-config.service.ts | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts index 0060c49e7f..1d6575207a 100644 --- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts @@ -23,4 +23,4 @@ export class CfAutoscalerTestingModule { // NoopAnimationsModule, // HttpModule, // SharedModule, -// ]; \ No newline at end of file +// ]; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index c8b3d54ba0..4110e6b8b6 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -1,6 +1,7 @@ import { DatePipe } from '@angular/common'; import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; +import * as moment from 'moment'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; @@ -106,6 +107,19 @@ export class CfAppAutoscalerEventsConfigService } ]; + private thirtyDays = 1000 * 60 * 60 * 24 * 30; + customTimeValidation = (start: moment.Moment, end: moment.Moment) => { + if (!end || !start) { + return null; + } + if (!start.isBefore(end)) { + return 'Start date must be before end date.'; + } + if (moment().diff(start) > this.thirtyDays) { + return 'Only recent 30 days data are support to be query.'; + } + } + constructor(private store: Store, private appService: ApplicationService, private datePipe: DatePipe) { super(); this.autoscalerEventSource = new CfAppAutoscalerEventsDataSource( From 9d3c213f60d7e665c38c5ef659ee0634d2635ce7 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 29 May 2019 16:11:34 +0800 Subject: [PATCH 79/98] [autoscaler] add unit test cases --- .../autoscaler-base.component.spec.ts | 48 +++++++++++++++ ...caler-scale-history-page.component.spec.ts | 48 +++++++++++++++ ...autoscaler-tab-extension.component.spec.ts | 54 +++++++++++++++++ .../edit-autoscaler-policy-service.spec.ts | 27 +++++++++ ...-autoscaler-policy-step1.component.spec.ts | 50 ++++++++++++++++ ...-autoscaler-policy-step2.component.spec.ts | 50 ++++++++++++++++ ...-autoscaler-policy-step3.component.spec.ts | 50 ++++++++++++++++ ...-autoscaler-policy-step4.component.spec.ts | 50 ++++++++++++++++ .../edit-autoscaler-policy.component.spec.ts | 60 +++++++++++++++++++ ...-autoscaler-event-change.component.spec.ts | 33 ++++++++++ ...caler-metric-chart-card.component.spec.ts} | 2 +- .../combo-series-vertical.component.spec.ts | 50 ++++++++++++++++ ...scaler-metric-chart-list-config.service.ts | 4 +- 13 files changed, 523 insertions(+), 3 deletions(-) create mode 100644 src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.spec.ts rename src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/{app-autoscaler-metric-card.component.spec.ts => app-autoscaler-metric-chart-card.component.spec.ts} (97%) create mode 100644 src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts new file mode 100644 index 0000000000..9f78819d24 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts @@ -0,0 +1,48 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../core/src/core/core.module'; +import { ApplicationService } from '../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../cf-autoscaler-testing.module'; +import { AutoscalerBaseComponent } from './autoscaler-base.component'; + +describe('AutoscalerBaseComponent', () => { + let component: AutoscalerBaseComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AutoscalerBaseComponent], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscalerBaseComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts new file mode 100644 index 0000000000..48028069df --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts @@ -0,0 +1,48 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; +import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page.component'; + +describe('AutoscalerScaleHistoryPageComponent', () => { + let component: AutoscalerScaleHistoryPageComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AutoscalerScaleHistoryPageComponent], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscalerScaleHistoryPageComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts new file mode 100644 index 0000000000..be3c53d2be --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts @@ -0,0 +1,54 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +import { CoreModule } from '../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; +import { AutoscalerTabExtensionComponent } from './autoscaler-tab-extension.component'; +import { CardAutoscalerDefaultComponent } from '../../shared/card-autoscaler-default/card-autoscaler-default.component'; + +describe('AutoscalerTabExtensionComponent', () => { + let component: AutoscalerTabExtensionComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AutoscalerTabExtensionComponent, + CardAutoscalerDefaultComponent, + ], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + NgxChartsModule, + RouterTestingModule, + CfAutoscalerTestingModule, + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AutoscalerTabExtensionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts new file mode 100644 index 0000000000..a2ce67df14 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts @@ -0,0 +1,27 @@ +import { inject, TestBed } from '@angular/core/testing'; + +import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; +import { ApplicationsModule } from '../../../../core/src/features/applications/applications.module'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + EditAutoscalerPolicyService, + EntityServiceFactory, + ], + imports: [ + ApplicationsModule, + createBasicStoreModule(), + CfAutoscalerTestingModule + ] + }); + }); + + it('should be created', inject([EditAutoscalerPolicyService], (service: EditAutoscalerPolicyService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts new file mode 100644 index 0000000000..ce9dd0097a --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts @@ -0,0 +1,50 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyStep1Component } from './edit-autoscaler-policy-step1.component'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyStep1Component', () => { + let component: EditAutoscalerPolicyStep1Component; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [EditAutoscalerPolicyStep1Component], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService, + EditAutoscalerPolicyService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditAutoscalerPolicyStep1Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts new file mode 100644 index 0000000000..8cbb1fa5a7 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts @@ -0,0 +1,50 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyStep2Component } from './edit-autoscaler-policy-step2.component'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyStep2Component', () => { + let component: EditAutoscalerPolicyStep2Component; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [EditAutoscalerPolicyStep2Component], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService, + EditAutoscalerPolicyService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditAutoscalerPolicyStep2Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts new file mode 100644 index 0000000000..186a4dac47 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts @@ -0,0 +1,50 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyStep3Component } from './edit-autoscaler-policy-step3.component'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyStep3Component', () => { + let component: EditAutoscalerPolicyStep3Component; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [EditAutoscalerPolicyStep3Component], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService, + EditAutoscalerPolicyService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditAutoscalerPolicyStep3Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts new file mode 100644 index 0000000000..b965864158 --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts @@ -0,0 +1,50 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyStep4Component } from './edit-autoscaler-policy-step4.component'; +import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyStep4Component', () => { + let component: EditAutoscalerPolicyStep4Component; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [EditAutoscalerPolicyStep4Component], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService, + EditAutoscalerPolicyService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditAutoscalerPolicyStep4Component); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts new file mode 100644 index 0000000000..7069cac31b --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts @@ -0,0 +1,60 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { CoreModule } from '../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; +import { EditAutoscalerPolicyComponent } from './edit-autoscaler-policy.component'; +import { EditAutoscalerPolicyStep1Component } from './edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component'; +import { EditAutoscalerPolicyStep2Component } from './edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component'; +import { EditAutoscalerPolicyStep3Component } from './edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component'; +import { EditAutoscalerPolicyStep4Component } from './edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component'; +import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; + +describe('EditAutoscalerPolicyComponent', () => { + let component: EditAutoscalerPolicyComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + EditAutoscalerPolicyComponent, + EditAutoscalerPolicyStep1Component, + EditAutoscalerPolicyStep2Component, + EditAutoscalerPolicyStep3Component, + EditAutoscalerPolicyStep4Component, + ], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService, + EditAutoscalerPolicyService, + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditAutoscalerPolicyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.spec.ts new file mode 100644 index 0000000000..f9ee28447f --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.spec.ts @@ -0,0 +1,33 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MatIcon } from '@angular/material'; + +import { EntityInfo } from '../../../../../../store/src/types/api.types'; +import { TableCellAutoscalerEventChangeIconPipe } from './table-cell-autoscaler-event-change-icon.pipe'; +import { TableCellAutoscalerEventChangeComponent } from './table-cell-autoscaler-event-change.component'; + +describe('TableCellAutoscalerEventChangeComponent', () => { + let component: TableCellAutoscalerEventChangeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [TableCellAutoscalerEventChangeComponent, MatIcon, TableCellAutoscalerEventChangeIconPipe] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TableCellAutoscalerEventChangeComponent); + component = fixture.componentInstance; + component.row = { + entity: { + type: '' + } + } as EntityInfo; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts similarity index 97% rename from src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts rename to src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts index d02fd9e598..21f89a04de 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-card.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts @@ -18,7 +18,7 @@ import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-c import { AppAutoscalerComboChartComponent } from './combo-chart/combo-chart.component'; import { AppAutoscalerComboSeriesVerticalComponent } from './combo-chart/combo-series-vertical.component'; -describe('AppServiceBindingCardComponent', () => { +describe('AppAutoscalerMetricChartCardComponent', () => { let component: AppAutoscalerMetricChartCardComponent; let fixture: ComponentFixture; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts new file mode 100644 index 0000000000..528fada25f --- /dev/null +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts @@ -0,0 +1,50 @@ +import { DatePipe } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; +import { NgxChartsModule } from '@swimlane/ngx-charts'; + +import { CoreModule } from '../../../../../../../core/src/core/core.module'; +import { ApplicationService } from '../../../../../../../core/src/features/applications/application.service'; +import { SharedModule } from '../../../../../../../core/src/shared/shared.module'; +import { TabNavService } from '../../../../../../../core/tab-nav.service'; +import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper'; +import { createBasicStoreModule } from '../../../../../../../core/test-framework/store-test-helper'; +import { CfAutoscalerTestingModule } from '../../../../../cf-autoscaler-testing.module'; +import { AppAutoscalerComboSeriesVerticalComponent } from './combo-series-vertical.component'; + +describe('AppAutoscalerComboSeriesVerticalComponent', () => { + let component: AppAutoscalerComboSeriesVerticalComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AppAutoscalerComboSeriesVerticalComponent], + imports: [ + BrowserAnimationsModule, + createBasicStoreModule(), + CoreModule, + SharedModule, + RouterTestingModule, + CfAutoscalerTestingModule, + NgxChartsModule, + ], + providers: [ + DatePipe, + { provide: ApplicationService, useClass: ApplicationServiceMock }, + TabNavService + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AppAutoscalerComboSeriesVerticalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index ba9bfb04b3..8ccdb14b98 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -40,8 +40,8 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< }; showCustomTime = true; - customTimePollingInterval = 6000000; - customTimeInitialValue = '1:minute'; + customTimePollingInterval = 60000; + customTimeInitialValue = '30:minute'; customTimeWindows: ITimeRange[] = [ { value: '30:minute', From 1e018516e6443ad6e1af95155a0f16b88327b1ff Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 29 May 2019 16:43:36 +0800 Subject: [PATCH 80/98] [autoscaler] show the latest events table with the msg "No events." when there is no events --- .../autoscaler-tab-extension.component.html | 96 +++++++++---------- ...cf-app-autoscaler-events-config.service.ts | 2 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 6d66d3df52..b97a6d11de 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -210,53 +210,53 @@
-
- - - - - Latest Events - - - -
- - - - - - - - - - - - - - - - - - - -
Event Instances scaled - {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to - {{element.new_instances}} Trigger {{element.reason}} {{element.message}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.error}}
-
- - - - - - - -
+ + + + + Latest Events + + + +
+ + + + + + + + + + + + + + + + + + + +
Event Instances scaled + {{element.old_instances > element.new_instances? 'down' : 'up'}} from {{element.old_instances}} to + {{element.new_instances}} Trigger {{element.reason}} {{element.message}} Date {{element.timestamp / 1000000 | date:'medium'}} Error {{element.error}}
+
+ No events.
+
+ + + + + + +
\ No newline at end of file diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index 4110e6b8b6..fd674f3fdc 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -84,7 +84,7 @@ export class CfAppAutoscalerEventsConfigService showCustomTime = true; customTimePollingInterval = 120000; - customTimeInitialValue = '1:week'; + customTimeInitialValue = '1:month'; customTimeWindows: ITimeRange[] = [ { value: '1:day', From ae9a08e1e21a1f048a8bdd98330c14b6cb46f085 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 31 May 2019 15:04:19 +0100 Subject: [PATCH 81/98] Fix issue where 'set' was not correctly enabled after being disabled - set start date - set end date that fires off `invalid` state - fix either date, set is now enabled --- ...scaler-metric-chart-list-config.service.ts | 2 +- .../start-end-date.component.ts | 34 ++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index 8ccdb14b98..e3d90a3c6d 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -67,7 +67,7 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< private twoHours = 1000 * 60 * 60 * 2; customTimeValidation = (start: moment.Moment, end: moment.Moment) => { if (!end || !start) { - return null; + return ' '; } if (!start.isBefore(end)) { return 'Start date must be before end date.'; diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts index 16e9ca967d..b22fbb2619 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts @@ -25,14 +25,12 @@ export class StartEndDateComponent { return; } if (start.isValid()) { + const clone = moment(start); + this.startValue = clone; if (!this.pValidate(start, this.end)) { this.valid = false; - return; - } - if (this.isDifferentDate(this.startValue, start)) { - const clone = moment(start); - this.startValue = clone; - this.startChange.emit(clone); + } else { + this.emitChanges(); } } } @@ -49,14 +47,12 @@ export class StartEndDateComponent { return; } if (end && end.isValid()) { + const clone = moment(end); + this.endValue = clone; if (!this.pValidate(this.start, end)) { this.valid = false; - return; - } - if (this.isDifferentDate(this.endValue, end)) { - const clone = moment(end); - this.endValue = clone; - this.endChange.emit(clone); + } else { + this.emitChanges(); } } } @@ -78,6 +74,20 @@ export class StartEndDateComponent { private startValue: moment.Moment; private endValue: moment.Moment; + private lastValidStartValue: moment.Moment; + private lastValidEndValue: moment.Moment; + + private emitChanges() { + if (this.isDifferentDate(this.lastValidStartValue, this.startValue)) { + this.lastValidStartValue = this.startValue; + this.startChange.emit(this.startValue); + } + if (this.isDifferentDate(this.lastValidEndValue, this.endValue)) { + this.lastValidEndValue = this.endValue; + this.endChange.emit(this.endValue); + } + } + @Input() public validate: (start: moment.Moment, end: moment.Moment) => string = (start: moment.Moment, end: moment.Moment): string => { if (!end || !start) { From 4af6b234d698608b511dfe85dad41a3b0c1e9e6d Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 31 May 2019 15:32:54 +0100 Subject: [PATCH 82/98] Fix default validation following custom start/end time validation change --- .../components/start-end-date/start-end-date.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts index b22fbb2619..310fb39648 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.ts @@ -93,7 +93,7 @@ export class StartEndDateComponent { if (!end || !start) { return null; } - return start.isBefore(end) ? 'Start date must be before end date.' : null; + return end.isBefore(start) ? 'Start date must be before end date.' : null; } private pValidate(start: moment.Moment, end: moment.Moment): boolean { From 15ee13b334737264520be3084b6303aa57759fda Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 31 May 2019 15:34:12 +0100 Subject: [PATCH 83/98] Retain start/end time after commiting change - if we this is an issue an alternative is to only one way bind [(start)]="rangeSelectorManager.start" in metrics-range-selecto.component --- .../shared/services/metrics-range-selector-manager.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts index ca3e16e978..b0c939f649 100644 --- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts +++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts @@ -65,8 +65,8 @@ export class MetricsRangeSelectorManagerService { this.startEnd[0], this.startEnd[1] ]; - this.start = null; - this.end = null; + // this.start = null; + // this.end = null; this.commitAction(action); }; } From c4469d34e538570710e54bb4030b50c3ba45a06f Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 31 May 2019 16:06:07 +0100 Subject: [PATCH 84/98] Fix blip of set/cancel buttons on show of validation error --- .../components/start-end-date/start-end-date.component.html | 2 +- .../components/start-end-date/start-end-date.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html index c1e7423a2a..f2e5cba813 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.html @@ -9,6 +9,6 @@
-
+
{{ validMessage }}
\ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.scss b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.scss index 42b14c9b33..8d9ff8f5f7 100644 --- a/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.scss +++ b/src/frontend/packages/core/src/shared/components/start-end-date/start-end-date.component.scss @@ -14,5 +14,5 @@ .invalid-message { font-size: 12px; - margin-top: -15px; + min-height: 16px; } From f98e942e42ea0724989b439b3ed9dda271d0b541 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 3 Jun 2019 10:50:30 +0100 Subject: [PATCH 85/98] Switch from uptime to policy status to determine autoscaler tab visibility - show autoscaler tab if there's an existing policy or a 404 no policy error (as opposed to a 404 url not found error) - this solves the issue of a 200 uptime but 500 policy request on scf - This will eventually move out from making a request per app to once (for first app) per cf --- .../autoscaler-tab-extension.component.ts | 38 ++++++++++++------- .../src/store/app-autoscaler.actions.ts | 1 + .../src/store/app-autoscaler.types.ts | 5 +++ .../src/store/autoscaler.effects.ts | 17 ++++++--- .../api-request-reducer/fail-request.ts | 9 ++--- .../packages/store/src/types/request.types.ts | 4 +- 6 files changed, 49 insertions(+), 25 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index a16d9609a1..a4c5f0df2e 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -8,8 +8,9 @@ import { distinctUntilChanged, filter, first, map, publishReplay, refCount, star import { EntityService } from '../../../../core/src/core/entity-service'; import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; import { StratosTab, StratosTabType } from '../../../../core/src/core/extension/extension-service'; -import { ApplicationService } from '../../../../core/src/features/applications/application.service'; +import { safeUnsubscribe } from '../../../../core/src/core/utils.service'; import { ApplicationMonitorService } from '../../../../core/src/features/applications/application-monitor.service'; +import { ApplicationService } from '../../../../core/src/features/applications/application.service'; import { getGuids } from '../../../../core/src/features/applications/application/application-base.component'; import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service'; @@ -27,13 +28,14 @@ import { AutoscalerPaginationParams, DetachAppAutoscalerPolicyAction, GetAppAutoscalerAppMetricAction, - GetAppAutoscalerHealthAction, GetAppAutoscalerPolicyAction, GetAppAutoscalerScalingHistoryAction, UpdateAppAutoscalerPolicyAction, } from '../../store/app-autoscaler.actions'; import { + AppAutoscalerFetchPolicyFailedResponse, AppAutoscalerMetricData, + AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory, } from '../../store/app-autoscaler.types'; @@ -43,6 +45,25 @@ import { appAutoscalerScalingHistorySchemaKey, } from '../../store/autoscaler.store.module'; +const enableAutoscaler = (appGuid: string, endpointGuid: string, esf: EntityServiceFactory): Observable => { + // This will eventual be moved out into a service and made generic to the cf (one call per cf, rather than one call per app - See #3583) + const action = new GetAppAutoscalerPolicyAction(appGuid, endpointGuid); + const entityService = esf.create(action.entityKey, action.entity, action.guid, action); + return entityService.entityObs$.pipe( + filter(entityInfo => + !!entityInfo && !!entityInfo.entityRequestInfo && !!entityInfo.entityRequestInfo.response && + !entityInfo.entityRequestInfo.fetching), + map(entityInfo => { + // Autoscaler feature should be enabled if either .. + // 1) There's an autoscaler policy + // 2) There's a 404 no policy error (as opposed to a 404 url not found error) + const noPolicySet = (entityInfo.entityRequestInfo.response as AppAutoscalerFetchPolicyFailedResponse).noPolicy; + return !!entityInfo.entity || noPolicySet; + }), + startWith(true) + ); +}; + @StratosTab({ type: StratosTabType.Application, label: 'Autoscale', @@ -52,11 +73,7 @@ import { hidden: (store: Store, esf: EntityServiceFactory, activatedRoute: ActivatedRoute) => { const endpointGuid = getGuids('cf')(activatedRoute) || window.location.pathname.split('/')[2]; const appGuid = getGuids()(activatedRoute) || window.location.pathname.split('/')[3]; - const action = new GetAppAutoscalerHealthAction(appGuid, endpointGuid); - return esf.create<{ uptime: number }>(action.entityKey, action.entity, action.guid, action).waitForEntity$.pipe( - map(health => health.entity.uptime > 0), - startWith(true) - ); + return enableAutoscaler(appGuid, endpointGuid, esf).pipe(map(enabled => !enabled)); } }) @Component({ @@ -113,12 +130,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { if (this.appAutoscalerScalingHistorySnackBarRef) { this.appAutoscalerScalingHistorySnackBarRef.dismiss(); } - if (this.appAutoscalerPolicyErrorSub) { - this.appAutoscalerPolicyErrorSub.unsubscribe(); - } - if (this.appAutoscalerScalingHistoryErrorSub) { - this.appAutoscalerScalingHistoryErrorSub.unsubscribe(); - } + safeUnsubscribe(this.appAutoscalerPolicyErrorSub, this.appAutoscalerScalingHistoryErrorSub); } constructor( 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 index 42d9229bed..07de28f3d1 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -71,6 +71,7 @@ export class GetAppAutoscalerPolicyAction implements IRequestAction { public endpointGuid: string, ) { } type = APP_AUTOSCALER_POLICY; + entity = entityFactory(appAutoscalerPolicySchemaKey); entityKey = appAutoscalerPolicySchemaKey; } diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts index d2b71d06a1..41cd75a4d4 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts @@ -132,3 +132,8 @@ export interface AppAutoscalerMetricBasicInfo { chartMaxValue: number; } +export interface AppAutoscalerFetchPolicyFailedResponse { + status: number; + noPolicy: boolean; +} + diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts index a158abd075..7b2c762e19 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts @@ -42,12 +42,14 @@ import { UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, } from './app-autoscaler.actions'; -import { AppAutoscalerMetricDataLocal, AppScalingTrigger } from './app-autoscaler.types'; +import { + AppAutoscalerFetchPolicyFailedResponse, + AppAutoscalerMetricDataLocal, + AppScalingTrigger, +} from './app-autoscaler.types'; const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; -// const commonPrefix = `/pp/${proxyAPIVersion}/proxy/${autoscalerAPIVersion}`; -// const healthPrefix = `/pp/${proxyAPIVersion}/proxy`; function createAutoscalerRequestMessage(requestType: string, error: { status: string, _body: string }) { return `Unable to ${requestType}: ${error.status} ${error._body}`; @@ -306,11 +308,16 @@ export class AutoscalerEffects { return res; }), catchError(err => { - if (err.status === 404 && err._body === '{}') { + const noPolicy = err.status === 404 && err._body === '{}'; + if (noPolicy) { err._body = 'No policy is defined for this application.'; } + const response: AppAutoscalerFetchPolicyFailedResponse = { status: err.status, noPolicy }; + + // const notFound = err.status === 404 && err._body === '{}'; + // err._body = notFound ? 'No policy is defined for this application.' : err._body; return [ - new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), getPolicyAction, actionType) + new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), getPolicyAction, actionType, null, response) ]; })); } diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts index 3d1e3757b9..5bb9be3e00 100644 --- a/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts +++ b/src/frontend/packages/store/src/reducers/api-request-reducer/fail-request.ts @@ -1,9 +1,5 @@ -import { IRequestAction, IFailedRequestAction } from '../../types/request.types'; -import { - getEntityRequestState, - mergeUpdatingState, - setEntityRequestState, -} from './request-helpers'; +import { IFailedRequestAction, IRequestAction } from '../../types/request.types'; +import { getEntityRequestState, mergeUpdatingState, setEntityRequestState } from './request-helpers'; export function failRequest(state, action: IFailedRequestAction) { if (action.apiAction.guid) { @@ -32,6 +28,7 @@ export function failRequest(state, action: IFailedRequestAction) { requestFailedState.error = true; requestFailedState.creating = false; requestFailedState.message = action.message; + requestFailedState.response = action.response; } return setEntityRequestState(state, requestFailedState, apiAction); } diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts index a9a227c82b..3b57a3cbed 100644 --- a/src/frontend/packages/store/src/types/request.types.ts +++ b/src/frontend/packages/store/src/types/request.types.ts @@ -81,6 +81,7 @@ export interface IFailedRequestAction { message: string; apiAction: IRequestAction | PaginatedAction; requestType: ApiRequestTypes; + response?: any; } export abstract class CFStartAction implements Action { @@ -162,7 +163,8 @@ export class WrapperRequestActionFailed extends RequestFailedAction implements I public message: string, public apiAction: IRequestAction | PaginatedAction, public requestType: ApiRequestTypes = 'fetch', - public internalEndpointError?: InternalEndpointError + public internalEndpointError?: InternalEndpointError, + public response?: any ) { super(); } From b9962524702d3edf04fa8949ce3c5002a94390ba Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Thu, 6 Jun 2019 18:08:56 +0800 Subject: [PATCH 86/98] [autoscaler] add refresh button for latest metric view in autoscaler tab --- .../autoscaler-tab-extension.component.html | 15 +++++++++------ .../autoscaler-tab-extension.component.ts | 14 +++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index b97a6d11de..296c11344d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -72,6 +72,9 @@
+ @@ -215,12 +218,6 @@ Latest Events -
@@ -251,6 +248,12 @@
+ diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index a4c5f0df2e..2bf56bd93f 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -107,6 +107,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerAppMetrics = {}; appAutoscalerAppMetricNames = []; + appAutoscalerPolicy: AppAutoscalerPolicyLocal; paramsMetrics: AutoscalerPaginationParams = { 'start-time': ((new Date()).getTime() - 60000).toString() + '000000', @@ -155,7 +156,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { map(({ entity }) => { if (entity && entity.entity) { this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.loadLatestMetricsUponPolicy(entity.entity); + this.appAutoscalerPolicy = entity.entity; + this.loadLatestMetricsUponPolicy(); } return entity && entity.entity; }), @@ -187,6 +189,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { getAppMetric(metricName: string, trigger: any, params: any) { const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, this.applicationService.cfGuid, metricName, true, trigger, params); + this.store.dispatch(action); return getPaginationObservables({ store: this.store, action, @@ -197,12 +200,12 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { }, false).entities$; } - loadLatestMetricsUponPolicy(policyEntity: AppAutoscalerPolicyLocal) { - if (policyEntity.scaling_rules_map) { + loadLatestMetricsUponPolicy() { + if (this.appAutoscalerPolicy.scaling_rules_map) { this.appAutoscalerAppMetrics = {}; - Object.keys(policyEntity.scaling_rules_map).map((metricName) => { + Object.keys(this.appAutoscalerPolicy.scaling_rules_map).map((metricName) => { this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, policyEntity.scaling_rules_map[metricName], this.paramsMetrics); + this.getAppMetric(metricName, this.appAutoscalerPolicy.scaling_rules_map[metricName], this.paramsMetrics); }); } } @@ -309,6 +312,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { } fetchScalingHistory() { + this.paramsHistory['end-time'] = (new Date()).getTime().toString() + '000000'; this.store.dispatch(this.scalingHistoryAction); } } From 8bbc8386235d9ac057960e61e6c9e3bbe6fad0d1 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 7 Jun 2019 14:10:18 +0100 Subject: [PATCH 87/98] Add some space between nav/refresh buttons and table in autoscaler tab --- .../autoscaler-tab-extension.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index 2eb0ced5de..6fd84d1a30 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -33,6 +33,7 @@ .app-metadata-table { display: block; + padding-bottom: 8px; } app-tile-grid { From 8020516627e38a179e1852bd6ddc9c093cccc8a0 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 7 Jun 2019 14:32:38 +0100 Subject: [PATCH 88/98] Fix issue were deleting and then creating the same entity was never returned from entity service - ensure 'deleting' state is wiped when any non-delete request completes --- .../src/reducers/api-request-reducer/succeed-request.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts index c3e7e5d243..148e7dd64f 100644 --- a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts +++ b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts @@ -8,6 +8,7 @@ import { mergeUpdatingState, setEntityRequestState, } from './request-helpers'; +import { defaultDeletingActionState } from './types'; export function succeedRequest(state: IRequestTypeState, action: ISuccessRequestAction) { if (action.apiAction.guid) { @@ -36,6 +37,12 @@ export function succeedRequest(state: IRequestTypeState, action: ISuccessRequest requestSuccessState.response = successAction.response; } + if (action.requestType !== 'delete') { + requestSuccessState.deleting = { + ...defaultDeletingActionState + }; + } + const newState = mergeState( createRequestStateFromResponse(successAction.response, state), setEntityRequestState(state, requestSuccessState, action.apiAction) From d5d11c8da3b34a81517f5d39de2e87d9ccfbce0e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 7 Jun 2019 14:38:23 +0100 Subject: [PATCH 89/98] Update start/end time for new autoscaler tab metrics requests - also refactored some of the core appAutoscalerPolicy observables to remove the need to assign local values on observable emissions --- .../autoscaler-tab-extension.component.html | 2 +- .../autoscaler-tab-extension.component.ts | 45 ++++++++++++------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 296c11344d..6c708562c2 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -56,7 +56,7 @@
-
+
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 2bf56bd93f..397e492cfa 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -95,7 +95,9 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { appAutoscalerPolicyService: EntityService>; public appAutoscalerScalingHistoryService: EntityService>; appAutoscalerPolicy$: Observable; + appAutoscalerPolicySafe$: Observable; appAutoscalerScalingHistory$: Observable; + appAutoscalerAppMetricNames$: Observable; private appAutoscalerPolicyErrorSub: Subscription; private appAutoscalerScalingHistoryErrorSub: Subscription; @@ -106,8 +108,6 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { private detachConfirmOk = 0; appAutoscalerAppMetrics = {}; - appAutoscalerAppMetricNames = []; - appAutoscalerPolicy: AppAutoscalerPolicyLocal; paramsMetrics: AutoscalerPaginationParams = { 'start-time': ((new Date()).getTime() - 60000).toString() + '000000', @@ -153,17 +153,22 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { false ); this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( - map(({ entity }) => { - if (entity && entity.entity) { - this.appAutoscalerAppMetricNames = Object.keys(entity.entity.scaling_rules_map); - this.appAutoscalerPolicy = entity.entity; - this.loadLatestMetricsUponPolicy(); - } - return entity && entity.entity; - }), + map(({ entity }) => entity ? entity.entity : null), publishReplay(1), refCount() ); + this.appAutoscalerPolicySafe$ = this.appAutoscalerPolicyService.waitForEntity$.pipe( + map(({ entity }) => entity && entity.entity), + publishReplay(1), + refCount() + ); + + this.loadLatestMetricsUponPolicy(); + + this.appAutoscalerAppMetricNames$ = this.appAutoscalerPolicySafe$.pipe( + map(entity => Object.keys(entity.scaling_rules_map)), + ); + this.scalingHistoryAction = new GetAppAutoscalerScalingHistoryAction( createEntityRelationPaginationKey(applicationSchemaKey, this.applicationService.appGuid, 'latest'), this.applicationService.appGuid, @@ -201,13 +206,19 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { } loadLatestMetricsUponPolicy() { - if (this.appAutoscalerPolicy.scaling_rules_map) { - this.appAutoscalerAppMetrics = {}; - Object.keys(this.appAutoscalerPolicy.scaling_rules_map).map((metricName) => { - this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, this.appAutoscalerPolicy.scaling_rules_map[metricName], this.paramsMetrics); - }); - } + this.appAutoscalerPolicySafe$.pipe( + first(), + ).subscribe(appAutoscalerPolicy => { + this.paramsMetrics['start-time'] = ((new Date()).getTime() - 60000).toString() + '000000'; + this.paramsMetrics['end-time'] = (new Date()).getTime().toString() + '000000'; + if (appAutoscalerPolicy.scaling_rules_map) { + this.appAutoscalerAppMetrics = {}; + Object.keys(appAutoscalerPolicy.scaling_rules_map).map((metricName) => { + this.appAutoscalerAppMetrics[metricName] = + this.getAppMetric(metricName, appAutoscalerPolicy.scaling_rules_map[metricName], this.paramsMetrics); + }); + } + }); } initErrorSub() { From b485f08aff885e7eea56a62f353dea4ef52c1ca9 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 10 Jun 2019 10:58:55 +0100 Subject: [PATCH 90/98] Ensure refresh on app events and metrics table update time window --- .../cf-app-autoscaler-events-config.service.ts | 10 ++++++++-- .../cf-app-autoscaler-events-data-source.ts | 13 +++++++++++-- .../app-autoscaler-metric-chart-data-source.ts | 12 ++++++++++-- ...p-autoscaler-metric-chart-list-config.service.ts | 9 +++++++-- .../data-sources-controllers/list-data-source.ts | 5 ++++- .../metrics-range-selector-manager.service.ts | 4 ++-- .../services/metrics-range-selector.service.ts | 11 ++++++----- 7 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts index fd674f3fdc..4f888d39b9 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.ts @@ -6,6 +6,7 @@ import * as moment from 'moment'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; import { IListConfig, ListConfig, ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types'; +import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types'; import { AppState } from '../../../../../store/src/app-state'; import { APIResource } from '../../../../../store/src/types/api.types'; @@ -120,13 +121,18 @@ export class CfAppAutoscalerEventsConfigService } } - constructor(private store: Store, private appService: ApplicationService, private datePipe: DatePipe) { + constructor( + private store: Store, + private appService: ApplicationService, + private datePipe: DatePipe, + metricsRangeService: MetricsRangeSelectorService) { super(); this.autoscalerEventSource = new CfAppAutoscalerEventsDataSource( this.store, this.appService.cfGuid, this.appService.appGuid, - this + this, + metricsRangeService ); } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts index 725eb78707..1f59912244 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts @@ -3,6 +3,7 @@ import { Store } from '@ngrx/store'; import { getRowMetadata } from '../../../../../core/src/features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; +import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { AppState } from '../../../../../store/src/app-state'; import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; import { APIResource } from '../../../../../store/src/types/api.types'; @@ -17,7 +18,8 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource, cfGuid: string, appGuid: string, - listConfig: IListConfig> + listConfig: IListConfig>, + metricsRangeService: MetricsRangeSelectorService ) { const action = new GetAppAutoscalerScalingHistoryAction(null, appGuid, cfGuid); super( @@ -28,8 +30,15 @@ export class CfAppAutoscalerEventsDataSource extends ListDataSource { + if (this.metricsAction.windowValue) { + this.metricsAction = metricsRangeService.getNewTimeWindowAction(this.metricsAction, this.metricsAction.windowValue); + } + this.store.dispatch(this.metricsAction); + } } ); } + } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts index 04c91657f8..fd4d9029e5 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts @@ -3,6 +3,7 @@ import { Store } from '@ngrx/store'; import { getRowMetadata } from '../../../../../core/src/features/cloud-foundry/cf.helpers'; import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types'; +import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { AppState } from '../../../../../store/src/app-state'; import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; import { APIResource } from '../../../../../store/src/types/api.types'; @@ -16,7 +17,8 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource, cfGuid: string, appGuid: string, - listConfig: IListConfig> + listConfig: IListConfig>, + metricsRangeService: MetricsRangeSelectorService ) { const action = new GetAppAutoscalerPolicyTriggerAction(null, appGuid, cfGuid); super( @@ -27,7 +29,13 @@ export class AppAutoscalerMetricChartDataSource extends ListDataSource { + if (this.metricsAction.windowValue) { + this.metricsAction = metricsRangeService.getNewTimeWindowAction(this.metricsAction, this.metricsAction.windowValue); + } + this.store.dispatch(this.metricsAction); + } } ); } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts index e3d90a3c6d..093ee9a298 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.ts @@ -6,6 +6,7 @@ import { ApplicationService } from '../../../../../core/src/features/application import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types'; import { BaseCfListConfig } from '../../../../../core/src/shared/components/list/list-types/base-cf/base-cf-list-config'; import { ListViewTypes } from '../../../../../core/src/shared/components/list/list.component.types'; +import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { ITimeRange, MetricQueryType } from '../../../../../core/src/shared/services/metrics-range-selector.types'; import { ListView } from '../../../../../store/src/actions/list.actions'; import { AppState } from '../../../../../store/src/app-state'; @@ -77,13 +78,17 @@ export class AppAutoscalerMetricChartListConfigService extends BaseCfListConfig< } } - constructor(private store: Store, private appService: ApplicationService) { + constructor( + private store: Store, + private appService: ApplicationService, + metricsRangeService: MetricsRangeSelectorService) { super(); this.autoscalerMetricSource = new AppAutoscalerMetricChartDataSource( this.store, this.appService.cfGuid, this.appService.appGuid, - this + this, + metricsRangeService ); } diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts index 0f5889904c..27aa57b44a 100644 --- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts @@ -124,7 +124,7 @@ export abstract class ListDataSource extends DataSource implements private pageSubscription: Subscription; private transformedEntitiesSubscription: Subscription; private seedSyncSub: Subscription; - private metricsAction: MetricsAction; + protected metricsAction: MetricsAction; public entitySelectConfig: EntitySelectConfig; public refresh: () => void; @@ -286,6 +286,9 @@ export abstract class ListDataSource extends DataSource implements if (Array.isArray(this.action)) { this.action.forEach(action => this.store.dispatch(action)); } else { + // Metrics actions that rely on a time window will dispatch the same action with a stale time window. To fix this we could do + // something similar to CfAppAutoscalerEventsDataSource (currently avoided due to updated ctor leading to wide scale change, + // alternatively could make helper function required a static) this.store.dispatch(this.metricsAction || this.masterAction); } }; diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts index b0c939f649..37b41e95d1 100644 --- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts +++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts @@ -143,7 +143,7 @@ export class MetricsRangeSelectorManagerService { private startWindowPoll(timeWindow: ITimeRange) { this.endWindowPoll(); this.pollIndex = window.setInterval( - () => this.commitAction(this.metricRangeService.getNewTimeWindowAction(this.baseAction, timeWindow)), + () => this.commitAction(this.metricRangeService.getNewTimeWindowAction(this.baseAction, timeWindow.value)), this.pollInterval ); } @@ -159,7 +159,7 @@ export class MetricsRangeSelectorManagerService { } this.committedStartEnd = [null, null]; this.startEnd = [null, null]; - this.commitAction(this.metricRangeService.getNewTimeWindowAction(this.baseAction, timeWindow)); + this.commitAction(this.metricRangeService.getNewTimeWindowAction(this.baseAction, timeWindow.value)); if (timeWindow.value) { this.startWindowPoll(timeWindow); } diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts index f96c98363e..321129e196 100644 --- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts +++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts @@ -1,8 +1,9 @@ import { Injectable } from '@angular/core'; import * as moment from 'moment'; -import { ITimeRange, StoreMetricTimeRange, MetricQueryType } from './metrics-range-selector.types'; -import { MetricsAction, MetricQueryConfig } from '../../../../store/src/actions/metrics.actions'; + +import { MetricQueryConfig, MetricsAction } from '../../../../store/src/actions/metrics.actions'; import { IMetrics } from '../../../../store/src/types/base-metric.types'; +import { ITimeRange, MetricQueryType, StoreMetricTimeRange } from './metrics-range-selector.types'; @Injectable() export class MetricsRangeSelectorService { @@ -59,10 +60,10 @@ export class MetricsRangeSelectorService { })); } - public getNewTimeWindowAction(action: MetricsAction, window: ITimeRange) { - const [start, end] = this.convertWindowToRange(window.value); + public getNewTimeWindowAction(action: MetricsAction, windowValue: string) { + const [start, end] = this.convertWindowToRange(windowValue); const newAction = { ...action }; - newAction.windowValue = window.value; + newAction.windowValue = windowValue; return this.getNewDateRangeAction(newAction, start, end); } From 32a31d7c7e8171a9880bdffcbba99d92bb7a9a6e Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 19 Jun 2019 14:37:20 +0800 Subject: [PATCH 91/98] [autoscaler] fix upon Nathan's comments --- .../src/cf-autoscaler-testing.module.ts | 10 -- .../autoscaler-transform-metric.ts | 118 +++++++----------- .../autoscaler-transform-policy.spec.ts | 34 ++--- .../autoscaler-transform-policy.ts | 83 ++++++------ .../autoscaler-helpers/autoscaler-util.ts | 73 +++++++---- .../autoscaler-validation.ts | 66 +++++----- .../autoscaler-metric-page.component.html | 2 +- .../autoscaler-metric-page.component.ts | 15 ++- ...toscaler-scale-history-page.component.html | 2 +- ...toscaler-scale-history-page.component.scss | 25 ---- ...autoscaler-scale-history-page.component.ts | 16 ++- .../autoscaler-tab-extension.component.html | 6 +- .../autoscaler-tab-extension.component.scss | 2 +- .../autoscaler-tab-extension.component.ts | 12 +- .../edit-autoscaler-policy-service.ts | 5 +- .../edit-autoscaler-policy-step1.component.ts | 13 +- ...dit-autoscaler-policy-step2.component.html | 2 +- ...dit-autoscaler-policy-step2.component.scss | 2 +- .../edit-autoscaler-policy-step2.component.ts | 8 +- ...dit-autoscaler-policy-step3.component.html | 16 +-- ...dit-autoscaler-policy-step3.component.scss | 2 +- .../edit-autoscaler-policy-step3.component.ts | 36 +++--- ...dit-autoscaler-policy-step4.component.html | 16 +-- ...dit-autoscaler-policy-step4.component.scss | 2 +- .../edit-autoscaler-policy-step4.component.ts | 32 ++--- .../edit-autoscaler-policy.component.ts | 16 ++- .../card-autoscaler-default.component.html | 39 ++---- .../card-autoscaler-default.component.scss | 7 -- .../card-autoscaler-default.component.ts | 86 ++----------- ...ell-autoscaler-event-change.component.html | 2 +- ...ell-autoscaler-event-change.component.scss | 2 +- ...ell-autoscaler-event-status.component.html | 2 +- ...ell-autoscaler-event-status.component.scss | 2 +- ...utoscaler-metric-chart-card.component.html | 6 +- ...utoscaler-metric-chart-card.component.scss | 2 +- ...scaler-metric-chart-card.component.spec.ts | 2 + ...-autoscaler-metric-chart-card.component.ts | 16 ++- .../src/store/app-autoscaler.actions.ts | 20 ++- .../src/store/app-autoscaler.types.ts | 6 +- .../src/store/autoscaler.effects.ts | 36 +++--- .../packages/cf-autoscaler/src/styles.scss | 2 +- .../src/core/extension/extension-service.ts | 2 +- .../packages/core/src/core/utils.service.ts | 4 - .../tabs/events-tab/events-tab.component.scss | 25 ---- .../metrics-range-selector-manager.service.ts | 2 - 45 files changed, 372 insertions(+), 505 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts index 1d6575207a..cd4586dc0b 100644 --- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts +++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts @@ -14,13 +14,3 @@ export class CfAutoscalerTestingModule { registerEntitiesForTesting(autoscalerEntities); } } - -// export const KubernetesBaseTestModules = [ -// KubernetesTestingModule, -// RouterTestingModule, -// CoreModule, -// createBasicStoreModule(), -// NoopAnimationsModule, -// HttpModule, -// SharedModule, -// ]; diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts index 06c7ddf3bb..1030dac093 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts @@ -145,10 +145,10 @@ function buildMetricColorData(metricData: AppAutoscalerMetricDataPoint[], trigge value: getColor(trigger, item.value), }); }); - if (trigger.upper && trigger.upper.length > 0) { + if (trigger.upper.length > 0) { buildSingleColor(colorTarget, trigger.upper); } - if (trigger.lower && trigger.lower.length > 0) { + if (trigger.lower.length > 0) { buildSingleColor(colorTarget, trigger.lower); } return colorTarget; @@ -164,15 +164,8 @@ function buildSingleColor(lineChartSeries: AppAutoscalerMetricDataPoint[], ul: A }); } -function buildMarkLineData(metricData, trigger: AppScalingTrigger): AppAutoscalerMetricDataLine[] { - const lineChartSeries: AppAutoscalerMetricDataLine[] = []; - if (trigger.upper && trigger.upper.length > 0) { - buildSingleMarkLine(lineChartSeries, metricData, trigger.upper); - } - if (trigger.lower && trigger.lower.length > 0) { - buildSingleMarkLine(lineChartSeries, metricData, trigger.lower); - } - return lineChartSeries; +function buildMarkLineData(metricData: AppAutoscalerMetricDataPoint[], trigger: AppScalingTrigger): AppAutoscalerMetricDataLine[] { + return buildSingleMarkLine(metricData, trigger.upper).concat(buildSingleMarkLine(metricData, trigger.lower)); } function buildTriggerName(item: AppScalingRule): string { @@ -180,20 +173,20 @@ function buildTriggerName(item: AppScalingRule): string { return `${type} threshold: ${item.operator} ${item.threshold}`; } -function buildSingleMarkLine(lineChartSeries: AppAutoscalerMetricDataLine[], metricData: AppAutoscalerMetricData[], ul: AppScalingRule[]) { - ul.forEach(item => { +function buildSingleMarkLine(metricData: AppAutoscalerMetricDataPoint[], ul: AppScalingRule[]) { + return ul.reduce((lineChartSeries, item) => { const lineData = { name: buildTriggerName(item), - series: [] + series: metricData.map((data) => { + return { + name: data.name, + value: item.threshold, + }; + }) }; - metricData.map((data) => { - lineData.series.push({ - name: data.name, - value: item.threshold, - }); - }); lineChartSeries.push(lineData); - }); + return lineChartSeries; + }, []); } function executeCompare(val1: number, operator: string, val2: number): boolean { @@ -210,21 +203,18 @@ function executeCompare(val1: number, operator: string, val2: number): boolean { } function getColor(trigger: AppScalingTrigger, value: any): string { - let color = AutoscalerConstants.normalColor; - if (Number.isNaN(value)) { - return color; - } - for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { - if (executeCompare(value, trigger.upper[i].operator, trigger.upper[i].threshold)) { - color = trigger.upper[i].color; - break; + const color = AutoscalerConstants.normalColor; + if (!Number.isNaN(value)) { + for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { + if (executeCompare(value, trigger.upper[i].operator, trigger.upper[i].threshold)) { + return trigger.upper[i].color; + } } - } - for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { - const index = trigger.lower.length - 1 - i; - if (executeCompare(value, trigger.lower[index].operator, trigger.lower[index].threshold)) { - color = trigger.lower[index].color; - break; + for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { + const index = trigger.lower.length - 1 - i; + if (executeCompare(value, trigger.lower[index].operator, trigger.lower[index].threshold)) { + return trigger.lower[index].color; + } } } return color; @@ -235,66 +225,52 @@ function getMetricBasicInfo( source: AppAutoscalerMetricData[], trigger: AppScalingTrigger ): AppAutoscalerMetricBasicInfo { - const map = {}; - let interval = AutoscalerConstants.metricMap[metricName].interval; + const intervalMap = {}; let maxCount = 1; let preTimestamp = 0; let maxValue = -1; const unit = AutoscalerConstants.metricMap[metricName].unit_internal; - map[interval] = 1; - for (const item of source) { + intervalMap[AutoscalerConstants.metricMap[metricName].interval] = 1; + const resultInterval = source.reduce((interval, item) => { maxValue = Math.max(Number(item.value), maxValue); const thisTimestamp = Math.round(item.timestamp / AutoscalerConstants.S2NS); const currentInterval = thisTimestamp - preTimestamp; - map[currentInterval] = map[currentInterval] ? map[currentInterval] + 1 : 1; - if (map[currentInterval] > maxCount) { + intervalMap[currentInterval] = intervalMap[currentInterval] ? intervalMap[currentInterval] + 1 : 1; + if (intervalMap[currentInterval] > maxCount) { interval = currentInterval; - maxCount = map[currentInterval]; + maxCount = intervalMap[currentInterval]; } preTimestamp = thisTimestamp; // unit = item.unit === '' ? unit : item.unit; - } + return interval; + }, AutoscalerConstants.metricMap[metricName].interval); return { - interval, + interval: resultInterval, unit, - chartMaxValue: getChartMax(trigger, maxValue) + chartMaxValue: getChartMax(trigger, maxValue, metricName) }; } -function getChartMax(trigger: AppScalingTrigger, maxValue: number): number { - let thresholdCount = 0; - let maxThreshold = 0; - let thresholdmax = 0; - let metricType = ''; - if (trigger.upper && trigger.upper.length > 0) { - thresholdCount += trigger.upper.length; - maxThreshold = trigger.upper[0].threshold; - metricType = trigger.upper[0].metric_type; - } - if (trigger.lower && trigger.lower.length > 0) { - thresholdCount += trigger.lower.length; - maxThreshold = Math.max(trigger.lower[0].threshold, maxThreshold); - metricType = trigger.lower[0].metric_type; - } - if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricType) >= 0) { +function getMaxThreshod(rules: AppScalingRule[]) { + return rules.length > 0 ? rules[0].threshold : 0; +} + +function getChartMax(trigger: AppScalingTrigger, maxValue: number, metricName: string): number { + if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricName) >= 0) { return 100; } - if (maxThreshold > 0) { - thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); - } - thresholdmax = Math.max(maxValue, thresholdmax, 10); - thresholdmax = getTrimmedInteger(thresholdmax); - return thresholdmax; + const thresholdCount = trigger.upper.length + trigger.lower.length; + const maxThreshold = Math.max(getMaxThreshod(trigger.upper), getMaxThreshod(trigger.lower)); + const thresholdmax = Math.ceil(maxThreshold * (thresholdCount + 1) / (thresholdCount)); + return getTrimmedInteger(Math.max(maxValue, thresholdmax, 10)); } function getTrimmedInteger(thresholdmax: number): number { for (let i = 10; i < Number.MAX_VALUE && i < thresholdmax; i = i * 10) { if (thresholdmax / i >= 1 && thresholdmax / i < 10 && thresholdmax > 100) { - thresholdmax = (Math.ceil(thresholdmax / i * 10)) * i / 10; - break; + return (Math.ceil(thresholdmax / i * 10)) * i / 10; } else if (thresholdmax / i >= 1 && thresholdmax / i < 10 && thresholdmax <= 100) { - thresholdmax = (Math.ceil(thresholdmax / i)) * i; - break; + return (Math.ceil(thresholdmax / i)) * i; } } return thresholdmax; diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts index 9ab676fab9..65c74a95a6 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts @@ -8,7 +8,6 @@ import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-a describe('Autoscaler Transform Policy Helper', () => { it('Test policy transformation', () => { const arrayPolicy: AppAutoscalerPolicy = { - enabled: true, instance_min_count: 1, instance_max_count: 10, scaling_rules: [ @@ -142,8 +141,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 10, operator: '<=', cool_down_secs: 300, - adjustment: '-2', - color: 'rgba(51, 136, 255, 0.6)' + adjustment: '-2' }, { metric_type: 'memoryused', @@ -151,8 +149,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 30, operator: '<', cool_down_secs: 300, - adjustment: '-1', - color: 'rgba(51, 204, 255, 0.6)' + adjustment: '-1' }, { metric_type: 'memoryused', @@ -160,8 +157,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 120, operator: '>', cool_down_secs: 300, - adjustment: '+3', - color: 'rgba(255, 85, 0, 0.6)' + adjustment: '+3' }, { metric_type: 'memoryused', @@ -169,8 +165,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 90, operator: '>=', cool_down_secs: 300, - adjustment: '+2', - color: 'rgba(255, 170, 0, 0.6)' + adjustment: '+2' }, { metric_type: 'memoryused', @@ -178,8 +173,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 200, operator: '>=', cool_down_secs: 300, - adjustment: '+4', - color: 'rgba(255, 0, 0, 0.6)' + adjustment: '+4' }, { metric_type: 'memoryutil', @@ -187,8 +181,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 20, operator: '<', cool_down_secs: 300, - adjustment: '-3', - color: 'rgba(51, 204, 255, 0.6)' + adjustment: '-3' }, { metric_type: 'responsetime', @@ -196,8 +189,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 50, operator: '>=', cool_down_secs: 300, - adjustment: '+4', - color: 'rgba(255, 0, 0, 0.6)' + adjustment: '+4' }, { metric_type: 'responsetime', @@ -205,8 +197,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 40, operator: '<', cool_down_secs: 300, - adjustment: '-5', - color: 'rgba(51, 204, 255, 0.6)' + adjustment: '-5' }, { metric_type: 'memoryutil', @@ -214,8 +205,7 @@ describe('Autoscaler Transform Policy Helper', () => { threshold: 90, operator: '>=', cool_down_secs: 300, - adjustment: '+6', - color: 'rgba(255, 0, 0, 0.6)' + adjustment: '+6' } ], schedules: { @@ -453,9 +443,7 @@ describe('Autoscaler Transform Policy Helper', () => { expect(isEqual(mapPolicyFromArray, mapPolicy)).toBe(true); expect(isEqual(arrayPolicyFromMap, autoscalerTransformMapToArray(autoscalerTransformArrayToMap(arrayPolicy)))).toBe(true); delete arrayPolicy.scaling_rules; - delete mapPolicy.scaling_rules; - delete mapPolicy.scaling_rules_map; - delete mapPolicy.scaling_rules_form; - expect(isEqual(mapPolicy, autoscalerTransformMapToArray(mapPolicy))).toBe(true); + mapPolicy.scaling_rules_form = []; + expect(isEqual(arrayPolicy, autoscalerTransformMapToArray(mapPolicy))).toBe(true); }); }); diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts index eb5ce51b35..414ce6e735 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts @@ -6,16 +6,16 @@ import { AppScalingRule, AppScalingTrigger, } from '../../store/app-autoscaler.types'; -import { AutoscalerConstants, getScaleType, isEqual } from './autoscaler-util'; +import { AutoscalerConstants, getScaleType, isEqual, deepClone } from './autoscaler-util'; export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { - const newPolicy: AppAutoscalerPolicyLocal = { + let newPolicy: AppAutoscalerPolicyLocal = { ...policy, enabled: true, scaling_rules_map: {}, scaling_rules_form: [] }; - initIfUndefined(newPolicy, 'scaling_rules', []); + newPolicy = initIfUndefined(newPolicy, 'scaling_rules', []) as AppAutoscalerPolicyLocal; newPolicy.scaling_rules.map((trigger) => { pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); }); @@ -31,9 +31,9 @@ export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { } buildFormUponMap(newPolicy, metricName); }); - initIfUndefined(newPolicy, 'schedules', { timezone: moment.tz.guess() }); - initIfUndefined(newPolicy.schedules, 'recurring_schedule', []); - initIfUndefined(newPolicy.schedules, 'specific_date', []); + newPolicy = initIfUndefined(newPolicy, 'schedules', { timezone: moment.tz.guess() }); + newPolicy.schedules = initIfUndefined(newPolicy.schedules, 'recurring_schedule', []); + newPolicy.schedules = initIfUndefined(newPolicy.schedules, 'specific_date', []); return newPolicy; } @@ -77,41 +77,52 @@ function setLowerColor(array: AppScalingRule[]) { } } -export function autoscalerTransformMapToArray(newPolicy: AppAutoscalerPolicyLocal) { - newPolicy = JSON.parse(JSON.stringify(newPolicy)); - const scalingRules = []; - if (newPolicy.scaling_rules_form) { - newPolicy.scaling_rules_form.map((trigger) => { - deleteIf(trigger, 'breach_duration_secs', - trigger.breach_duration_secs === AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); - deleteIf(trigger, 'cool_down_secs', trigger.cool_down_secs === AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); - delete trigger.color; - scalingRules.push(trigger); - }); - } +export function autoscalerTransformMapToArray(oldPolicy: AppAutoscalerPolicyLocal) { + const newPolicy: AppAutoscalerPolicy = { + instance_min_count: oldPolicy.instance_min_count, + instance_max_count: oldPolicy.instance_max_count + }; + const scalingRules: AppScalingRule[] = oldPolicy.scaling_rules_form.map((trigger) => { + return { + adjustment: trigger.adjustment, + breach_duration_secs: trigger.breach_duration_secs, + cool_down_secs: trigger.breach_duration_secs, + metric_type: trigger.metric_type, + operator: trigger.operator, + threshold: trigger.threshold + }; + }); if (scalingRules.length > 0) { newPolicy.scaling_rules = scalingRules; - } else { - delete newPolicy.scaling_rules; } - delete newPolicy.scaling_rules_form; - delete newPolicy.scaling_rules_map; - if (newPolicy.schedules) { - deleteIf(newPolicy.schedules, 'recurring_schedule', - newPolicy.schedules.recurring_schedule && newPolicy.schedules.recurring_schedule.length === 0); - deleteIf(newPolicy.schedules, 'specific_date', - newPolicy.schedules.specific_date && newPolicy.schedules.specific_date.length === 0); - deleteIf(newPolicy, 'schedules', !newPolicy.schedules.recurring_schedule && !newPolicy.schedules.specific_date); + if (oldPolicy.schedules && + (hasNamedSchedule(oldPolicy.schedules.recurring_schedule) || hasNamedSchedule(oldPolicy.schedules.specific_date))) { + newPolicy.schedules = { + timezone: oldPolicy.schedules.timezone + }; + if (hasNamedSchedule(oldPolicy.schedules.recurring_schedule)) { + newPolicy.schedules.recurring_schedule = oldPolicy.schedules.recurring_schedule; + } + if (hasNamedSchedule(oldPolicy.schedules.specific_date)) { + newPolicy.schedules.specific_date = oldPolicy.schedules.specific_date; + } } return newPolicy; } +function hasNamedSchedule(schedule: any) { + return schedule !== undefined && schedule !== null && schedule.length > 0; +} + function pushAndSortTrigger(map: { [metricName: string]: AppScalingTrigger }, metricName: string, newTrigger: AppScalingRule) { const scaleType = getScaleType(newTrigger.operator); - initIfUndefined(newTrigger, 'breach_duration_secs', AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); - initIfUndefined(newTrigger, 'cool_down_secs', AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); + newTrigger = initIfUndefined(newTrigger, 'breach_duration_secs', AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); + newTrigger = initIfUndefined(newTrigger, 'cool_down_secs', AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); if (!map[metricName]) { - map[metricName] = {}; + map[metricName] = { + upper: [], + lower: [] + }; } if (!map[metricName][scaleType]) { map[metricName][scaleType] = []; @@ -126,9 +137,9 @@ function pushAndSortTrigger(map: { [metricName: string]: AppScalingTrigger }, me } function buildFormUponMap(newPolicy: AppAutoscalerPolicyLocal, metricName: string) { - AutoscalerConstants.ScaleTypes.map((triggerType) => { + AutoscalerConstants.ScaleTypes.forEach((triggerType) => { if (newPolicy.scaling_rules_map[metricName][triggerType]) { - newPolicy.scaling_rules_map[metricName][triggerType].map((trigger) => { + newPolicy.scaling_rules_map[metricName][triggerType].forEach((trigger: AppScalingRule) => { newPolicy.scaling_rules_form.push(trigger); }); } @@ -136,9 +147,11 @@ function buildFormUponMap(newPolicy: AppAutoscalerPolicyLocal, metricName: strin } function initIfUndefined(fatherEntity: any, childName: string, defaultData: any) { - if (fatherEntity[childName] === undefined || fatherEntity[childName] === '') { - fatherEntity[childName] = defaultData; + const entity = deepClone(fatherEntity); + if (entity[childName] === undefined || entity[childName] === '') { + entity[childName] = defaultData; } + return entity; } function deleteIf(fatherEntity: any, childName: string, condition: boolean) { diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index dd2e0db6cc..c308d505aa 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -126,10 +126,10 @@ export const PolicyAlert = { }; export function isEqual(a: any, b: any): boolean { - if (typeof (a) !== typeof (b)) { + if (typeof a !== typeof b) { return false; } else { - if (typeof (a) === 'object') { + if (typeof a === 'object') { if (Object.keys(a).length !== Object.keys(b).length) { return false; } @@ -160,7 +160,8 @@ export function buildLegendData(trigger: AppScalingTrigger): AppAutoscalerMetric const legendData: AppAutoscalerMetricLegend[] = []; let latestUl: AppScalingRule = null; if (trigger.upper && trigger.upper.length > 0) { - latestUl = buildUpperLegendData(legendData, trigger.upper, !trigger.lower || trigger.lower.length === 0); + const noLowerRule = !trigger.lower || trigger.lower.length === 0; + latestUl = buildUpperLegendData(legendData, trigger.upper, noLowerRule); } if (trigger.lower && trigger.lower.length > 0) { latestUl = buildLowerLegendData(legendData, trigger.lower, latestUl); @@ -168,16 +169,20 @@ export function buildLegendData(trigger: AppScalingTrigger): AppAutoscalerMetric return legendData; } +function getLegendName(currentRule: AppScalingRule, latestRule: AppScalingRule, singleRange: boolean, isLowerRule: boolean) { + if (singleRange) { + const operator = isLowerRule ? getOppositeOperator(currentRule.operator) : currentRule.operator; + return `${currentRule.metric_type} ${operator} ${currentRule.threshold}`; + } else { + return `${currentRule.threshold} ${getLeftOperator(currentRule.operator)} ${currentRule. + metric_type} ${getRightOperator(latestRule.operator)} ${latestRule.threshold}`; + } +} + function buildUpperLegendData(legendData: any, upper: AppScalingRule[], noLower: boolean): AppScalingRule { let latestUl: AppScalingRule; - upper.map((item, index) => { - let name = ''; - if (index === 0) { - name = `${item.metric_type} ${item.operator} ${item.threshold}`; - } else { - name = `${item.threshold} ${getLeftOperator(item.operator)} ${item. - metric_type} ${getRightOperator(latestUl.operator)} ${latestUl.threshold}`; - } + upper.forEach((item, index) => { + const name = getLegendName(item, latestUl, index === 0, false); legendData.push({ name, value: item.color @@ -198,14 +203,9 @@ function buildLowerLegendData( lower: AppScalingRule[], latestUl: AppScalingRule ): AppScalingRule { - lower.map((item, index) => { - let name = ''; - if (!latestUl || !latestUl.threshold) { - name = `${item.metric_type} ${getOppositeOperator(item.operator)} ${item.threshold}`; - } else { - name = `${item.threshold} ${getLeftOperator(item.operator)} ${item. - metric_type} ${getRightOperator(latestUl.operator)} ${latestUl.threshold}`; - } + lower.forEach((item, index) => { + const isSingleRange = !latestUl || !latestUl.threshold; + const name = getLegendName(item, latestUl, isSingleRange, true); legendData.push({ name, value: index === 0 ? AutoscalerConstants.normalColor : latestUl.color @@ -257,9 +257,36 @@ function getLeftOperator(operator: string): string { } export function shiftArray(array: number[], step: number): number[] { - const days = []; - for (let i = 0; i < array.length; i++) { - days[i] = array[i] + step; + return array.map(value => value + step); +} + +export function deepClone(obj: any) { + let result = {}; + const oClass = isClass(obj); + if (oClass === 'Object') { + result = {}; + } else if (oClass === 'Array') { + result = []; + } else { + return obj; + } + Object.keys(obj).map((key, value) => { + const vClass = isClass(value); + if (vClass === 'Object' || vClass === 'Array') { + result[key] = deepClone(value); + } else { + result[key] = obj[key]; + } + }); + return result; +} + +function isClass(o: any) { + if (o === null) { + return 'Null'; + } + if (o === undefined) { + return 'Undefined'; } - return days; + return Object.prototype.toString.call(o).slice(8, -1); } diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts index 0e4085c963..c7b31f9c7c 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts @@ -37,39 +37,45 @@ export function recurringSchedulesInvalidRepeatOn(inputRecurringSchedules: AppRe export function recurringSchedulesOverlapping( newSchedule: AppRecurringSchedule, index: number, inputRecurringSchedules: AppRecurringSchedule[], property: string) { - for (let i = 0; inputRecurringSchedules && i < inputRecurringSchedules.length; i++) { + if (!inputRecurringSchedules) { + return false; + } + const overlappingSchedule = inputRecurringSchedules.find((value, i) => { if (index === i || !inputRecurringSchedules[i].hasOwnProperty(property) || inputRecurringSchedules[i].start_date && newSchedule.start_date && !dateOverlaps(inputRecurringSchedules[i], newSchedule)) { - continue; + return false; } if (timeOverlaps(inputRecurringSchedules[i], newSchedule)) { const intersects = intersect(inputRecurringSchedules[i][property], newSchedule[property]); return intersects.length > 0; } - } - return false; + }); + return !!overlappingSchedule; } export function specificDateRangeOverlapping(newSchedule: AppSpecificDate, index: number, inputSpecificDates: AppSpecificDate[]) { - const dateRangeList = []; const start = moment(newSchedule.start_date_time, AutoscalerConstants.MomentFormateDateTimeT); const end = moment(newSchedule.end_date_time, AutoscalerConstants.MomentFormateDateTimeT); - for (let i = 0; inputSpecificDates && i < inputSpecificDates.length; i++) { - if (i !== index) { - const starti = moment(inputSpecificDates[i].start_date_time, AutoscalerConstants.MomentFormateDateTimeT); - const endi = moment(inputSpecificDates[i].end_date_time, AutoscalerConstants.MomentFormateDateTimeT); - dateRangeList.push({ - start: starti, - end: endi - }); - } - } - for (const item of dateRangeList) { - if (dateTimeOverlaps(start, end, item.start, item.end)) { - return true; - } + if (inputSpecificDates) { + const dateRangeList = inputSpecificDates.map((value, i) => { + if (i !== index) { + const starti = moment(value.start_date_time, AutoscalerConstants.MomentFormateDateTimeT); + const endi = moment(value.end_date_time, AutoscalerConstants.MomentFormateDateTimeT); + return { + start: starti, + end: endi + }; + } + }); + const overlappingSchedule = dateRangeList.find((item) => { + if (item && dateTimeOverlaps(start, end, item.start, item.end)) { + return true; + } + }); + return !!overlappingSchedule; + } else { + return false; } - return false; } function timeOverlaps(timeI: AppRecurringSchedule, tiemJ: AppRecurringSchedule) { @@ -99,27 +105,27 @@ function dateTimeOverlaps( } export function getThresholdMin(policyTriggers: AppScalingRule[], metricType: string, scaleType: string, index: number) { - let thresholdMin = 1; if (scaleType === 'upper') { - policyTriggers.map((trigger, triggerIndex) => { + return policyTriggers.reduce((thresholdMin, trigger, triggerIndex) => { if (triggerIndex !== index && trigger.metric_type === metricType && AutoscalerConstants.LowerOperators.indexOf(trigger.operator) >= 0) { - thresholdMin = Math.max(trigger.threshold + 1, thresholdMin); + return Math.max(trigger.threshold + 1, thresholdMin); } - }); + }, 1); + } else { + return 1; } - return thresholdMin; } export function getThresholdMax(policyTriggers: AppScalingRule[], metricType: string, scaleType: string, index: number) { - let thresholdMax = Number.MAX_VALUE; if (scaleType === 'lower') { - policyTriggers.map((trigger, triggerIndex) => { + return policyTriggers.reduce((thresholdMax, trigger, triggerIndex) => { if (triggerIndex !== index && trigger.metric_type === metricType && AutoscalerConstants.UpperOperators.indexOf(trigger.operator) >= 0) { - thresholdMax = Math.min(trigger.threshold - 1, thresholdMax); + return Math.min(trigger.threshold - 1, thresholdMax); } - }); + }, Number.MAX_VALUE); + } else { + return Number.MAX_VALUE; } - return thresholdMax; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html index 121506aa48..690ac8e5c0 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.html @@ -1,5 +1,5 @@ -

AutoScaler Metric Charts: {{ (applicationService.application$ | async)?.app.entity.name }}

+

AutoScaler Metric Charts: {{ applicationName$ | async }}

- + diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index 6fd84d1a30..bf73942887 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -36,7 +36,7 @@ padding-bottom: 8px; } -app-tile-grid { +.app-autoscaler-tile-grid-100 { width: 100%; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 397e492cfa..9c36a75f39 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -38,6 +38,7 @@ import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerScalingHistory, + AppScalingTrigger, } from '../../store/app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, @@ -191,7 +192,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.initErrorSub(); } - getAppMetric(metricName: string, trigger: any, params: any) { + getAppMetric(metricName: string, trigger: AppScalingTrigger, params: AutoscalerPaginationParams) { const action = new GetAppAutoscalerAppMetricAction(this.applicationService.appGuid, this.applicationService.cfGuid, metricName, true, trigger, params); this.store.dispatch(action); @@ -212,11 +213,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.paramsMetrics['start-time'] = ((new Date()).getTime() - 60000).toString() + '000000'; this.paramsMetrics['end-time'] = (new Date()).getTime().toString() + '000000'; if (appAutoscalerPolicy.scaling_rules_map) { - this.appAutoscalerAppMetrics = {}; - Object.keys(appAutoscalerPolicy.scaling_rules_map).map((metricName) => { - this.appAutoscalerAppMetrics[metricName] = - this.getAppMetric(metricName, appAutoscalerPolicy.scaling_rules_map[metricName], this.paramsMetrics); - }); + this.appAutoscalerAppMetrics = Object.keys(appAutoscalerPolicy.scaling_rules_map).reduce((metricMap, metricName) => { + metricMap[metricName] = this.getAppMetric(metricName, appAutoscalerPolicy.scaling_rules_map[metricName], this.paramsMetrics); + return metricMap; + }, {}); } }); } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts index 04fa186e06..4ebf82e09a 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts @@ -4,20 +4,19 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { filter, first } from 'rxjs/operators'; import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; -import { cloneObject } from '../../../../core/src/core/utils.service'; import { entityFactory } from '../../../../store/src/helpers/entity-factory'; import { EntityInfo } from '../../../../store/src/types/api.types'; import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy'; import { GetAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module'; +import { deepClone } from '../../core/autoscaler-helpers/autoscaler-util'; @Injectable() export class EditAutoscalerPolicyService { private initialState: AppAutoscalerPolicyLocal = autoscalerTransformArrayToMap({ - enabled: true, instance_min_count: 1, instance_max_count: 10, scaling_rules: [], @@ -56,7 +55,7 @@ export class EditAutoscalerPolicyService { } setState(state: AppAutoscalerPolicy) { - this.stateSubject.next(cloneObject(state)); + this.stateSubject.next(deepClone(state)); } getState(): Observable { diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts index 877a402a4a..ef98dc334d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.ts @@ -70,10 +70,8 @@ export class EditAutoscalerPolicyStep1Component extends EditAutoscalerPolicy imp validateGlobalLimitMin(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - let invalid = false; - if (this.editLimitForm) { - invalid = numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true); - } + const invalid = this.editLimitForm ? + numberWithFractionOrExceedRange(control.value, 1, this.editLimitForm.get('instance_max_count').value - 1, true) : false; const lastValid = this.editLimitValid; this.editLimitValid = this.editLimitForm && control.value < this.editLimitForm.get('instance_max_count').value; if (this.editLimitForm && this.editLimitValid !== lastValid) { @@ -85,11 +83,8 @@ export class EditAutoscalerPolicyStep1Component extends EditAutoscalerPolicy imp validateGlobalLimitMax(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { - let invalid = false; - if (this.editLimitForm) { - invalid = numberWithFractionOrExceedRange(control.value, - this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true); - } + const invalid = this.editLimitForm ? numberWithFractionOrExceedRange(control.value, + this.editLimitForm.get('instance_min_count').value + 1, Number.MAX_VALUE, true) : false; const lastValid = this.editLimitValid; this.editLimitValid = this.editLimitForm && this.editLimitForm.get('instance_min_count').value < control.value; if (this.editLimitForm && this.editLimitValid !== lastValid) { diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index a559996ca7..1f4cc99811 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -1,5 +1,5 @@
- + diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss index a03ff24c30..2e060b8936 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss @@ -1,4 +1,4 @@ -app-tile-grid { +.app-autoscaler-tile-grid-100 { width: 100%; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 46c375a814..7acb9756fb 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -3,13 +3,13 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Observable } from 'rxjs'; -import { cloneObject } from '../../../../../core/src/core/utils.service'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { AutoscalerConstants, getAdjustmentType, getScaleType, PolicyAlert, + deepClone, } from '../../../core/autoscaler-helpers/autoscaler-util'; import { getThresholdMax, @@ -66,18 +66,18 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp } addTrigger = () => { - this.currentPolicy.scaling_rules_form.push(cloneObject(AutoscalerConstants.PolicyDefaultTrigger)); + this.currentPolicy.scaling_rules_form.push(deepClone(AutoscalerConstants.PolicyDefaultTrigger)); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); } - removeTrigger(index) { + removeTrigger(index: number) { if (this.editIndex === index) { this.editIndex = -1; } this.currentPolicy.scaling_rules_form.splice(index, 1); } - editTrigger(index) { + editTrigger(index: number) { this.editIndex = index; this.editScaleType = getScaleType(this.currentPolicy.scaling_rules_form[index].operator); this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html index 25e5db9a72..4ed111d0e6 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.html @@ -1,5 +1,5 @@
- + @@ -10,10 +10,10 @@
- The initial number of application instance is + The initial number of application instances is {{rule.initial_min_instance_count}}, and the range - The number of application instance - is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} during + The number of application instances + is limited from {{rule.instance_min_count}} to {{rule.instance_max_count}} during {{rule.start_time}} ~ {{rule.end_time}} every {{rule.days_of_month}} of the month {{rule.days_of_week}} of the week @@ -113,18 +113,10 @@ *ngIf="editRecurringScheduleForm.get('start_date').hasError('alertInvalidPolicyScheduleEndDateBeforeStartDate')"> {{policyAlert.alertInvalidPolicyScheduleEndDateBeforeStartDate}} - {{policyAlert.alertInvalidPolicyScheduleEndTimeBeforeStartTime}} - {{policyAlert.alertInvalidPolicyScheduleRepeatOn}} diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss index a8bcea035e..59c4ea6d60 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.scss @@ -4,7 +4,7 @@ width: 15px; } -app-tile-grid { +.app-autoscaler-tile-grid-100 { width: 100%; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index cc994fde69..36932ffa4e 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -4,9 +4,8 @@ import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/materi import * as moment from 'moment-timezone'; import { Observable } from 'rxjs'; -import { cloneObject } from '../../../../../core/src/core/utils.service'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; -import { AutoscalerConstants, PolicyAlert, shiftArray } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { AutoscalerConstants, PolicyAlert, shiftArray, deepClone } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateIsAfter, numberWithFractionOrExceedRange, @@ -69,31 +68,32 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp } addRecurringSchedule = () => { - this.currentPolicy.schedules.recurring_schedule.push(cloneObject(AutoscalerConstants.PolicyDefaultRecurringSchedule)); + this.currentPolicy.schedules.recurring_schedule.push(deepClone(AutoscalerConstants.PolicyDefaultRecurringSchedule)); this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); } - removeRecurringSchedule(index) { + removeRecurringSchedule(index: number) { if (this.editIndex === index) { this.editIndex = -1; } this.currentPolicy.schedules.recurring_schedule.splice(index, 1); } - editRecurringSchedule(index) { + editRecurringSchedule(index: number) { + const editSchedule = this.currentPolicy.schedules.recurring_schedule[index]; this.editIndex = index; - this.editEffectiveType = this.currentPolicy.schedules.recurring_schedule[index].start_date ? 'custom' : 'always'; - this.editRepeatType = this.currentPolicy.schedules.recurring_schedule[index].days_of_week ? 'week' : 'month'; + this.editEffectiveType = editSchedule.start_date ? 'custom' : 'always'; + this.editRepeatType = editSchedule.days_of_week ? 'week' : 'month'; this.editRecurringScheduleForm.setValue({ - days_of_week: shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_week || [], -1), - days_of_month: shiftArray(this.currentPolicy.schedules.recurring_schedule[index].days_of_month || [], -1), - instance_min_count: this.currentPolicy.schedules.recurring_schedule[index].instance_min_count, - instance_max_count: Math.abs(Number(this.currentPolicy.schedules.recurring_schedule[index].instance_max_count)), - initial_min_instance_count: this.currentPolicy.schedules.recurring_schedule[index].initial_min_instance_count, - start_date: this.currentPolicy.schedules.recurring_schedule[index].start_date || '', - end_date: this.currentPolicy.schedules.recurring_schedule[index].end_date || '', - start_time: this.currentPolicy.schedules.recurring_schedule[index].start_time, - end_time: this.currentPolicy.schedules.recurring_schedule[index].end_time, + days_of_week: shiftArray(editSchedule.days_of_week || [], -1), + days_of_month: shiftArray(editSchedule.days_of_month || [], -1), + instance_min_count: editSchedule.instance_min_count, + instance_max_count: Math.abs(Number(editSchedule.instance_max_count)), + initial_min_instance_count: editSchedule.initial_min_instance_count, + start_date: editSchedule.start_date || '', + end_date: editSchedule.end_date || '', + start_time: editSchedule.start_time, + end_time: editSchedule.end_time, effective_type: this.editEffectiveType, repeat_type: this.editRepeatType, }); @@ -180,7 +180,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp }; } - validateRecurringScheduleDate(mutualName): ValidatorFn { + validateRecurringScheduleDate(mutualName: string): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (this.editEffectiveType === 'always') { return null; @@ -200,7 +200,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp }; } - validateRecurringScheduleTime(mutualName): ValidatorFn { + validateRecurringScheduleTime(mutualName: string): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { const invalid = this.editRecurringScheduleForm && timeIsSameOrAfter(this.editRecurringScheduleForm.get('start_time').value, this.editRecurringScheduleForm.get('end_time').value); diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html index 2d08f154cf..948cf3574a 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.html @@ -1,5 +1,5 @@
- + @@ -10,10 +10,10 @@
- The initial number of application instance is + The initial number of application instances is {{rule.initial_min_instance_count}}, and the range - The number of application instance - is limited to from {{rule.instance_min_count}} to {{rule.instance_max_count}} from + The number of application instances + is limited from {{rule.instance_min_count}} to {{rule.instance_max_count}} from {{rule.start_date_time}} to {{rule.end_date_time}}.
@@ -77,14 +77,6 @@ *ngIf="editSpecificDateForm.get('end_date_time').hasError('alertInvalidPolicyScheduleEndDateTimeBeforeNow')"> {{policyAlert.alertInvalidPolicyScheduleEndDateTimeBeforeNow}} - -
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss index 83afba6e0e..7cb3f43091 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.scss @@ -1,4 +1,4 @@ -app-tile-grid { +.app-autoscaler-tile-grid-100 { width: 100%; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index c34101d37d..ef240b0bcd 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -8,12 +8,11 @@ import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; import { EntityService } from '../../../../../core/src/core/entity-service'; import { EntityServiceFactory } from '../../../../../core/src/core/entity-service-factory.service'; -import { cloneObject } from '../../../../../core/src/core/utils.service'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component'; import { AppState } from '../../../../../store/src/app-state'; import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { AutoscalerConstants, PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { AutoscalerConstants, PolicyAlert, deepClone } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, numberWithFractionOrExceedRange, @@ -103,19 +102,20 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp return msg; }), distinctUntilChanged(), - ).pipe(map(errorMessage => { - if (errorMessage) { - return { - success: false, - message: `Could not update policy: ${errorMessage}`, - }; - } else { - return { - success: true, - redirect: true - }; - } - })); + ).pipe(map( + errorMessage => { + if (errorMessage) { + return { + success: false, + message: `Could not update policy: ${errorMessage}`, + }; + } else { + return { + success: true, + redirect: true + }; + } + })); return waitForAppAutoscalerUpdateStatus$.pipe(take(1), map(res => { return { ...res, @@ -124,7 +124,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp } addSpecificDate = () => { - this.currentPolicy.schedules.specific_date.push(cloneObject(AutoscalerConstants.PolicyDefaultSpecificDate)); + this.currentPolicy.schedules.specific_date.push(deepClone(AutoscalerConstants.PolicyDefaultSpecificDate)); this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts index 0c4d19651a..1af999f6b9 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.ts @@ -1,4 +1,6 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; +import { map, publishReplay, refCount } from 'rxjs/operators'; import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { ApplicationService } from '../../../../core/src/features/applications/application.service'; @@ -13,12 +15,22 @@ import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service'; EditAutoscalerPolicyService ] }) -export class EditAutoscalerPolicyComponent { +export class EditAutoscalerPolicyComponent implements OnInit { parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`; + applicationName$: Observable; constructor( public applicationService: ApplicationService, ) { } + + ngOnInit() { + this.applicationName$ = this.applicationService.app$.pipe( + map(({ entity }) => entity ? entity.entity.name : null), + publishReplay(1), + refCount() + ); + } + } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html index e180113e16..0dc89a73d4 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.html @@ -7,8 +7,9 @@
- - + +
@@ -23,13 +24,7 @@
-
{{ policy.instance_min_count }}
- - - - - +
{{ policy.instance_min_count }}
-
 @@ -37,13 +32,7 @@
-
{{ policy.instance_max_count }}
-
- - - -
+
{{ policy.instance_max_count }}
-
 @@ -51,17 +40,9 @@
- - - - - - - + + + \ No newline at end of file diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss index 4e25b31838..03cff2642b 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.scss @@ -18,13 +18,6 @@ text-align: right; } - mat-form-field { - width: 50px; - .mat-form-field-infix { - border-top: unset; - } - } - app-metadata-item { .metadata-item__content { flex-direction: row; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts index 845de7e719..9b85a65095 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts @@ -1,20 +1,13 @@ -import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material'; -import { Store } from '@ngrx/store'; +import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { Observable } from 'rxjs'; -import { filter, first, map } from 'rxjs/operators'; +import { map, publishReplay, refCount } from 'rxjs/operators'; import { EntityService } from '../../../../core/src/core/entity-service'; import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service'; import { ApplicationService } from '../../../../core/src/features/applications/application.service'; -import { StratosStatus } from '../../../../core/src/shared/shared.types'; -import { AppState } from '../../../../store/src/app-state'; import { entityFactory } from '../../../../store/src/helpers/entity-factory'; -import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; -import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'; import { APIResource } from '../../../../store/src/types/api.types'; -import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/autoscaler-transform-policy'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; +import { GetAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; import { AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module'; @@ -24,35 +17,20 @@ import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.modul templateUrl: './card-autoscaler-default.component.html', styleUrls: ['./card-autoscaler-default.component.scss'] }) -export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { +export class CardAutoscalerDefaultComponent implements OnInit { @ViewChild('instanceField') instanceField: ElementRef; constructor( public appService: ApplicationService, - private store: Store, - private snackBar: MatSnackBar, private entityServiceFactory: EntityServiceFactory, private applicationService: ApplicationService, ) { - this.status$ = this.appService.applicationState$.pipe( - map(state => state.indicator) - ); } - status$: Observable; appAutoscalerPolicyService: EntityService; - appAutoscalerPolicyUpdateService: EntityService; - public appAutoscalerPolicy$: Observable>; - - currentPolicy: AppAutoscalerPolicyLocal; - public isEditing = false; - public instanceMinCountCurrent: number; - public instanceMinCountEdit: number; - public instanceMaxCountCurrent: any; - public instanceMaxCountEdit: any; - - private snackBarRef: MatSnackBarRef; + appAutoscalerPolicy$: Observable>; + applicationInstances$: Observable; @Input() onUpdate: () => void = () => { } @@ -67,58 +45,14 @@ export class CardAutoscalerDefaultComponent implements OnInit, OnDestroy { ); this.appAutoscalerPolicy$ = this.appAutoscalerPolicyService.entityObs$.pipe( map(({ entity }) => { - if (entity && entity.entity) { - this.instanceMinCountCurrent = entity.entity.instance_min_count; - this.instanceMaxCountCurrent = entity.entity.instance_max_count; - this.currentPolicy = entity.entity; - if (!this.currentPolicy.scaling_rules_form) { - this.currentPolicy = autoscalerTransformArrayToMap(this.currentPolicy); - } - } return entity && entity.entity; }) ); - } - - ngOnDestroy(): void { - if (this.snackBarRef) { - this.snackBarRef.dismiss(); - } - } - - edit() { - this.instanceMinCountEdit = this.instanceMinCountCurrent; - this.instanceMaxCountEdit = this.instanceMaxCountCurrent; - this.isEditing = true; - } - - finishEdit(ok: boolean) { - this.isEditing = false; - this.currentPolicy.instance_min_count = this.instanceMinCountEdit; - this.currentPolicy.instance_max_count = this.instanceMaxCountEdit; - if (ok) { - const doUpdate = () => this.updatePolicy(); - doUpdate().pipe( - first(), - ).subscribe(actionState => { - if (actionState.error) { - this.snackBarRef = this.snackBar.open(`Failed to update instance count: ${actionState.message}`, 'Dismiss'); - } - }); - } - } - - updatePolicy(): Observable { - this.store.dispatch( - new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) - ); - const actionState = selectUpdateInfo(appAutoscalerPolicySchemaKey, - this.applicationService.appGuid, - UpdateAppAutoscalerPolicyAction.updateKey); - this.store.dispatch( - new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid) + this.applicationInstances$ = this.applicationService.app$.pipe( + map(({ entity }) => entity ? entity.entity.instances : null), + publishReplay(1), + refCount() ); - return this.store.select(actionState).pipe(filter(item => !!item)); } } diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html index 8216d3828c..cde0f6d000 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.html @@ -1,4 +1,4 @@ -
+
{{row.entity.old_instances}} {{row.entity.new_instances-row.entity.old_instances | tableCellAutoscalerEventChangeIcon:'icon'}} diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss index 3cb8006227..7585cbff9a 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-change/table-cell-autoscaler-event-change.component.scss @@ -1,4 +1,4 @@ -div { +.app-autoscaler-event-change { align-items: center; display: flex; flex-direction: row; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html index 818a6ae638..d295c4f14c 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.html @@ -1,4 +1,4 @@ -
+
{{row.entity.status | tableCellAutoscalerEventStatusIcon:'icon'}} {{row.entity.status | tableCellAutoscalerEventStatusIcon:'label'}} diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss index 855064aeb0..195f5260cb 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/table-cell-autoscaler-event-status/table-cell-autoscaler-event-status.component.scss @@ -1,4 +1,4 @@ -div { +.app-autoscaler-event-status { align-items: center; display: flex; flex-direction: row; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html index 1ac8ea849c..8496cb9450 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.html @@ -3,12 +3,12 @@ {{metricType}}
- {{paramsMetrics['start-time'] / 1000000 | date:'medium'}} ~ - {{paramsMetrics['end-time'] / 1000000 | date:'medium'}} + {{paramsMetricsStart | date:'medium'}} ~ + {{paramsMetricsEnd | date:'medium'}}
- +
{ component = fixture.componentInstance; component.row = { entity: { + upper: [], + lower: [], }, metadata: { guid: '', diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts index 5669799bfa..a8c1d94480 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.ts @@ -49,22 +49,26 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell) { if (row) { if (row.entity.query && row.entity.query.params) { - this.paramsMetrics['start-time'] = row.entity.query.params.start + '000000000'; - this.paramsMetrics['end-time'] = row.entity.query.params.end + '000000000'; + this.paramsMetricsStart = row.entity.query.params.start * 1000; + this.paramsMetricsEnd = row.entity.query.params.end * 1000; + this.paramsMetrics['start-time'] = this.paramsMetricsStart + '000000'; + this.paramsMetrics['end-time'] = this.paramsMetricsEnd + '000000'; this.appAutoscalerAppMetricLegend = this.getLegend2(row.entity); this.metricType = AutoscalerConstants.getMetricFromMetricId(row.metadata.guid); @@ -99,7 +103,7 @@ export class AppAutoscalerMetricChartCardComponent extends CardCell { + getAppMetric(metricName: string, trigger: AppScalingTrigger, params: AutoscalerPaginationParams): Observable { const action = new GetAppAutoscalerAppMetricAction(this.appService.appGuid, this.appService.cfGuid, metricName, false, trigger, params); this.store.dispatch(action); 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 index 07de28f3d1..0fa992e75b 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -5,7 +5,7 @@ import { createEntityRelationPaginationKey } from '../../../store/src/helpers/en import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { IRequestAction } from '../../../store/src/types/request.types'; -import { AppAutoscalerPolicyLocal } from './app-autoscaler.types'; +import { AppAutoscalerPolicyLocal, AppScalingTrigger } from './app-autoscaler.types'; import { appAutoscalerAppMetricSchemaKey, appAutoscalerHealthSchemaKey, @@ -38,12 +38,6 @@ export const AppAutoscalerMetricEvents = { GET_APP_AUTOSCALER_METRIC_FAILED: '[App Autoscaler] Get autoscaler metric failed' }; -// export const AppAutoscalerHealthEvents = { -// GET_APP_AUTOSCALER_HEALTH: '[App Autoscaler] Get autoscaler health', -// GET_APP_AUTOSCALER_HEALTH_SUCCESS: '[App Autoscaler] Get autoscaler health success', -// GET_APP_AUTOSCALER_HEALTH_FAILED: '[App Autoscaler] Get autoscaler health failed' -// }; - export const APP_AUTOSCALER_POLICY = '[New App Autoscaler] Fetch policy'; export const APP_AUTOSCALER_POLICY_TRIGGER = '[New App Autoscaler] Fetch policy trigger'; export const UPDATE_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Update policy'; @@ -144,8 +138,8 @@ export class GetAppAutoscalerScalingHistoryAction implements PaginatedAction { public paginationKey: string, public guid: string, public endpointGuid: string, - public normalFormat?, - public params?, + public normalFormat?: boolean, + public params?: AutoscalerPaginationParams, ) { this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid); } @@ -177,8 +171,8 @@ export abstract class GetAppAutoscalerMetricAction implements PaginatedAction { public endpointGuid: string, public metricName: string, public skipFormat: boolean, - public trigger, - public params + public trigger: AppScalingTrigger, + public params: AutoscalerPaginationParams, ) { this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(applicationSchemaKey, guid, metricName); } @@ -200,8 +194,8 @@ export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricActio public endpointGuid: string, public metricName: string, public skipFormat: boolean, - public trigger, - public params + public trigger: AppScalingTrigger, + public params: AutoscalerPaginationParams, ) { super(guid, endpointGuid, metricName, skipFormat, trigger, params); this.url = `apps/${guid}/metric/${metricName}`; diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts index 41cd75a4d4..d786943c17 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts @@ -1,7 +1,6 @@ import { AutoscalerQuery } from './app-autoscaler.actions'; export interface AppAutoscalerPolicy { - enabled: boolean; instance_min_count: number; instance_max_count: number; scaling_rules?: AppScalingRule[]; @@ -31,8 +30,8 @@ export interface AppScalingRule { } export interface AppScalingTrigger { - upper?: AppScalingRule[]; - lower?: AppScalingRule[]; + upper: AppScalingRule[]; + lower: AppScalingRule[]; query?: AutoscalerQuery; } @@ -49,6 +48,7 @@ export interface AppRecurringSchedule { } export interface AppAutoscalerPolicyLocal extends AppAutoscalerPolicy { + enabled: boolean; scaling_rules_form: AppScalingRule[]; scaling_rules_map: { [metricName: string]: AppScalingTrigger diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts index 7b2c762e19..03e76301f8 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts @@ -41,12 +41,17 @@ import { GetAppAutoscalerScalingHistoryAction, UPDATE_APP_AUTOSCALER_POLICY, UpdateAppAutoscalerPolicyAction, + AutoscalerPaginationParams, } from './app-autoscaler.actions'; import { AppAutoscalerFetchPolicyFailedResponse, AppAutoscalerMetricDataLocal, AppScalingTrigger, + AppAutoscalerMetricData, + AppAutoscalerPolicyLocal, + AppAutoscalerEvent, } from './app-autoscaler.types'; +import { PaginationResponse } from '../../../store/src/types/api.types'; const { proxyAPIVersion } = environment; const commonPrefix = `/pp/${proxyAPIVersion}/autoscaler`; @@ -82,9 +87,6 @@ export class AutoscalerEffects { result: [] } as NormalizedResponse; this.transformData(action.entityKey, mappedData, action.guid, healthInfo); - // if (healthInfo.uptime > 0 && action.onSucceed) { - // action.onSucceed(); - // } return [ new WrapperRequestActionSuccess(mappedData, action, actionType) ]; @@ -245,13 +247,14 @@ export class AutoscalerEffects { return this.http .request(new Request(options)).pipe( mergeMap(response => { - const data = response.json(); + const data: PaginationResponse = response.json(); const mappedData = { entities: { [action.entityKey]: {} }, result: [] } as NormalizedResponse; - this.addMetric(action.entityKey, mappedData, action.guid, action.metricName, data, - action.initialParams['start-time'], action.initialParams['end-time'], action.skipFormat, action.trigger); + this.addMetric( + action.entityKey, mappedData, action.guid, action.metricName, data, parseInt(action.initialParams['start-time'], 10), + parseInt(action.initialParams['end-time'], 10), action.skipFormat, action.trigger); return [ new WrapperRequestActionSuccess(mappedData, action, actionType) ]; @@ -314,8 +317,6 @@ export class AutoscalerEffects { } const response: AppAutoscalerFetchPolicyFailedResponse = { status: err.status, noPolicy }; - // const notFound = err.status === 404 && err._body === '{}'; - // err._body = notFound ? 'No policy is defined for this application.' : err._body; return [ new WrapperRequestActionFailed(createAutoscalerRequestMessage('fetch policy', err), getPolicyAction, actionType, null, response) ]; @@ -327,7 +328,7 @@ export class AutoscalerEffects { mappedData: NormalizedResponse>, appId: string, metricName: string, - data, + data: PaginationResponse, startTime: number, endTime: number, skipFormat: boolean, @@ -357,10 +358,10 @@ export class AutoscalerEffects { mappedData.result.push(appGuid); } - transformEventData(key: string, mappedData: NormalizedResponse, appGuid: string, data: any) { + transformEventData(key: string, mappedData: NormalizedResponse, appGuid: string, data: PaginationResponse) { mappedData.entities[key] = []; data.resources.forEach((item) => { - const id = AutoscalerConstants.createMetricId(appGuid, item.timestamp); + const id = AutoscalerConstants.createMetricId(appGuid, item.timestamp + ''); mappedData.entities[key][id] = { entity: item, metadata: { @@ -373,18 +374,19 @@ export class AutoscalerEffects { mappedData.result = Object.keys(mappedData.entities[key]); } - transformTriggerData(key: string, mappedData: NormalizedResponse, data: any, query: AutoscalerQuery, appGuid: string) { - mappedData.entities[key] = []; - Object.keys(data.scaling_rules_map).forEach((metricType) => { + transformTriggerData( + key: string, mappedData: NormalizedResponse, data: AppAutoscalerPolicyLocal, query: AutoscalerQuery, appGuid: string) { + mappedData.entities[key] = Object.keys(data.scaling_rules_map).reduce((entity, metricType) => { const id = AutoscalerConstants.createMetricId(appGuid, metricType); data.scaling_rules_map[metricType].query = query; - mappedData.entities[key][id] = { + entity[id] = { entity: data.scaling_rules_map[metricType], metadata: { guid: id } }; - }); + return entity; + }, []); mappedData.result = Object.keys(mappedData.entities[key]); } @@ -396,7 +398,7 @@ export class AutoscalerEffects { return headers; } - buildParams(initialParams, params?, paginationParams?) { + buildParams(initialParams: AutoscalerPaginationParams, params?: PaginationParam, paginationParams?: AutoscalerPaginationParams) { const searchParams = new URLSearchParams(); if (initialParams) { Object.keys(initialParams).forEach((key) => { diff --git a/src/frontend/packages/cf-autoscaler/src/styles.scss b/src/frontend/packages/cf-autoscaler/src/styles.scss index 93318a1c2d..8edf850b82 100644 --- a/src/frontend/packages/cf-autoscaler/src/styles.scss +++ b/src/frontend/packages/cf-autoscaler/src/styles.scss @@ -1,5 +1,5 @@ .autoscaler-policy-edit-specific-left { - mat-form-field { + .form-field-left { .mat-form-field-infix { width: unset; } diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts index 638bfd1751..7fcaa88c0c 100644 --- a/src/frontend/packages/core/src/core/extension/extension-service.ts +++ b/src/frontend/packages/core/src/core/extension/extension-service.ts @@ -80,7 +80,7 @@ export type StratosRouteType = StratosTabType | StratosActionType; export interface StratosExtensionRoutes { path: string; - component: Type; + component: any; } // Stores the extension metadata as defined by the decorators diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts index 46a063a85e..d1272517cd 100644 --- a/src/frontend/packages/core/src/core/utils.service.ts +++ b/src/frontend/packages/core/src/core/utils.service.ts @@ -280,7 +280,3 @@ export const sortStringify = (obj: { [key: string]: string }): string => { return res += `${key}-${obj[key]},`; }, ''); }; - -export function cloneObject(obj: any) { - return JSON.parse(JSON.stringify(obj)); -} diff --git a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss index 8685ed0699..e69de29bb2 100644 --- a/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss +++ b/src/frontend/packages/core/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.scss @@ -1,25 +0,0 @@ -// .app-table__content { -// mat-header-cell, -// mat-cell { -// flex-grow: 1; -// } - -// .cdk-column-actor_name { -// align-items: center; -// display: flex; -// flex-basis: 100px; -// flex-direction: row; -// } - -// .cdk-column-type { -// flex-basis: 100px; -// } - -// .cdk-column-detail { -// flex-grow: 3; - -// td { -// padding-right: 5px; -// } -// } -// } diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts index 37b41e95d1..0c8e42ffec 100644 --- a/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts +++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector-manager.service.ts @@ -65,8 +65,6 @@ export class MetricsRangeSelectorManagerService { this.startEnd[0], this.startEnd[1] ]; - // this.start = null; - // this.end = null; this.commitAction(action); }; } From 91d8ef664dfffb97ed66372afc0d9b27778f161b Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 19 Jun 2019 18:20:10 +0800 Subject: [PATCH 92/98] [autoscaler] add common 'refresh-icon' to use in autoscaler tab and list --- .../autoscaler-tab-extension.component.html | 12 +++---- .../autoscaler-tab-extension.component.scss | 21 ------------ .../edit-autoscaler-policy-step4.component.ts | 3 +- .../card-cf-recent-apps.component.html | 3 +- .../card-cf-recent-apps.component.scss | 21 ------------ .../list-data-source.ts | 3 -- .../components/list/list.component.html | 6 ++-- .../components/list/list.component.scss | 21 ------------ .../refresh-icon/refresh-icon.component.html | 2 ++ .../refresh-icon/refresh-icon.component.scss | 22 ++++++++++++ .../refresh-icon.component.spec.ts | 34 +++++++++++++++++++ .../refresh-icon/refresh-icon.component.ts | 17 ++++++++++ .../packages/core/src/shared/shared.module.ts | 3 ++ 13 files changed, 87 insertions(+), 81 deletions(-) create mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html create mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss create mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts create mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 23001a77b5..f7b2b80a5d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -72,8 +72,8 @@
-
- diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss index 051908a95a..4a6374eb18 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss +++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss @@ -20,27 +20,6 @@ margin-bottom: 0; } - .refresh-icon { - animation: spin .4s infinite linear; - animation-play-state: paused; - transform: rotate(0deg); - transition: transform 1s linear; - } - - .refreshing { - animation-play-state: running; - } - - @keyframes spin { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(359deg); - } - } - button { margin-right: -10px; margin-top: -10px; diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts index 27aa57b44a..eda6983908 100644 --- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts +++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts @@ -286,9 +286,6 @@ export abstract class ListDataSource extends DataSource implements if (Array.isArray(this.action)) { this.action.forEach(action => this.store.dispatch(action)); } else { - // Metrics actions that rely on a time window will dispatch the same action with a stale time window. To fix this we could do - // something similar to CfAppAutoscalerEventsDataSource (currently avoided due to updated ctor leading to wide scale change, - // alternatively could make helper function required a static) this.store.dispatch(this.metricsAction || this.masterAction); } }; diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.html b/src/frontend/packages/core/src/shared/components/list/list.component.html index 76c6316398..86a45b210a 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list.component.html @@ -141,8 +141,7 @@
@@ -152,8 +151,7 @@ *ngIf="dataSource.refresh && !(hasControls$ | async) && (!(hasRowsOrIsFiltering$ | async) && noEntries)">
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.scss b/src/frontend/packages/core/src/shared/components/list/list.component.scss index 3d57482830..2756aa86c1 100644 --- a/src/frontend/packages/core/src/shared/components/list/list.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list.component.scss @@ -155,24 +155,3 @@ margin: 24px; } } - -.refresh-icon { - animation: spin .4s infinite linear; - animation-play-state: paused; - transform: rotate(0deg); - transition: transform 1s linear; -} - -.refreshing { - animation-play-state: running; -} - -@keyframes spin { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(359deg); - } -} diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html new file mode 100644 index 0000000000..829a596763 --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html @@ -0,0 +1,2 @@ +refresh + \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss new file mode 100644 index 0000000000..33385874e5 --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss @@ -0,0 +1,22 @@ +.refresh-icon { + animation: spin .4s infinite linear; + animation-play-state: paused; + margin-bottom: 2px; + transform: rotate(0deg); + transition: transform 1s linear; + vertical-align: middle; +} + +.refreshing { + animation-play-state: running; +} + +@keyframes spin { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(359deg); + } +} diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts new file mode 100644 index 0000000000..c15163120b --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts @@ -0,0 +1,34 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RefreshIconComponent } from './refresh-icon.component'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MDAppModule } from '../../../core/md.module'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; + +describe('RefreshIconComponent', () => { + let component: RefreshIconComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [RefreshIconComponent], + imports: [ + FormsModule, + ReactiveFormsModule, + MDAppModule, + NoopAnimationsModule + ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RefreshIconComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts new file mode 100644 index 0000000000..982cd5a2ad --- /dev/null +++ b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts @@ -0,0 +1,17 @@ +import { Component, Input } from '@angular/core'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'refresh-icon', + templateUrl: './refresh-icon.component.html', + styleUrls: ['./refresh-icon.component.scss'] +}) +export class RefreshIconComponent { + + @Input() + public isRefreshing$: Observable; + + constructor() { + } + +} diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index 77a4c2a701..43a49ebb46 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -121,6 +121,7 @@ import { NestedTabsComponent } from './components/nested-tabs/nested-tabs.compon import { PageHeaderModule } from './components/page-header/page-header.module'; import { PageSubNavSectionComponent } from './components/page-sub-nav-section/page-sub-nav-section.component'; import { PageSubNavComponent } from './components/page-sub-nav/page-sub-nav.component'; +import { RefreshIconComponent } from './components/refresh-icon/refresh-icon.component'; import { RingChartComponent } from './components/ring-chart/ring-chart.component'; import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component'; import { RunningInstancesComponent } from './components/running-instances/running-instances.component'; @@ -290,6 +291,7 @@ import { UserPermissionDirective } from './user-permission.directive'; SimpleUsageChartComponent, PageSubNavComponent, BreadcrumbsComponent, + RefreshIconComponent, PageSubNavSectionComponent, EntitySummaryTitleComponent, MarkdownPreviewComponent, @@ -394,6 +396,7 @@ import { UserPermissionDirective } from './user-permission.directive'; MultilineTitleComponent, PageSubNavComponent, BreadcrumbsComponent, + RefreshIconComponent, PageSubNavSectionComponent, TileSelectorComponent, AddServiceInstanceBaseStepComponent, From 660826c473726a2a2e76f35079f60f122fb360c7 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Fri, 21 Jun 2019 12:35:24 +0800 Subject: [PATCH 93/98] [autoscaler] remove usage of deepclone and intIfUndefined --- .../autoscaler-transform-metric.ts | 27 ++-- .../autoscaler-transform-policy.spec.ts | 126 +----------------- .../autoscaler-transform-policy.ts | 31 ++--- .../autoscaler-helpers/autoscaler-util.ts | 31 ----- .../edit-autoscaler-policy-service.ts | 7 +- .../edit-autoscaler-policy-step2.component.ts | 10 +- .../edit-autoscaler-policy-step3.component.ts | 9 +- .../edit-autoscaler-policy-step4.component.ts | 17 ++- .../src/store/app-autoscaler.types.ts | 16 +++ .../card-cf-recent-apps.component.spec.ts | 2 + 10 files changed, 67 insertions(+), 209 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts index 1030dac093..88b6e9cb64 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts @@ -202,22 +202,21 @@ function executeCompare(val1: number, operator: string, val2: number): boolean { } } -function getColor(trigger: AppScalingTrigger, value: any): string { - const color = AutoscalerConstants.normalColor; - if (!Number.isNaN(value)) { - for (let i = 0; trigger.upper && trigger.upper.length > 0 && i < trigger.upper.length; i++) { - if (executeCompare(value, trigger.upper[i].operator, trigger.upper[i].threshold)) { - return trigger.upper[i].color; - } - } - for (let i = 0; trigger.lower && trigger.lower.length > 0 && i < trigger.lower.length; i++) { - const index = trigger.lower.length - 1 - i; - if (executeCompare(value, trigger.lower[index].operator, trigger.lower[index].threshold)) { - return trigger.lower[index].color; - } +function getColorCommon(triggerRules: AppScalingRule[], value: number, isLower?: boolean) { + for (let i = 0; triggerRules && triggerRules.length > 0 && i < triggerRules.length; i++) { + const index = isLower ? triggerRules.length - 1 - i : i; + if (executeCompare(value, triggerRules[index].operator, triggerRules[index].threshold)) { + return triggerRules[index].color; } } - return color; + return ''; +} + +function getColor(trigger: AppScalingTrigger, value: any): string { + if (Number.isNaN(value)) { + return AutoscalerConstants.normalColor; + } + return getColorCommon(trigger.upper, value) || getColorCommon(trigger.lower, value, true) || AutoscalerConstants.normalColor; } function getMetricBasicInfo( diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts index 65c74a95a6..9512064caf 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.spec.ts @@ -7,7 +7,7 @@ import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-a describe('Autoscaler Transform Policy Helper', () => { it('Test policy transformation', () => { - const arrayPolicy: AppAutoscalerPolicy = { + const arrayPolicy: AppAutoscalerPolicy = { instance_min_count: 1, instance_max_count: 10, scaling_rules: [ @@ -130,129 +130,9 @@ describe('Autoscaler Transform Policy Helper', () => { ] } }; - const mapPolicy: AppAutoscalerPolicyLocal = { + const { ...mapPolicy }: AppAutoscalerPolicyLocal = { + ...arrayPolicy, enabled: true, - instance_min_count: 1, - instance_max_count: 10, - scaling_rules: [ - { - metric_type: 'memoryused', - breach_duration_secs: 600, - threshold: 10, - operator: '<=', - cool_down_secs: 300, - adjustment: '-2' - }, - { - metric_type: 'memoryused', - breach_duration_secs: 600, - threshold: 30, - operator: '<', - cool_down_secs: 300, - adjustment: '-1' - }, - { - metric_type: 'memoryused', - breach_duration_secs: 600, - threshold: 120, - operator: '>', - cool_down_secs: 300, - adjustment: '+3' - }, - { - metric_type: 'memoryused', - breach_duration_secs: 600, - threshold: 90, - operator: '>=', - cool_down_secs: 300, - adjustment: '+2' - }, - { - metric_type: 'memoryused', - breach_duration_secs: 600, - threshold: 200, - operator: '>=', - cool_down_secs: 300, - adjustment: '+4' - }, - { - metric_type: 'memoryutil', - breach_duration_secs: 600, - threshold: 20, - operator: '<', - cool_down_secs: 300, - adjustment: '-3' - }, - { - metric_type: 'responsetime', - breach_duration_secs: 600, - threshold: 50, - operator: '>=', - cool_down_secs: 300, - adjustment: '+4' - }, - { - metric_type: 'responsetime', - breach_duration_secs: 600, - threshold: 40, - operator: '<', - cool_down_secs: 300, - adjustment: '-5' - }, - { - metric_type: 'memoryutil', - breach_duration_secs: 600, - threshold: 90, - operator: '>=', - cool_down_secs: 300, - adjustment: '+6' - } - ], - schedules: { - timezone: 'Asia/Shanghai', - recurring_schedule: [ - { - start_time: '10:00', - end_time: '18:00', - days_of_week: [ - 1, - 2, - 3 - ], - instance_min_count: 1, - instance_max_count: 10, - initial_min_instance_count: 5 - }, - { - start_date: '2099-06-27', - end_date: '2099-07-23', - start_time: '11:00', - end_time: '19:30', - days_of_month: [ - 5, - 15, - 25 - ], - instance_min_count: 3, - instance_max_count: 10 - } - ], - specific_date: [ - { - start_date_time: '2099-06-02T10:00', - end_date_time: '2099-06-15T13:59', - instance_min_count: 1, - instance_max_count: 4, - initial_min_instance_count: 2 - }, - { - start_date_time: '2099-01-04T20:00', - end_date_time: '2099-02-19T23:15', - instance_min_count: 2, - instance_max_count: 5 - } - ] - }, scaling_rules_map: { memoryused: { lower: [ diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts index 414ce6e735..ef37ce3d6d 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts @@ -6,16 +6,16 @@ import { AppScalingRule, AppScalingTrigger, } from '../../store/app-autoscaler.types'; -import { AutoscalerConstants, getScaleType, isEqual, deepClone } from './autoscaler-util'; +import { AutoscalerConstants, getScaleType, isEqual } from './autoscaler-util'; export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { - let newPolicy: AppAutoscalerPolicyLocal = { + const newPolicy: AppAutoscalerPolicyLocal = { ...policy, enabled: true, scaling_rules_map: {}, scaling_rules_form: [] }; - newPolicy = initIfUndefined(newPolicy, 'scaling_rules', []) as AppAutoscalerPolicyLocal; + newPolicy.scaling_rules = newPolicy.scaling_rules || []; newPolicy.scaling_rules.map((trigger) => { pushAndSortTrigger(newPolicy.scaling_rules_map, trigger.metric_type, trigger); }); @@ -31,9 +31,9 @@ export function autoscalerTransformArrayToMap(policy: AppAutoscalerPolicy) { } buildFormUponMap(newPolicy, metricName); }); - newPolicy = initIfUndefined(newPolicy, 'schedules', { timezone: moment.tz.guess() }); - newPolicy.schedules = initIfUndefined(newPolicy.schedules, 'recurring_schedule', []); - newPolicy.schedules = initIfUndefined(newPolicy.schedules, 'specific_date', []); + newPolicy.schedules = newPolicy.schedules || { timezone: moment.tz.guess() }; + newPolicy.schedules.recurring_schedule = newPolicy.schedules.recurring_schedule || []; + newPolicy.schedules.specific_date = newPolicy.schedules.specific_date || []; return newPolicy; } @@ -116,8 +116,9 @@ function hasNamedSchedule(schedule: any) { function pushAndSortTrigger(map: { [metricName: string]: AppScalingTrigger }, metricName: string, newTrigger: AppScalingRule) { const scaleType = getScaleType(newTrigger.operator); - newTrigger = initIfUndefined(newTrigger, 'breach_duration_secs', AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default); - newTrigger = initIfUndefined(newTrigger, 'cool_down_secs', AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default); + newTrigger.breach_duration_secs = + newTrigger.breach_duration_secs || AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_default; + newTrigger.cool_down_secs = newTrigger.cool_down_secs || AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_default; if (!map[metricName]) { map[metricName] = { upper: [], @@ -146,20 +147,6 @@ function buildFormUponMap(newPolicy: AppAutoscalerPolicyLocal, metricName: strin }); } -function initIfUndefined(fatherEntity: any, childName: string, defaultData: any) { - const entity = deepClone(fatherEntity); - if (entity[childName] === undefined || entity[childName] === '') { - entity[childName] = defaultData; - } - return entity; -} - -function deleteIf(fatherEntity: any, childName: string, condition: boolean) { - if (condition) { - delete fatherEntity[childName]; - } -} - export function isPolicyMapEqual(a: AppAutoscalerPolicyLocal, b: AppAutoscalerPolicyLocal) { return isEqual(autoscalerTransformMapToArray(a), autoscalerTransformMapToArray(b)); } diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index c308d505aa..c3f2898ea6 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -259,34 +259,3 @@ function getLeftOperator(operator: string): string { export function shiftArray(array: number[], step: number): number[] { return array.map(value => value + step); } - -export function deepClone(obj: any) { - let result = {}; - const oClass = isClass(obj); - if (oClass === 'Object') { - result = {}; - } else if (oClass === 'Array') { - result = []; - } else { - return obj; - } - Object.keys(obj).map((key, value) => { - const vClass = isClass(value); - if (vClass === 'Object' || vClass === 'Array') { - result[key] = deepClone(value); - } else { - result[key] = obj[key]; - } - }); - return result; -} - -function isClass(o: any) { - if (o === null) { - return 'Null'; - } - if (o === undefined) { - return 'Undefined'; - } - return Object.prototype.toString.call(o).slice(8, -1); -} diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts index 4ebf82e09a..4d5752f7b2 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.ts @@ -10,8 +10,6 @@ import { autoscalerTransformArrayToMap } from '../../core/autoscaler-helpers/aut import { GetAppAutoscalerPolicyAction } from '../../store/app-autoscaler.actions'; import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types'; import { appAutoscalerPolicySchemaKey } from '../../store/autoscaler.store.module'; -import { deepClone } from '../../core/autoscaler-helpers/autoscaler-util'; - @Injectable() export class EditAutoscalerPolicyService { @@ -54,8 +52,9 @@ export class EditAutoscalerPolicyService { })); } - setState(state: AppAutoscalerPolicy) { - this.stateSubject.next(deepClone(state)); + setState(state: AppAutoscalerPolicyLocal) { + const {...newState} = state; + this.stateSubject.next(newState); } getState(): Observable { diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index 7acb9756fb..a76a22497f 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -9,14 +9,13 @@ import { getAdjustmentType, getScaleType, PolicyAlert, - deepClone, } from '../../../core/autoscaler-helpers/autoscaler-util'; import { getThresholdMax, getThresholdMin, numberWithFractionOrExceedRange, } from '../../../core/autoscaler-helpers/autoscaler-validation'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerInvalidPolicyError } from '../../../store/app-autoscaler.types'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @@ -66,7 +65,8 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp } addTrigger = () => { - this.currentPolicy.scaling_rules_form.push(deepClone(AutoscalerConstants.PolicyDefaultTrigger)); + const {...newTrigger} = AutoscalerConstants.PolicyDefaultTrigger; + this.currentPolicy.scaling_rules_form.push(newTrigger); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); } @@ -142,7 +142,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp } const metricType = this.editTriggerForm.get('metric_type').value; this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; - const errors: any = {}; + const errors: AppAutoscalerInvalidPolicyError = {}; if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricType) >= 0) { if (numberWithFractionOrExceedRange(control.value, 1, 100, true)) { errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; @@ -163,7 +163,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp return null; } this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; - const errors: any = {}; + const errors: AppAutoscalerInvalidPolicyError = {}; const max = this.editAdjustmentType === 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; if (numberWithFractionOrExceedRange(control.value, 1, max, true)) { errors.alertInvalidPolicyTriggerStepRange = {}; diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts index 36932ffa4e..34eebe9b2b 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts @@ -5,14 +5,14 @@ import * as moment from 'moment-timezone'; import { Observable } from 'rxjs'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; -import { AutoscalerConstants, PolicyAlert, shiftArray, deepClone } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { AutoscalerConstants, PolicyAlert, shiftArray } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateIsAfter, numberWithFractionOrExceedRange, recurringSchedulesOverlapping, timeIsSameOrAfter, } from '../../../core/autoscaler-helpers/autoscaler-validation'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types'; +import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppAutoscalerInvalidPolicyError } from '../../../store/app-autoscaler.types'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; import { @@ -68,7 +68,8 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp } addRecurringSchedule = () => { - this.currentPolicy.schedules.recurring_schedule.push(deepClone(AutoscalerConstants.PolicyDefaultRecurringSchedule)); + const {...newSchedule} = AutoscalerConstants.PolicyDefaultRecurringSchedule; + this.currentPolicy.schedules.recurring_schedule.push(newSchedule); this.editRecurringSchedule(this.currentPolicy.schedules.recurring_schedule.length - 1); } @@ -185,7 +186,7 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp if (this.editEffectiveType === 'always') { return null; } - const errors: any = {}; + const errors: AppAutoscalerInvalidPolicyError = {}; if (dateIsAfter(moment().format(AutoscalerConstants.MomentFormateDate), control.value)) { errors.alertInvalidPolicyScheduleDateBeforeNow = { value: control.value }; } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts index ad3d54946f..f43e297500 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.ts @@ -12,14 +12,18 @@ import { ApplicationService } from '../../../../../core/src/features/application import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component'; import { AppState } from '../../../../../store/src/app-state'; import { entityFactory } from '../../../../../store/src/helpers/entity-factory'; -import { AutoscalerConstants, PolicyAlert, deepClone } from '../../../core/autoscaler-helpers/autoscaler-util'; +import { AutoscalerConstants, PolicyAlert } from '../../../core/autoscaler-helpers/autoscaler-util'; import { dateTimeIsSameOrAfter, numberWithFractionOrExceedRange, specificDateRangeOverlapping, } from '../../../core/autoscaler-helpers/autoscaler-validation'; -import { GetAppAutoscalerPolicyAction, UpdateAppAutoscalerPolicyAction } from '../../../store/app-autoscaler.actions'; -import { AppAutoscalerPolicy, AppAutoscalerPolicyLocal, AppSpecificDate } from '../../../store/app-autoscaler.types'; +import { UpdateAppAutoscalerPolicyAction } from '../../../store/app-autoscaler.actions'; +import { + AppAutoscalerPolicy, + AppAutoscalerPolicyLocal, + AppSpecificDate, + AppAutoscalerInvalidPolicyError } from '../../../store/app-autoscaler.types'; import { appAutoscalerPolicySchemaKey } from '../../../store/autoscaler.store.module'; import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step'; import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service'; @@ -123,7 +127,8 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp } addSpecificDate = () => { - this.currentPolicy.schedules.specific_date.push(deepClone(AutoscalerConstants.PolicyDefaultSpecificDate)); + const {...newSchedule} = AutoscalerConstants.PolicyDefaultSpecificDate; + this.currentPolicy.schedules.specific_date.push(newSchedule); this.editSpecificDate(this.currentPolicy.schedules.specific_date.length - 1); } @@ -178,7 +183,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp if (!this.editSpecificDateForm) { return null; } - const errors: any = {}; + const errors: AppAutoscalerInvalidPolicyError = {}; const newSchedule: AppSpecificDate = { instance_min_count: 0, instance_max_count: 0, @@ -211,7 +216,7 @@ export class EditAutoscalerPolicyStep4Component extends EditAutoscalerPolicy imp if (!this.editSpecificDateForm) { return null; } - const errors: any = {}; + const errors: AppAutoscalerInvalidPolicyError = {}; const newSchedule = { instance_min_count: 0, instance_max_count: 0, diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts index d786943c17..d7cb19c63d 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts @@ -137,3 +137,19 @@ export interface AppAutoscalerFetchPolicyFailedResponse { noPolicy: boolean; } +export interface AppAutoscalerInvalidPolicyError { + alertInvalidPolicyTriggerThreshold100?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyTriggerThresholdRange?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyTriggerStepRange?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleDateBeforeNow?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleEndDateBeforeStartDate?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleStartDateTimeBeforeNow?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleEndDateTimeBeforeStartDateTime?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleSpecificConflict?: AppAutoscalerInvalidPolicyErrorEntity; + alertInvalidPolicyScheduleEndDateTimeBeforeNow?: AppAutoscalerInvalidPolicyErrorEntity; +} + +export interface AppAutoscalerInvalidPolicyErrorEntity { + value?: string | number; +} + diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts index 2000b04db6..414fb938d2 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts @@ -9,6 +9,7 @@ import { ApplicationStateIconPipe } from '../../application-state/application-st import { StatefulIconComponent } from '../../../../core/stateful-icon/stateful-icon.component'; import { CardCfRecentAppsComponent } from './card-cf-recent-apps.component'; import { CompactAppCardComponent } from './compact-app-card/compact-app-card.component'; +import { RefreshIconComponent } from '../../refresh-icon/refresh-icon.component'; import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; import { ActiveRouteCfOrgSpace } from '../../../../features/cloud-foundry/cf-page.types'; import { EntityMonitorFactory } from '../../../monitors/entity-monitor.factory.service'; @@ -25,6 +26,7 @@ describe('CardCfRecentAppsComponent', () => { CardCfRecentAppsComponent, ApplicationStateIconComponent, CompactAppCardComponent, + RefreshIconComponent, ApplicationStateIconPipe ], imports: [...BaseTestModulesNoShared], From efeac40529016f8d12543117f90b6f0516e05be8 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Wed, 26 Jun 2019 10:01:41 +0800 Subject: [PATCH 94/98] [autoscaler] fix policy validation bugs --- .../autoscaler-helpers/autoscaler-util.ts | 8 +++++ .../autoscaler-validation.ts | 4 +++ .../autoscaler-tab-extension.component.html | 5 +-- .../autoscaler-tab-extension.component.ts | 5 +++ ...dit-autoscaler-policy-step2.component.html | 7 ++-- .../edit-autoscaler-policy-step2.component.ts | 36 +++++++++++++------ 6 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts index c3f2898ea6..46fd4b6d21 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts @@ -88,6 +88,14 @@ export class AutoscalerConstants { } }; + public static getMetricUnit(metricType: string) { + if (AutoscalerConstants.metricMap[metricType]) { + return AutoscalerConstants.metricMap[metricType].unit_internal; + } else { + return ''; + } + } + public static createMetricId(appGuid: string, metricType: string): string { return appGuid + ':' + metricType; } diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts index c7b31f9c7c..2f9f60de3f 100644 --- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts +++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts @@ -110,6 +110,8 @@ export function getThresholdMin(policyTriggers: AppScalingRule[], metricType: st if (triggerIndex !== index && trigger.metric_type === metricType && AutoscalerConstants.LowerOperators.indexOf(trigger.operator) >= 0) { return Math.max(trigger.threshold + 1, thresholdMin); + } else { + return thresholdMin; } }, 1); } else { @@ -123,6 +125,8 @@ export function getThresholdMax(policyTriggers: AppScalingRule[], metricType: st if (triggerIndex !== index && trigger.metric_type === metricType && AutoscalerConstants.UpperOperators.indexOf(trigger.operator) >= 0) { return Math.min(trigger.threshold - 1, thresholdMax); + } else { + return thresholdMax; } }, Number.MAX_VALUE); } else { diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index f7b2b80a5d..0e86397d2d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -98,7 +98,8 @@ Condition - {{element.operator}} {{element.threshold}} for + + {{element.operator}}{{element.threshold}}{{getMetricUnit(element.metric_type)}} for {{element.breach_duration_secs}} secs. @@ -167,7 +168,7 @@ Effective Duration {{ element.start_date? element.start_date + ' ~ ' + - element.end_date : 'Aways'}} + element.end_date : 'Always'}} Repeats On diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts index 9c36a75f39..b011679585 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts @@ -326,4 +326,9 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy { this.paramsHistory['end-time'] = (new Date()).getTime().toString() + '000000'; this.store.dispatch(this.scalingHistoryAction); } + + getMetricUnit(metricType: string) { + return AutoscalerConstants.getMetricUnit(metricType); + } + } diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html index 1f4cc99811..5f15c5934d 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html @@ -10,8 +10,9 @@
- If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} for {{rule.breach_duration_secs}} - seconds, then {{rule.adjustment}} instances. Cooldown: {{rule.cool_down_secs}} seconds. + If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} {{getMetricUnit(rule.metric_type)}} + for {{rule.breach_duration_secs}} seconds, then {{rule.adjustment}} instances. Cooldown: + {{rule.cool_down_secs}} seconds.
@@ -33,7 +34,7 @@ - for + {{getMetricUnit(rule.metric_type)}} for diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts index a76a22497f..29165b0c00 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts +++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts @@ -38,6 +38,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp public currentPolicy: AppAutoscalerPolicyLocal; public testing = false; private editIndex = -1; + private editMetricType = ''; private editScaleType = 'upper'; private editAdjustmentType = 'value'; @@ -60,12 +61,12 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp Validators.min(AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_min), Validators.max(AutoscalerConstants.PolicyDefaultSetting.cool_down_secs_max) ]], - adjustment_type: [0] + adjustment_type: [0, this.validateTriggerAdjustmentType()] }); } addTrigger = () => { - const {...newTrigger} = AutoscalerConstants.PolicyDefaultTrigger; + const { ...newTrigger } = AutoscalerConstants.PolicyDefaultTrigger; this.currentPolicy.scaling_rules_form.push(newTrigger); this.editTrigger(this.currentPolicy.scaling_rules_form.length - 1); } @@ -79,16 +80,17 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp editTrigger(index: number) { this.editIndex = index; + this.editMetricType = this.currentPolicy.scaling_rules_form[index].metric_type; this.editScaleType = getScaleType(this.currentPolicy.scaling_rules_form[index].operator); this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment); this.editTriggerForm.setValue({ - metric_type: this.currentPolicy.scaling_rules_form[index].metric_type, + metric_type: this.editMetricType, operator: this.currentPolicy.scaling_rules_form[index].operator, threshold: this.currentPolicy.scaling_rules_form[index].threshold, adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)), breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs, cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs, - adjustment_type: this.currentPolicy.scaling_rules_form[index].adjustment.indexOf('%') >= 0 ? 'percentage' : 'value' + adjustment_type: this.editAdjustmentType }); } @@ -119,6 +121,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp validateTriggerMetricType(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (this.editTriggerForm) { + this.editMetricType = control.value; this.editTriggerForm.controls.threshold.updateValueAndValidity(); } return null; @@ -128,7 +131,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp validateTriggerOperator(): ValidatorFn { return (control: AbstractControl): { [key: string]: any } => { if (this.editTriggerForm) { - this.editScaleType = getScaleType(this.editTriggerForm.get('operator').value); + this.editScaleType = getScaleType(control.value); this.editTriggerForm.controls.threshold.updateValueAndValidity(); } return null; @@ -140,16 +143,14 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp if (!this.editTriggerForm) { return null; } - const metricType = this.editTriggerForm.get('metric_type').value; - this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; const errors: AppAutoscalerInvalidPolicyError = {}; - if (AutoscalerConstants.MetricPercentageTypes.indexOf(metricType) >= 0) { + if (AutoscalerConstants.MetricPercentageTypes.indexOf(this.editMetricType) >= 0) { if (numberWithFractionOrExceedRange(control.value, 1, 100, true)) { errors.alertInvalidPolicyTriggerThreshold100 = { value: control.value }; } } - const thresholdMin = getThresholdMin(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); - const thresholdMax = getThresholdMax(this.currentPolicy.scaling_rules_form, metricType, this.editScaleType, this.editIndex); + const thresholdMin = getThresholdMin(this.currentPolicy.scaling_rules_form, this.editMetricType, this.editScaleType, this.editIndex); + const thresholdMax = getThresholdMax(this.currentPolicy.scaling_rules_form, this.editMetricType, this.editScaleType, this.editIndex); if (numberWithFractionOrExceedRange(control.value, thresholdMin, thresholdMax, true)) { errors.alertInvalidPolicyTriggerThresholdRange = { value: control.value }; } @@ -162,7 +163,6 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp if (!this.editTriggerForm) { return null; } - this.editAdjustmentType = this.editTriggerForm.get('adjustment_type').value; const errors: AppAutoscalerInvalidPolicyError = {}; const max = this.editAdjustmentType === 'value' ? this.currentPolicy.instance_max_count - 1 : Number.MAX_VALUE; if (numberWithFractionOrExceedRange(control.value, 1, max, true)) { @@ -171,4 +171,18 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp return Object.keys(errors).length === 0 ? null : errors; }; } + + validateTriggerAdjustmentType(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } => { + if (this.editTriggerForm) { + this.editAdjustmentType = control.value; + this.editTriggerForm.controls.adjustment.updateValueAndValidity(); + } + return null; + }; + } + + getMetricUnit(metricType: string) { + return AutoscalerConstants.getMetricUnit(metricType); + } } From c05f44f43193e83ff071ad953ee3e3dbfd7a6fcb Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 16 Jul 2019 11:52:30 +0100 Subject: [PATCH 95/98] Update package lock --- package-lock.json | 157 +++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb3e0e6adf..883f5a5341 100644 --- a/package-lock.json +++ b/package-lock.json @@ -599,7 +599,7 @@ "cli-width": "2.2.0", "external-editor": "3.0.3", "figures": "2.0.0", - "lodash": "4.17.11", + "lodash": "4.17.10", "mute-stream": "0.0.7", "run-async": "2.3.0", "rxjs": "6.3.3", @@ -630,8 +630,7 @@ "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", - "dev": true + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, "mute-stream": { "version": "0.0.7", @@ -1326,7 +1325,7 @@ }, "yargs": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", + "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz", "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "dev": true, "requires": { @@ -1357,7 +1356,7 @@ }, "yargs-parser": { "version": "10.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz", + "resolved": "http://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz", "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==", "dev": true, "requires": { @@ -2019,7 +2018,6 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, - "optional": true, "requires": { "kind-of": "3.2.2", "longest": "1.0.1", @@ -2031,7 +2029,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { "is-buffer": "1.1.6" } @@ -2572,7 +2569,7 @@ "babel-types": "6.26.0", "detect-indent": "4.0.0", "jsesc": "1.3.0", - "lodash": "4.17.11", + "lodash": "4.17.10", "source-map": "0.5.7", "trim-right": "1.0.1" }, @@ -2620,7 +2617,7 @@ "babel-traverse": "6.26.0", "babel-types": "6.26.0", "babylon": "6.18.0", - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "babel-traverse": { @@ -2637,7 +2634,7 @@ "debug": "2.6.9", "globals": "9.18.0", "invariant": "2.2.4", - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "babel-types": { @@ -2648,7 +2645,7 @@ "requires": { "babel-runtime": "6.26.0", "esutils": "2.0.2", - "lodash": "4.17.11", + "lodash": "4.17.10", "to-fast-properties": "1.0.3" }, "dependencies": { @@ -3617,7 +3614,7 @@ "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "combined-stream": { @@ -5203,7 +5200,7 @@ "js-yaml": "3.13.1", "json-stable-stringify": "1.0.1", "levn": "0.3.0", - "lodash": "4.17.11", + "lodash": "4.17.10", "mkdirp": "0.5.1", "optionator": "0.8.2", "path-is-absolute": "1.0.1", @@ -5863,7 +5860,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.1" } }, "global-modules": { @@ -5872,9 +5869,9 @@ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "1.0.2", + "is-windows": "1.0.2", + "resolve-dir": "1.0.1" } }, "global-prefix": { @@ -5883,11 +5880,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" + "expand-tilde": "2.0.2", + "homedir-polyfill": "1.0.1", + "ini": "1.3.5", + "is-windows": "1.0.2", + "which": "1.3.1" } }, "resolve-dir": { @@ -5896,8 +5893,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" + "expand-tilde": "2.0.2", + "global-modules": "1.0.0" } } } @@ -5921,7 +5918,7 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "^1.0.1" + "homedir-polyfill": "1.0.1" } } } @@ -6194,8 +6191,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -6213,13 +6209,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -6232,18 +6226,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -6346,8 +6337,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -6357,7 +6347,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "1.0.1" } @@ -6370,20 +6359,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "1.1.11" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "5.1.2", "yallist": "3.0.3" @@ -6400,7 +6386,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6473,8 +6458,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -6484,7 +6468,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1.0.2" } @@ -6560,8 +6543,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -6591,7 +6573,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -6609,7 +6590,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "2.1.1" } @@ -6648,13 +6628,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } }, @@ -6900,7 +6878,7 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.11", + "lodash": "4.17.10", "minimatch": "3.0.4" }, "dependencies": { @@ -6995,9 +6973,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" } }, "gulp-cli": { @@ -7038,19 +7016,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "5.0.0" } } } @@ -7431,7 +7409,7 @@ "requires": { "http-proxy": "1.17.0", "is-glob": "4.0.0", - "lodash": "4.17.11", + "lodash": "4.17.10", "micromatch": "3.1.10" }, "dependencies": { @@ -7689,7 +7667,7 @@ "cli-cursor": "1.0.2", "cli-width": "2.2.0", "figures": "1.7.0", - "lodash": "4.17.11", + "lodash": "4.17.10", "readline2": "1.0.1", "run-async": "0.1.0", "rx-lite": "3.1.2", @@ -8203,7 +8181,7 @@ "escodegen": "1.8.1", "esprima": "2.7.3", "glob": "5.0.15", - "handlebars": "4.0.11", + "handlebars": "4.1.1", "js-yaml": "3.13.1", "mkdirp": "0.5.1", "nopt": "3.0.6", @@ -8290,7 +8268,7 @@ "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "debug": { @@ -8703,7 +8681,7 @@ "graceful-fs": "4.1.11", "http-proxy": "1.17.0", "isbinaryfile": "3.0.3", - "lodash": "4.17.11", + "lodash": "4.17.13", "log4js": "3.0.6", "mime": "2.4.0", "minimatch": "3.0.4", @@ -8723,7 +8701,7 @@ "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "circular-json": { @@ -8822,7 +8800,7 @@ "date-format": "2.0.0", "debug": "3.2.6", "fs-extra": "7.0.1", - "lodash": "4.17.11" + "lodash": "4.17.13" } } } @@ -9133,8 +9111,7 @@ "lodash": { "version": "4.17.13", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==", - "dev": true + "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==" }, "lodash-es": { "version": "4.17.14", @@ -9234,8 +9211,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true, - "optional": true + "dev": true }, "loose-envify": { "version": "1.3.1", @@ -10147,9 +10123,8 @@ }, "ngrx-store-localstorage": { "version": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9", - "from": "github:cf-stratos/ngrx-store-localstorage#e722ed60861d49bec99482ac54f13e7485bb0ac9", "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "ngx-moment": { @@ -10704,7 +10679,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -12738,7 +12713,7 @@ "dev": true, "requires": { "glob": "7.1.2", - "lodash": "4.17.11", + "lodash": "4.17.10", "scss-tokenizer": "0.2.3", "yargs": "7.1.0" }, @@ -13721,7 +13696,7 @@ "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "statuses": { @@ -14104,7 +14079,7 @@ "ajv": "4.11.8", "ajv-keywords": "1.5.1", "chalk": "1.1.3", - "lodash": "4.17.11", + "lodash": "4.17.10", "slice-ansi": "0.0.4", "string-width": "2.1.1" }, @@ -14234,7 +14209,7 @@ "dependencies": { "rimraf": { "version": "2.5.4", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", + "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz", "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=", "dev": true, "requires": { @@ -15802,7 +15777,7 @@ "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { - "lodash": "4.17.11" + "lodash": "4.17.13" } }, "webpack-sources": { From f24d1647958a085601c363b3d77b1bbdb8074ff8 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 22 Jul 2019 14:30:23 +0100 Subject: [PATCH 96/98] Fix syntax error --- .../cloud-foundry-space-base.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts index 3332f1692a..f6d56c1727 100644 --- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts +++ b/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts @@ -138,8 +138,8 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy { this.tabLinks.push({ link: 'space-quota', label: 'Quota', - matIcon: 'data_usage', - hidden: of(!space.entity.entity.space_quota_definition) + icon: 'data_usage', + hidden$: of(!space.entity.entity.space_quota_definition) }); this.tabLinks = this.tabLinks.concat(getTabsFromExtensions(StratosTabType.CloudFoundrySpace)); }), From 87745f1b907f82b447f6af41cad7697ec3eeca24 Mon Sep 17 00:00:00 2001 From: zyjiaobj Date: Tue, 23 Jul 2019 11:14:10 +0800 Subject: [PATCH 97/98] [autoscaler] using app-polling-indicator to replace refresh-icon --- .../autoscaler-tab-extension.component.html | 13 ++++--- .../card-cf-recent-apps.component.html | 5 ++- .../card-cf-recent-apps.component.spec.ts | 4 +-- .../refresh-icon/refresh-icon.component.html | 2 -- .../refresh-icon/refresh-icon.component.scss | 22 ------------ .../refresh-icon.component.spec.ts | 34 ------------------- .../refresh-icon/refresh-icon.component.ts | 17 ---------- .../packages/core/src/shared/shared.module.ts | 3 -- 8 files changed, 10 insertions(+), 90 deletions(-) delete mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html delete mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss delete mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts delete mode 100644 src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index 0e86397d2d..c3e2982f10 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -72,9 +72,8 @@
- + + @@ -249,10 +248,10 @@
- + + diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.html b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.html index c60e4476b3..f26820ae69 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.html +++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.html @@ -2,9 +2,8 @@ Recently updated applications - +
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts index 414fb938d2..c6531ceb41 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.spec.ts @@ -9,12 +9,12 @@ import { ApplicationStateIconPipe } from '../../application-state/application-st import { StatefulIconComponent } from '../../../../core/stateful-icon/stateful-icon.component'; import { CardCfRecentAppsComponent } from './card-cf-recent-apps.component'; import { CompactAppCardComponent } from './compact-app-card/compact-app-card.component'; -import { RefreshIconComponent } from '../../refresh-icon/refresh-icon.component'; import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service'; import { ActiveRouteCfOrgSpace } from '../../../../features/cloud-foundry/cf-page.types'; import { EntityMonitorFactory } from '../../../monitors/entity-monitor.factory.service'; import { CfUserService } from '../../../data-services/cf-user.service'; import { PaginationMonitorFactory } from '../../../monitors/pagination-monitor.factory'; +import { PollingIndicatorComponent } from '../../polling-indicator/polling-indicator.component'; describe('CardCfRecentAppsComponent', () => { let component: CardCfRecentAppsComponent; @@ -26,7 +26,7 @@ describe('CardCfRecentAppsComponent', () => { CardCfRecentAppsComponent, ApplicationStateIconComponent, CompactAppCardComponent, - RefreshIconComponent, + PollingIndicatorComponent, ApplicationStateIconPipe ], imports: [...BaseTestModulesNoShared], diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html deleted file mode 100644 index 829a596763..0000000000 --- a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.html +++ /dev/null @@ -1,2 +0,0 @@ -refresh - \ No newline at end of file diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss deleted file mode 100644 index 33385874e5..0000000000 --- a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.scss +++ /dev/null @@ -1,22 +0,0 @@ -.refresh-icon { - animation: spin .4s infinite linear; - animation-play-state: paused; - margin-bottom: 2px; - transform: rotate(0deg); - transition: transform 1s linear; - vertical-align: middle; -} - -.refreshing { - animation-play-state: running; -} - -@keyframes spin { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(359deg); - } -} diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts deleted file mode 100644 index c15163120b..0000000000 --- a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { RefreshIconComponent } from './refresh-icon.component'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; -import { MDAppModule } from '../../../core/md.module'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; - -describe('RefreshIconComponent', () => { - let component: RefreshIconComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [RefreshIconComponent], - imports: [ - FormsModule, - ReactiveFormsModule, - MDAppModule, - NoopAnimationsModule - ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(RefreshIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts b/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts deleted file mode 100644 index 982cd5a2ad..0000000000 --- a/src/frontend/packages/core/src/shared/components/refresh-icon/refresh-icon.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'refresh-icon', - templateUrl: './refresh-icon.component.html', - styleUrls: ['./refresh-icon.component.scss'] -}) -export class RefreshIconComponent { - - @Input() - public isRefreshing$: Observable; - - constructor() { - } - -} diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts index a12b1a805a..0e2a188f6d 100644 --- a/src/frontend/packages/core/src/shared/shared.module.ts +++ b/src/frontend/packages/core/src/shared/shared.module.ts @@ -122,7 +122,6 @@ import { NestedTabsComponent } from './components/nested-tabs/nested-tabs.compon import { PageHeaderModule } from './components/page-header/page-header.module'; import { PageSubNavSectionComponent } from './components/page-sub-nav-section/page-sub-nav-section.component'; import { PageSubNavComponent } from './components/page-sub-nav/page-sub-nav.component'; -import { RefreshIconComponent } from './components/refresh-icon/refresh-icon.component'; import { PollingIndicatorComponent } from './components/polling-indicator/polling-indicator.component'; import { RingChartComponent } from './components/ring-chart/ring-chart.component'; import { RoutingIndicatorComponent } from './components/routing-indicator/routing-indicator.component'; @@ -295,7 +294,6 @@ import { UserPermissionDirective } from './user-permission.directive'; SimpleUsageChartComponent, PageSubNavComponent, BreadcrumbsComponent, - RefreshIconComponent, PageSubNavSectionComponent, EntitySummaryTitleComponent, MarkdownPreviewComponent, @@ -403,7 +401,6 @@ import { UserPermissionDirective } from './user-permission.directive'; MultilineTitleComponent, PageSubNavComponent, BreadcrumbsComponent, - RefreshIconComponent, PageSubNavSectionComponent, TileSelectorComponent, AddServiceInstanceBaseStepComponent, From 25db26330054838b458ac35e87ed525e67319dda Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 23 Jul 2019 11:53:04 +0100 Subject: [PATCH 98/98] Tidy up some styling - Ensure autoscaller tiles take up full width when page is shrunk horizontally - position of polling indicator on recent apps - app-tile margin removed from top and added to bottom (fixes app/cf summary pages) - added min height to latest metrics card to avoid vertical wibble on refresh --- .../autoscaler-tab-extension.component.html | 6 ++--- .../autoscaler-tab-extension.component.scss | 24 ++++--------------- .../card-cf-recent-apps.component.scss | 2 +- .../tile/tile-group/tile-group.component.scss | 4 ++-- .../tile/tile-group/tile-group.component.ts | 17 +++++++++---- 5 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html index c3e2982f10..1ea6e15f7a 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html @@ -45,10 +45,10 @@ - + - + @@ -83,7 +83,7 @@
- + Scaling Rules diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss index f7adfc5b10..2388c6fd13 100644 --- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss +++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.scss @@ -15,6 +15,10 @@ .autoscaler-tab-table-no-record { margin-top: .5em; } + + &__latest-metrics { + min-height: 200px; + } } .app-metadata { @@ -47,26 +51,6 @@ table { } } -.autoscaler-tab-policy { - margin-bottom: 24px; -} - -.autoscaler-tab-policy-left { - flex: 0 0 40%; -} - -.autoscaler-tab-tile { - &-1of2 { - flex: 0 0 50%; - } - &-1of3 { - flex: 0 0 30%; - } - &-1of6 { - flex: 0 0 16.78%; - } -} - .autoscaler-tile-events { &__header { display: flex; diff --git a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss index 4a6374eb18..e6f70f9ab0 100644 --- a/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss +++ b/src/frontend/packages/core/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.scss @@ -20,7 +20,7 @@ margin-bottom: 0; } - button { + app-polling-indicator { margin-right: -10px; margin-top: -10px; } diff --git a/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.scss b/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.scss index b451961147..efdca086ef 100644 --- a/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.scss +++ b/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.scss @@ -30,8 +30,8 @@ app-tile-group { margin-left: -$tile-grid-gutter; app-tile { - $top-bottom: $tile-grid-gutter / 2; - padding: $top-bottom 0 $top-bottom $tile-grid-gutter; + // $top-bottom: $tile-grid-gutter / 2; + padding: 0 0 $tile-grid-gutter $tile-grid-gutter; } } } diff --git a/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.ts b/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.ts index c897162a1f..69fb73d1bc 100644 --- a/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.ts +++ b/src/frontend/packages/core/src/shared/components/tile/tile-group/tile-group.component.ts @@ -1,7 +1,14 @@ -import { Component, OnInit, AfterContentInit, HostBinding, ContentChildren, QueryList, ViewEncapsulation } from '@angular/core'; - -import { TileComponent} from '../tile/tile.component'; -import { Subscription } from 'rxjs'; +import { + AfterContentInit, + Component, + ContentChildren, + HostBinding, + OnInit, + QueryList, + ViewEncapsulation, +} from '@angular/core'; + +import { TileComponent } from '../tile/tile.component'; @Component({ selector: 'app-tile-group', @@ -23,7 +30,7 @@ export class TileGroupComponent implements OnInit, AfterContentInit { @ContentChildren(TileComponent) tiles: QueryList; - ngOnInit() {} + ngOnInit() { } ngAfterContentInit() { this.isSixColumn = (this.tiles.length === 6);