From 7fab6fade61a88d4965e3c24e78d59d47b0173dc Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Tue, 2 Jul 2019 01:53:09 -0700 Subject: [PATCH 1/4] Removing console errors from built-in, dynampis, docker --- .../cloud-nodes-add-template.component.html | 2 +- .../cloud-nodes-add-template.component.ts | 2 +- .../ethernet-hubs-add-template.component.html | 4 ++-- .../ethernet-hubs-add-template.component.ts | 4 ++-- .../ethernet-switches-add-template.component.html | 2 +- .../ethernet-switches-add-template.component.ts | 2 +- .../add-docker-template.component.html | 3 --- .../add-docker-template/add-docker-template.component.ts | 3 +++ .../add-ios-template/add-ios-template.component.html | 9 ++------- .../add-ios-template/add-ios-template.component.ts | 5 +++++ 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html index 8698837f..ffa1a4f7 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html @@ -8,7 +8,7 @@
- +
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts index 962a5cc2..d1709375 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts @@ -54,7 +54,7 @@ export class CloudNodesAddTemplateComponent implements OnInit { }); cloudTemplate.template_id = uuid(); - cloudTemplate.name = this.templateName; + cloudTemplate.name = this.formGroup.get('templateName').value; this.builtInTemplatesService.addTemplate(this.server, cloudTemplate).subscribe((cloudNodeTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html index 42448de0..c27e8da5 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html @@ -8,10 +8,10 @@
- + - +
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts index 3bdc7eba..3fc061d3 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts @@ -56,9 +56,9 @@ export class EthernetHubsAddTemplateComponent implements OnInit { }); ethernetHubTemplate.template_id = uuid(); - ethernetHubTemplate.name = this.templateName; + ethernetHubTemplate.name = this.formGroup.get('templateName').value; - for(let i=0; i
- +
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts index 74482f6b..10cf03c1 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts @@ -56,7 +56,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { }); ethernetSwitchTemplate.template_id = uuid(); - ethernetSwitchTemplate.name = this.templateName; + ethernetSwitchTemplate.name = this.formGroup.get('templateName').value; for(let i=0; i @@ -48,7 +47,6 @@ matInput class="templatename" type="text" - [(ngModel)]="dockerTemplate.name" formControlName="templateName" placeholder="Container name"/> @@ -61,7 +59,6 @@ matInput class="networkadapter" type="number" - [(ngModel)]="dockerTemplate.adapters" formControlName="adapters" placeholder="Adapters"/> diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts index 18acf447..5d5827a6 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts @@ -87,6 +87,9 @@ export class AddDockerTemplateComponent implements OnInit { addTemplate() { if ((!this.virtualMachineForm.invalid || !this.newImageSelected) && !this.containerNameForm.invalid && !this.networkAdaptersForm.invalid) { this.dockerTemplate.template_id = uuid(); + this.dockerTemplate.image = this.virtualMachineForm.get('filename').value; + this.dockerTemplate.name = this.containerNameForm.get('templateName').value; + this.dockerTemplate.adapters = this.networkAdaptersForm.get('adapters').value; this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html index e4901ea7..d4c8e1a7 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html @@ -12,7 +12,6 @@ @@ -23,7 +22,6 @@ @@ -31,8 +29,7 @@ + formControlName="platform"> {{platform}} @@ -42,8 +39,7 @@ + formControlName="chassis"> {{chassis}} @@ -61,7 +57,6 @@ 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 07ee02cb..443c9b05 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 @@ -90,6 +90,11 @@ export class AddIosTemplateComponent implements OnInit { addTemplate() { if (!this.iosImageForm.invalid && !this.iosNameForm.invalid && !this.iosMemoryForm.invalid) { this.iosTemplate.template_id = uuid(); + this.iosTemplate.image = this.iosImageForm.get("imageName").value; + this.iosTemplate.name = this.iosNameForm.get('templateName').value; + this.iosTemplate.platform = this.iosNameForm.get('platform').value; + this.iosTemplate.chassis = this.iosNameForm.get('chassis').value; + this.iosTemplate.ram = this.iosMemoryForm.get('memory').value; if (this.isEtherSwitchRouter) { this.iosTemplate.symbol = ":/symbols/multilayer_switch.svg"; From 383b2460205905c8bc16fcdbbbec1dd13a0f89a4 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Tue, 2 Jul 2019 05:57:25 -0700 Subject: [PATCH 2/4] removing console errors from iou & qemu template pages --- .../add-iou-template/add-iou-template.component.html | 3 +-- .../add-iou-template/add-iou-template.component.ts | 2 ++ .../add-qemu-vm-template.component.html | 6 ++---- .../add-qemu-vm-template/add-qemu-vm-template.component.ts | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html index 06fbe7f1..9ce3423e 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html @@ -16,7 +16,7 @@
- +
@@ -59,7 +59,6 @@
diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts index 6723d313..012528b5 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts @@ -82,6 +82,8 @@ export class AddIouTemplateComponent implements OnInit { addTemplate() { if (!this.templateNameForm.invalid && ((this.newImageSelected && !this.imageForm.invalid) || (!this.newImageSelected && this.iouTemplate.path))) { this.iouTemplate.template_id = uuid(); + this.iouTemplate.name = this.templateNameForm.get("templateName").value; + this.iouTemplate.path = this.imageForm.get("imageName").value; this.iouService.addTemplate(this.server, this.iouTemplate).subscribe((template: IouTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html index cf51b441..0d2fe974 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html @@ -12,7 +12,6 @@ @@ -26,9 +25,9 @@
+ [ngModelOptions]="{standalone: true}"> {{binary.path}} @@ -38,7 +37,6 @@ diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts index 0522fe91..3643e4b3 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts @@ -51,7 +51,6 @@ export class AddQemuVmTemplateComponent implements OnInit { }); this.memoryForm = this.formBuilder.group({ - binary: new FormControl('', Validators.required), ramMemory: new FormControl('', Validators.required) }); @@ -95,7 +94,7 @@ export class AddQemuVmTemplateComponent implements OnInit { addTemplate() { if (!this.nameForm.invalid && !this.memoryForm.invalid && (this.selectedImage || this.chosenImage)) { - this.qemuTemplate.ram = this.ramMemory; + this.qemuTemplate.ram = this.memoryForm.get("ramMemory").value; this.qemuTemplate.qemu_path = this.selectedBinary.path; if (this.newImageSelected) { this.qemuTemplate.hda_disk_image = this.chosenImage; @@ -103,6 +102,7 @@ export class AddQemuVmTemplateComponent implements OnInit { this.qemuTemplate.hda_disk_image = this.selectedImage.path; } this.qemuTemplate.template_id = uuid(); + this.qemuTemplate.name = this.nameForm.get("templateName").value(); this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { this.goBack(); From 4377835153d271656dd8023bbe1ba8701c5dd007 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Wed, 3 Jul 2019 03:26:29 -0700 Subject: [PATCH 3/4] coorect flag in styl;e editor + width of menu changed + validation added --- .../ethernet-hubs-add-template.component.ts | 1 - .../ethernet-switches-add-template.component.html | 3 +++ .../ethernet-switches-add-template.component.ts | 3 +-- .../add-qemu-vm-template/add-qemu-vm-template.component.ts | 2 +- .../drawings-editors/style-editor/style-editor.component.html | 2 +- src/app/components/project-map/project-map.component.scss | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts index 3fc061d3..33c84606 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts @@ -17,7 +17,6 @@ import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms' }) export class EthernetHubsAddTemplateComponent implements OnInit { server: Server; - numberOfPorts: number; templateName: string = ''; formGroup: FormGroup; diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html index 51637272..1ff99a91 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html @@ -10,6 +10,9 @@ + + +
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts index 10cf03c1..61b064d6 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts @@ -17,7 +17,6 @@ import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms' }) export class EthernetSwitchesAddTemplateComponent implements OnInit { server: Server; - numberOfPorts: number; templateName: string = ''; formGroup: FormGroup; @@ -58,7 +57,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { ethernetSwitchTemplate.template_id = uuid(); ethernetSwitchTemplate.name = this.formGroup.get('templateName').value; - for(let i=0; i { this.goBack(); diff --git a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html index eef9b466..f7605d69 100644 --- a/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html +++ b/src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html @@ -7,7 +7,7 @@ - + diff --git a/src/app/components/project-map/project-map.component.scss b/src/app/components/project-map/project-map.component.scss index aef6907e..49f1556a 100644 --- a/src/app/components/project-map/project-map.component.scss +++ b/src/app/components/project-map/project-map.component.scss @@ -80,7 +80,7 @@ g.node:hover { } .extended { - width: 720px !important; + width: 700px !important; height: 100%; overflow: hidden; } From 830bc8140d777b8a6bf0a70f3f760ac4bbe01982 Mon Sep 17 00:00:00 2001 From: Piotr Pekala Date: Wed, 3 Jul 2019 04:57:49 -0700 Subject: [PATCH 4/4] fix for unit tests --- .../ethernet-hubs-add-template.component.spec.ts | 2 -- .../ethernet-switches-add-template.component.spec.ts | 1 - 2 files changed, 3 deletions(-) diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts index b8234bab..eb11840d 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts @@ -75,7 +75,6 @@ describe('EthernetHubsAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); component.templateName = "sample name"; - component.numberOfPorts = 2; component.server = {id: 1} as Server; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1'); @@ -89,7 +88,6 @@ describe('EthernetHubsAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ""; - component.numberOfPorts = 2; component.server = {id: 1} as Server; component.addTemplate(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts index 96236b8e..3cf4b9f8 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.spec.ts @@ -75,7 +75,6 @@ describe('EthernetSwitchesAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); component.templateName = "sample name"; - component.numberOfPorts = 2; component.server = {id: 1} as Server; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1');