From d484025fa1af95db4d2415f2cf1acac95fcf304c Mon Sep 17 00:00:00 2001
From: Qian Deng <dengq@vmware.com>
Date: Fri, 23 Nov 2018 17:38:51 +0800
Subject: [PATCH] Fix: helm chart results style

1. Do not show chart results if chart is not enabled
2. Fix style in scroll of results page

Signed-off-by: Qian Deng <dengq@vmware.com>
---
 .../global-search/search-result.component.html | 18 ++++++++++++------
 .../global-search/search-result.component.ts   |  7 ++++++-
 .../base/global-search/search.component.scss   |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/portal/src/app/base/global-search/search-result.component.html b/src/portal/src/app/base/global-search/search-result.component.html
index dcd6bb624..7b102a5f0 100644
--- a/src/portal/src/app/base/global-search/search-result.component.html
+++ b/src/portal/src/app/base/global-search/search-result.component.html
@@ -6,11 +6,17 @@
     <!-- spinner -->
     <div class="spinner spinner-lg search-spinner" [hidden]="done">{{'SEARCH.IN_PROGRESS' | translate}}</div>
     <div id="results">
-        <h2>{{'PROJECT.PROJECTS' | translate}}</h2>
-        <list-project-ro [projects]="searchResults.project"></list-project-ro>
-        <h2>{{'PROJECT_DETAIL.REPOSITORIES' | translate}}</h2>
-        <list-repository-ro [repositories]="searchResults.repository"></list-repository-ro>
-        <h2>{{'HELM_CHART.HELMCHARTS' | translate}}</h2>
-        <list-chart-version-ro [charts]="searchResults.Chart"></list-chart-version-ro>
+        <div class="project-results">
+            <h2>{{'PROJECT.PROJECTS' | translate}}</h2>
+            <list-project-ro [projects]="searchResults.project"></list-project-ro>
+        </div>
+        <div class="repo-results">
+            <h2>{{'PROJECT_DETAIL.REPOSITORIES' | translate}}</h2>
+            <list-repository-ro [repositories]="searchResults.repository"></list-repository-ro>
+        </div>
+        <div *ngIf="withHelmChart" class="chart-results">
+            <h2>{{'HELM_CHART.HELMCHARTS' | translate}}</h2>
+            <list-chart-version-ro [charts]="searchResults.Chart"></list-chart-version-ro>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/portal/src/app/base/global-search/search-result.component.ts b/src/portal/src/app/base/global-search/search-result.component.ts
index fa85a9feb..3a73e8e73 100644
--- a/src/portal/src/app/base/global-search/search-result.component.ts
+++ b/src/portal/src/app/base/global-search/search-result.component.ts
@@ -18,6 +18,7 @@ import { GlobalSearchService } from './global-search.service';
 import { SearchResults } from './search-results';
 import { SearchTriggerService } from './search-trigger.service';
 
+import { AppConfigService } from './../../app-config.service';
 import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
 
 @Component({
@@ -49,7 +50,8 @@ export class SearchResultComponent implements OnInit, OnDestroy {
     constructor(
         private search: GlobalSearchService,
         private msgHandler: MessageHandlerService,
-        private searchTrigger: SearchTriggerService) { }
+        private searchTrigger: SearchTriggerService,
+        private appConfigService: AppConfigService) { }
 
     ngOnInit() {
         this.searchSub = this.searchTrigger.searchTriggerChan$.subscribe(term => {
@@ -143,4 +145,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
                 this.msgHandler.handleError(error);
             });
     }
+    get withHelmChart(): boolean {
+        return this.appConfigService.getConfig().with_chartmuseum;
+    }
 }
diff --git a/src/portal/src/app/base/global-search/search.component.scss b/src/portal/src/app/base/global-search/search.component.scss
index fdcc82818..a4efecfb8 100644
--- a/src/portal/src/app/base/global-search/search.component.scss
+++ b/src/portal/src/app/base/global-search/search.component.scss
@@ -68,5 +68,5 @@
 
 #results {
     overflow-y: auto;
-    max-height: 99%;
+    max-height: 85%;
 }
\ No newline at end of file