From df8f39e951d13f1ad0e9d4ec5bb77ee4e63b6e35 Mon Sep 17 00:00:00 2001
From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com>
Date: Thu, 18 Jun 2020 17:27:52 +0200
Subject: [PATCH] Fix for importing images
---
.../new-template-dialog.component.html | 2 +-
.../new-template-dialog.component.ts | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
index 3dcbc942..d68d1e26 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
@@ -101,7 +101,7 @@
(change)="addAppliance($event)"
ng2FileSelect
[uploader]="uploader"/>
-
+
diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
index 29e06ad3..e90c4097 100644
--- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
+++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
@@ -109,8 +109,6 @@ export class NewTemplateDialogComponent implements OnInit {
this.uploaderImage.onSuccessItem = (item: FileItem, response: string, status: number, headers: ParsedResponseHeaders) => {
this.toasterService.success('Image imported succesfully');
};
-
- this.getAppliance('http://127.0.0.1:3080/v2/compute/qemu/images/firefox.gns3a');
}
getAppliance(url: string) {
@@ -118,6 +116,9 @@ export class NewTemplateDialogComponent implements OnInit {
let appliancePath = str[str.length-1];
this.applianceService.getAppliance(this.server, appliancePath).subscribe((appliance: Appliance) => {
this.applianceToInstall = appliance;
+ setTimeout(() => {
+ this.stepper.next();
+ }, 100);
});
}
@@ -225,20 +226,15 @@ export class NewTemplateDialogComponent implements OnInit {
let emulator;
fileReader.onloadend = () => {
- let appliance = JSON.parse(fileReader.result as string);
-
- if (appliance.docker) emulator = 'docker';
- if (appliance.dynamips) emulator = 'dynamips';
- if (appliance.iou) emulator = 'iou';
- if (appliance.qemu) emulator = 'qemu';
+ if (this.applianceToInstall.qemu) emulator = 'qemu';
const url = this.applianceService.getUploadPath(this.server, emulator, fileName);
- this.uploader.queue.forEach(elem => (elem.url = url));
+ this.uploaderImage.queue.forEach(elem => (elem.url = url));
- const itemToUpload = this.uploader.queue[0];
+ const itemToUpload = this.uploaderImage.queue[0];
(itemToUpload as any).options.disableMultipart = true;
- this.uploader.uploadItem(itemToUpload);
+ this.uploaderImage.uploadItem(itemToUpload);
};
fileReader.readAsText(file);