From 7ba485b7e3a7c6f3b5603c4bebed50111f503c66 Mon Sep 17 00:00:00 2001
From: Ezhilarasi <ezhrajam@in.ibm.com>
Date: Mon, 29 Jul 2019 22:20:39 +0530
Subject: Search component display of CBA

Create blueprint search blueprint
Change-Id: Iaa7dfbb2406d43f533587d5208fbe6c04ac7d97c
Issue-ID: CCSDK-1275
Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
---
 .../src/app/common/constants/app-constants.ts      |  2 +-
 .../search-from-database.component.html            |  3 +-
 .../search-from-database.component.ts              | 47 +++++++++++-----------
 .../search-template/search-template.service.ts     |  2 +-
 4 files changed, 28 insertions(+), 26 deletions(-)

(limited to 'cds-ui')

diff --git a/cds-ui/client/src/app/common/constants/app-constants.ts b/cds-ui/client/src/app/common/constants/app-constants.ts
index a01b7b27b..5ebde91e3 100644
--- a/cds-ui/client/src/app/common/constants/app-constants.ts
+++ b/cds-ui/client/src/app/common/constants/app-constants.ts
@@ -95,7 +95,7 @@ export const GlobalContants = {
 
 export const BlueprintURLs = {
    getAllBlueprints: '/controllerblueprint/all',
-   searchByTag: '/controllerblueprint/searchByTags/{tags}',
+   searchByTag: '/controllerblueprint/searchByTags/',
    save: '/controllerblueprint/create-blueprint',
    publish: '/controllerblueprint/publish',
    enrich: '/controllerblueprint/enrich-blueprint',
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html
index a3c287254..ca260394b 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.html
@@ -21,6 +21,7 @@ limitations under the License.
 <form class="search-form" [formGroup]="myControl">
     <mat-form-field class="search-full-width">
         <input #resourceSelect type="text" [(ngModel)]="searchText" placeholder="Search Resources" matInput [matAutocomplete]="auto" formControlName="search_input">
+        <!-- <input #resourceSelect type="text" [(ngModel)]="searchText" placeholder="Search Resources" formControlName="search_input"> -->
         <button matSuffix mat-icon-button (click)="fetchResourceByName()">
       <mat-icon>search</mat-icon>
     </button>
@@ -35,7 +36,7 @@ limitations under the License.
     <mat-grid-tile *ngFor="let option of options">
         <mat-card class="example-card">
             <mat-card-content class="card-content">
-                {{option}}
+                {{option.blueprintModel.artifactName}}
             </mat-card-content>
             <mat-card-actions>
                 <button mat-menu-item>Edit</button>
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
index 5ae1850cc..1c3630649 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-from-database/search-from-database.component.ts
@@ -19,8 +19,8 @@ limitations under the License.
 ============LICENSE_END============================================
 */
 
-import { Component, OnInit, ViewChild, EventEmitter, Output  } from '@angular/core';
-import { FormBuilder, FormGroup, Validators} from '@angular/forms';
+import { Component, OnInit, ViewChild, EventEmitter, Output } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { SearchTemplateService } from '../search-template.service';
 import { MatAutocompleteTrigger } from '@angular/material';
 import { SearchPipe } from 'src/app/common/shared/pipes/search.pipe';
@@ -32,35 +32,36 @@ import { SearchPipe } from 'src/app/common/shared/pipes/search.pipe';
 export class SearchFromDatabaseComponent implements OnInit {
 
   myControl: FormGroup;
-  @Output() resourcesData = new EventEmitter();  
-  options: any[]   = [];
+  @Output() resourcesData = new EventEmitter();
+  options: any[] = [];
   @ViewChild('resourceSelect', { read: MatAutocompleteTrigger }) resourceSelect: MatAutocompleteTrigger;
 
   searchText: string = '';
   constructor(private _formBuilder: FormBuilder,
-              private existingModelService: SearchTemplateService)  { }
-  
- ngOnInit() {
+    private searchService: SearchTemplateService) { }
+
+  ngOnInit() {
     this.myControl = this._formBuilder.group({
       search_input: ['', Validators.required]
     });
   }
- selected(value){
-   this.resourcesData.emit(value);
-   }
+  selected(value) {
+    this.resourcesData.emit(value);
+  }
 
-   fetchResourceByName() {
-      // this.existingModelService.searchByTags("/searchByTags/",this.searchText)
-      // .subscribe(data=>{
-      //     console.log(data);
-      //     data.forEach(element => {
-      //       this.options.push(element)
-      //     });          
-      //   this.resourceSelect.openPanel();
-      // }, error=>{
-      //   window.alert('error' + error);
-      // })
-      this.options=['test','vns','capability','hello','hi','hoi','dfagfagshdgfashdf','adsfhksd'];
-   }
+  fetchResourceByName() {
+    this.searchService.searchByTags(this.searchText)
+      .subscribe(data => {
+        // console.log(data);
+        data.forEach(element => {
+          this.options.push(element)
+        });
+        // this.resourceSelect.openPanel();
+      }, error => {
+        window.alert('error' + error);
+      })
+  console.log(this.options)
+    // this.options=['test','vns','capability','hello','hi','hoi','dfagfagshdgfashdf','adsfhksd'];
+  }
 
 }
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
index 9ce714dc9..31a839cc3 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.service.ts
@@ -33,6 +33,6 @@ export class SearchTemplateService {
   constructor(private _http: HttpClient, private api: ApiService) { }
 
   searchByTags(searchText: String): Observable<any>{
-    return this.api.post(BlueprintURLs.searchByTag, searchText);
+    return this.api.get(BlueprintURLs.searchByTag+'/'+searchText);
   }
 }
-- 
cgit 1.2.3-korg