diff options
author | Dan Timoney <dtimoney@att.com> | 2019-09-04 15:45:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-09-04 15:45:25 +0000 |
commit | 0bc235b587922bd8f4bcefbfc4a22fc3faba538e (patch) | |
tree | 11fa606f43a3c0a887ce3b2800d417fe65eb0f8a /cds-ui/client/src/app/feature-modules/blueprint | |
parent | 302ec11f5832bca25336febccedbc49490fc1106 (diff) | |
parent | 142ec3d2625d5d6fa8518a8e2b22832e93466f60 (diff) |
Merge "CDS UI code changes"
Diffstat (limited to 'cds-ui/client/src/app/feature-modules/blueprint')
3 files changed, 3 insertions, 9 deletions
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 1341b8bd1..58ed036aa 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 @@ -93,11 +93,9 @@ export class SearchFromDatabaseComponent implements OnInit { .then(blob => { const formData = new FormData(); formData.append("file", blob); - // this.editorService.enrich("/enrich-blueprint/", formData) this.searchService.getBlueprintZip(artifactName + "/" + artifactVersion) .subscribe( (response) => { - // console.log(response); this.zipFile.files = {}; this.zipFile.loadAsync(response) .then((zip) => { @@ -105,7 +103,7 @@ export class SearchFromDatabaseComponent implements OnInit { this.buildFileViewData(zip); } }); - // this.alertService.success('Blueprint enriched successfully'); + }, (error) => { this.alertService.error('Blue print error' + error.message); @@ -116,12 +114,9 @@ export class SearchFromDatabaseComponent implements OnInit { async buildFileViewData(zip) { this.validfile = false; this.paths = []; - // console.log(zip.files); for (var file in zip.files) { console.log("name: " + zip.files[file].name); this.fileObject = { - // nameForUIDisplay: this.uploadedFileName + '/' + zip.files[file].name, - // name: zip.files[file].name, name: this.uploadedFileName + '/' + zip.files[file].name, data: '' }; diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts index ee6e9631e..ed01e63b2 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/search-template/search-template.component.ts @@ -99,7 +99,7 @@ export class SearchTemplateComponent implements OnInit { entryDefinition: this.entryDefinition } this.store.dispatch(new SetBlueprintState(blueprintState)) - // this.store.dispatch(new LoadBlueprintSuccess(data)); + } async buildFileViewData(zip) { 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 a4e30a494..d79f9d870 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,6 @@ 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'; @NgModule({ declarations: [ @@ -42,6 +41,6 @@ import { SharedModule} from 'src/app/common/shared/shared.module'; SearchTemplateComponent, SearchFromDatabaseComponent ], - // providers:[ SelectTemplateService] + }) export class SearchTemplateModule { } |