From 5306da4cdbd068ec0785a785cc8d24bb1f03f549 Mon Sep 17 00:00:00 2001
From: Ezhilarasi <ezhrajam@in.ibm.com>
Date: Thu, 22 Aug 2019 23:08:39 +0530
Subject: Passing Option from Search DB to metadata

Changes to make metadata and editor option based Search from db buttons
Change-Id: I93f1f2658b2c2d4ba11f35cc44c190998c08381d
Issue-ID: CCSDK-1275
Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
---
 .../search-from-database/search-from-database.component.html     | 6 +++---
 .../search-from-database/search-from-database.component.ts       | 9 +++++----
 .../select-template/search-template/search-template.module.ts    | 4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template')

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 648271028..9cab6c44d 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
@@ -41,9 +41,9 @@ limitations under the License.
                     <br>{{option.blueprintModel.updatedBy}}
                 </mat-card-content>
                 <mat-card-actions class="flexBox">
-                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,edit)">Edit</button>
-                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,clone)">Clone</button>
-                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,info)">Info</button>
+                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,1)">Edit</button>
+                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,2)">Clone</button>
+                    <button matStepperNext mat-menu-item (click)="editCBA(option.blueprintModel.artifactName,option.blueprintModel.artifactVersion,3)">Info</button>
                 </mat-card-actions>
             </mat-card>
         </div>
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 588854f6b..47771a7aa 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
@@ -33,7 +33,7 @@ import { IBlueprint } from '../../../../../common/core/store/models/blueprint.mo
 import { IBlueprintState } from '../../../../../common/core/store/models/blueprintState.model';
 import { IAppState } from '../../../../../common/core/store/state/app.state';
 import { SetBlueprintState } from '../../../../../common/core/store/actions/blueprint.action';
-
+import { SelectTemplateService } from '../../select-template.service';
 @Component({
   selector: 'app-search-from-database',
   templateUrl: './search-from-database.component.html',
@@ -61,8 +61,8 @@ export class SearchFromDatabaseComponent implements OnInit {
 
   searchText: string = '';
   constructor(private _formBuilder: FormBuilder,
-    private searchService: SearchTemplateService, private alertService: NotificationHandlerService, 
-    private loader: LoaderService, private store: Store<IAppState>) { }
+    private searchService: SearchTemplateService, private alertService: NotificationHandlerService,
+    private loader: LoaderService, private store: Store<IAppState>, private cbEditOption: SelectTemplateService) { }
 
   ngOnInit() {
     this.myControl = this._formBuilder.group({
@@ -85,7 +85,8 @@ export class SearchFromDatabaseComponent implements OnInit {
       })
   }
 
-  editCBA(artifactName: string,artifactVersion:string, option: string) {
+  editCBA(artifactName: string, artifactVersion: string, option: string) {
+    this.cbEditOption.setCbaOption(option);
     this.zipFile.generateAsync({ type: "blob" })
       .then(blob => {
         const formData = new FormData();
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts
index 9bafaebdc..a4e30a494 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.module.ts
@@ -26,7 +26,7 @@ import { SearchTemplateComponent } from './search-template.component';
 import { ReactiveFormsModule } from '@angular/forms';
 import { AppMaterialModule } from 'src/app/common/modules/app-material.module';
 import { SharedModule} from 'src/app/common/shared/shared.module';
-import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service';
+// import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-template/select-template.service';
   
 @NgModule({
   declarations: [
@@ -42,6 +42,6 @@ import { SelectTemplateService } from 'src/app/feature-modules/blueprint/select-
     SearchTemplateComponent,
     SearchFromDatabaseComponent
     ],
-  providers:[ SelectTemplateService]
+  // providers:[ SelectTemplateService]
 })
 export class SearchTemplateModule { }
-- 
cgit 1.2.3-korg