Merge pull request #6110 from ninjadq/add_chart_2_global_result

Feature: Add helmchart version result in global search result

src/portal/lib/src/service/interface.ts

@@ -296,7 +296,11 @@ export interface ScrollPosition {
   sT: number;
   cH: number;
 }
-
+export interface HelmChartSearchResultItem {
+  Name: string;
+  Score: number;
+  Chart: HelmChartVersion;
+}
 export interface HelmChartItem {
   name: string;
   total_versions: number;

src/portal/src/app/base/global-search/search-result.component.html

@@ -10,5 +10,7 @@
         <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>
 </div>

src/portal/src/app/base/global-search/search-result.component.ts

@@ -76,7 +76,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
         if (src) {
             src.project.forEach(pro => res.project.push(Object.assign({}, pro)));
             src.repository.forEach(repo => res.repository.push(Object.assign({}, repo)));
-
+            src.Chart.forEach(chart => res.Chart.push(JSON.parse(JSON.stringify(chart))));
             return res;
         }
 
@@ -135,7 +135,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
         this.search.doSearch(term)
             .then(searchResults => {
                 this.onGoing = false;
-                this.originalCopy = searchResults; // Keeo the original data
+                this.originalCopy = searchResults; // Keep the original data
                 this.searchResults = this.clone(searchResults);
             })
             .catch(error => {

src/portal/src/app/base/global-search/search-results.ts

@@ -12,14 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { Project } from "../../project/project";
-import { Repository } from "@harbor/ui";
+import { Repository, HelmChartSearchResultItem } from "@harbor/ui";
 
 export class SearchResults {
   constructor() {
     this.project = [];
     this.repository = [];
+    this.Chart = [];
   }
 
   project: Project[];
   repository: Repository[];
+  Chart: HelmChartSearchResultItem[];
 }

src/portal/src/app/project/project.service.ts

@@ -35,7 +35,7 @@ export class ProjectService {
                catchError(error => observableThrowError(error)), );
   }
 
-  listProjects(name: string, isPublic: number, page?: number, pageSize?: number): Observable<any> {
+  listProjects(name: string, isPublic?: number, page?: number, pageSize?: number): Observable<any> {
     let params = new URLSearchParams();
     if (page && pageSize) {
       params.set('page', page + '');
@@ -47,7 +47,6 @@ export class ProjectService {
     if (isPublic !== undefined) {
       params.set('public', '' + isPublic);
     }
-
     return this.http
                .get(`/api/projects`, buildHttpRequestOptions(params)).pipe(
                map(response => response),

src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.html

@@ -0,0 +1,25 @@
+<clr-datagrid>
+  <clr-dg-column>{{'HELM_CHART.NAME' | translate}}</clr-dg-column>
+  <clr-dg-column>{{'HELM_CHART.VERSION' | translate}}</clr-dg-column>
+  <clr-dg-column>{{'HELM_CHART.STATUS' | translate }}</clr-dg-column>
+  <clr-dg-column>{{'HELM_CHART.MAINTAINERS' | translate }}</clr-dg-column>
+  <clr-dg-column>{{'HELM_CHART.CREATED' | translate }}</clr-dg-column>
+  <clr-dg-placeholder>{{'HELM_CHART.NO_VERSION_PLACEHOLDER' | translate }}</clr-dg-placeholder>
+  <clr-dg-row *clrDgItems="let chart of charts" [clrDgItem]="chart">
+      <clr-dg-cell>
+          <a href="javascript:void(0)" (click)="gotoChartVersion(chart.Chart)">{{ chart.Name }}</a>
+        </clr-dg-cell>
+      <clr-dg-cell>{{ chart.Chart.version }}</clr-dg-cell>
+      <clr-dg-cell>{{ getStatusString(chart.Chart) | translate }}</clr-dg-cell>
+      <clr-dg-cell>{{ getMaintainerString(chart.Chart.maintainers) | translate : getMaintainerTranslateInfo(chart.Chart.maintainers) }}</clr-dg-cell>
+      <clr-dg-cell>{{ chart.Chart.created | date}}</clr-dg-cell>
+  </clr-dg-row>
+  <clr-dg-footer>
+      <clr-dg-pagination #pagination [clrDgPageSize]="5" [clrDgTotalItems]="pagination.totalItems">
+          <span *ngIf="pagination.totalItems">
+              {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'HELM_CHART.OF' | translate}}
+          </span>
+          {{pagination.totalItems}} {{'HELM_CHART.ITEMS'| translate}}
+      </clr-dg-pagination>
+  </clr-dg-footer>
+</clr-datagrid>

src/portal/src/app/shared/list-chart-version-ro/list-chart-version-ro.component.ts

@@ -0,0 +1,69 @@
+import { extractJson } from './../shared.utils';
+import { Router } from '@angular/router';
+import { Component, OnInit, Input } from '@angular/core';
+
+import { HelmChartSearchResultItem, HelmChartVersion, HelmChartMaintainer } from '@harbor/ui';
+
+import { SearchTriggerService } from '../../base/global-search/search-trigger.service';
+import { ProjectService } from '../../project/project.service';
+
+@Component({
+  selector: 'list-chart-version-ro',
+  templateUrl: './list-chart-version-ro.component.html'
+})
+export class ListChartVersionRoComponent implements OnInit {
+
+  @Input() projectId: number;
+  @Input() charts: HelmChartSearchResultItem;
+
+  constructor(
+    private searchTrigger: SearchTriggerService,
+    private projectService: ProjectService,
+    private router: Router) { }
+
+  ngOnInit() {
+  }
+
+  getStatusString(chart: HelmChartVersion) {
+    if (chart.deprecated) {
+      return "HELM_CHART.DEPRECATED";
+    } else {
+      return "HELM_CHART.ACTIVE";
+    }
+  }
+
+  getMaintainerString(maintainers: HelmChartMaintainer[]) {
+    if (!maintainers || maintainers.length < 1) {
+      return "";
+    }
+
+    let maintainer_string = maintainers[0].name;
+    if (maintainers.length > 1) {
+      maintainer_string = "HELM_CHART.OTHER_MAINTAINERS";
+    }
+    return maintainer_string;
+  }
+
+  getMaintainerTranslateInfo(maintainers: HelmChartMaintainer[]) {
+    if (!maintainers || maintainers.length < 1) {
+      return {};
+    }
+    let name = maintainers[0].name;
+    let number = maintainers.length;
+    return {name: name, number: number};
+  }
+
+  gotoChartVersion(chartVersion: HelmChartVersion) {
+    this.searchTrigger.closeSearch(true);
+    let [projectName, chartName] = chartVersion.name.split('/');
+    this.projectService.listProjects(projectName).subscribe( res => {
+      let projects = extractJson(res);
+      if (projects || projects.length >= 1) {
+        let linkUrl = ['harbor', 'projects', projects[0].project_id, 'helm-charts', chartName, 'versions', chartVersion.version];
+        this.router.navigate(linkUrl);
+      } else {
+        return;
+      }
+    });
+  }
+}

src/portal/src/app/shared/list-project-ro/list-project-ro.component.ts

@@ -30,11 +30,7 @@ export class ListProjectROComponent {
 
   constructor(
     private searchTrigger: SearchTriggerService,
-    private router: Router,
+    private router: Router) {}
-    private ref: ChangeDetectorRef) {
-    let hnd = setInterval(() => ref.markForCheck(), 100);
-    setTimeout(() => clearInterval(hnd), 1000);
-  }
 
   goToLink(proId: number): void {
     this.searchTrigger.closeSearch(true);

src/portal/src/app/shared/shared.module.ts

@@ -52,6 +52,7 @@ import { GaugeComponent } from "./gauge/gauge.component";
 import { ConfirmationDialogComponent } from "./confirmation-dialog/confirmation-dialog.component";
 import { ConfirmationDialogService } from "./confirmation-dialog/confirmation-dialog.service";
 import { MessageHandlerService } from "./message-handler/message-handler.service";
+import { ListChartVersionRoComponent } from './list-chart-version-ro/list-chart-version-ro.component';
 
 const uiLibConfig: IServiceConfig = {
   enablei18Support: true,
@@ -103,7 +104,8 @@ const uiLibConfig: IServiceConfig = {
     ListProjectROComponent,
     ListRepositoryROComponent,
     GaugeComponent,
-    DateValidatorDirective
+    DateValidatorDirective,
+    ListChartVersionRoComponent
   ],
   exports: [
     CoreModule,
@@ -124,7 +126,8 @@ const uiLibConfig: IServiceConfig = {
     GaugeComponent,
     DateValidatorDirective,
     FormsModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    ListChartVersionRoComponent
   ],
   providers: [
     SessionService,

src/portal/src/app/shared/shared.utils.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { NgForm } from '@angular/forms';
-import {RequestOptions, Headers} from "@angular/http";
+import {RequestOptions, Headers, Response} from "@angular/http";
 import { Comparator, State } from '@clr/angular';
 import {RequestQueryParams} from "@harbor/ui";
 
@@ -301,3 +301,10 @@ export function doSorting<T extends { [key: string]: any | any[] }>(items: T[],
         return comp;
     });
 }
+
+export const extractJson = (res: Response) => {
+    if (res.text() === '') {
+        return [];
+    }
+    return (res.json() || []);
+};

src/portal/src/i18n/lang/en-us-lang.json

@@ -490,6 +490,7 @@
         "SRC_REPO": "Source Repository",
         "CREATED": "Created Time",
         "MAINTAINERS": "Maintainers",
+        "OTHER_MAINTAINERS": "{{ name }} and {{ number }} others",
         "PULLS": "Pull Count",
         "VERSION": "Version",
         "APP_VERSION": "Application Version",

src/portal/src/i18n/lang/es-es-lang.json

@@ -489,6 +489,7 @@
         "SRC_REPO": "Source Repository",
         "CREATED": "Created Time",
         "MAINTAINERS": "Maintainers",
+        "OTHER_MAINTAINERS": "{{ name }} and {{ number }} others",
         "PULLS": "Pull Count",
         "VERSION": "Version",
         "APP_VERSION": "Application Version",

src/portal/src/i18n/lang/fr-fr-lang.json

@@ -467,6 +467,7 @@
         "SRC_REPO": "Source Repository",
         "CREATED": "Created Time",
         "MAINTAINERS": "Maintainers",
+        "OTHER_MAINTAINERS": "{{ name }} and {{ number }} others",
         "PULLS": "Pull Count",
         "VERSION": "Version",
         "APP_VERSION": "Application Version",

src/portal/src/i18n/lang/zh-cn-lang.json

@@ -489,6 +489,7 @@
         "SRC_REPO": "源仓库",
         "CREATED": "创建时间",
         "MAINTAINERS": "维护者",
+        "OTHER_MAINTAINERS": "{{ name }} 与其他 {{ number }} 位",
         "PULLS": "拉取数",
         "VERSION": "版本",
         "INSTALL": "安装",