From dac86844e4d693a14bc469ff12dbb0e9a5b4a2a3 Mon Sep 17 00:00:00 2001
From: Qian Deng <dengq@vmware.com>
Date: Tue, 21 Aug 2018 18:34:35 +0800
Subject: [PATCH] Add github flavered table in markdown

Add table style in markdown and
Fix deleted all version may cause 404

Signed-off-by: Qian Deng <dengq@vmware.com>
---
 .../chart-detail-summary.component.scss       | 105 ++++++++++++------
 .../versions/helm-chart-version.component.ts  |  11 +-
 2 files changed, 83 insertions(+), 33 deletions(-)

diff --git a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.scss b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.scss
index db3e2976a..358293fa3 100644
--- a/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.scss
+++ b/src/ui_ng/lib/src/helm-chart/chart-detail/chart-detail-summary.component.scss
@@ -1,37 +1,80 @@
 .content-wrapper {
-    margin-top:20px;
-    padding: 0 0 0 15px;
+  margin-top: 20px;
+  padding: 0 0 0 15px;
+  .md-container {
+    border: solid 1px #ddd;
+  }
+  .summary-container {
+    padding: 0;
+    table {
+      background-color: #f2f2f2;
+      margin-top: 0.5rem;
+    }
+    .content-group {
+      margin-bottom: 30px;
+    }
+    .content-icon {
+      margin-right: 6px;
+    }
+    .text-wrapper {
+      word-break: break-all;
+    }
+  }
+  .cmd-title {
+    white-space: nowrap;
+    vertical-align: middle;
+  }
+  .cmd-content {
+    width: 100%;
+  }
+}
 
-    .md-container {
-        border: solid 1px #ddd;
-    }
-    
-    .summary-container {
-        padding:0;
-        table {
-            background-color: #F2F2F2;
-            margin-top: 0.5rem;
-        }
-    
-        .content-group {
-            margin-bottom: 30px;
-        }
-        
-        .content-icon {
-            margin-right: 6px;
-        }
-    
-        .text-wrapper {
-            word-break: break-all;
-        }
+@mixin align-text-mixin($values...) {
+  @each $var in $values {
+    &[align="$var"] {
+      text-align: $var;
     }
+  }
+}
 
-    .cmd-title {
-        white-space: nowrap;
-        vertical-align: middle;
-    }
+%code-block {
+  background: #ddd;
+  border-radius: 2px;
+  padding: 2px 4px;
+}
 
-    .cmd-content {
-        width: 100%;
+.md-div {
+  ::ng-deep {
+    code:not([class*="language-"]) {
+      @extend %code-block;
+      color: #657b83;
     }
-}
\ No newline at end of file
+    pre:not([class*="language-"]) {
+      background: #fdf6e3;
+      code:not([class*="language-"]) {
+        @extend %code-block;
+        background: transparent;
+      }
+    }
+    table {
+      display: block;
+      width: 100%;
+      overflow: auto;
+      padding: 0;
+      border-spacing: 0;
+      border-collapse: collapse;
+      margin-bottom: 16px;
+      td,
+      th {
+        padding: 6px 13px;
+        border: 1px solid #ddd;
+        @include align-text-mixin(left, right, center);
+      }
+      tr {
+        &:nth-child(2n) {
+          background-color: #f2f2f2;
+        }
+      }
+    }
+  }
+}
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 e4a9fca98..60633544d 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
@@ -160,9 +160,16 @@ export class ChartVersionComponent implements OnInit {
 
   deleteVersions(versions: HelmChartVersion[]) {
     if (versions && versions.length < 1) { return; }
+    let successCount: number;
+    let totalCount = this.chartVersions.length;
     let versionObs = versions.map(v => this.deleteVersion(v));
-    Observable.forkJoin(versionObs).finally(() => this.refresh()).subscribe(res => {
-      if (this.chartVersions.length === versionObs.length) {
+    Observable.forkJoin(versionObs).finally(() => {
+      if (totalCount !== successCount) {
+        this.refresh();
+      }
+    }).subscribe(res => {
+      successCount = res.filter(r => r.state === OperationState.success).length;
+      if (totalCount === successCount) {
         this.backEvt.emit();
       }
     });