From 07b70ec6b649020eed49bc4a81cb381a65c3d095 Mon Sep 17 00:00:00 2001 From: Ezhilarasi Date: Thu, 11 Apr 2019 18:34:10 +0530 Subject: Enrichment and Download Zip file bug fix Change-Id: If4219a99bfc7082648a28149652d75a09333bd55 Issue-ID: CCSDK-1212 Signed-off-by: Ezhilarasi --- .../src/app/common/core/services/api.service.ts | 32 +-- .../modify-template/editor/editor.component.ts | 216 +++++++++++---------- .../modify-template/editor/editor.service.ts | 58 ++++++ .../modify-template/modify-template.component.html | 2 +- .../modify-template/modify-template.module.ts | 3 +- 5 files changed, 183 insertions(+), 128 deletions(-) create mode 100644 cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts (limited to 'cds-ui/client/src') diff --git a/cds-ui/client/src/app/common/core/services/api.service.ts b/cds-ui/client/src/app/common/core/services/api.service.ts index 20d8a9bce..463ef3827 100644 --- a/cds-ui/client/src/app/common/core/services/api.service.ts +++ b/cds-ui/client/src/app/common/core/services/api.service.ts @@ -31,38 +31,14 @@ export class ApiService { constructor(private _http: HttpClient) { } - enrich(uri: string, body: FormData): Observable { - - var HTTPOptions = { - headers: new HttpHeaders({ 'Accept': 'application/zip', }), - observe: "response" as 'body',// to display the full response & as 'body' for type cast - 'responseType': 'blob' as 'json' - } - return this._http.post(LoopbackConfig.url + uri, body, HTTPOptions); - + get(url: string, params?: any): Observable { + return this._http.get(url,params); } - downloadCBA(uri: string, params?: any): Observable { - // return this._http.get(LoopbackConfig.url+uri); - var HTTPOptions = { - headers: new HttpHeaders({ 'Accept': 'application/zip; charset=UTF-8', }), - observe: "response" as 'body',// to display the full response & as 'body' for type cast - 'responseType': 'blob' as 'json' - } - return this._http.get(LoopbackConfig.url + uri, HTTPOptions); - } + post(url: string, body: any | null, options?:any): Observable { - post(uri: string, body: FormData): Observable { - // to do - const httpOptions = { - headers: new HttpHeaders({ - 'Authorization': LoopbackConfig.authtoken, - - }) - }; - return this._http.post(LoopbackConfig.url + uri, body, httpOptions); + return this._http.post(url, body,options); } - put() { // to do } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts index 7cbf5b0a5..73cc72cfd 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.component.ts @@ -36,7 +36,8 @@ import { Observable } from 'rxjs'; import { IBlueprintState } from 'src/app/common/core/store/models/blueprintState.model'; import { LoadBlueprintSuccess, SetBlueprintState } from '../../../../common/core/store/actions/blueprint.action' import { ApiService } from 'src/app/common/core/services/api.service'; - +import { IMetaData } from 'src/app/common/core/store/models/metadata.model'; +import { EditorService } from './editor.service'; interface Node { name: string; @@ -92,9 +93,9 @@ export class EditorComponent implements OnInit { currentFilePath: string = ''; selectedFileObj = { name: '', type: '' }; viewTemplateMode: boolean = false; - paramData : any = { + paramData: any = { 'capability-data': [], - 'resourceAccumulatorResolvedData' : [] + 'resourceAccumulatorResolvedData': [] }; validfile: boolean = false; @ViewChild('fileInput') fileInput; @@ -103,6 +104,7 @@ export class EditorComponent implements OnInit { private tree; private fileObject: any; private tocsaMetadaData: any; + metadata: IMetaData; private transformer = (node: Node, level: number) => { return { @@ -119,8 +121,10 @@ export class EditorComponent implements OnInit { this.transformer, node => node.level, node => node.expandable, node => node.children); dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + artifactName: any; + artifactVersion: any; - constructor(private store: Store, private apiservice: ApiService) { + constructor(private store: Store, private apiservice: EditorService) { this.dataSource.data = TREE_DATA; this.bpState = this.store.select('blueprint'); // this.dataSource.data = TREE_DATA; @@ -161,8 +165,15 @@ export class EditorComponent implements OnInit { blueprint.push(this.blueprintdata[key]); } } - // this.text = JSON.stringify(this.blueprintdata, null, '\t'); - // this.editor.getEditor().getSession().setMode("ace/mode/json"); + this.metadata=blueprintState.blueprint.metadata; + let metadatavalues = []; + for (let key in this.metadata) { + if (this.metadata.hasOwnProperty(key)) { + metadatavalues.push(this.metadata[key]); + } + } + this.artifactName = metadatavalues[3]; + this.artifactVersion = metadatavalues[4]; this.editor.getEditor().getSession().setTabSize(2); this.editor.getEditor().getSession().setUseWrapMode(true); this.setEditorMode(); @@ -197,7 +208,7 @@ export class EditorComponent implements OnInit { } selectFileToView(file) { - if(file.name.includes('.vtl')) { this.viewTemplateMode = true;} else { this.viewTemplateMode = false;} + if (file.name.includes('.vtl')) { this.viewTemplateMode = true; } else { this.viewTemplateMode = false; } this.currentFilePath = ''; this.expandParents(file); this.selectedFileObj.name = file.name; @@ -224,70 +235,21 @@ export class EditorComponent implements OnInit { this.apiservice.enrich("/enrich-blueprint/", formData) .subscribe( (response) => { - console.log("Inside blob"); - var blob = new Blob([response.data], { type: 'application/zip' }); - const fileName = 'CBA.zip'; - saveAs(blob, fileName); this.zipFile.files = {}; - this.zipFile.loadAsync(blob) + this.zipFile.loadAsync(response) .then((zip) => { if (zip) { this.buildFileViewData(zip); + console.log("processed"); } }); - + window.alert('Blueprint enriched successfully' ); }); - }); - - } - async buildFileViewData(zip) { - this.validfile = false; - this.paths = []; - for (var file in zip.files) { - this.fileObject = { - name: zip.files[file].name, - data: '' - }; - const value = await zip.files[file].async('string'); - this.fileObject.data = value; - this.paths.push(this.fileObject); - } - - if(this.paths) { - this.paths.forEach(path =>{ - if(path.name.includes("TOSCA.meta")) { - this.validfile = true - } - }); - } else { - alert('Please update proper file'); - } - - if(this.validfile) { - this.fetchTOSACAMetadata(); - this.tree = this.arrangeTreeData(this.paths); - } else { - alert('Please update proper file with TOSCA metadata'); - } } + - fetchTOSACAMetadata() { - let toscaData = {}; - this.paths.forEach(file =>{ - if(file.name.includes('TOSCA.meta')) { - let keys = file.data.split("\n"); - keys.forEach((key)=>{ - let propertyData = key.split(':'); - toscaData[propertyData[0]] = propertyData[1]; - }); - } - }); - this.blueprintName = (((toscaData['Entry-Definitions']).split('/'))[1]).toString();; - console.log(toscaData); - } - saveToBackend() { this.create(); this.zipFile.generateAsync({ type: "blob" }) @@ -295,7 +257,11 @@ export class EditorComponent implements OnInit { const formData = new FormData(); formData.append("file", blob); this.apiservice.post("/create-blueprint/", formData) - .subscribe(data => console.log(data)); + .subscribe( + data => { + // console.log(data); + window.alert('Success:' + JSON.stringify(data)); + }); }); } @@ -307,8 +273,11 @@ export class EditorComponent implements OnInit { .then(blob => { const formData = new FormData(); formData.append("file", blob); - this.apiservice.post("/deploy-blueprint/", formData) - .subscribe(data => console.log(data)); + this.apiservice.deployPost("/deploy-blueprint/", formData) + .subscribe(data => { + // console.log(data); + window.alert('Saved Successfully:' + JSON.stringify(data)); + }); }); } @@ -320,7 +289,10 @@ export class EditorComponent implements OnInit { const formData = new FormData(); formData.append("file", blob); this.apiservice.post("/publish/", formData) - .subscribe(data => console.log(data)); + .subscribe(data => { + // console.log(data); + window.alert('Published:' + JSON.stringify(data)); + }); }); @@ -333,17 +305,19 @@ export class EditorComponent implements OnInit { } download() { - this.apiservice.downloadCBA("/download-blueprint/baseconfiguration/1.0.0") - .subscribe(response => { - console.log(response); - var blob = new Blob([response], { type: 'application/zip' }); - const fileName = 'CBA'; - saveAs(blob, fileName); - }, - error => { - console.log(error); - } - ); + console.log(this.artifactName); + status = this.apiservice.downloadCBA("/download-blueprint/" + this.artifactName + "/" + this.artifactVersion); + window.alert(status); + // .subscribe(response => { + // console.log(response); + // var blob = new Blob([response], { type: 'application/zip' }); + // const fileName = 'CBA'; + // saveAs(blob, fileName); + // }, + // error => { + // console.log(error); + // } + // ); } setEditorMode() { switch (this.fileExtension) { @@ -417,6 +391,52 @@ export class EditorComponent implements OnInit { return indexForNewNode; } + async buildFileViewData(zip) { + this.validfile = false; + this.paths = []; + for (var file in zip.files) { + this.fileObject = { + name: zip.files[file].name, + data: '' + }; + const value = await zip.files[file].async('string'); + this.fileObject.data = value; + this.paths.push(this.fileObject); + } + + if (this.paths) { + this.paths.forEach(path => { + if (path.name.includes("TOSCA.meta")) { + this.validfile = true + } + }); + } else { + alert('Please update proper file'); + } + + if (this.validfile) { + this.fetchTOSACAMetadata(); + this.tree = this.arrangeTreeData(this.paths); + } else { + alert('Please update proper file with TOSCA metadata'); + } + } + + fetchTOSACAMetadata() { + let toscaData = {}; + this.paths.forEach(file => { + if (file.name.includes('TOSCA.meta')) { + let keys = file.data.split("\n"); + keys.forEach((key) => { + let propertyData = key.split(':'); + toscaData[propertyData[0]] = propertyData[1]; + }); + } + }); + this.blueprintName = (((toscaData['Entry-Definitions']).split('/'))[1]).toString();; + console.log(toscaData); + } + arrangeTreeData(paths) { const tree = []; @@ -505,34 +525,34 @@ export class EditorComponent implements OnInit { } loadConfigParams() { console.log(this.currentFilePath); - console.log(this.selectedFile); - console.log(this.selectedFileObj); - console.log(this.selectedFolder); - console.log(this.text); - - let parsedData = JSON.parse(this.text); - this.paramData.resourceAccumulatorResolvedData = parsedData['resource-accumulator-resolved-data']; - let i=0; - - this.paramData.resourceAccumulatorResolvedData.forEach(element => { - element.id = i; - let tempElement = element['param-value']; - let indexLength = tempElement.length; - tempElement = tempElement.slice(2,indexLength); - let index = tempElement.indexOf('}'); - tempElement = this.removeItemByIndex(tempElement, index); - element['param-value'] = tempElement; - i++; - }); + console.log(this.selectedFile); + console.log(this.selectedFileObj); + console.log(this.selectedFolder); + console.log(this.text); + + let parsedData = JSON.parse(this.text); + this.paramData.resourceAccumulatorResolvedData = parsedData['resource-accumulator-resolved-data']; + let i = 0; + + this.paramData.resourceAccumulatorResolvedData.forEach(element => { + element.id = i; + let tempElement = element['param-value']; + let indexLength = tempElement.length; + tempElement = tempElement.slice(2, indexLength); + let index = tempElement.indexOf('}'); + tempElement = this.removeItemByIndex(tempElement, index); + element['param-value'] = tempElement; + i++; + }); } removeItemByIndex(paramValue, index) { - if(index == 0) { - return paramValue.slice(1) - } else if(index > 0) { + if (index == 0) { + return paramValue.slice(1) + } else if (index > 0) { let indexLength = paramValue.length; - return paramValue.slice(0,index) + paramValue.slice(index+1, indexLength); + return paramValue.slice(0, index) + paramValue.slice(index + 1, indexLength); } else { return paramValue; } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts new file mode 100644 index 000000000..98e43b6b1 --- /dev/null +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/editor/editor.service.ts @@ -0,0 +1,58 @@ +/* +============LICENSE_START========================================== +=================================================================== +Copyright (C) 2018 IBM Intellectual Property. All rights reserved. +=================================================================== + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the License); +you may not use this software except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END============================================ +*/ + + +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable, observable } from 'rxjs'; +import { ApiService } from '../../../../common/core/services/api.service'; +import { LoopbackConfig } from '../../../../common/constants/app-constants'; +import { saveAs } from 'file-saver'; + +@Injectable() +export class EditorService { + // blueprintUrl = '../../constants/blueprint.json'; + + constructor(private _http: HttpClient, private api: ApiService) { + } + + enrich(uri: string, body: FormData): Observable { + return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'blob' }); + } + downloadCBA(uri: string): string { + this.api.get(LoopbackConfig.url + uri, { responseType: 'blob' }) + .subscribe(response => { + let blob = new Blob([response], { 'type': "application/octet-stream" }); + saveAs(blob, "CBA.zip"); + }); + return "Download Success"; + + } + post(uri: string, body: any | null, options?: any): Observable { + + return this.api.post(LoopbackConfig.url + uri, body, options); + } + + deployPost(uri: string, body: any | null, options?: any): Observable { + + return this.api.post(LoopbackConfig.url + uri, body, { responseType: 'text' }); + } +} \ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.component.html b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.component.html index 1d9b5266e..b3eeeeda2 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.component.html @@ -38,7 +38,7 @@ limitations under the License. - + diff --git a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts index 7d22c569b..64ba4cdb1 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/modify-template/modify-template.module.ts @@ -31,6 +31,7 @@ import { EditorComponent } from './editor/editor.component'; import { AceEditorModule } from 'ng2-ace-editor'; import { ResourceMappingComponent } from './resource-mapping/resource-mapping.component'; import { ResourceMappingService } from './resource-mapping/resource-mapping.service'; +import { EditorService } from './editor/editor.service'; @NgModule({ declarations: [ @@ -52,6 +53,6 @@ import { ResourceMappingService } from './resource-mapping/resource-mapping.serv AceEditorModule, FormsModule ], - providers: [ ResourceMappingService ] + providers: [ ResourceMappingService , EditorService ] }) export class ModifyTemplateModule { } -- cgit 1.2.3-korg