From 72b6be686259f6990bd586f645e02072688c7f1f Mon Sep 17 00:00:00 2001 From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com> Date: Wed, 22 Apr 2020 16:36:11 +0200 Subject: [PATCH] IOS service updated --- .../add-ios-template/add-ios-template.component.ts | 13 +++++++++---- src/app/services/ios.service.ts | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts index 4a5847be..cd7c7aca 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts @@ -86,6 +86,7 @@ export class AddIosTemplateComponent implements OnInit { status: number, headers: ParsedResponseHeaders ) => { + this.getImages(); this.toasterService.success('Image uploaded'); }; @@ -93,9 +94,7 @@ export class AddIosTemplateComponent implements OnInit { this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { this.server = server; - this.iosService.getImages(this.server).subscribe((images: IosImage[]) => { - this.iosImages = images; - }); + this.getImages(); this.templateMocksService.getIosTemplate().subscribe((iosTemplate: IosTemplate) => { this.iosTemplate = iosTemplate; @@ -112,12 +111,18 @@ export class AddIosTemplateComponent implements OnInit { }); } + getImages() { + this.iosService.getImages(this.server).subscribe((images: IosImage[]) => { + this.iosImages = images; + }); + } + addImage(event): void { let name = event.target.files[0].name.split('-')[0]; this.iosNameForm.controls['templateName'].setValue(name); let fileName = event.target.files[0].name; - const url = this.iosService.getImagePath(fileName); + const url = this.iosService.getImagePath(this.server, fileName); this.uploader.queue.forEach(elem => (elem.url = url)); const itemToUpload = this.uploader.queue[0]; diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index 168d1641..41c6a423 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -13,8 +13,8 @@ export class IosService { return this.httpServer.get(server, '/compute/dynamips/images') as Observable; } - getImagePath(filename: string): string { - return `/compute/dynamips/images/${filename}`; + getImagePath(server: Server, filename: string): string { + return `http://${server.host}:${server.port}/v2/compute/dynamips/images/${filename}`; } getTemplates(server: Server): Observable {