-
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
index 482e94a189..78aa3599eb 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.scss
@@ -40,4 +40,26 @@
&__limit {
font-size: 18px;
}
+ &__alerts {
+ cursor: pointer;
+ display: flex;
+ flex: 0;
+ flex-direction: column;
+ }
+ &__alert-badge {
+ align-items: center;
+ border-radius: 4px;
+ color: #fff;
+ display: flex;
+ font-size: 14px;
+ margin-bottom: 2px;
+ padding: 2px 4px;
+
+ &> mat-icon {
+ font-size: 16px;
+ height: 16px;
+ margin-right: 2px;
+ width: 16x;
+ }
+ }
}
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
index eba218e2e2..2493db6d56 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.theme.scss
@@ -1,6 +1,12 @@
@mixin app-card-number-metric-theme($theme, $app-theme) {
$status-colors: map-get($app-theme, status);
$subdued: mat-color($app-theme, subdued-color);
+
+ $status-colors: map-get($app-theme, status);
+ $status-warning: map-get($status-colors, warning);
+ $status-danger: map-get($status-colors, danger);
+ $status-info: map-get($status-colors, info);
+
.number-metric-card {
&__icon,
&__anchor,
@@ -9,4 +15,16 @@
color: $subdued;
}
}
-}
+
+ .number-metric-card__alert-badge {
+ &-error {
+ background-color: $status-danger;
+ }
+ &-info {
+ background-color: $status-info;
+ }
+ &-warning {
+ background-color: $status-warning;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
index f0170d28b4..fa02ab447e 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
import { Store } from '@ngrx/store';
import { BehaviorSubject } from 'rxjs';
@@ -8,6 +8,14 @@ import { StratosStatus } from '../../../../../../store/src/types/shared.types';
import { UtilsService } from '../../../../core/utils.service';
import { determineCardStatus } from '../card-status/card-status.component';
+enum AlertLevel {
+ OK = 0,
+ Info,
+ Warning,
+ Error,
+ Unknown,
+}
+
@Component({
selector: 'app-card-number-metric',
templateUrl: './card-number-metric.component.html',
@@ -26,6 +34,16 @@ export class CardNumberMetricComponent implements OnInit, OnChanges {
@Input() textOnly = false;
@Input() labelAtTop = false;
@Input() link: () => void | string;
+ @Output() showAlerts = new EventEmitter
();
+
+ @Input('alerts')
+ set alerts(alerts) {
+ if (alerts) {
+ this.processAlerts(alerts);
+ }
+ }
+
+ alertInfo: any;
formattedValue: string;
formattedLimit: string;
@@ -102,4 +120,31 @@ export class CardNumberMetricComponent implements OnInit, OnChanges {
this.link();
}
}
+
+ processAlerts(alerts) {
+ this.alertInfo = {
+ info: 0,
+ warning: 0,
+ error: 0
+ };
+
+ alerts.forEach((alert) => {
+ switch (alert.level as AlertLevel) {
+ case AlertLevel.Warning:
+ this.alertInfo.warning++;
+ break;
+ case AlertLevel.Error:
+ this.alertInfo.error++;
+ break;
+ case AlertLevel.Info:
+ this.alertInfo.info++;
+ break;
+ }
+ });
+ }
+
+ public alertsClicked() {
+ this.showAlerts.emit(this.alertInfo);
+ }
+
}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
index 979c260eb6..5d12e93d83 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
@@ -1,5 +1,5 @@
import { Component, Input, OnDestroy } from '@angular/core';
-import { Subscription, Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
import { objectHelper } from '../../../../../core/helper-classes/object.helpers';
import { pathGet } from '../../../../../core/utils.service';
@@ -22,6 +22,7 @@ export class TableCellDefaultComponent extends TableCellCustom implements
this.pRow = row;
if (row) {
this.setValue(row, this.schemaKey);
+ this.setSyncLink();
}
}
@@ -32,6 +33,7 @@ export class TableCellDefaultComponent extends TableCellCustom implements
this.pSchemaKey = schemaKey;
if (this.row) {
this.setValue(this.row, schemaKey);
+ this.setSyncLink();
}
}
@@ -63,7 +65,7 @@ export class TableCellDefaultComponent extends TableCellCustom implements
}
private setSyncLink() {
- if (!this.cellDefinition.getLink) {
+ if (!this.cellDefinition || !this.cellDefinition.getLink) {
return;
}
const linkValue = this.cellDefinition.getLink(this.row);
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
index 01680e8f60..107f5c8149 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.html
@@ -3,8 +3,9 @@
-
-
+
{{ label.name }}
{{ label.value }}
@@ -27,7 +27,10 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
index 5df03aea30..75fb79c994 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.spec.ts
@@ -5,6 +5,7 @@ import { SidePanelService } from '../../../shared/services/side-panel.service';
import { KubeBaseGuidMock, KubernetesBaseTestModules } from '../kubernetes.testing.module';
import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
import { KubernetesResourceViewerComponent } from './kubernetes-resource-viewer.component';
+import { ResourceAlertViewComponent } from './../analysis-report-viewer/resource-alert-preview/resource-alert-view/resource-alert-view.component';
describe('KubernetesResourceViewerComponent', () => {
let component: KubernetesResourceViewerComponent;
@@ -12,7 +13,7 @@ describe('KubernetesResourceViewerComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [KubernetesResourceViewerComponent],
+ declarations: [KubernetesResourceViewerComponent, KubernetesResourceViewerComponent, ResourceAlertViewComponent],
imports: KubernetesBaseTestModules,
providers: [
KubernetesEndpointService,
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
index 871f4e9a17..4672958d66 100644
--- a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
+++ b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes-resource-viewer/kubernetes-resource-viewer.component.ts
@@ -6,10 +6,11 @@ import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/ope
import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
import { PreviewableComponent } from '../../../../../core/src/shared/previewable-component';
import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service';
-import { BasicKubeAPIResource, KubeAPIResource } from '../store/kube.types';
+import { BasicKubeAPIResource, KubeAPIResource, KubeStatus } from '../store/kube.types';
export interface KubernetesResourceViewerConfig {
title: string;
+ analysis?: any;
resource$: Observable