Merge "Fixed issues in metadata component"

3 files changed, 8 insertions, 7 deletions

diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
index 033950b3a..2327a5839 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
@@ -59,6 +59,7 @@ export class MetadataComponent implements OnInit {
       blueprintdata => {
         var blueprintState: IBlueprintState = { blueprint: blueprintdata.blueprint, isLoadSuccess: blueprintdata.isLoadSuccess, isSaveSuccess: blueprintdata.isSaveSuccess, isUpdateSuccess: blueprintdata.isUpdateSuccess };
         this.metadata = blueprintState.blueprint.metadata;
+        this.blueprint = blueprintState.blueprint;
         let metadatavalues = [];
         for (let key in this.metadata) {
           if (this.metadata.hasOwnProperty(key)) {
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html
index f0a38324b..d11b37144 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html
@@ -34,7 +34,7 @@ limitations under the License.
         <ng-template matStepLabel>Browse CBA Template file</ng-template>
         <div class="matStepContent">
             <app-search-template (cbaFile)="fileChange($event)"></app-search-template>
-           <!-- <div>
+            <!-- <div>
                 <button mat-button matStepperNext class="matStepNextBtn">Upload</button>
             </div>-->
         </div>
@@ -46,4 +46,4 @@ limitations under the License.
         </div>
     </mat-step>
 </mat-vertical-stepper>
-<button mat-button matStepperNext class="matStepNextBtn" (click)="saveBlueprintModel()">Next</button>
\ No newline at end of file
+<button mat-button matStepperNext class="matStepNextBtn">Next</button>
\ No newline at end of file
diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts
index 431b734e9..d9591dd80 100644
--- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts
+++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts
@@ -57,9 +57,9 @@ export class SelectTemplateComponent implements OnInit {
   upload() {
 
   }
-  saveBlueprintModel(){
-    this.blueprint.toplogyTemplates=this.topologyTemplate;
-    this.blueprint.metadata= this.metaData;
-   // this.store.dispatch(new CreateBlueprint(this.blueprint));
-  }
+  // saveBlueprintModel(){
+  //   this.blueprint.toplogyTemplates=this.topologyTemplate;
+  //   this.blueprint.metadata= this.metaData;
+  //  // this.store.dispatch(new CreateBlueprint(this.blueprint));
+  // }
 }