From 80bf232f0626ed2f199768a5ae7f96930342888b Mon Sep 17 00:00:00 2001 From: Billy Nix Date: Sun, 31 Jan 2021 00:47:03 +0100 Subject: [PATCH 1/2] Make categories singular instead of plural --- .../services/docker-configuration.service.ts | 8 ++++---- src/app/services/qemu-configuration.service.ts | 18 +++++++++--------- .../virtual-box-configuration.service.ts | 14 +++++++------- .../services/vmware-configuration.service.ts | 14 +++++++------- src/app/services/vpcs-configuration.service.ts | 8 ++++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts index 735dd5ba..a3f75967 100644 --- a/src/app/services/docker-configuration.service.ts +++ b/src/app/services/docker-configuration.service.ts @@ -8,10 +8,10 @@ export class DockerConfigurationService { getCategories() { let categories = [["Default", "guest"], - ["Routers", "routers"], - ["Switches", "switches"], - ["End devices", "end_devices"], - ["Security devices", "security_devices"]]; + ["Routers", "router"], + ["Switches", "switch"], + ["End devices", "end_device"], + ["Security devices", "security_device"]]; return categories; } diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts index e30f4a5b..8d81a1e7 100644 --- a/src/app/services/qemu-configuration.service.ts +++ b/src/app/services/qemu-configuration.service.ts @@ -64,17 +64,17 @@ export class QemuConfigurationService { getBootPriorities() { let bootPriorities = [["HDD", "c"], - ["CD/DVD-ROM", "d"], - ["Network", "n"], - ["HDD or Network", "cn"], + ["CD/DVD-ROM", "d"], + ["Network", "n"], + ["HDD or Network", "cn"], ["HDD or CD/DVD-ROM", "cd"]]; return bootPriorities; } getOnCloseOptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], + let onCloseOptions = [["Power off the VM", "power_off"], + ["Send the shutdown signal (ACPI)", "shutdown_signal"], ["Save the VM state", "save_vm_state"]]; return onCloseOptions; @@ -82,10 +82,10 @@ export class QemuConfigurationService { getCategories() { let categories = [["Default", "guest"], - ["Routers", "routers"], - ["Switches", "switches"], - ["End devices", "end_devices"], - ["Security devices", "security_devices"]]; + ["Routers", "router"], + ["Switches", "switch"], + ["End devices", "end_device"], + ["Security devices", "security_device"]]; return categories; } diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts index 36016690..ae29a4ad 100644 --- a/src/app/services/virtual-box-configuration.service.ts +++ b/src/app/services/virtual-box-configuration.service.ts @@ -7,8 +7,8 @@ export class VirtualBoxConfigurationService{ } getOnCloseoptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], + let onCloseOptions = [["Power off the VM", "power_off"], + ["Send the shutdown signal (ACPI)", "shutdown_signal"], ["Save the VM state", "save_vm_state"]]; return onCloseOptions; @@ -16,10 +16,10 @@ export class VirtualBoxConfigurationService{ getCategories() { let categories = [["Default", "guest"], - ["Routers", "routers"], - ["Switches", "switches"], - ["End devices", "end_devices"], - ["Security devices", "security_devices"]]; + ["Routers", "router"], + ["Switches", "switch"], + ["End devices", "end_device"], + ["Security devices", "security_device"]]; return categories; } @@ -33,5 +33,5 @@ export class VirtualBoxConfigurationService{ "Paravirtualized Network (virtio-net)"]; return networkTypes; - } + } } diff --git a/src/app/services/vmware-configuration.service.ts b/src/app/services/vmware-configuration.service.ts index ddc09710..1eeada48 100644 --- a/src/app/services/vmware-configuration.service.ts +++ b/src/app/services/vmware-configuration.service.ts @@ -7,8 +7,8 @@ export class VmwareConfigurationService{ } getOnCloseoptions() { - let onCloseOptions = [["Power off the VM", "power_off"], - ["Send the shutdown signal (ACPI)", "shutdown_signal"], + let onCloseOptions = [["Power off the VM", "power_off"], + ["Send the shutdown signal (ACPI)", "shutdown_signal"], ["Save the VM state", "save_vm_state"]]; return onCloseOptions; @@ -16,10 +16,10 @@ export class VmwareConfigurationService{ getCategories() { let categories = [["Default", "guest"], - ["Routers", "routers"], - ["Switches", "switches"], - ["End devices", "end_devices"], - ["Security devices", "security_devices"]]; + ["Routers", "router"], + ["Switches", "switch"], + ["End devices", "end_device"], + ["Security devices", "security_device"]]; return categories; } @@ -35,5 +35,5 @@ export class VmwareConfigurationService{ "vmxnet3"]; return networkTypes; - } + } } diff --git a/src/app/services/vpcs-configuration.service.ts b/src/app/services/vpcs-configuration.service.ts index fbc171df..c465dd37 100644 --- a/src/app/services/vpcs-configuration.service.ts +++ b/src/app/services/vpcs-configuration.service.ts @@ -8,10 +8,10 @@ export class VpcsConfigurationService { getCategories(){ let categories = [["Default", "guest"], - ["Routers", "routers"], - ["Switches", "switches"], - ["End devices", "end_devices"], - ["Security devices", "security_devices"]]; + ["Routers", "router"], + ["Switches", "switch"], + ["End devices", "end_device"], + ["Security devices", "security_device"]]; return categories; } From 317304c08a074eecb0b03bf12b5deec6f1130c84 Mon Sep 17 00:00:00 2001 From: Billy Nix Date: Sun, 31 Jan 2021 01:35:23 +0100 Subject: [PATCH 2/2] Change end device and security device categories to guest and firewall --- .../built-in-templates-configuration.service.ts | 12 ++++++------ src/app/services/docker-configuration.service.ts | 4 ++-- src/app/services/iou-configuration.service.ts | 4 ++-- src/app/services/qemu-configuration.service.ts | 4 ++-- .../services/virtual-box-configuration.service.ts | 4 ++-- src/app/services/vmware-configuration.service.ts | 4 ++-- src/app/services/vpcs-configuration.service.ts | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/services/built-in-templates-configuration.service.ts b/src/app/services/built-in-templates-configuration.service.ts index 0d4d16d1..c1526a4a 100644 --- a/src/app/services/built-in-templates-configuration.service.ts +++ b/src/app/services/built-in-templates-configuration.service.ts @@ -6,8 +6,8 @@ export class BuiltInTemplatesConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } @@ -20,8 +20,8 @@ export class BuiltInTemplatesConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } @@ -30,8 +30,8 @@ export class BuiltInTemplatesConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts index a3f75967..d80a51d2 100644 --- a/src/app/services/docker-configuration.service.ts +++ b/src/app/services/docker-configuration.service.ts @@ -10,8 +10,8 @@ export class DockerConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/iou-configuration.service.ts b/src/app/services/iou-configuration.service.ts index 5d5591dd..80cbabc8 100644 --- a/src/app/services/iou-configuration.service.ts +++ b/src/app/services/iou-configuration.service.ts @@ -10,8 +10,8 @@ export class IouConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts index 8d81a1e7..c9fedcf8 100644 --- a/src/app/services/qemu-configuration.service.ts +++ b/src/app/services/qemu-configuration.service.ts @@ -84,8 +84,8 @@ export class QemuConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/virtual-box-configuration.service.ts b/src/app/services/virtual-box-configuration.service.ts index ae29a4ad..59e1157f 100644 --- a/src/app/services/virtual-box-configuration.service.ts +++ b/src/app/services/virtual-box-configuration.service.ts @@ -18,8 +18,8 @@ export class VirtualBoxConfigurationService{ let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/vmware-configuration.service.ts b/src/app/services/vmware-configuration.service.ts index 1eeada48..7f9fa6eb 100644 --- a/src/app/services/vmware-configuration.service.ts +++ b/src/app/services/vmware-configuration.service.ts @@ -18,8 +18,8 @@ export class VmwareConfigurationService{ let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; } diff --git a/src/app/services/vpcs-configuration.service.ts b/src/app/services/vpcs-configuration.service.ts index c465dd37..2216013a 100644 --- a/src/app/services/vpcs-configuration.service.ts +++ b/src/app/services/vpcs-configuration.service.ts @@ -10,8 +10,8 @@ export class VpcsConfigurationService { let categories = [["Default", "guest"], ["Routers", "router"], ["Switches", "switch"], - ["End devices", "end_device"], - ["Security devices", "security_device"]]; + ["End devices", "guest"], + ["Security devices", "firewall"]]; return categories; }