From 8f73f25131bc6c8778b06d85863c3d2cc9beaa96 Mon Sep 17 00:00:00 2001 From: Ahmedeldeeb50 Date: Tue, 24 Nov 2020 11:51:41 +0200 Subject: add enrich button in the designer add loader with designer actions Issue-ID: CCSDK-2900 Signed-off-by: Ahmedeldeeb50 Change-Id: I53fc5577a814fbb4eac406dad251a484393bb4d8 --- .../packages/designer/designer.component.html | 6 ++- .../packages/designer/designer.component.ts | 50 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html index b0bfe8be7..c51c7fa7b 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.html @@ -1,4 +1,5 @@ +
@@ -92,7 +93,10 @@ Save
  • - Save & Deploy + Enrich +
  • +
  • + Deploy
  • diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts index 3011dd790..1aa283ca3 100644 --- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts +++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/designer/designer.component.ts @@ -52,6 +52,7 @@ import { CBAPackage } from '../package-creation/mapping-models/CBAPacakge.model' import { TopologyTemplate } from './model/designer.topologyTemplate.model'; import { ToastrService } from 'ngx-toastr'; import { DesignerDashboardState } from './model/designer.dashboard.state'; +import { NgxUiLoaderService } from 'ngx-ui-loader'; @Component({ selector: 'app-designer', @@ -100,6 +101,7 @@ export class DesignerComponent implements OnInit, OnDestroy { private packageCreationService: PackageCreationService, private packageCreationExtractionService: PackageCreationExtractionService, private activatedRoute: ActivatedRoute, + private ngxService: NgxUiLoaderService, private toastService: ToastrService) { this.controllerSideBar = true; this.actionAttributesSideBar = false; @@ -152,6 +154,7 @@ export class DesignerComponent implements OnInit, OnDestroy { */ ngOnInit() { + // this.ngxService.start(); this.customActionName = this.route.snapshot.paramMap.get('actionName'); if (this.customActionName !== '') { this.showAction = true; @@ -450,7 +453,7 @@ export class DesignerComponent implements OnInit, OnDestroy { } saveBluePrint() { - + this.ngxService.start(); FilesContent.clear(); let packageCreationModes: PackageCreationModes; this.cbaPackage = PackageCreationModes.mapModeType(this.cbaPackage); @@ -465,6 +468,46 @@ export class DesignerComponent implements OnInit, OnDestroy { } + enrichBluePrint() { + this.ngxService.start(); + this.packageCreationStore.addTopologyTemplate(this.cbaPackage.templateTopology); + this.formTreeData(); + this.enrichPackage(); + this.designerStore.clear(); + this.packageCreationStore.clear(); + } + + private formTreeData() { + FilesContent.clear(); + let packageCreationModes: PackageCreationModes; + this.cbaPackage = PackageCreationModes.mapModeType(this.cbaPackage); + this.cbaPackage.metaData = PackageCreationModes.setEntryPoint(this.cbaPackage.metaData); + packageCreationModes = PackageCreationBuilder.getCreationMode(this.cbaPackage); + packageCreationModes.execute(this.cbaPackage, this.packageCreationUtils); + this.filesData.push(this.folder.TREE_DATA); + } + private enrichPackage() { + this.create(); + this.zipFile.generateAsync({ type: 'blob' }) + .then(blob => { + this.packageCreationService.enrichPackage(blob).subscribe(response => { + console.log('success'); + const blobInfo = new Blob([response], { type: 'application/octet-stream' }); + this.packageCreationStore.clear(); + this.packageCreationExtractionService.extractBlobToStore(blobInfo); + this.toastService.info('enriched successfully '); + }, err => { + }, () => { + this.ngxService.stop(); + }); + }, error => { + this.toastService.error('error happened when enrich ' + error.message); + console.error('Error -' + error.message); + }, () => { + this.ngxService.stop(); + }); + } + create() { this.zipFile = new JSZip(); FilesContent.getMapOfFilesNamesAndContent().forEach((value, key) => { @@ -487,8 +530,11 @@ export class DesignerComponent implements OnInit, OnDestroy { }, error => { this.toastService.error('error happened when editing ' + error.message); console.log('Error -' + error.message); + }, () => { + this.ngxService.stop(); }); - }); + }, err => { }, + () => { this.ngxService.stop(); }); } openActionAttributes(customActionName: string) { -- cgit 1.2.3-korg