From b8d0dd57944ba367d5acc2fbdcb475247abf4f95 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 5 May 2020 17:21:30 +0100 Subject: [PATCH 01/14] Fix row highlight (see app github tab commit table) - wasn't showing after list in list changes - fixes #4243 --- .../list/list-table/table-row/table-row.component.html | 4 ++-- .../list/list-table/table-row/table-row.component.scss | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html index a9cd96a7f3..be2ec31af4 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html @@ -1,5 +1,5 @@
+ [ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__warning': inWarningState$ | async,'table-row-wrapper__errored': inErrorState$ | async }">
Deleting
@@ -11,7 +11,7 @@
+ [hideToggle]="true" [ngClass]="{'table-row-wrapper__highlighted': isHighlighted$ | async}"> Date: Wed, 6 May 2020 09:07:14 +0100 Subject: [PATCH 02/14] Improve metrics view --- .../cf-endpoint-details.component.scss | 2 +- .../packages/core/sass/_all-theme.scss | 4 +- .../packages/core/src/base-entity-types.ts | 10 ++- .../metrics-endpoint-details.component.html | 9 ++ .../metrics-endpoint-details.component.scss | 16 ++++ ...metrics-endpoint-details.component.spec.ts | 31 +++++++ .../metrics-endpoint-details.component.ts | 75 ++++++++++++++++ .../src/features/metrics/metrics.helpers.ts | 74 +++++++++++++++ .../src/features/metrics/metrics.module.ts | 15 ++-- .../metrics/metrics/metrics.component.html | 90 ++++++++++--------- .../metrics/metrics/metrics.component.scss | 80 ++++++++++++++++- .../metrics/metrics.component.theme.scss | 15 ++++ .../metrics/metrics/metrics.component.ts | 61 ++++++------- .../store/src/actions/metrics-api.actions.ts | 18 +++- .../store/src/effects/metrics.effects.ts | 4 +- .../src/reducers/system-endpoints.reducer.ts | 13 +++ .../store/src/types/endpoint.types.ts | 5 +- 17 files changed, 432 insertions(+), 90 deletions(-) create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts create mode 100644 src/frontend/packages/core/src/features/metrics/metrics.helpers.ts create mode 100644 src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss index 5b7707aa0e..4a125b2a60 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss +++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss @@ -11,6 +11,6 @@ align-items: center; display: flex; justify-content: center; - width: 32px; + margin-right: 8px; } } diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss index a6fdef57e5..4f657dbc93 100644 --- a/src/frontend/packages/core/sass/_all-theme.scss +++ b/src/frontend/packages/core/sass/_all-theme.scss @@ -67,6 +67,7 @@ @import '../../cloud-foundry/src/features/applications/application-wall/application-wall.component.theme'; @import '../../core/src/features/error-page/error-page/error-page.component.theme'; @import '../../core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme'; +@import '../../core/src/features/metrics/metrics/metrics.component.theme'; // Defaults $side-nav-light-text: #fff; @@ -160,7 +161,8 @@ $side-nav-light-active: #484848; @include code-block-theme($theme, $app-theme); @include copy-to-clipboard-theme($theme, $app-theme); @include app-user-avatar-theme($theme, $app-theme); - @include restore-endpoints-theme($theme, $app-theme) + @include restore-endpoints-theme($theme, $app-theme); + @include metrics-component-theme($theme, $app-theme); } @function app-generate-nav-theme($theme, $nav-theme: null) { diff --git a/src/frontend/packages/core/src/base-entity-types.ts b/src/frontend/packages/core/src/base-entity-types.ts index 33ba893917..37f2c840ac 100644 --- a/src/frontend/packages/core/src/base-entity-types.ts +++ b/src/frontend/packages/core/src/base-entity-types.ts @@ -1,8 +1,9 @@ -import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer'; +import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity'; import { addOrUpdateUserFavoriteMetadataReducer, deleteUserFavoriteMetadataReducer, } from '../../store/src/reducers/favorite.reducer'; +import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer'; import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE, @@ -10,8 +11,10 @@ import { userFavoritesEntitySchema, userProfileEntitySchema, } from './base-entity-schemas'; -import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity'; import { BaseEndpointAuth } from './features/endpoints/endpoint-auth'; +import { + MetricsEndpointDetailsComponent, +} from './features/metrics/metrics-endpoint-details/metrics-endpoint-details.component'; // // These types are used to represent the base stratos types. @@ -94,7 +97,8 @@ export function generateStratosEntities() { tokenSharing: true, logoUrl: '/core/assets/endpoint-icons/metrics.svg', authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None], - renderPriority: 1 + renderPriority: 1, + listDetailsComponent: MetricsEndpointDetailsComponent, }, metadata => `/endpoints/metrics/${metadata.guid}` ) diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html new file mode 100644 index 0000000000..d15144178e --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html @@ -0,0 +1,9 @@ +
+
+ warning + {{ info.ok }} + / {{info.total}} + sources + source +
+
diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss new file mode 100644 index 0000000000..c18a9f0f79 --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss @@ -0,0 +1,16 @@ +.metrics-details { + display: flex; + flex-direction: column; + + &__line { + align-items: center; + display: flex; + } + + &__icon { + align-items: center; + display: flex; + justify-content: center; + margin-right: 8px; + } +} diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts new file mode 100644 index 0000000000..5676ad6173 --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts @@ -0,0 +1,31 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SharedModule } from '../../../shared/shared.module'; +import { CoreModule } from './../../../core/core.module'; +import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details.component'; + +describe('MetricsEndpointDetailsComponent', () => { + let component: MetricsEndpointDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + CoreModule, + SharedModule + ], + declarations: [ MetricsEndpointDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MetricsEndpointDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts new file mode 100644 index 0000000000..0fd3561fcc --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts @@ -0,0 +1,75 @@ +import { Component, Input } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { MetricsStratosAction } from 'frontend/packages/store/src/actions/metrics-api.actions'; +import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; +import { filter, map, tap } from 'rxjs/operators'; + +import { AppState } from '../../../../../store/src/app-state'; +import { EndpointListDetailsComponent } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers'; +import { mapMetricsData } from '../metrics.helpers'; +import { MetricsEndpointProvider, MetricsService } from '../services/metrics-service'; +import { EndpointModel } from './../../../../../store/src/types/endpoint.types'; + + +interface MetricsDetailsInfo { + ok: number; + total: number; + warning: boolean; + plural: boolean; +} + +@Component({ + selector: 'app-metrics-endpoint-details', + templateUrl: './metrics-endpoint-details.component.html', + styleUrls: ['./metrics-endpoint-details.component.scss'] +}) +export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponent { + + data$: Observable; + + // The guid of the metrics endpoint that this row shows + guid$ = new BehaviorSubject(null); + + constructor( + public store: Store, + private metricsService: MetricsService + ) { + super(); + + // Raw endpoint data for this metrics endpoint + this.data$ = combineLatest( + this.metricsService.metricsEndpoints$, + this.guid$.asObservable()).pipe( + map(([endpoints, guid]) => endpoints.find((item) => item.provider.guid === guid)), + filter(provider => !!provider), + tap(data => { + if (!this.hasStratosData(data)) { + this.store.dispatch(new MetricsStratosAction(data.provider.guid)); + } + }), + map((provider) => this.processProvider(provider)) + ); + } + + private hasStratosData(provider: MetricsEndpointProvider): boolean { + const data = provider.provider; + return data && data.metadata && data.metadata.metrics_stratos && Array.isArray(data.metadata.metrics_stratos); + } + + private processProvider(provider: MetricsEndpointProvider): MetricsDetailsInfo { + const hasStratosData = this.hasStratosData(provider); + const parsed = mapMetricsData(provider); + const known = parsed.filter(item => item.known).length; + return { + ok: known, + total: hasStratosData ? parsed.length : -1, + warning: known === 0, + plural: hasStratosData ? parsed.length !== 1 : known !== 1, + }; + } + + @Input() + set row(data: EndpointModel) { + this.guid$.next(data.guid); + } +} diff --git a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts new file mode 100644 index 0000000000..f3bb9d0763 --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts @@ -0,0 +1,74 @@ +import { Observable, of as observableOf } from 'rxjs'; + +import { StratosStatus } from '../../shared/shared.types'; +import { EndpointIcon, getFullEndpointApiUrl } from '../endpoints/endpoint-helpers'; +import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog.service'; +import { MetricsEndpointProvider } from './services/metrics-service'; + +// Info for an endpoint that a metrics endpoint provides for +export interface MetricsEndpointInfo { + name: string; + icon: EndpointIcon; + type: string; + known: boolean; + url: string; + metadata: { + metrics_job?: string; + metrics_environment?: string; + }; + status: Observable; +} + +// Process the endpoint and Stratos marker file data to give a single list of endpoitns +// linked to this metrics endpoint, comprising those that are known in Stratos and those that are not +export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo[] { + const data: MetricsEndpointInfo[] = []; + + // Add all of the known endpoints first + ep.endpoints.forEach(endpoint => { + const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type); + + data.push({ + known: true, + name: endpoint.name, + url: getFullEndpointApiUrl(endpoint), + type: catalogEndpoint.definition.label, + icon: { + name: catalogEndpoint.definition.icon, + font: 'stratos-icons' + }, + metadata: { + metrics_job: endpoint.metadata ? endpoint.metadata.metrics_job : null, + metrics_environment: endpoint.metadata ? endpoint.metadata.metrics_environment : null + }, + status: observableOf(StratosStatus.OK) + }); + }); + + // Add all of the potentially unknown endpoints + if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos + && Array.isArray(ep.provider.metadata.metrics_stratos)) { + ep.provider.metadata.metrics_stratos.forEach(endp => { + // See if we already know about this endpoint + const hasEndpoint = data.findIndex(i => i.url === endp.url || i.url === endp.cfEndpoint) !== -1; + if (!hasEndpoint) { + const catalogEndpoint = entityCatalog.getEndpoint(endp.type, ''); + data.push({ + known: false, + name: '', + url: endp.cfEndpoint || endp.url, + type: catalogEndpoint.definition.label, + icon: { + name: catalogEndpoint.definition.icon, + font: 'stratos-icons' + }, + metadata: { + metrics_job: endp.job + }, + status: observableOf(StratosStatus.WARNING) + }); + } + }); + } + return data; + } diff --git a/src/frontend/packages/core/src/features/metrics/metrics.module.ts b/src/frontend/packages/core/src/features/metrics/metrics.module.ts index 7aa2a94888..9c14db9211 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics.module.ts +++ b/src/frontend/packages/core/src/features/metrics/metrics.module.ts @@ -1,10 +1,12 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { MetricsComponent } from './metrics/metrics.component'; -import { MetricsRoutingModule } from './metrics.routing'; -import { MetricsService } from './services/metrics-service'; +import { NgModule } from '@angular/core'; + import { CoreModule } from '../../core/core.module'; import { SharedModule } from '../../shared/shared.module'; +import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details/metrics-endpoint-details.component'; +import { MetricsRoutingModule } from './metrics.routing'; +import { MetricsComponent } from './metrics/metrics.component'; +import { MetricsService } from './services/metrics-service'; @NgModule({ imports: [ @@ -13,9 +15,12 @@ import { SharedModule } from '../../shared/shared.module'; SharedModule, MetricsRoutingModule, ], - declarations: [MetricsComponent], + declarations: [MetricsComponent, MetricsEndpointDetailsComponent], providers: [ MetricsService, + ], + entryComponents: [ + MetricsEndpointDetailsComponent, ] }) export class MetricsModule { } diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html index 3d5b4dfaf9..6407fa952b 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html @@ -1,4 +1,4 @@ -{{ (metricsEndpoint$ | async)?.entity.provider.name }} +{{ (metricsEndpoint$ | async)?.provider.name }}
@@ -6,57 +6,67 @@
equalizer
-
{{ ep.entity.provider.name }}
+
{{ ep.provider.name }}

- {{ ep.entity.provider.token_endpoint }} + {{ ep.provider.token_endpoint }}

+
+

This metrics endpoint does not provide a Stratos metadata file

+
-
-

Provides metrics for the following endpoints:

-
- -
-

Does not provide metrics for any endpoints

-
- -
-
- - -
- {{ ep.metadata[svc.guid].icon.name }} -
-
{{ svc.name }}
-
{{ ep.metadata[svc.guid].type }}
-
-
- {{ svc.url }} - {{ svc.metadata.metrics_job || 'N/A' }} - {{ svc.metadata.metrics_environment || 'N/A' }} -
-
-
-
- {{ - jobDetails[svc.metadata.metrics_job].health | uppercase }} - {{ - jobDetails[svc.metadata.metrics_job].lastScrape | date:'medium' }} - {{ - jobDetails[svc.metadata.metrics_job].lastError || 'None' }} +
+
+

This metrics endpoint does not provide data for any endpoints

+
+
+
+
    +
  • + + + +
    + {{info.icon.name }} +
    +
    {{ info.name }}
    +
    {{ info.type }}
    +
    +
    + {{ info.url }} + {{ info.metadata.metrics_job || 'N/A' }} + {{ info.metadata.metrics_environment || 'N/A' }} +
    +
    +
    +
    + {{ + jobDetails[info.metadata.metrics_job].health | uppercase }} + {{ + jobDetails[info.metadata.metrics_job].lastScrape | date:'medium' }} + {{ + jobDetails[info.metadata.metrics_job].lastError || 'None' }} +
    +
    +
    +
    +
    +
    + warning +
    The metrics endpoint reports that it provides data for this endpoint which is not registered with Stratos
    +
    This could be intentional or there may be a mismatch in the endpoint address used by this Metrics endpoint and that which is registered with Stratos.
    -
-
- - + + + +
- diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss index 859d78a163..3ae887765f 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss @@ -9,13 +9,23 @@ } &-info { display: flex; - mat-icon { + > mat-icon { font-size: 48px; height: 48px; margin-right: 8px; width: 48px; } } + &-unknown { + display: flex; + mat-icon { + margin-right: 8px; + } + &__detail { + margin-left: 32px; + opacity: .8; + } + } &-metadata { width: 100%; div { @@ -42,5 +52,73 @@ margin-top: 0; } } + &-detail { + padding-top: 12px; + } +} + +// Adapted from: http://cssdeck.com/labs/pure-css-tree-menu-framework +$hz-indent-top: 60px; +$hz-indent-left: 40px; +$hz-indent-width: 40px; +$tree-indicator-width: 3px; + +.metrics-tree { + display: flex; + flex-direction: column; + flex: 1; + + &__root { + height: 24px; + margin-left: $hz-indent-left; + width: 3px; + } +} + +.tree, +.tree ul { + list-style: none; + margin: 0 0 0 $hz-indent-left; + padding: 0; + position: relative; +} + +.tree ul { + margin-left: .5em +} + +.tree:before, +.tree ul:before { + border-left: $tree-indicator-width solid; + bottom: 0; + content: ""; + display: block; + left: 0; + position: absolute; + top: 0; + width:0; +} + +.tree li { + margin: 0; + padding: 0 $hz-indent-width; + position: relative; +} + +.tree li:before { + border-top: $tree-indicator-width solid; + content:""; + display: block; + height:0; + left: 0; + margin-top: -1px; + position:absolute; + top: $hz-indent-top; + width: $hz-indent-width; } +.tree li:last-child:before { + bottom: 0; + height: auto; + top: $hz-indent-top; +} \ No newline at end of file diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss new file mode 100644 index 0000000000..8336d10fae --- /dev/null +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss @@ -0,0 +1,15 @@ +@mixin metrics-component-theme($theme, $app-theme) { + $primary: map-get($theme, primary); + $background: map-get($theme, background); + $tree-background-color: mat-color($background, background); + + // Last item uses background color to overwrisr the side bar to make it appear + // like its the last item in th tree + .tree li:last-child:before { + background-color: $tree-background-color; + } + + .metrics-tree__root { + background-color: mat-contrast($primary, 300); + } +} diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts index 348b5ebf48..090a536487 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts @@ -4,12 +4,16 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map } from 'rxjs/operators'; -import { MetricsAPIAction, MetricsAPITargets } from '../../../../../store/src/actions/metrics-api.actions'; +import { + MetricsAPIAction, + MetricsAPITargets, + MetricsStratosAction, +} from '../../../../../store/src/actions/metrics-api.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service'; import { getIdFromRoute } from '../../../core/utils.service'; import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; import { EndpointIcon } from '../../endpoints/endpoint-helpers'; +import { mapMetricsData, MetricsEndpointInfo } from '../metrics.helpers'; import { MetricsEndpointProvider, MetricsService } from '../services/metrics-service'; interface EndpointMetadata { @@ -40,57 +44,48 @@ interface PrometheusJobs { styleUrls: ['./metrics.component.scss'] }) export class MetricsComponent { - - public metricsEndpoint$: Observable; + public metricsEndpoint$: Observable; + public metricsInfo$: Observable; public breadcrumbs$: Observable; public jobDetails$: Observable; + // Was there an error retrieving data from the Prometheus server? + public error = false; + constructor( private activatedRoute: ActivatedRoute, private metricsService: MetricsService, private store: Store, - ) { const metricsGuid = getIdFromRoute(this.activatedRoute, 'metricsId'); - const metricsAction = new MetricsAPIAction(metricsGuid, 'targets'); - this.store.dispatch(metricsAction); + this.store.dispatch(new MetricsAPIAction(metricsGuid, 'targets')); + this.store.dispatch(new MetricsStratosAction(metricsGuid)); + // Raw endpoint data for this metrics endpoint this.metricsEndpoint$ = this.metricsService.metricsEndpoints$.pipe( map((ep) => ep.find((item) => item.provider.guid === metricsGuid)), - map((ep) => { - const metadata = {}; - ep.endpoints.forEach(endpoint => { - const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type); - metadata[endpoint.guid] = { - type: catalogEndpoint.definition.type, - icon: catalogEndpoint.definition.icon - }; - }); - return { - entity: ep, - metadata - }; + ); + + // Processed endpoint data + this.metricsInfo$ = this.metricsEndpoint$.pipe(map((ep) => { + if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos + && (ep.provider.metadata.metrics_stratos as any).error) { + this.error = true; } - )); + return mapMetricsData(ep); + })); + // Breadcrumbs this.breadcrumbs$ = this.metricsEndpoint$.pipe( - map(() => ([ - { - breadcrumbs: [ - { - value: 'Endpoints', - routerLink: `/endpoints` - } - ] - } - ])), + map(() => ([ { breadcrumbs: [ { value: 'Endpoints', routerLink: `/endpoints` } ] } ])), first() ); + // Job details obtained from the Prometheus server this.jobDetails$ = this.metricsEndpoint$.pipe( - filter(mi => !!mi && !!mi.entity.provider && !!mi.entity.provider.metadata && !!mi.entity.provider.metadata.metrics_targets), - map(mi => mi.entity.provider.metadata.metrics_targets), + filter(mi => !!mi && !!mi.provider && !!mi.provider.metadata && !!mi.provider.metadata.metrics_targets), + map(mi => mi.provider.metadata.metrics_targets), map((targetsData: MetricsAPITargets) => targetsData.activeTargets.reduce((mapped, t) => { if (t.labels && t.labels.job) { mapped[t.labels.job] = t; diff --git a/src/frontend/packages/store/src/actions/metrics-api.actions.ts b/src/frontend/packages/store/src/actions/metrics-api.actions.ts index d6254bf9da..2fe8232094 100644 --- a/src/frontend/packages/store/src/actions/metrics-api.actions.ts +++ b/src/frontend/packages/store/src/actions/metrics-api.actions.ts @@ -1,4 +1,5 @@ import { Action } from '@ngrx/store'; + import { environment } from '../../../core/src/environments/environment'; export const METRIC_API_START = '[Metrics] API Start'; @@ -8,7 +9,8 @@ export const METRIC_API_FAILED = '[Metrics] API Failed'; const { proxyAPIVersion } = environment; export const MetricAPIQueryTypes = { - TARGETS: 'targets' + TARGETS: 'targets', + STRATOS_METADATA: 'stratos' }; export interface MetricAPIResponse { @@ -29,6 +31,11 @@ export interface MetricsAPITargets { }[]; } +export interface MetricsStratosInfo { + name: string; + +} + export class MetricsAPIAction implements Action { public url; constructor(public endpointGuid: string, public query: string, public queryType = MetricAPIQueryTypes.TARGETS) { @@ -37,6 +44,15 @@ export class MetricsAPIAction implements Action { type = METRIC_API_START; } +export class MetricsStratosAction implements Action { + public url; + public queryType = MetricAPIQueryTypes.STRATOS_METADATA; + constructor(public endpointGuid: string) { + this.url = `/pp/${proxyAPIVersion}/proxy/stratos`; + } + type = METRIC_API_START; +} + export class MetricsAPIActionSuccess implements Action { constructor(public endpointGuid: string, public data: MetricAPIResponse, public queryType = MetricAPIQueryTypes.TARGETS) { } type = METRIC_API_SUCCESS; diff --git a/src/frontend/packages/store/src/effects/metrics.effects.ts b/src/frontend/packages/store/src/effects/metrics.effects.ts index f4bc789531..3bd1d52cd2 100644 --- a/src/frontend/packages/store/src/effects/metrics.effects.ts +++ b/src/frontend/packages/store/src/effects/metrics.effects.ts @@ -4,7 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { catchError, map, mergeMap } from 'rxjs/operators'; -import { entityCatalog } from '../entity-catalog/entity-catalog.service'; import { METRIC_API_FAILED, METRIC_API_START, @@ -13,6 +12,7 @@ import { } from '../actions/metrics-api.actions'; import { getFullMetricQueryQuery, METRICS_START, MetricsAction } from '../actions/metrics.actions'; import { DispatchOnlyAppState } from '../app-state'; +import { entityCatalog } from '../entity-catalog/entity-catalog.service'; import { IMetricsResponse } from '../types/base-metric.types'; import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from './../types/request.types'; @@ -78,7 +78,7 @@ export class MetricsEffect { }).pipe( map(metrics => { const metric = metrics[action.endpointGuid]; - return new MetricsAPIActionSuccess(action.endpointGuid, metric); + return new MetricsAPIActionSuccess(action.endpointGuid, metric, action.queryType); }) ).pipe(catchError(errObservable => { return [ diff --git a/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts b/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts index 175e6539f3..40fdc63271 100644 --- a/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts +++ b/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts @@ -111,7 +111,20 @@ function updateMetricsInfo(state: IRequestEntityTypeState, action } }, }; + } else if (action.queryType === MetricAPIQueryTypes.STRATOS_METADATA) { + const existingEndpoint = state[action.endpointGuid]; + return { + ...state, + [action.endpointGuid]: { + ...existingEndpoint, + metadata: { + ...existingEndpoint.metadata, + metrics_stratos: action.data + } + }, + }; } + return state; } diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts index 83bf97984a..792223ebcb 100644 --- a/src/frontend/packages/store/src/types/endpoint.types.ts +++ b/src/frontend/packages/store/src/types/endpoint.types.ts @@ -1,6 +1,6 @@ import { ScopeStrings } from '../../../core/src/core/current-user-permissions.config'; import { EndpointType } from '../../../core/src/core/extension/extension-types'; -import { MetricsAPITargets } from '../actions/metrics-api.actions'; +import { MetricsAPITargets, MetricsStratosInfo } from '../actions/metrics-api.actions'; import { endpointSchemaKey } from '../helpers/entity-factory'; import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types'; @@ -51,6 +51,7 @@ export interface EndpointModel { metrics_job?: string; metrics_environment?: string; metrics_targets?: MetricsAPITargets; + metrics_stratos?: MetricsStratosInfo; userInviteAllowed?: 'true' | any; }; system_shared_token: boolean; @@ -60,8 +61,6 @@ export interface EndpointModel { metricsAvailable: boolean; } -export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444'; - // Metadata for the user connected to an endpoint export interface EndpointUser { guid: string; From 11bae3dbbbdf41f83395348a2caab23c4534cc06 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 6 May 2020 09:16:56 +0100 Subject: [PATCH 03/14] Fix code climate issues --- .../metrics/metrics/metrics.component.scss | 20 +++++++++---------- .../metrics/metrics.component.theme.scss | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss index 3ae887765f..eac28d4abf 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss @@ -65,8 +65,8 @@ $tree-indicator-width: 3px; .metrics-tree { display: flex; - flex-direction: column; flex: 1; + flex-direction: column; &__root { height: 24px; @@ -84,19 +84,19 @@ $tree-indicator-width: 3px; } .tree ul { - margin-left: .5em + margin-left: .5em; } -.tree:before, +.tree::before, .tree ul:before { border-left: $tree-indicator-width solid; bottom: 0; - content: ""; + content: ''; display: block; left: 0; position: absolute; top: 0; - width:0; + width: 0; } .tree li { @@ -105,14 +105,14 @@ $tree-indicator-width: 3px; position: relative; } -.tree li:before { +.tree li::before { border-top: $tree-indicator-width solid; - content:""; + content: ''; display: block; - height:0; + height: 0; left: 0; margin-top: -1px; - position:absolute; + position: absolute; top: $hz-indent-top; width: $hz-indent-width; } @@ -121,4 +121,4 @@ $tree-indicator-width: 3px; bottom: 0; height: auto; top: $hz-indent-top; -} \ No newline at end of file +} diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss index 8336d10fae..cc55f5f450 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss @@ -5,9 +5,9 @@ // Last item uses background color to overwrisr the side bar to make it appear // like its the last item in th tree - .tree li:last-child:before { + .tree li:last-child::before { background-color: $tree-background-color; - } + } .metrics-tree__root { background-color: mat-contrast($primary, 300); From 6bf7f760d768e924780903824f2c6a2c785b6488 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 6 May 2020 09:36:19 +0100 Subject: [PATCH 04/14] Fix 2 more code climate issues --- .../core/src/features/metrics/metrics/metrics.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss index eac28d4abf..3280ff302b 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss @@ -88,7 +88,7 @@ $tree-indicator-width: 3px; } .tree::before, -.tree ul:before { +.tree ul::before { border-left: $tree-indicator-width solid; bottom: 0; content: ''; @@ -117,7 +117,7 @@ $tree-indicator-width: 3px; width: $hz-indent-width; } -.tree li:last-child:before { +.tree li:last-child::before { bottom: 0; height: auto; top: $hz-indent-top; From b5f1c0e37d97e0ee26271ca2407bb2f196cea74e Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 6 May 2020 09:59:13 +0100 Subject: [PATCH 05/14] Fix merge issue --- src/frontend/packages/store/src/types/endpoint.types.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts index 792223ebcb..aedd7673fd 100644 --- a/src/frontend/packages/store/src/types/endpoint.types.ts +++ b/src/frontend/packages/store/src/types/endpoint.types.ts @@ -61,6 +61,8 @@ export interface EndpointModel { metricsAvailable: boolean; } +export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444'; + // Metadata for the user connected to an endpoint export interface EndpointUser { guid: string; From 35dc66594ff6ff901fb4fea28cbdb88085ebb363 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 6 May 2020 11:35:00 +0100 Subject: [PATCH 06/14] Fix dark mode box shadow - dark mode styling overode disabling of box shadow --- .../list/list-table/table-row/table-row.component.scss | 2 -- .../list-table/table-row/table-row.component.theme.scss | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss index 8c1dc9b1d0..06621f3b97 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss @@ -93,8 +93,6 @@ } .table-row__inner__expansion.mat-expansion-panel { - box-shadow: none; - box-sizing: inherit; width: 100%; .table-row__inner__expansion--header { diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss index ced96a6e62..3509bdb6f4 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss @@ -11,6 +11,13 @@ &.in-expanded-row { border-left-color: mat-color($foreground, divider); } + + &__inner { + .table-row__inner__expansion.mat-expansion-panel { + box-shadow: none; + } + } + } .table-row-wrapper { &__errored { From 3395e87860ce3f8cd72b41833f8bd5e798149689 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 6 May 2020 15:17:20 +0100 Subject: [PATCH 07/14] Fix multiple metrics requests due to recreated list cards --- .../list/list-cards/card/card.component.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 dfdea1cb9a..4f4257a11a 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 @@ -71,17 +71,23 @@ export class CardComponent { return; } const { component, entityKey, entity } = this.getComponent(componentType, item); - if (component) { + if (!this.cardComponent && component) { const componentFactory = this.componentFactoryResolver.resolveComponentFactory(component); if (componentFactory) { this.clear(); this.componentRef = this.target.createComponent(componentFactory); this.cardComponent = this.componentRef.instance as CardCell; - this.cardComponent.row = entity; - this.cardComponent.dataSource = dataSource; - this.cardComponent.entityKey = entityKey; } } + this.updateComponentInputs(dataSource, entityKey, entity); + } + + private updateComponentInputs(dataSource, entityKey, entity) { + if (this.cardComponent) { + this.cardComponent.row = entity; + this.cardComponent.dataSource = dataSource; + this.cardComponent.entityKey = entityKey; + } } private clear() { From e1926c02f5ff85b03c4febb04607733e15c1005f Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 6 May 2020 15:18:11 +0100 Subject: [PATCH 08/14] Fix most additional /stratos requests on load of endpoints page with metrics --- .../metrics-endpoint-details.component.ts | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts index 0fd3561fcc..3463b18918 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts @@ -1,9 +1,9 @@ import { Component, Input } from '@angular/core'; import { Store } from '@ngrx/store'; -import { MetricsStratosAction } from 'frontend/packages/store/src/actions/metrics-api.actions'; import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; -import { filter, map, tap } from 'rxjs/operators'; +import { distinctUntilChanged, filter, map, publishReplay, refCount, tap } from 'rxjs/operators'; +import { MetricsStratosAction } from '../../../../../store/src/actions/metrics-api.actions'; import { AppState } from '../../../../../store/src/app-state'; import { EndpointListDetailsComponent } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers'; import { mapMetricsData } from '../metrics.helpers'; @@ -36,24 +36,37 @@ export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponen ) { super(); + const endpoints$ = this.metricsService.metricsEndpoints$.pipe( + filter(endpoints => !!endpoints), + distinctUntilChanged() + ) + + const guid$ = this.guid$.asObservable().pipe( + filter(guid => !!guid), + distinctUntilChanged() + ) + // Raw endpoint data for this metrics endpoint this.data$ = combineLatest( - this.metricsService.metricsEndpoints$, - this.guid$.asObservable()).pipe( - map(([endpoints, guid]) => endpoints.find((item) => item.provider.guid === guid)), - filter(provider => !!provider), - tap(data => { - if (!this.hasStratosData(data)) { - this.store.dispatch(new MetricsStratosAction(data.provider.guid)); - } - }), - map((provider) => this.processProvider(provider)) + endpoints$, + guid$ + ).pipe( + map(([endpoints, guid]) => endpoints.find((item) => item.provider.guid === guid)), + filter(provider => !!provider), + tap(data => { + if (!this.hasStratosData(data)) { + this.store.dispatch(new MetricsStratosAction(data.provider.guid)); + } + }), + map((provider) => this.processProvider(provider)), + publishReplay(1), + refCount() ); } private hasStratosData(provider: MetricsEndpointProvider): boolean { const data = provider.provider; - return data && data.metadata && data.metadata.metrics_stratos && Array.isArray(data.metadata.metrics_stratos); + return !!data && !!data.metadata && !!data.metadata.metrics_stratos; } private processProvider(provider: MetricsEndpointProvider): MetricsDetailsInfo { From 058836d0ce37aaaabbf6ec6bf88a6d15b9b9aa3a Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Thu, 7 May 2020 08:13:04 +0100 Subject: [PATCH 09/14] Fix unit tests --- .../metrics-endpoint-details.component.spec.ts | 10 ++++++++-- .../metrics-endpoint-details.component.ts | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts index 5676ad6173..b825e86948 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts @@ -1,6 +1,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { createBasicStoreModule } from '../../../../../store/testing/src/store-test-helper'; +import { CoreTestingModule } from '../../../../test-framework/core-test.modules'; import { SharedModule } from '../../../shared/shared.module'; +import { MetricsService } from '../services/metrics-service'; import { CoreModule } from './../../../core/core.module'; import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details.component'; @@ -12,9 +15,12 @@ describe('MetricsEndpointDetailsComponent', () => { TestBed.configureTestingModule({ imports: [ CoreModule, - SharedModule + SharedModule, + CoreTestingModule, + createBasicStoreModule() ], - declarations: [ MetricsEndpointDetailsComponent ] + declarations: [ MetricsEndpointDetailsComponent ], + providers: [ MetricsService ] }) .compileComponents(); })); diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts index 3463b18918..0b47762037 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts +++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts @@ -39,12 +39,12 @@ export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponen const endpoints$ = this.metricsService.metricsEndpoints$.pipe( filter(endpoints => !!endpoints), distinctUntilChanged() - ) + ); const guid$ = this.guid$.asObservable().pipe( filter(guid => !!guid), distinctUntilChanged() - ) + ); // Raw endpoint data for this metrics endpoint this.data$ = combineLatest( From 777d04e2a0655ffb6eae1890457fd498006c5377 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 09:22:41 +0100 Subject: [PATCH 10/14] Fix EndpointCardComponent test --- .../endpoint-card.component.spec.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts index f7aae439d7..329ae6d4f2 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts +++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts @@ -1,7 +1,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types'; import { BaseTestModules } from '../../../../../../../test-framework/core-test.helper'; +import { + MetricsEndpointDetailsComponent, +} from '../../../../../../features/metrics/metrics-endpoint-details/metrics-endpoint-details.component'; +import { MetricsService } from '../../../../../../features/metrics/services/metrics-service'; import { EndpointListHelper } from '../endpoint-list.helpers'; import { EndpointCardComponent } from './endpoint-card.component'; @@ -11,11 +16,18 @@ describe('EndpointCardComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [], + declarations: [MetricsEndpointDetailsComponent], imports: [ ...BaseTestModules ], - providers: [EndpointListHelper] + providers: [ + EndpointListHelper, + MetricsService + ], + }).overrideModule(BrowserDynamicTestingModule, { + set: { + entryComponents: [MetricsEndpointDetailsComponent], + } }) .compileComponents(); })); From 96424b8118ada533c9096fe46e2ec16e013bf443 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 14:08:37 +0100 Subject: [PATCH 11/14] Fix root list colour in metrics summary page dark mode --- .../features/metrics/metrics/metrics.component.theme.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss index cc55f5f450..f89c2e350a 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss @@ -2,6 +2,7 @@ $primary: map-get($theme, primary); $background: map-get($theme, background); $tree-background-color: mat-color($background, background); + $is-dark: map-get($theme, is-dark); // Last item uses background color to overwrisr the side bar to make it appear // like its the last item in th tree @@ -10,6 +11,11 @@ } .metrics-tree__root { - background-color: mat-contrast($primary, 300); + // Should match .mat-drawer-container + @if $is-dark == true { + background-color: #ffffff; + } @else { + background-color: mat-contrast($primary, 300); + } } } From 7c5a80e60291e082202873726283d016535db732 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 14:41:46 +0100 Subject: [PATCH 12/14] Fix first row alignment in users table --- .../list/list-table/table-row/table-row.component.theme.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss index 3509bdb6f4..0ac4538dad 100644 --- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss +++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss @@ -15,6 +15,7 @@ &__inner { .table-row__inner__expansion.mat-expansion-panel { box-shadow: none; + box-sizing: inherit; } } From ef6aaa2608ad062571c46851180c93df4c61abc9 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 16:32:58 +0100 Subject: [PATCH 13/14] Fix invite user e2e test (see #4272) --- src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts index 43c6e0ec60..c8eae9174c 100644 --- a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts +++ b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts @@ -164,7 +164,8 @@ export function setupInviteUserTests( inviteUserStepper.snackBar.waitForMessage('Failed to invite one or more users. Please address per user message and try again'); expect(stackedActions.isInputSuccess(0)).toBe(true); expect(stackedActions.isInputSuccess(1)).toBe(false); - expect(stackedActions.getInputMessage(1)).toBe(`${slightlyValidEmail} is invalid email.`); + // expect(stackedActions.getInputMessage(1)).toBe(`${slightlyValidEmail} is invalid email.`); // See #4272 + expect(stackedActions.getInputMessage(1)).toBe(`No authentication provider found.`); // Clear state inviteUserStepper.cancel(); usersTable.inviteUser(); From 50277f8bcb21d4cb23b75fd1ebe6a6e7b350f2dc Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 16:46:04 +0100 Subject: [PATCH 14/14] Disable random route override setting when deploying apps in e2e tests - pushes route over max 63 chars --- src/test-e2e/application/application-deploy-helper.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test-e2e/application/application-deploy-helper.ts b/src/test-e2e/application/application-deploy-helper.ts index 03f7c456a3..05be4096d1 100644 --- a/src/test-e2e/application/application-deploy-helper.ts +++ b/src/test-e2e/application/application-deploy-helper.ts @@ -207,9 +207,10 @@ export function createApplicationDeployTests(type = CREATE_APP_DEPLOY_TEST_TYPE. const overrides = deployApp.getOverridesForm(); overrides.waitUntilShown(); - if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) { - overrides.fill({ name: res.testAppName, random_route: true }); - } + // Adding a random route appends to the app name... which bumps route over 63 character max + // if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) { + // overrides.fill({ name: res.testAppName, random_route: true }); + // } e2e.debugLog(`${loggingPrefix} Overrides Step - overrides set`); });