From 2a583fccfe9c4b4671d0ce7fc59d0ae21dc84f36 Mon Sep 17 00:00:00 2001
From: Qian Deng <dengq@vmware.com>
Date: Fri, 30 Nov 2018 14:41:56 +0800
Subject: [PATCH] Fix: helmchart api change caused problems

Adapter ui to new backend API

Signed-off-by: Qian Deng <dengq@vmware.com>
---
 .../lib/src/service/helm-chart.service.ts     | 22 +------------------
 src/portal/lib/src/service/interface.ts       |  3 ++-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/portal/lib/src/service/helm-chart.service.ts b/src/portal/lib/src/service/helm-chart.service.ts
index d8f15ba1a..02bad80fa 100644
--- a/src/portal/lib/src/service/helm-chart.service.ts
+++ b/src/portal/lib/src/service/helm-chart.service.ts
@@ -113,26 +113,6 @@ export class HelmChartDefaultService extends HelmChartService {
     return res.json() || [];
   }
 
-  private extractHelmItems(res: Response) {
-    if (res.text() === "") {
-      return [];
-    }
-    let charts = res.json();
-    if (charts) {
-      return charts.map( chart => {
-        return {
-          name: chart.Name,
-          total_versions: chart.total_versions,
-          latest_version: chart.latest_version,
-          created: chart.Created,
-          icon: chart.Icon,
-          home: chart.Home};
-      });
-    } else {
-      return [];
-    }
-  }
-
   private handleErrorObservable(error: HttpErrorResponse) {
     return observableThrowError(error.message || error);
   }
@@ -147,7 +127,7 @@ export class HelmChartDefaultService extends HelmChartService {
     return this.http
       .get(`${this.config.helmChartEndpoint}/${projectName}/charts`, HTTP_GET_OPTIONS)
       .pipe(
-        map(response => this.extractHelmItems(response),
+        map(response => this.extractData(response),
         catchError(error => this.handleErrorObservable(error))
       ));
   }
diff --git a/src/portal/lib/src/service/interface.ts b/src/portal/lib/src/service/interface.ts
index 02834bc71..7f4dfa701 100644
--- a/src/portal/lib/src/service/interface.ts
+++ b/src/portal/lib/src/service/interface.ts
@@ -306,12 +306,13 @@ export interface HelmChartItem {
   total_versions: number;
   latest_version: string;
   created: string;
+  updated: string;
   icon: string;
   home: string;
+  deprecated?: boolean;
   status?: string;
   pulls?: number;
   maintainer?: string;
-  deprecated?: boolean;
 }
 
 export interface HelmChartVersion {