From 8d67330d9a72619dab66d8f3668240cca01937c9 Mon Sep 17 00:00:00 2001 From: "Deng, Qian" Date: Wed, 8 Aug 2018 14:56:35 +0800 Subject: [PATCH] Add status to charts and versions UI Add status to present if the chart or version is deprecated. --- .../chart-detail-summary.component.html | 3 ++- .../src/helm-chart/helm-chart.component.html | 22 ++++++++++++++----- .../src/helm-chart/helm-chart.component.ts | 8 +++++++ .../helm-chart-version.component.html | 11 ++++++++-- .../versions/helm-chart-version.component.ts | 18 +++++++++++++-- src/ui_ng/lib/src/service/interface.ts | 3 ++- src/ui_ng/src/i18n/lang/en-us-lang.json | 3 ++- src/ui_ng/src/i18n/lang/es-es-lang.json | 3 ++- src/ui_ng/src/i18n/lang/fr-fr-lang.json | 3 ++- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 3 ++- 10 files changed, 61 insertions(+), 16 deletions(-) diff --git a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.html b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.html index bdcdfd4a0c4..4a52061da01 100644 --- a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.html +++ b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.html @@ -117,7 +117,8 @@ -  {{'HELM_CHART.READY' | translate }} +  {{'HELM_CHART.READY' | translate }} + diff --git a/src/ui_ng/lib/src/helm-chart/helm-chart.component.html b/src/ui_ng/lib/src/helm-chart/helm-chart.component.html index f9b0028a570..a4006cde8b5 100644 --- a/src/ui_ng/lib/src/helm-chart/helm-chart.component.html +++ b/src/ui_ng/lib/src/helm-chart/helm-chart.component.html @@ -28,7 +28,8 @@  {{'HELM_CHART.UPLOAD' | translate}} - {{'HELM_CHART.NAME' | translate}} + {{'HELM_CHART.NAME' | translate}} + {{'HELM_CHART.STATUS' | translate}} {{'HELM_CHART.CHARTVERSIONS' | translate}} {{'HELM_CHART.CREATED' | translate}} {{'HELM_CHART.PLACEHOLDER' | translate }} @@ -39,6 +40,7 @@ {{ chart.name }} + {{ getStatusString(chart) | translate }} {{ chart.total_versions }} {{ chart.created | date }} @@ -51,7 +53,7 @@
-
+
@@ -60,10 +62,18 @@
{{item.name}}
-
- {{item.total_versions}} - - +
+
+ {{item.total_versions}} + + +
+
+ {{getStatusString(item) | translate}} +
diff --git a/src/ui_ng/lib/src/helm-chart/helm-chart.component.ts b/src/ui_ng/lib/src/helm-chart/helm-chart.component.ts index 83be7e14818..9adfbf66c95 100644 --- a/src/ui_ng/lib/src/helm-chart/helm-chart.component.ts +++ b/src/ui_ng/lib/src/helm-chart/helm-chart.component.ts @@ -178,4 +178,12 @@ export class HelmChartComponent implements OnInit { getDefaultIcon(chart: HelmChartItem) { chart.icon = this.chartDefaultIcon; } + + getStatusString(chart: HelmChartItem) { + if (chart.deprecated) { + return "HELM_CHART.DEPRECATED"; + } else { + return "HELM_CHART.ACTIVE"; + } + } } diff --git a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html index ae7b4039eb4..a66390841db 100644 --- a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html +++ b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html @@ -50,8 +50,10 @@ (click)="openVersionDeleteModal(selectedRows)">  {{'BUTTON.DELETE' | translate}} - {{'HELM_CHART.VERSION' | translate}} + {{'HELM_CHART.VERSION' | translate}} + {{'HELM_CHART.STATUS' | translate }} {{'HELM_CHART.ENGINE' | translate }} + {{'HELM_CHART.MAINTAINERS' | translate }} {{'HELM_CHART.CREATED' | translate }} {{'HELM_CHART.NO_VERSION_PLACEHOLDER' | translate }} @@ -62,6 +64,7 @@ {{ v.version }} + {{ getStatusString(v) | translate }} {{ v.engine }} {{ getMaintainerString(v.maintainers) }} {{ v.created | date}} @@ -87,6 +90,10 @@
+
+ +
{{getStatusString(item) | translate}}
+
{{item.engine}}
@@ -103,7 +110,7 @@
- +
diff --git a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts index 5f1305e46c0..86f3240f114 100644 --- a/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts +++ b/src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts @@ -172,7 +172,10 @@ export class ChartVersionComponent implements OnInit { }); } - versionDownload(item?: HelmChartVersion) { + versionDownload(evt: Event, item?: HelmChartVersion) { + if (evt) { + evt.stopPropagation(); + } let selectedVersion: HelmChartVersion; if (item) { @@ -268,6 +271,10 @@ export class ChartVersionComponent implements OnInit { } } + deleteVersionCard(env: Event, version: HelmChartVersion) { + env.stopPropagation(); + this.openVersionDeleteModal([version]); + } openVersionDeleteModal(versions: HelmChartVersion[]) { let versionNames = versions.map(v => v.name).join(","); this.translateService.get("HELM_CHART.DELETE_CHART_VERSION").subscribe(key => { @@ -304,8 +311,15 @@ export class ChartVersionComponent implements OnInit { } } - getDefaultIcon(v: HelmChartVersion) { v.icon = this.chartDefaultIcon; } + + getStatusString(chartVersion: HelmChartVersion) { + if (chartVersion.deprecated) { + return "HELM_CHART.DEPRECATED"; + } else { + return "HELM_CHART.ACTIVE"; + } + } } diff --git a/src/ui_ng/lib/src/service/interface.ts b/src/ui_ng/lib/src/service/interface.ts index d1b8708795c..62415be6fe5 100644 --- a/src/ui_ng/lib/src/service/interface.ts +++ b/src/ui_ng/lib/src/service/interface.ts @@ -307,7 +307,7 @@ export interface HelmChartItem { status?: string; pulls?: number; maintainer?: string; - + deprecated?: boolean; } export interface HelmChartVersion { @@ -324,6 +324,7 @@ export interface HelmChartVersion { urls: string[]; created: string; digest: string; + deprecated?: boolean; } export interface HelmChartDetail { diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index 844d7f2bb83..0111fc9b452 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -521,7 +521,8 @@ "COMMAND": "Commands", "PROV_FILE": "Prov File", "READY": "Ready", - "NOT_READY": "Not Ready" + "NOT_READY": "Not Ready", + "STATUS": "Status" }, "ALERT": { "FORM_CHANGE_CONFIRMATION": "Some changes are not saved yet. Do you want to cancel?" diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json index 0f4ba2a9efe..627895e4baa 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -520,7 +520,8 @@ "COMMAND": "Commands", "PROV_FILE": "Prov File", "READY": "Ready", - "NOT_READY": "Not Ready" + "NOT_READY": "Not Ready", + "STATUS": "Status" }, "ALERT": { "FORM_CHANGE_CONFIRMATION": "Algunos cambios no se han guardado aún. ¿Quiere cancelar?" diff --git a/src/ui_ng/src/i18n/lang/fr-fr-lang.json b/src/ui_ng/src/i18n/lang/fr-fr-lang.json index 8683bd2cc48..b4fadc631bb 100644 --- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json +++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json @@ -495,7 +495,8 @@ "COMMAND": "Commands", "PROV_FILE": "Prov File", "READY": "Ready", - "NOT_READY": "Not Ready" + "NOT_READY": "Not Ready", + "STATUS": "Status" }, "ALERT": { "FORM_CHANGE_CONFIRMATION": "Certaines modifications ne sont pas encore enregistrées. Voulez-vous annuler ?" diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index efa056850ef..f2e6666a7c1 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -520,7 +520,8 @@ "COMMAND": "命令", "PROV_FILE": "Prov 文件", "READY": "就绪", - "NOT_READY": "未就绪" + "NOT_READY": "未就绪", + "STATUS": "状态" }, "ALERT": { "FORM_CHANGE_CONFIRMATION": "表单内容改变，确认是否取消?"