From: Dan Timoney <dtimoney@att.com>
Date: Tue, 25 Jun 2019 18:57:41 +0000 (+0000)
Subject: Merge "Replace windows alert with Notification component"
X-Git-Tag: 0.5.0~126
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ed124819a2c928d895ba275d51eadc97afdf5a09;p=ccsdk%2Fcds.git

Merge "Replace windows alert with Notification component"
---

ed124819a2c928d895ba275d51eadc97afdf5a09
diff --cc cds-ui/client/src/app/feature-modules/blueprint/select-template/metadata/metadata.component.ts
index 0792c4478,c7f6dec67..cefe0fd93
--- 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
@@@ -96,15 -97,10 +97,16 @@@ export class MetadataComponent implemen
    }
  
    UploadMetadata() {
+     this.loader.showLoader();
      this.metadata = Object.assign({}, this.CBAMetadataForm.value);
      this.blueprint.metadata = this.metadata;
 -
 +    if( this.blueprint && 
 +        this.blueprint['topology_template'] && 
 +        this.blueprint['topology_template'].workflows && 
 +        this.blueprint['topology_template'].workflows['resource-assignment'] &&
 +        this.blueprint['topology_template'].workflows['resource-assignment'].name) {
 +          delete this.blueprint['topology_template'].workflows['resource-assignment'].name;
 +      }
      this.filesData.forEach((fileNode) => {
        if (fileNode.name.includes(this.blueprintName) && fileNode.name == this.entryDefinition) {
          fileNode.data = JSON.stringify(this.blueprint, null, "\t");