From bba7d8b2210f52b2ccf8f0625d51866edf556644 Mon Sep 17 00:00:00 2001
From: piotrpekala7 <31202938+piotrpekala7@users.noreply.github.com>
Date: Mon, 12 Apr 2021 13:15:45 +0200
Subject: [PATCH 1/3] Code optimization
---
e2e/app.e2e-spec.ts | 2 +-
e2e/helpers/common.po.ts | 26 +-
e2e/helpers/project-map.po.ts | 84 +-
e2e/helpers/project.po.ts | 30 +-
e2e/helpers/server.po.ts | 58 +-
e2e/project-map.e2e-spec.ts | 56 +-
e2e/projects.e2e-spec.ts | 46 +-
e2e/servers.e2e-spec.ts | 70 +-
src/app/app-routing.module.ts | 119 +-
src/app/app.component.html | 6 +-
src/app/app.component.scss | 6 +-
src/app/app.component.spec.ts | 2 +-
src/app/app.component.ts | 18 +-
src/app/app.module.ts | 12 +-
src/app/cartography/angular-map.imports.ts | 2 +-
src/app/cartography/cartography.module.ts | 8 +-
.../components/d3-map/d3-map.component.html | 32 +-
.../d3-map/d3-map.component.spec.ts | 2 +-
.../components/d3-map/d3-map.component.ts | 37 +-
.../draggable-selection.component.spec.ts | 28 +-
.../draggable-selection.component.ts | 58 +-
.../drawing-adding.component.spec.ts | 4 +-
.../drawing-adding.component.ts | 12 +-
.../drawing-resizing.component.spec.ts | 4 +-
.../drawing-resizing.component.ts | 6 +-
.../draggable/draggable.component.spec.ts | 2 +-
.../draggable/draggable.component.ts | 6 +-
.../drawing/drawing.component.spec.ts | 2 +-
.../drawing/drawing.component.ts | 2 +-
.../ellipse/ellipse.component.spec.ts | 2 +-
.../drawings/ellipse/ellipse.component.ts | 2 +-
.../drawings/image/image.component.spec.ts | 2 +-
.../drawing/drawings/image/image.component.ts | 2 +-
.../drawings/line/line.component.spec.ts | 2 +-
.../drawing/drawings/line/line.component.ts | 2 +-
.../drawings/rect/rect.component.spec.ts | 2 +-
.../drawing/drawings/rect/rect.component.ts | 2 +-
.../drawings/text/text.component.spec.ts | 2 +-
.../drawing/drawings/text/text.component.ts | 2 +-
.../experimental-map.component.ts | 6 +-
.../interface-label.component.spec.ts | 2 +-
.../interface-label.component.ts | 4 +-
.../link/link.component.spec.ts | 2 +-
.../experimental-map/link/link.component.ts | 4 +-
.../link/strategies/ethernet-link-strategy.ts | 2 +-
.../link/strategies/serial-link-strategy.ts | 8 +-
.../node/node.component.spec.ts | 2 +-
.../experimental-map/node/node.component.ts | 4 +-
.../selection/selection.component.spec.ts | 2 +-
.../selection/selection.component.ts | 2 +-
.../status/status.component.spec.ts | 2 +-
.../status/status.component.ts | 4 +-
.../selection-control.component.ts | 22 +-
.../selection-select.component.spec.ts | 2 +-
.../selection-select.component.ts | 7 +-
.../text-editor/text-editor.component.spec.ts | 4 +-
.../text-editor/text-editor.component.ts | 82 +-
.../map/link-to-map-link-converter.ts | 4 +-
.../map/map-drawing-to-svg-converter.ts | 22 +-
.../map/map-link-to-link-converter.ts | 2 +-
.../map/map-node-to-node-converter.ts | 2 +-
.../map/node-to-map-node-converter.ts | 6 +-
.../styles-to-font-converter.spec.ts | 2 +-
.../converters/styles-to-font-converter.ts | 12 +-
src/app/cartography/d3-map.imports.ts | 2 +-
src/app/cartography/datasources/datasource.ts | 6 +-
.../moving-canvas.directive.spec.ts | 310 +++--
.../directives/moving-canvas.directive.ts | 108 +-
.../zooming-canvas.directive.spec.ts | 252 ++--
.../directives/zooming-canvas.directive.ts | 86 +-
.../events/drawings-event-source.ts | 2 +-
.../cartography/events/moving-event-source.ts | 4 +-
src/app/cartography/helpers/css-fixer.ts | 6 +-
.../helpers/default-drawings-factory.ts | 2 +-
.../helpers/font-bbox-calculator.ts | 2 +-
.../cartography/helpers/font-fixer.spec.ts | 8 +-
src/app/cartography/helpers/font-fixer.ts | 10 +-
.../helpers/multi-link-calculator-helper.ts | 2 +-
.../cartography/helpers/qt-dasharray-fixer.ts | 2 +-
.../helpers/svg-to-drawing-converter.ts | 2 +-
.../managers/graph-data-manager.ts | 12 +-
.../cartography/managers/selection-manager.ts | 12 +-
src/app/cartography/testing.ts | 9 +-
src/app/cartography/tools/moving-tool.spec.ts | 12 +-
src/app/cartography/tools/moving-tool.ts | 2 +-
src/app/cartography/tools/selection-tool.ts | 26 +-
src/app/cartography/widgets/drawing-line.ts | 13 +-
src/app/cartography/widgets/drawing.ts | 59 +-
src/app/cartography/widgets/drawings.ts | 40 +-
.../widgets/drawings/ellipse-drawing.spec.ts | 5 +-
.../widgets/drawings/ellipse-drawing.ts | 38 +-
.../widgets/drawings/image-drawing.spec.ts | 5 +-
.../widgets/drawings/image-drawing.ts | 9 +-
.../widgets/drawings/line-drawing.spec.ts | 5 +-
.../widgets/drawings/line-drawing.ts | 29 +-
.../widgets/drawings/rect-drawing.spec.ts | 5 +-
.../widgets/drawings/rect-drawing.ts | 39 +-
.../widgets/drawings/text-drawing.spec.ts | 15 +-
.../widgets/drawings/text-drawing.ts | 13 +-
src/app/cartography/widgets/graph-layout.ts | 10 +-
.../widgets/interface-label.spec.ts | 5 +-
.../cartography/widgets/interface-label.ts | 22 +-
.../cartography/widgets/interface-status.ts | 83 +-
src/app/cartography/widgets/label.ts | 24 +-
src/app/cartography/widgets/layers.ts | 5 +-
src/app/cartography/widgets/link.ts | 84 +-
src/app/cartography/widgets/links.spec.ts | 5 +-
.../widgets/links/ethernet-link.ts | 13 +-
.../cartography/widgets/links/serial-link.ts | 24 +-
src/app/cartography/widgets/node.spec.ts | 2 +-
src/app/cartography/widgets/node.ts | 39 +-
.../error-handlers/sentry-error-handler.ts | 20 +-
.../toaster-error-handler.spec.ts | 4 +-
.../error-handlers/toaster-error-handler.ts | 10 +-
.../progress-dialog.component.spec.ts | 2 +-
.../progress-dialog.component.ts | 2 +-
.../progress-dialog.service.spec.ts | 2 +-
.../progress-dialog.service.ts | 2 +-
.../common/progress/progress.component.html | 8 +-
.../progress/progress.component.spec.ts | 6 +-
src/app/common/progress/progress.component.ts | 4 +-
.../common/progress/progress.service.spec.ts | 4 +-
.../adbutler/adbutler.component.html | 20 +-
.../adbutler/adbutler.component.scss | 18 +-
.../adbutler/adbutler.component.spec.ts | 5 +-
.../components/adbutler/adbutler.component.ts | 95 +-
.../bundled-server-finder.component.spec.ts | 7 +-
.../bundled-server-finder.component.ts | 17 +-
.../dialogs/information-dialog.component.ts | 2 +-
.../direct-link/direct-link.component.ts | 35 +-
.../drawing-added.component.spec.ts | 4 +-
.../drawing-added/drawing-added.component.ts | 4 +-
.../drawing-dragged.component.spec.ts | 8 +-
.../drawing-dragged.component.ts | 4 +-
.../drawing-resized.component.spec.ts | 8 +-
.../drawing-resized.component.ts | 4 +-
.../interface-label-dragged.component.spec.ts | 12 +-
.../interface-label-dragged.component.ts | 6 +-
.../link-created.component.spec.ts | 8 +-
.../link-created/link-created.component.ts | 75 +-
.../node-dragged.component.spec.ts | 6 +-
.../node-dragged/node-dragged.component.ts | 6 +-
.../node-label-dragged.component.spec.ts | 6 +-
.../node-label-dragged.component.ts | 4 +-
.../text-added/text-added.component.spec.ts | 4 +-
.../text-added/text-added.component.ts | 10 +-
.../text-edited/text-edited.component.spec.ts | 6 +-
.../text-edited/text-edited.component.ts | 4 +-
src/app/components/help/help.component.html | 76 +-
src/app/components/help/help.component.scss | 4 +-
src/app/components/help/help.component.ts | 44 +-
.../install-software.component.html | 2 +-
.../install-software.component.spec.ts | 5 +-
.../install-software.component.ts | 17 +-
.../installed-software.component.html | 65 +-
.../installed-software.component.spec.ts | 5 +-
.../installed-software.component.ts | 9 +-
.../page-not-found.component.html | 9 +-
.../page-not-found.component.scss | 2 +-
.../page-not-found.component.ts | 8 +-
.../built-in-preferences.component.html | 38 +-
.../built-in-preferences.component.spec.ts | 69 +-
.../built-in-preferences.component.ts | 21 +-
.../cloud-nodes-add-template.component.html | 48 +-
...cloud-nodes-add-template.component.spec.ts | 128 +-
.../cloud-nodes-add-template.component.ts | 133 +-
...loud-nodes-template-details.component.html | 311 ++---
...d-nodes-template-details.component.spec.ts | 100 +-
.../cloud-nodes-template-details.component.ts | 196 +--
.../cloud-nodes-templates.component.html | 68 +-
.../cloud-nodes-templates.component.spec.ts | 73 +-
.../cloud-nodes-templates.component.ts | 61 +-
.../ethernet-hubs-add-template.component.html | 54 +-
...hernet-hubs-add-template.component.spec.ts | 153 ++-
.../ethernet-hubs-add-template.component.ts | 153 +--
...ernet-hubs-template-details.component.html | 122 +-
...et-hubs-template-details.component.spec.ts | 168 +--
...thernet-hubs-template-details.component.ts | 137 +-
.../ethernet-hubs-templates.component.html | 68 +-
.../ethernet-hubs-templates.component.spec.ts | 73 +-
.../ethernet-hubs-templates.component.ts | 65 +-
...ernet-switches-add-template.component.html | 54 +-
...et-switches-add-template.component.spec.ts | 153 ++-
...thernet-switches-add-template.component.ts | 157 +--
...t-switches-template-details.component.html | 153 ++-
...witches-template-details.component.spec.ts | 162 ++-
...net-switches-template-details.component.ts | 133 +-
...ethernet-switches-templates.component.html | 68 +-
...ernet-switches-templates.component.spec.ts | 73 +-
.../ethernet-switches-templates.component.ts | 67 +-
.../custom-adapters-table.component.html | 58 +-
.../custom-adapters-table.component.ts | 35 +-
.../custom-adapters.component.html | 34 +-
.../custom-adapters.component.spec.ts | 70 +-
.../custom-adapters.component.ts | 57 +-
.../delete-confirmation-dialog.component.html | 20 +-
.../delete-confirmation-dialog.component.scss | 8 +-
.../delete-confirmation-dialog.component.ts | 37 +-
.../delete-template.component.ts | 62 +-
.../empty-templates-list.component.html | 10 +-
.../empty-templates-list.component.scss | 4 +-
.../empty-templates-list.component.ts | 21 +-
.../common/ports/ports.component.html | 93 +-
.../common/ports/ports.component.ts | 73 +-
.../symbols-menu/symbols-menu.component.html | 18 +-
.../symbols-menu/symbols-menu.component.ts | 37 +-
.../common/symbols/symbols.component.html | 59 +-
.../common/symbols/symbols.component.scss | 56 +-
.../common/symbols/symbols.component.spec.ts | 87 +-
.../common/symbols/symbols.component.ts | 137 +-
.../udp-tunnels/udp-tunnels.component.html | 76 +-
.../udp-tunnels/udp-tunnels.component.ts | 71 +-
.../add-docker-template.component.html | 194 +--
.../add-docker-template.component.spec.ts | 289 ++--
.../add-docker-template.component.ts | 203 +--
.../copy-docker-template.component.html | 36 +-
.../copy-docker-template.component.ts | 102 +-
.../docker-template-details.component.html | 239 ++--
.../docker-template-details.component.spec.ts | 105 +-
.../docker-template-details.component.ts | 135 +-
.../docker-templates.component.html | 74 +-
.../docker-templates.component.spec.ts | 68 +-
.../docker-templates.component.ts | 77 +-
.../add-ios-template.component.html | 287 ++--
.../add-ios-template.component.scss | 2 +-
.../add-ios-template.component.spec.ts | 186 +--
.../add-ios-template.component.ts | 432 +++---
.../copy-ios-template.component.html | 36 +-
.../copy-ios-template.component.ts | 102 +-
.../dynamips-preferences.component.html | 18 +-
.../dynamips-preferences.component.scss | 6 +-
.../dynamips-preferences.component.spec.ts | 82 +-
.../dynamips-preferences.component.ts | 41 +-
.../ios-template-details.component.html | 478 ++++---
.../ios-template-details.component.spec.ts | 125 +-
.../ios-template-details.component.ts | 243 ++--
.../ios-templates.component.html | 74 +-
.../ios-templates.component.spec.ts | 73 +-
.../ios-templates/ios-templates.component.ts | 79 +-
.../general-preferences.component.html | 14 +-
.../general-preferences.component.spec.ts | 69 +-
.../general/general-preferences.component.ts | 21 +-
.../preferences/gns3vm/gns3vm.component.html | 110 +-
.../preferences/gns3vm/gns3vm.component.scss | 8 +-
.../preferences/gns3vm/gns3vm.component.ts | 133 +-
.../add-iou-template.component.html | 151 +-
.../add-iou-template.component.spec.ts | 152 +-
.../add-iou-template.component.ts | 258 ++--
.../copy-iou-template.component.html | 36 +-
.../copy-iou-template.component.ts | 102 +-
.../iou-template-details.component.html | 263 ++--
.../iou-template-details.component.spec.ts | 106 +-
.../iou-template-details.component.ts | 151 +-
.../iou-templates.component.html | 74 +-
.../iou-templates.component.spec.ts | 68 +-
.../iou-templates/iou-templates.component.ts | 69 +-
.../preferences/preferences.component.html | 56 +-
.../preferences/preferences.component.scss | 68 +-
.../preferences/preferences.component.spec.ts | 103 +-
.../preferences/preferences.component.ts | 21 +-
.../add-qemu-vm-template.component.html | 215 +--
.../add-qemu-vm-template.component.spec.ts | 218 +--
.../add-qemu-vm-template.component.ts | 267 ++--
.../copy-qemu-vm-template.component.html | 36 +-
.../copy-qemu-vm-template.component.ts | 104 +-
.../qemu-preferences.component.html | 56 +-
.../qemu-preferences.component.scss | 4 +-
.../qemu-preferences.component.spec.ts | 82 +-
.../qemu-preferences.component.ts | 85 +-
.../qemu-vm-template-details.component.html | 636 ++++-----
...qemu-vm-template-details.component.spec.ts | 192 +--
.../qemu-vm-template-details.component.ts | 269 ++--
.../qemu-vm-templates.component.html | 74 +-
.../qemu-vm-templates.component.spec.ts | 73 +-
.../qemu-vm-templates.component.ts | 69 +-
.../add-traceng-template.component.html | 38 +-
.../add-traceng-template.component.ts | 103 +-
.../traceng-preferences.component.html | 18 +-
.../traceng-preferences.component.scss | 2 +-
.../traceng-preferences.component.ts | 36 +-
.../traceng-template-details.component.html | 83 +-
.../traceng-template-details.component.ts | 109 +-
.../traceng-templates.component.html | 68 +-
.../traceng-templates.component.ts | 60 +-
.../add-virtual-box-template.component.html | 49 +-
...add-virtual-box-template.component.spec.ts | 174 +--
.../add-virtual-box-template.component.ts | 111 +-
.../virtual-box-preferences.component.html | 18 +-
.../virtual-box-preferences.component.ts | 36 +-
.../virtual-box-prefernces.component.spec.ts | 71 +-
...irtual-box-template-details.component.html | 294 ++--
...ual-box-template-details.component.spec.ts | 184 +--
.../virtual-box-template-details.component.ts | 237 ++--
.../virtual-box-templates.component.html | 68 +-
.../virtual-box-templates.component.spec.ts | 73 +-
.../virtual-box-templates.component.ts | 63 +-
.../add-vmware-template.component.html | 49 +-
.../add-vmware-template.component.ts | 109 +-
.../add-vmware.component.template.spec.ts | 132 +-
.../vmware-preferences.component.html | 18 +-
.../vmware-preferences.component.scss | 2 +-
.../vmware-preferences.component.spec.ts | 71 +-
.../vmware-preferences.component.ts | 36 +-
.../vmware-template-details.component.html | 277 ++--
.../vmware-template-details.component.spec.ts | 184 +--
.../vmware-template-details.component.ts | 211 ++-
.../vmware-templates.component.html | 68 +-
.../vmware-templates.component.spec.ts | 73 +-
.../vmware-templates.component.ts | 61 +-
.../add-vpcs-template.component.html | 48 +-
.../add-vpcs-template.component.spec.ts | 132 +-
.../add-vpcs-template.component.ts | 137 +-
.../vpcs-preferences.component.html | 18 +-
.../vpcs-preferences.component.scss | 2 +-
.../vpcs-preferences.component.spec.ts | 73 +-
.../vpcs-preferences.component.ts | 36 +-
.../vpcs-template-details.component.html | 143 +-
.../vpcs-template-details.component.spec.ts | 177 +--
.../vpcs-template-details.component.ts | 129 +-
.../vpcs-templates.component.html | 68 +-
.../vpcs-templates.component.spec.ts | 73 +-
.../vpcs-templates.component.ts | 56 +-
.../change-hostname-dialog.component.html | 26 +-
.../change-hostname-dialog.component.scss | 2 +-
.../change-hostname-dialog.component.ts | 73 +-
.../change-symbol-dialog.component.html | 12 +-
.../change-symbol-dialog.component.scss | 16 +-
.../change-symbol-dialog.component.ts | 45 +-
.../console-wrapper.component.html | 130 +-
.../console-wrapper.component.scss | 134 +-
.../console-wrapper.component.spec.ts | 32 +-
.../console-wrapper.component.ts | 254 ++--
.../context-console-menu.component.html | 36 +-
.../context-console-menu.component.scss | 20 +-
.../context-console-menu.component.spec.ts | 30 +-
.../context-console-menu.component.ts | 83 +-
.../align-horizontally.component.html | 4 +-
.../align-horizontally.component.ts | 21 +-
.../align-vertically.component.html | 4 +-
.../align-vertically.component.ts | 21 +-
.../bring-to-front-action.component.html | 4 +-
.../bring-to-front-action.component.spec.ts | 29 +-
.../bring-to-front-action.component.ts | 6 +-
.../change-hostname-action.component.html | 4 +-
.../change-hostname-action.component.ts | 14 +-
.../change-symbol-action.component.html | 4 +-
.../change-symbol-action.component.ts | 18 +-
.../config-action.component.html | 4 +-
.../config-action/config-action.component.ts | 5 +-
...nsole-device-action-browser.component.html | 4 +-
...console-device-action-browser.component.ts | 68 +-
.../console-device-action.component.spec.ts | 52 +-
.../console-device-action.component.ts | 18 +-
.../delete-action.component.html | 4 +-
.../delete-action.component.spec.ts | 112 +-
.../delete-action/delete-action.component.ts | 14 +-
.../duplicate-action.component.html | 4 +-
.../duplicate-action.component.spec.ts | 106 +-
.../duplicate-action.component.ts | 70 +-
.../edit-config-action.component.html | 12 +-
.../edit-config-action.component.ts | 36 +-
.../edit-style-action.component.ts | 4 +-
.../edit-text-action.component.ts | 4 +-
.../export-config-action.component.html | 12 +-
.../export-config-action.component.ts | 85 +-
...http-console-new-tab-action.component.html | 4 +-
.../http-console-new-tab-action.component.ts | 12 +-
.../http-console-action.component.html | 4 +-
.../http-console-action.component.ts | 7 +-
.../import-config-action.component.html | 11 +-
.../import-config-action.component.scss | 2 +-
.../import-config-action.component.ts | 92 +-
.../lock-action/lock-action.component.html | 4 +-
.../lock-action/lock-action.component.ts | 62 +-
.../move-layer-down-action.component.spec.ts | 2 +-
.../move-layer-down-action.component.ts | 2 +-
.../move-layer-up-action.component.spec.ts | 2 +-
.../move-layer-up-action.component.ts | 2 +-
.../open-file-explorer-action.component.html | 4 +-
.../open-file-explorer-action.component.ts | 7 +-
.../packet-filters-action.component.html | 4 +-
.../packet-filters-action.component.ts | 38 +-
.../reload-node-action.component.html | 4 +-
.../reload-node-action.component.ts | 15 +-
.../resume-link-action.component.html | 4 +-
.../resume-link-action.component.ts | 18 +-
.../show-node-action.component.html | 4 +-
.../show-node-action.component.ts | 12 +-
...art-capture-on-started-link.component.html | 4 +-
...start-capture-on-started-link.component.ts | 6 +-
.../start-capture-action.component.html | 4 +-
.../start-capture-action.component.ts | 8 +-
.../start-node-action.component.spec.ts | 2 +-
.../start-node-action.component.ts | 16 +-
.../stop-capture-action.component.html | 4 +-
.../stop-capture-action.component.ts | 6 +-
.../stop-node-action.component.spec.ts | 2 +-
.../stop-node-action.component.ts | 7 +-
.../suspend-link-action.component.html | 4 +-
.../suspend-link-action.component.ts | 18 +-
.../suspend-node-action.component.html | 4 +-
.../suspend-node-action.component.ts | 7 +-
.../context-menu/context-menu.component.html | 114 +-
.../context-menu/context-menu.component.scss | 14 +-
.../context-menu.component.spec.ts | 10 +-
.../context-menu/context-menu.component.ts | 12 +-
.../config-dialog.component.html | 18 +-
.../config-dialog.component.scss | 6 +-
.../config-dialog/config-dialog.component.ts | 16 +-
.../draw-link-tool.component.spec.ts | 2 +-
.../draw-link-tool.component.ts | 6 +-
.../style-editor/style-editor.component.html | 30 +-
.../style-editor/style-editor.component.scss | 14 +-
.../style-editor/style-editor.component.ts | 9 +-
.../text-editor/text-editor.component.html | 12 +-
.../text-editor/text-editor.component.scss | 14 +-
.../text-editor/text-editor.component.ts | 56 +-
.../help-dialog/help-dialog.component.html | 20 +-
.../help-dialog/help-dialog.component.scss | 4 +-
.../help-dialog/help-dialog.component.ts | 20 +-
.../node-created-label-styles-fixer.spec.ts | 16 +-
.../node-created-label-styles-fixer.ts | 4 +-
.../import-appliance.component.ts | 257 ++--
.../info-dialog/info-dialog.component.html | 42 +-
.../info-dialog/info-dialog.component.scss | 2 +-
.../info-dialog/info-dialog.component.ts | 37 +-
.../log-console/log-console.component.html | 51 +-
.../log-console/log-console.component.scss | 106 +-
.../log-console/log-console.component.spec.ts | 48 +-
.../log-console/log-console.component.ts | 546 ++++----
.../appliance-info-dialog.component.html | 24 +-
.../appliance-info-dialog.component.ts | 22 +-
.../new-template-dialog.component.html | 637 +++++----
.../new-template-dialog.component.scss | 58 +-
.../new-template-dialog.component.ts | 1220 +++++++++--------
.../template-name-dialog.component.html | 4 +-
.../template-name-dialog.component.scss | 4 +-
.../template-name-dialog.component.ts | 15 +-
.../config-editor.component.html | 20 +-
.../config-editor.component.scss | 8 +-
.../config-editor.component.spec.ts | 10 +-
.../config-editor/config-editor.component.ts | 74 +-
.../configurator-atm-switch.component.html | 188 ++-
.../configurator-atm-switch.component.ts | 270 ++--
.../cloud/configurator-cloud.component.html | 154 +--
.../cloud/configurator-cloud.component.ts | 178 ++-
.../configurator/configurator.component.scss | 34 +-
.../docker/configurator-docker.component.html | 171 ++-
.../docker/configurator-docker.component.ts | 141 +-
.../configure-custom-adapters.component.html | 40 +-
.../configure-custom-adapters.component.scss | 14 +-
.../configure-custom-adapters.component.ts | 79 +-
.../edit-network-configuration.component.html | 4 +-
.../edit-network-configuration.component.scss | 4 +-
.../edit-network-configuration.component.ts | 55 +-
...onfigurator-ethernet-switch.component.html | 49 +-
.../configurator-ethernet-switch.component.ts | 89 +-
.../configurator-ethernet-hub.component.html | 42 +-
.../configurator-ethernet-hub.component.ts | 111 +-
.../ios/configurator-ios.component.html | 96 +-
.../ios/configurator-ios.component.ts | 101 +-
.../iou/configurator-iou.component.html | 108 +-
.../iou/configurator-iou.component.ts | 101 +-
.../nat/configurator-nat.component.html | 26 +-
.../nat/configurator-nat.component.ts | 73 +-
.../qemu/configurator-qemu.component.html | 518 ++++---
.../qemu/configurator-qemu.component.ts | 215 ++-
.../qemu-image-creator.component.html | 196 +--
.../qemu-image-creator.component.ts | 197 ++-
.../switch/configurator-switch.component.html | 142 +-
.../switch/configurator-switch.component.ts | 216 +--
.../configurator-traceng.component.html | 26 +-
.../traceng/configurator-traceng.component.ts | 73 +-
.../configurator-virtualbox.component.html | 123 +-
.../configurator-virtualbox.component.ts | 123 +-
.../vmware/configurator-vmware.component.html | 115 +-
.../vmware/configurator-vmware.component.ts | 121 +-
.../vpcs/configurator-vpcs.component.html | 55 +-
.../vpcs/configurator-vpcs.component.ts | 85 +-
.../node-select-interface.component.scss | 2 +-
.../node-select-interface.component.spec.ts | 2 +-
.../node-select-interface.component.ts | 29 +-
.../nodes-menu/nodes-menu.component.html | 86 +-
.../nodes-menu/nodes-menu.component.scss | 4 +-
.../nodes-menu/nodes-menu.component.spec.ts | 98 +-
.../nodes-menu/nodes-menu.component.ts | 112 +-
.../packet-filters.component.html | 76 +-
.../packet-filters.component.scss | 58 +-
.../packet-filters.component.spec.ts | 88 +-
.../packet-filters.component.ts | 148 +-
.../start-capture.component.html | 40 +-
.../start-capture.component.scss | 2 +-
.../start-capture.component.spec.ts | 118 +-
.../start-capture/start-capture.component.ts | 132 +-
.../project-map-menu.component.html | 154 ++-
.../project-map-menu.component.scss | 8 +-
.../project-map-menu.component.spec.ts | 96 +-
.../project-map-menu.component.ts | 305 +++--
.../project-map/project-map.component.html | 149 +-
.../project-map/project-map.component.scss | 294 ++--
.../project-map/project-map.component.spec.ts | 48 +-
.../project-map/project-map.component.ts | 319 +++--
.../screenshot-dialog.component.html | 10 +-
.../screenshot-dialog.component.scss | 6 +-
.../screenshot-dialog.component.ts | 23 +-
.../web-console/web-console.component.scss | 4 +-
.../web-console/web-console.component.ts | 125 +-
.../add-blank-project-dialog.component.html | 4 +-
.../add-blank-project-dialog.component.scss | 6 +-
...add-blank-project-dialog.component.spec.ts | 20 +-
.../add-blank-project-dialog.component.ts | 17 +-
.../choose-name-dialog.component.html | 10 +-
.../choose-name-dialog.component.scss | 2 +-
.../choose-name-dialog.component.ts | 40 +-
.../confirmation-bottomsheet.component.html | 12 +-
.../confirmation-bottomsheet.component.scss | 18 +-
.../confirmation-bottomsheet.component.ts | 34 +-
.../confirmation-dialog.component.ts | 2 +-
.../edit-project-dialog.component.html | 159 ++-
.../edit-project-dialog.component.scss | 8 +-
.../edit-project-dialog.component.ts | 20 +-
.../import-project-dialog.component.html | 11 +-
.../import-project-dialog.component.scss | 36 +-
.../import-project-dialog.component.spec.ts | 20 +-
.../import-project-dialog.component.ts | 14 +-
.../navigation-dialog.component.html | 12 +-
.../navigation-dialog.component.scss | 18 +-
.../navigation-dialog.component.ts | 34 +-
.../projects/projects.component.html | 66 +-
.../projects/projects.component.scss | 14 +-
.../projects/projects.component.spec.ts | 20 +-
.../components/projects/projects.component.ts | 31 +-
.../save-project-dialog.component.scss | 4 +-
.../save-project-dialog.component.ts | 31 +-
.../add-server-dialog.component.html | 11 +-
.../add-server-dialog.component.ts | 78 +-
.../configure-gns3vm-dialog.component.html | 2 +-
.../configure-gns3vm-dialog.component.ts | 2 +-
.../server-discovery.component.spec.ts | 16 +-
.../server-discovery.component.ts | 41 +-
.../components/servers/servers.component.html | 54 +-
.../components/servers/servers.component.scss | 4 +-
.../servers/servers.component.spec.ts | 2 +-
.../components/servers/servers.component.ts | 37 +-
.../settings/console/console.component.html | 45 +-
.../settings/console/console.component.scss | 2 +-
.../console/console.component.spec.ts | 25 +-
.../settings/console/console.component.ts | 16 +-
.../settings/settings.component.html | 8 +-
.../settings/settings.component.scss | 8 +-
.../settings/settings.component.spec.ts | 22 +-
.../components/settings/settings.component.ts | 4 +-
.../create-snapshot-dialog.component.html | 15 +-
.../create-snapshot-dialog.component.scss | 20 +-
.../create-snapshot-dialog.component.spec.ts | 2 +-
.../create-snapshot-dialog.component.ts | 7 +-
.../list-of-snaphshots.component.spec.ts | 222 +--
.../list-of-snapshots.component.html | 94 +-
.../list-of-snapshots.component.scss | 4 +-
.../list-of-snapshots.component.ts | 120 +-
.../snapshot-menu-item.component.html | 13 +-
.../snapshot-menu-item.component.spec.ts | 2 +-
.../snapshot-menu-item.component.ts | 20 +-
.../status-chart/status-chart.component.html | 300 ++--
.../status-chart/status-chart.component.scss | 16 +-
.../status-chart/status-chart.component.ts | 37 +-
.../status-info/status-info.component.html | 10 +-
.../status-info/status-info.component.ts | 63 +-
.../system-status.component.html | 14 +-
.../system-status/system-status.component.ts | 21 +-
.../template-list-dialog.component.html | 79 +-
.../template-list-dialog.component.scss | 2 +-
.../template-list-dialog.component.spec.ts | 2 +-
.../template-list-dialog.component.ts | 51 +-
.../template/template.component.html | 128 +-
.../template/template.component.scss | 50 +-
.../template/template.component.spec.ts | 2 +-
.../components/template/template.component.ts | 33 +-
.../topology-summary.component.html | 189 +--
.../topology-summary.component.scss | 130 +-
.../topology-summary.component.spec.ts | 217 ++-
.../topology-summary.component.ts | 467 ++++---
.../web-console-full-window.component.html | 2 +-
.../web-console-full-window.component.ts | 175 ++-
src/app/filters/dataSourceFilter.ts | 21 +-
src/app/filters/dateFilter.pipe.ts | 23 +-
src/app/filters/nameFilter.pipe.ts | 21 +-
src/app/filters/projectsFilter.pipe.ts | 21 +-
src/app/filters/searchFilter.pipe.ts | 21 +-
src/app/filters/templateFilter.pipe.ts | 21 +-
src/app/guards/console-guard.ts | 27 +-
.../project-web-service-handler.spec.ts | 2 +-
.../default-layout.component.html | 15 +-
.../default-layout.component.scss | 10 +-
.../default-layout.component.spec.ts | 19 +-
.../default-layout.component.ts | 27 +-
src/app/material.imports.ts | 2 +-
src/app/models/adbutler.ts | 30 +-
src/app/models/appliance.ts | 136 +-
src/app/models/capturingSettings.ts | 4 +-
src/app/models/compute.ts | 28 +-
src/app/models/computeStatistics.ts | 28 +-
src/app/models/docker/docker-image.ts | 2 +-
.../models/ethernetHub/ports-mapping-enity.ts | 18 +-
src/app/models/filter-description.ts | 18 +-
src/app/models/filter.ts | 10 +-
src/app/models/gns3vm/gns3vm.ts | 16 +-
src/app/models/gns3vm/gns3vmEngine.ts | 12 +-
src/app/models/gns3vm/vm.ts | 2 +-
src/app/models/images/ios-image.ts | 8 +-
src/app/models/iou/iou-image.ts | 8 +-
src/app/models/logEvent.ts | 4 +-
src/app/models/message.ts | 4 +-
src/app/models/project-statistics.ts | 8 +-
src/app/models/qemu/qemu-binary.ts | 4 +-
src/app/models/qemu/qemu-custom-adapter.ts | 4 +-
src/app/models/qemu/qemu-image.ts | 8 +-
src/app/models/qemu/qemu-img.ts | 20 +-
.../models/server-settings-models/builtin.ts | 4 +-
.../models/server-settings-models/docker.ts | 4 +-
.../models/server-settings-models/dynamips.ts | 12 +-
.../server-settings-models/graphics-view.ts | 32 +-
src/app/models/server-settings-models/iou.ts | 6 +-
src/app/models/server-settings-models/qemu.ts | 12 +-
.../server-settings-models/virtual-box.ts | 4 +-
.../models/server-settings-models/vmware.ts | 12 +-
src/app/models/server-settings-models/vpcs.ts | 4 +-
src/app/models/server.ts | 2 +-
src/app/models/serverSettings.ts | 20 +-
src/app/models/settings/qemu-settings.ts | 4 +-
src/app/models/software.ts | 20 +-
src/app/models/symbol.ts | 8 +-
src/app/models/templates/cloud-template.ts | 26 +-
src/app/models/templates/docker-template.ts | 40 +-
.../models/templates/ethernet-hub-template.ts | 18 +-
.../templates/ethernet-switch-template.ts | 20 +-
src/app/models/templates/ios-template.ts | 82 +-
src/app/models/templates/iou-template.ts | 40 +-
src/app/models/templates/qemu-template.ts | 84 +-
src/app/models/templates/traceng-template.ts | 20 +-
.../models/templates/virtualbox-template.ts | 46 +-
src/app/models/templates/vmware-template.ts | 44 +-
src/app/models/templates/vpcs-template.ts | 22 +-
src/app/models/virtualBox/virtual-box-vm.ts | 4 +-
src/app/models/vmware/vmware-vm.ts | 4 +-
src/app/resolvers/server-resolve.ts | 12 +-
src/app/services/appliances.service.ts | 26 +-
...uilt-in-templates-configuration.service.ts | 80 +-
.../built-in-templates.service.spec.ts | 248 ++--
.../services/built-in-templates.service.ts | 33 +-
src/app/services/compute.service.ts | 20 +-
.../services/docker-configuration.service.ts | 42 +-
src/app/services/docker.service.ts | 39 +-
src/app/services/drawing.service.spec.ts | 21 +-
src/app/services/drawing.service.ts | 27 +-
...ternal-software-definition.service.spec.ts | 18 +-
.../external-software-definition.service.ts | 29 +-
src/app/services/gns3vm.service.ts | 26 +-
src/app/services/google-analytics.service.ts | 11 +-
src/app/services/http-server.service.spec.ts | 26 +-
src/app/services/http-server.service.ts | 6 +-
src/app/services/indexed-db.service.spec.ts | 2 +-
src/app/services/info.service.ts | 134 +-
.../services/installed-software.service.ts | 8 +-
src/app/services/ios-configuration.service.ts | 505 ++++---
src/app/services/ios.service.ts | 44 +-
src/app/services/iou-configuration.service.ts | 26 +-
src/app/services/iou.service.ts | 45 +-
src/app/services/link.service.spec.ts | 18 +-
src/app/services/link.service.ts | 46 +-
src/app/services/mapScale.service.ts | 38 +-
src/app/services/mapsettings.service.ts | 125 +-
src/app/services/node.service.spec.ts | 38 +-
src/app/services/node.service.ts | 66 +-
src/app/services/nodeConsole.service.ts | 4 +-
src/app/services/packet-capture.service.ts | 12 +-
src/app/services/platform.service.spec.ts | 9 +-
src/app/services/platform.service.ts | 5 +-
src/app/services/project.service.spec.ts | 7 +-
src/app/services/project.service.ts | 10 +-
.../services/qemu-configuration.service.ts | 177 +--
src/app/services/qemu.service.spec.ts | 240 ++--
src/app/services/qemu.service.ts | 58 +-
.../services/recentlyOpenedProject.service.ts | 53 +-
.../server-management.service.spec.ts | 37 +-
src/app/services/server-management.service.ts | 19 +-
.../services/server-settings.service.spec.ts | 34 +-
src/app/services/server-settings.service.ts | 36 +-
src/app/services/server.service.spec.ts | 30 +-
src/app/services/server.service.ts | 81 +-
src/app/services/settings.service.spec.ts | 10 +-
src/app/services/settings.service.ts | 10 +-
.../services/settings/console.service.spec.ts | 2 +-
src/app/services/settings/console.service.ts | 8 +-
.../settings/default-console.service.spec.ts | 12 +-
.../settings/default-console.service.ts | 15 +-
src/app/services/snapshot.service.spec.ts | 2 +-
src/app/services/symbol.service.spec.ts | 2 +-
src/app/services/symbol.service.ts | 16 +-
src/app/services/template-mocks.service.ts | 522 +++----
src/app/services/template.service.spec.ts | 2 +-
src/app/services/theme.service.ts | 2 +-
src/app/services/toaster.service.spec.ts | 8 +-
src/app/services/toaster.service.ts | 10 +-
src/app/services/traceng.service.ts | 32 +-
src/app/services/version.service.spec.ts | 2 +-
.../virtual-box-configuration.service.ts | 62 +-
src/app/services/virtual-box.service.spec.ts | 174 +--
src/app/services/virtual-box.service.ts | 45 +-
.../services/vmware-configuration.service.ts | 57 +-
src/app/services/vmware.service.spec.ts | 170 +--
src/app/services/vmware.service.ts | 38 +-
.../services/vpcs-configuration.service.ts | 26 +-
src/app/services/vpcs.service.spec.ts | 116 +-
src/app/services/vpcs.service.ts | 32 +-
.../testing/app-testing/app-testing.module.ts | 2 +-
src/app/validators/non-negative-validator.ts | 4 +-
.../project-name-async-validator.ts | 14 +-
src/app/validators/rotation-validator.ts | 4 +-
.../template-name-async-validator.ts | 14 +-
src/environments/environment.electron.prod.ts | 2 +-
src/environments/environment.electron.ts | 2 +-
src/environments/environment.github.prod.ts | 2 +-
src/environments/environment.prod.ts | 2 +-
src/environments/environment.ts | 2 +-
src/index.html | 8 +-
src/main.ts | 8 +-
src/styles.scss | 18 +-
src/test.ts | 1 -
src/theme.scss | 10 +-
730 files changed, 21307 insertions(+), 19956 deletions(-)
diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
index 7e2a1898..217ef4e7 100644
--- a/e2e/app.e2e-spec.ts
+++ b/e2e/app.e2e-spec.ts
@@ -10,7 +10,7 @@ describe('GNS3 Web UI Application', () => {
it('should have correct page title', async () => {
// arrange
await page.navigateTo();
-
+
// act
let text = await page.getTitleText();
diff --git a/e2e/helpers/common.po.ts b/e2e/helpers/common.po.ts
index 3dae8252..5d06c069 100644
--- a/e2e/helpers/common.po.ts
+++ b/e2e/helpers/common.po.ts
@@ -2,21 +2,21 @@ import { browser, by, element } from 'protractor';
import { ServersPage } from './server.po';
export class TestHelper {
- sleep(value: number) {
- browser.sleep(value);
- }
+ sleep(value: number) {
+ browser.sleep(value);
+ }
- waitForLoading() {
- browser.waitForAngular();
- }
+ waitForLoading() {
+ browser.waitForAngular();
+ }
- async asyncForEach(array, callback) {
- for (let index = 0; index < array.length; index++) {
- await callback(array[index], index, array);
- }
+ async asyncForEach(array, callback) {
+ for (let index = 0; index < array.length; index++) {
+ await callback(array[index], index, array);
}
+ }
- getCurrentUrl() {
- return browser.getCurrentUrl();
- }
+ getCurrentUrl() {
+ return browser.getCurrentUrl();
+ }
}
diff --git a/e2e/helpers/project-map.po.ts b/e2e/helpers/project-map.po.ts
index 7ce8c823..d2df6967 100644
--- a/e2e/helpers/project-map.po.ts
+++ b/e2e/helpers/project-map.po.ts
@@ -1,50 +1,50 @@
-import { TestHelper } from "./common.po"
-import { browser, by } from "protractor";
+import { TestHelper } from './common.po';
+import { browser, by } from 'protractor';
export class ProjectMapPage {
- helper = new TestHelper();
+ helper = new TestHelper();
- async openAddProjectDialog() {
- let addButton = await browser.driver.findElement(by.css('button.addNode'));
- await addButton.click();
+ async openAddProjectDialog() {
+ let addButton = await browser.driver.findElement(by.css('button.addNode'));
+ await addButton.click();
+ }
+
+ async addNode() {
+ let inputs = await browser.driver.findElements(by.css('input.mat-input-element'));
+ await inputs[0].sendKeys('VPCS');
+ this.helper.sleep(1000);
+
+ let selects = await browser.driver.findElements(by.css('mat-select.mat-select'));
+ await selects[1].click();
+ this.helper.sleep(1000);
+
+ let options = await browser.driver.findElements(by.css('mat-option.mat-option'));
+ await options[1].click(); //first option should be chosen
+ this.helper.sleep(1000);
+
+ // new select appears after refreshing data
+ selects = await browser.driver.findElements(by.css('mat-select.mat-select'));
+ if (selects[2]) {
+ await selects[2].click();
+ this.helper.sleep(1000);
+
+ options = await browser.driver.findElements(by.css('mat-option.mat-option'));
+ await options[0].click();
+ this.helper.sleep(1000);
}
- async addNode() {
- let inputs = await browser.driver.findElements(by.css('input.mat-input-element'));
- await inputs[0].sendKeys('VPCS');
- this.helper.sleep(1000);
+ let addButton = await browser.driver.findElement(by.css('button.addButton'));
+ await addButton.click();
+ this.helper.sleep(1000);
+ }
- let selects = await browser.driver.findElements(by.css('mat-select.mat-select'));
- await selects[1].click();
- this.helper.sleep(1000);
+ async verifyIfNodeWithLabelExists(labelToFind: string) {
+ this.helper.sleep(5000);
+ let nodeLabel = await browser.driver.findElement(by.css('#map > g > g.layer > g.nodes > g > g > g > g > text'));
+ let selectedNode;
+ let textFromNodeLabel = await nodeLabel.getText();
+ if (textFromNodeLabel == labelToFind) selectedNode = nodeLabel;
- let options = await browser.driver.findElements(by.css('mat-option.mat-option'));
- await options[1].click(); //first option should be chosen
- this.helper.sleep(1000);
-
- // new select appears after refreshing data
- selects = await browser.driver.findElements(by.css('mat-select.mat-select'));
- if (selects[2]) {
- await selects[2].click();
- this.helper.sleep(1000);
-
- options = await browser.driver.findElements(by.css('mat-option.mat-option'));
- await options[0].click();
- this.helper.sleep(1000);
- }
-
- let addButton = await browser.driver.findElement(by.css('button.addButton'));
- await addButton.click();
- this.helper.sleep(1000);
- }
-
- async verifyIfNodeWithLabelExists(labelToFind: string) {
- this.helper.sleep(5000);
- let nodeLabel = await browser.driver.findElement(by.css('#map > g > g.layer > g.nodes > g > g > g > g > text'));
- let selectedNode;
- let textFromNodeLabel = await nodeLabel.getText();
- if (textFromNodeLabel == labelToFind) selectedNode = nodeLabel;
-
- return selectedNode ? true : false;
- }
+ return selectedNode ? true : false;
+ }
}
diff --git a/e2e/helpers/project.po.ts b/e2e/helpers/project.po.ts
index 76b60ec2..0afcc74e 100644
--- a/e2e/helpers/project.po.ts
+++ b/e2e/helpers/project.po.ts
@@ -1,20 +1,20 @@
-import { TestHelper } from "./common.po"
-import { browser, by } from "protractor";
+import { TestHelper } from './common.po';
+import { browser, by } from 'protractor';
export class ProjectsPage {
- helper = new TestHelper();
+ helper = new TestHelper();
- async openAddProjectDialog() {
- let addButton = await browser.driver.findElement(by.css('button.add-button'));
- await addButton.click();
- }
+ async openAddProjectDialog() {
+ let addButton = await browser.driver.findElement(by.css('button.add-button'));
+ await addButton.click();
+ }
- async createProject() {
- let today = new Date();
- let inputs = await browser.driver.findElements(by.css('input.mat-input-element'));
- await inputs[1].sendKeys('test project ' + today.getUTCMilliseconds());
- this.helper.sleep(2000);
- let dialogButton = await browser.driver.findElement(by.css('button.add-project-button'));
- await dialogButton.click();
- }
+ async createProject() {
+ let today = new Date();
+ let inputs = await browser.driver.findElements(by.css('input.mat-input-element'));
+ await inputs[1].sendKeys('test project ' + today.getUTCMilliseconds());
+ this.helper.sleep(2000);
+ let dialogButton = await browser.driver.findElement(by.css('button.add-project-button'));
+ await dialogButton.click();
+ }
}
diff --git a/e2e/helpers/server.po.ts b/e2e/helpers/server.po.ts
index ece2422b..eec3956c 100644
--- a/e2e/helpers/server.po.ts
+++ b/e2e/helpers/server.po.ts
@@ -2,40 +2,40 @@ import { browser, by, element } from 'protractor';
import { TestHelper } from './common.po';
export class ServersPage {
- helper = new TestHelper;
+ helper = new TestHelper();
- maximizeWindow() {
- browser.driver.manage().window().maximize();
- }
+ maximizeWindow() {
+ browser.driver.manage().window().maximize();
+ }
- navigateToServersPage() {
- return browser.get('/servers');
- }
+ navigateToServersPage() {
+ return browser.get('/servers');
+ }
- getAddServerNotificationText() {
- return browser.driver.findElement(by.className('mat-card-content')).getText();
- }
+ getAddServerNotificationText() {
+ return browser.driver.findElement(by.className('mat-card-content')).getText();
+ }
- async clickAddServer() {
- let serversTable = await this.checkServersTable();
- if (serversTable.length === 0) {
- let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base'));
- await buttons[3].click();
- }
+ async clickAddServer() {
+ let serversTable = await this.checkServersTable();
+ if (serversTable.length === 0) {
+ let buttons = await browser.driver.findElements(by.className('mat-button mat-button-base'));
+ await buttons[3].click();
}
+ }
- checkServersTable() {
- return browser.driver.findElements(by.css('mat-cell'));
- }
+ checkServersTable() {
+ return browser.driver.findElements(by.css('mat-cell'));
+ }
- async navigateToServerProjects() {
- this.helper.sleep(2000);
- let hyperlinks = await browser.driver.findElements(by.css('a.table-link'));
- let serverLink;
- await this.helper.asyncForEach(hyperlinks, async element => {
- let text = await element.getText();
- if (text === '127.0.0.1') serverLink = element;
- });
- await serverLink.click();
- }
+ async navigateToServerProjects() {
+ this.helper.sleep(2000);
+ let hyperlinks = await browser.driver.findElements(by.css('a.table-link'));
+ let serverLink;
+ await this.helper.asyncForEach(hyperlinks, async (element) => {
+ let text = await element.getText();
+ if (text === '127.0.0.1') serverLink = element;
+ });
+ await serverLink.click();
+ }
}
diff --git a/e2e/project-map.e2e-spec.ts b/e2e/project-map.e2e-spec.ts
index f5379d9d..d489b1d5 100644
--- a/e2e/project-map.e2e-spec.ts
+++ b/e2e/project-map.e2e-spec.ts
@@ -5,37 +5,37 @@ import { ProjectsPage } from './helpers/project.po';
import { ProjectMapPage } from './helpers/project-map.po';
describe('Project map page', () => {
- let serversPage: ServersPage;
- let projectsPage: ProjectsPage;
- let projectMapPage: ProjectMapPage;
- let helper: TestHelper;
+ let serversPage: ServersPage;
+ let projectsPage: ProjectsPage;
+ let projectMapPage: ProjectMapPage;
+ let helper: TestHelper;
- beforeEach(async () => {
- serversPage = new ServersPage();
- projectsPage = new ProjectsPage();
- projectMapPage = new ProjectMapPage();
- helper = new TestHelper();
+ beforeEach(async () => {
+ serversPage = new ServersPage();
+ projectsPage = new ProjectsPage();
+ projectMapPage = new ProjectMapPage();
+ helper = new TestHelper();
- serversPage.maximizeWindow();
- await serversPage.navigateToServersPage();
- await serversPage.clickAddServer();
- await serversPage.navigateToServerProjects();
- await projectsPage.openAddProjectDialog();
- helper.sleep(2000);
- await projectsPage.createProject();
- helper.sleep(2000);
- });
+ serversPage.maximizeWindow();
+ await serversPage.navigateToServersPage();
+ await serversPage.clickAddServer();
+ await serversPage.navigateToServerProjects();
+ await projectsPage.openAddProjectDialog();
+ helper.sleep(2000);
+ await projectsPage.createProject();
+ helper.sleep(2000);
+ });
- it('user should have possibility to add nodes to map', async () => {
- // arrange
- projectMapPage.openAddProjectDialog();
- helper.sleep(2000);
+ it('user should have possibility to add nodes to map', async () => {
+ // arrange
+ projectMapPage.openAddProjectDialog();
+ helper.sleep(2000);
- //act
- projectMapPage.addNode();
- helper.sleep(2000);
+ //act
+ projectMapPage.addNode();
+ helper.sleep(2000);
- //assert
- expect(await projectMapPage.verifyIfNodeWithLabelExists('PC1')).toBe(true);
- });
+ //assert
+ expect(await projectMapPage.verifyIfNodeWithLabelExists('PC1')).toBe(true);
+ });
});
diff --git a/e2e/projects.e2e-spec.ts b/e2e/projects.e2e-spec.ts
index 977c3656..0333b065 100644
--- a/e2e/projects.e2e-spec.ts
+++ b/e2e/projects.e2e-spec.ts
@@ -4,31 +4,31 @@ import { element } from 'protractor';
import { ProjectsPage } from './helpers/project.po';
describe('Projects page', () => {
- let serversPage: ServersPage;
- let projectsPage: ProjectsPage;
- let helper: TestHelper;
+ let serversPage: ServersPage;
+ let projectsPage: ProjectsPage;
+ let helper: TestHelper;
- beforeEach(() => {
- serversPage = new ServersPage();
- projectsPage = new ProjectsPage();
- helper = new TestHelper();
- });
+ beforeEach(() => {
+ serversPage = new ServersPage();
+ projectsPage = new ProjectsPage();
+ helper = new TestHelper();
+ });
- it('user should have possibility to create new project', async () => {
- // arrange
- serversPage.maximizeWindow();
- await serversPage.navigateToServersPage();
- await serversPage.clickAddServer();
- await serversPage.navigateToServerProjects();
- helper.sleep(2000);
+ it('user should have possibility to create new project', async () => {
+ // arrange
+ serversPage.maximizeWindow();
+ await serversPage.navigateToServersPage();
+ await serversPage.clickAddServer();
+ await serversPage.navigateToServerProjects();
+ helper.sleep(2000);
- //act
- await projectsPage.openAddProjectDialog();
- helper.sleep(2000);
- await projectsPage.createProject();
- helper.sleep(2000);
+ //act
+ await projectsPage.openAddProjectDialog();
+ helper.sleep(2000);
+ await projectsPage.createProject();
+ helper.sleep(2000);
- //assert
- expect(helper.getCurrentUrl()).toMatch('server/1/project/');
- });
+ //assert
+ expect(helper.getCurrentUrl()).toMatch('server/1/project/');
+ });
});
diff --git a/e2e/servers.e2e-spec.ts b/e2e/servers.e2e-spec.ts
index 1d177f4b..be7f65c9 100644
--- a/e2e/servers.e2e-spec.ts
+++ b/e2e/servers.e2e-spec.ts
@@ -3,42 +3,42 @@ import { TestHelper } from './helpers/common.po';
import { element } from 'protractor';
describe('Servers page', () => {
- let page: ServersPage;
- let helper: TestHelper;
+ let page: ServersPage;
+ let helper: TestHelper;
- beforeEach(() => {
- page = new ServersPage();
- helper = new TestHelper();
+ beforeEach(() => {
+ page = new ServersPage();
+ helper = new TestHelper();
+ });
+
+ xit('user should have possibility to add server', async () => {
+ // arrange
+ page.maximizeWindow();
+ await page.navigateToServersPage();
+
+ // act
+ let text = await page.getAddServerNotificationText();
+
+ // assert
+ expect(text).toBe("We've discovered GNS3 server on 127.0.0.1:3080, would you like to add to the list?");
+ });
+
+ it('user should see added server in the list', async () => {
+ // arrange
+ page.maximizeWindow();
+ await page.navigateToServersPage();
+ await page.clickAddServer();
+ helper.sleep(1000);
+
+ // act
+ let firstRowOfServersTable = await page.checkServersTable();
+ let serverData = [];
+ await helper.asyncForEach(firstRowOfServersTable, async (element) => {
+ serverData.push(await element.getText());
});
- xit('user should have possibility to add server', async () => {
- // arrange
- page.maximizeWindow();
- await page.navigateToServersPage();
-
- // act
- let text = await page.getAddServerNotificationText();
-
- // assert
- expect(text).toBe("We've discovered GNS3 server on 127.0.0.1:3080, would you like to add to the list?");
- });
-
- it('user should see added server in the list', async () => {
- // arrange
- page.maximizeWindow();
- await page.navigateToServersPage();
- await page.clickAddServer();
- helper.sleep(1000);
-
- // act
- let firstRowOfServersTable = await page.checkServersTable();
- let serverData = [];
- await helper.asyncForEach(firstRowOfServersTable, async element => {
- serverData.push(await element.getText());
- });
-
- // assert
- expect(serverData).toContain('127.0.0.1');
- expect(serverData).toContain('3080');
- });
+ // assert
+ expect(serverData).toContain('127.0.0.1');
+ expect(serverData).toContain('3080');
+ });
});
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index e1552e7c..46959a94 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -74,10 +74,10 @@ const routes: Routes = [
{ path: '', redirectTo: 'servers', pathMatch: 'full' },
{ path: 'servers', component: ServersComponent },
{ path: 'bundled', component: BundledServerFinderComponent },
- {
- path: 'server/:server_id/projects',
+ {
+ path: 'server/:server_id/projects',
component: ProjectsComponent,
- resolve: { server : ServerResolve }
+ resolve: { server: ServerResolve },
},
{ path: 'help', component: HelpComponent },
{ path: 'help/reportissue', component: ReportIssueComponent },
@@ -86,54 +86,87 @@ const routes: Routes = [
{ path: 'installed-software', component: InstalledSoftwareComponent },
{ path: 'server/:server_id/systemstatus', component: SystemStatusComponent },
- { path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent},
- {
- path: 'server/:server_id/project/:project_id/snapshots',
+ { path: 'server/:server_ip/:server_port/project/:project_id', component: DirectLinkComponent },
+ {
+ path: 'server/:server_id/project/:project_id/snapshots',
component: ListOfSnapshotsComponent,
- resolve: { server : ServerResolve }
+ resolve: { server: ServerResolve },
},
{ path: 'server/:server_id/preferences', component: PreferencesComponent },
{ path: 'server/:server_id/preferences/gns3vm', component: Gns3vmComponent },
// { path: 'server/:server_id/preferences/general', component: GeneralPreferencesComponent },
- { path: 'server/:server_id/preferences/builtin', component: BuiltInPreferencesComponent},
+ { path: 'server/:server_id/preferences/builtin', component: BuiltInPreferencesComponent },
{ path: 'server/:server_id/preferences/builtin/ethernet-hubs', component: EthernetHubsTemplatesComponent },
- { path: 'server/:server_id/preferences/builtin/ethernet-hubs/addtemplate', component: EthernetHubsAddTemplateComponent },
- { path: 'server/:server_id/preferences/builtin/ethernet-hubs/:template_id', component: EthernetHubsTemplateDetailsComponent },
+ {
+ path: 'server/:server_id/preferences/builtin/ethernet-hubs/addtemplate',
+ component: EthernetHubsAddTemplateComponent,
+ },
+ {
+ path: 'server/:server_id/preferences/builtin/ethernet-hubs/:template_id',
+ component: EthernetHubsTemplateDetailsComponent,
+ },
- { path: 'server/:server_id/preferences/builtin/ethernet-switches', component: EthernetSwitchesTemplatesComponent },
- { path: 'server/:server_id/preferences/builtin/ethernet-switches/addtemplate', component: EthernetSwitchesAddTemplateComponent },
- { path: 'server/:server_id/preferences/builtin/ethernet-switches/:template_id', component: EthernetSwitchesTemplateDetailsComponent },
+ {
+ path: 'server/:server_id/preferences/builtin/ethernet-switches',
+ component: EthernetSwitchesTemplatesComponent,
+ },
+ {
+ path: 'server/:server_id/preferences/builtin/ethernet-switches/addtemplate',
+ component: EthernetSwitchesAddTemplateComponent,
+ },
+ {
+ path: 'server/:server_id/preferences/builtin/ethernet-switches/:template_id',
+ component: EthernetSwitchesTemplateDetailsComponent,
+ },
{ path: 'server/:server_id/preferences/builtin/cloud-nodes', component: CloudNodesTemplatesComponent },
- { path: 'server/:server_id/preferences/builtin/cloud-nodes/addtemplate', component: CloudNodesAddTemplateComponent },
- { path: 'server/:server_id/preferences/builtin/cloud-nodes/:template_id', component: CloudNodesTemplateDetailsComponent },
+ {
+ path: 'server/:server_id/preferences/builtin/cloud-nodes/addtemplate',
+ component: CloudNodesAddTemplateComponent,
+ },
+ {
+ path: 'server/:server_id/preferences/builtin/cloud-nodes/:template_id',
+ component: CloudNodesTemplateDetailsComponent,
+ },
//{ path: 'server/:server_id/preferences/dynamips', component: DynamipsPreferencesComponent },
{ path: 'server/:server_id/preferences/dynamips/templates', component: IosTemplatesComponent },
{ path: 'server/:server_id/preferences/dynamips/templates/addtemplate', component: AddIosTemplateComponent },
{ path: 'server/:server_id/preferences/dynamips/templates/:template_id', component: IosTemplateDetailsComponent },
- { path: 'server/:server_id/preferences/dynamips/templates/:template_id/copy', component: CopyIosTemplateComponent },
+ {
+ path: 'server/:server_id/preferences/dynamips/templates/:template_id/copy',
+ component: CopyIosTemplateComponent,
+ },
// { path: 'server/:server_id/preferences/qemu', component: QemuPreferencesComponent },
{ path: 'server/:server_id/preferences/qemu/templates', component: QemuVmTemplatesComponent },
- { path: 'server/:server_id/preferences/qemu/templates/:template_id/copy', component: CopyQemuVmTemplateComponent },
+ {
+ path: 'server/:server_id/preferences/qemu/templates/:template_id/copy',
+ component: CopyQemuVmTemplateComponent,
+ },
{ path: 'server/:server_id/preferences/qemu/templates/:template_id', component: QemuVmTemplateDetailsComponent },
{ path: 'server/:server_id/preferences/qemu/addtemplate', component: AddQemuVmTemplateComponent },
// { path: 'server/:server_id/preferences/vpcs', component: VpcsPreferencesComponent },
{ path: 'server/:server_id/preferences/vpcs/templates', component: VpcsTemplatesComponent },
- { path: 'server/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent},
+ { path: 'server/:server_id/preferences/vpcs/templates/:template_id', component: VpcsTemplateDetailsComponent },
{ path: 'server/:server_id/preferences/vpcs/addtemplate', component: AddVpcsTemplateComponent },
// { path: 'server/:server_id/preferences/virtualbox', component: VirtualBoxPreferencesComponent },
{ path: 'server/:server_id/preferences/virtualbox/templates', component: VirtualBoxTemplatesComponent },
- { path: 'server/:server_id/preferences/virtualbox/templates/:template_id', component: VirtualBoxTemplateDetailsComponent },
+ {
+ path: 'server/:server_id/preferences/virtualbox/templates/:template_id',
+ component: VirtualBoxTemplateDetailsComponent,
+ },
{ path: 'server/:server_id/preferences/virtualbox/addtemplate', component: AddVirtualBoxTemplateComponent },
// { path: 'server/:server_id/preferences/vmware', component: VmwarePreferencesComponent },
{ path: 'server/:server_id/preferences/vmware/templates', component: VmwareTemplatesComponent },
- { path: 'server/:server_id/preferences/vmware/templates/:template_id', component: VmwareTemplateDetailsComponent },
+ {
+ path: 'server/:server_id/preferences/vmware/templates/:template_id',
+ component: VmwareTemplateDetailsComponent,
+ },
{ path: 'server/:server_id/preferences/vmware/addtemplate', component: AddVmwareTemplateComponent },
// { path: 'server/:server_id/preferences/traceng', component: TracengPreferencesComponent },
@@ -142,37 +175,49 @@ const routes: Routes = [
// { path: 'server/:server_id/preferences/traceng/addtemplate', component: AddTracengTemplateComponent },
{ path: 'server/:server_id/preferences/docker/templates', component: DockerTemplatesComponent },
- { path: 'server/:server_id/preferences/docker/templates/:template_id', component: DockerTemplateDetailsComponent },
- { path: 'server/:server_id/preferences/docker/templates/:template_id/copy', component: CopyDockerTemplateComponent },
+ {
+ path: 'server/:server_id/preferences/docker/templates/:template_id',
+ component: DockerTemplateDetailsComponent,
+ },
+ {
+ path: 'server/:server_id/preferences/docker/templates/:template_id/copy',
+ component: CopyDockerTemplateComponent,
+ },
{ path: 'server/:server_id/preferences/docker/addtemplate', component: AddDockerTemplateComponent },
{ path: 'server/:server_id/preferences/iou/templates', component: IouTemplatesComponent },
{ path: 'server/:server_id/preferences/iou/templates/:template_id', component: IouTemplateDetailsComponent },
{ path: 'server/:server_id/preferences/iou/templates/:template_id/copy', component: CopyIouTemplateComponent },
- { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent }
- ]
+ { path: 'server/:server_id/preferences/iou/addtemplate', component: AddIouTemplateComponent },
+ ],
},
- {
- path: 'server/:server_id/project/:project_id',
+ {
+ path: 'server/:server_id/project/:project_id',
component: ProjectMapComponent,
- canDeactivate: [ConsoleGuard]
+ canDeactivate: [ConsoleGuard],
},
- {
- path: 'server/:server_id/project/:project_id/nodes/:node_id',
- component: WebConsoleFullWindowComponent
+ {
+ path: 'server/:server_id/project/:project_id/nodes/:node_id',
+ component: WebConsoleFullWindowComponent,
},
- {
- path: 'static/web-ui/server/:server_id/project/:project_id/nodes/:node_id',
- component: WebConsoleFullWindowComponent
+ {
+ path: 'static/web-ui/server/:server_id/project/:project_id/nodes/:node_id',
+ component: WebConsoleFullWindowComponent,
},
{
path: '**',
- component: PageNotFoundComponent
- }
+ component: PageNotFoundComponent,
+ },
];
@NgModule({
- imports: [RouterModule.forRoot(routes, { anchorScrolling: 'enabled', enableTracing: false, scrollPositionRestoration: 'enabled'})],
- exports: [RouterModule]
+ imports: [
+ RouterModule.forRoot(routes, {
+ anchorScrolling: 'enabled',
+ enableTracing: false,
+ scrollPositionRestoration: 'enabled',
+ }),
+ ],
+ exports: [RouterModule],
})
export class AppRoutingModule {}
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 69475d67..db17fd83 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-
-
-
+
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index bad2bc18..193c4c31 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -1,11 +1,11 @@
mat-menu-panel {
- min-height: 0px;
+ min-height: 0px;
}
.dark {
- background: #263238!important;
+ background: #263238 !important;
}
.light {
- background: white!important;
+ background: white !important;
}
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 1eb4a588..00903884 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -22,7 +22,7 @@ describe('AppComponent', () => {
declarations: [AppComponent],
imports: [RouterTestingModule, MatIconModule, NgxElectronModule],
providers: [SettingsService, PersistenceService, ProgressService],
- schemas: [NO_ERRORS_SCHEMA]
+ schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
electronService = TestBed.get(ElectronService);
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index cd6c901f..8d89c006 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -6,12 +6,12 @@ import { SettingsService } from './services/settings.service';
import { ThemeService } from './services/theme.service';
import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router';
import { ProgressService } from './common/progress/progress.service';
-import { OverlayContainer} from '@angular/cdk/overlay';
+import { OverlayContainer } from '@angular/cdk/overlay';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
- styleUrls: ['./app.component.scss']
+ styleUrls: ['./app.component.scss'],
})
export class AppComponent implements OnInit {
public darkThemeEnabled: boolean = false;
@@ -38,7 +38,7 @@ export class AppComponent implements OnInit {
ngOnInit(): void {
if (this.electronService.isElectronApp) {
- this.settingsService.subscribe(settings => {
+ this.settingsService.subscribe((settings) => {
this.electronService.ipcRenderer.send('settings.changed', settings);
});
}
@@ -59,14 +59,14 @@ export class AppComponent implements OnInit {
this.componentCssClass = theme;
}
- checkEvent(routerEvent) : void {
+ checkEvent(routerEvent): void {
if (routerEvent instanceof NavigationStart) {
this.progressService.activate();
- }
-
- else if (routerEvent instanceof NavigationEnd ||
- routerEvent instanceof NavigationCancel ||
- routerEvent instanceof NavigationError) {
+ } else if (
+ routerEvent instanceof NavigationEnd ||
+ routerEvent instanceof NavigationCancel ||
+ routerEvent instanceof NavigationError
+ ) {
this.progressService.deactivate();
}
}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 670201b2..a05a1878 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -470,7 +470,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay';
TemplateNameDialogComponent,
ConfigureCustomAdaptersDialogComponent,
EditNetworkConfigurationDialogComponent,
- ReportIssueComponent
+ ReportIssueComponent,
],
imports: [
AngularReactBrowserModule,
@@ -492,7 +492,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay';
NgxChildProcessModule,
MATERIAL_IMPORTS,
NgCircleProgressModule.forRoot(),
- OverlayModule
+ OverlayModule,
],
providers: [
SettingsService,
@@ -567,7 +567,7 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay';
ConsoleGuard,
Title,
ApplianceService,
- UpdatesService
+ UpdatesService,
],
entryComponents: [
AddServerDialogComponent,
@@ -615,10 +615,10 @@ import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay';
ChangeHostnameDialogComponent,
ApplianceInfoDialogComponent,
ConfigureCustomAdaptersDialogComponent,
- EditNetworkConfigurationDialogComponent
+ EditNetworkConfigurationDialogComponent,
],
- bootstrap: [AppComponent]
+ bootstrap: [AppComponent],
})
export class AppModule {
- constructor(protected _googleAnalyticsService: GoogleAnalyticsService) { }
+ constructor(protected _googleAnalyticsService: GoogleAnalyticsService) {}
}
diff --git a/src/app/cartography/angular-map.imports.ts b/src/app/cartography/angular-map.imports.ts
index e2a53e9f..06856ccf 100644
--- a/src/app/cartography/angular-map.imports.ts
+++ b/src/app/cartography/angular-map.imports.ts
@@ -23,5 +23,5 @@ export const ANGULAR_MAP_DECLARATIONS = [
TextComponent,
DraggableComponent,
SelectionComponent,
- InterfaceLabelComponent
+ InterfaceLabelComponent,
];
diff --git a/src/app/cartography/cartography.module.ts b/src/app/cartography/cartography.module.ts
index 3ebad213..46c44721 100644
--- a/src/app/cartography/cartography.module.ts
+++ b/src/app/cartography/cartography.module.ts
@@ -37,7 +37,7 @@ import {
MapNodesDataSource,
MapLinksDataSource,
MapDrawingsDataSource,
- MapSymbolsDataSource
+ MapSymbolsDataSource,
} from './datasources/map-datasource';
import { LinksEventSource } from './events/links-event-source';
import { D3MapComponent } from './components/d3-map/d3-map.component';
@@ -75,7 +75,7 @@ import { SerialLinkWidget } from './widgets/links/serial-link';
SelectionSelectComponent,
DraggableSelectionComponent,
MovingCanvasDirective,
- ZoomingCanvasDirective
+ ZoomingCanvasDirective,
],
providers: [
CssFixer,
@@ -122,8 +122,8 @@ import { SerialLinkWidget } from './widgets/links/serial-link';
StylesToFontConverter,
EthernetLinkWidget,
SerialLinkWidget,
- ...D3_MAP_IMPORTS
+ ...D3_MAP_IMPORTS,
],
- exports: [D3MapComponent, ExperimentalMapComponent]
+ exports: [D3MapComponent, ExperimentalMapComponent],
})
export class CartographyModule {}
diff --git a/src/app/cartography/components/d3-map/d3-map.component.html b/src/app/cartography/components/d3-map/d3-map.component.html
index b409cd50..e166c697 100644
--- a/src/app/cartography/components/d3-map/d3-map.component.html
+++ b/src/app/cartography/components/d3-map/d3-map.component.html
@@ -1,14 +1,38 @@
diff --git a/src/app/common/progress/progress.component.spec.ts b/src/app/common/progress/progress.component.spec.ts
index b56fe900..7649964c 100644
--- a/src/app/common/progress/progress.component.spec.ts
+++ b/src/app/common/progress/progress.component.spec.ts
@@ -28,7 +28,7 @@ describe('ProgressComponent', () => {
TestBed.configureTestingModule({
imports: [RouterTestingModule, MatProgressSpinnerModule, MatIconModule],
providers: [ProgressService, { provide: Router, useValue: router }],
- declarations: [ProgressComponent]
+ declarations: [ProgressComponent],
}).compileComponents();
progressService = TestBed.get(ProgressService);
@@ -59,7 +59,7 @@ describe('ProgressComponent', () => {
});
it('should set error state when error defined', () => {
- const error = {error: 'test'};
+ const error = { error: 'test' };
progressService.setError(error);
expect(component.error).toEqual(error.error);
});
@@ -75,7 +75,7 @@ describe('ProgressComponent', () => {
expect(progressService.clear).toHaveBeenCalled();
});
- it("should reload page after clicking refresh", () => {
+ it('should reload page after clicking refresh', () => {
spyOn(router, 'navigateByUrl');
component.refresh();
diff --git a/src/app/common/progress/progress.component.ts b/src/app/common/progress/progress.component.ts
index b9ce8f91..d6fada6e 100644
--- a/src/app/common/progress/progress.component.ts
+++ b/src/app/common/progress/progress.component.ts
@@ -6,7 +6,7 @@ import { Subscription } from 'rxjs';
@Component({
selector: 'app-progress',
templateUrl: './progress.component.html',
- styleUrls: ['./progress.component.scss']
+ styleUrls: ['./progress.component.scss'],
})
export class ProgressComponent implements OnInit, OnDestroy {
visible = false;
@@ -16,7 +16,7 @@ export class ProgressComponent implements OnInit, OnDestroy {
constructor(private progressService: ProgressService, private router: Router) {}
ngOnInit() {
- this.progressService.state.subscribe(state => {
+ this.progressService.state.subscribe((state) => {
this.visible = state.visible;
// only set error state once; ignore next "correct" states
diff --git a/src/app/common/progress/progress.service.spec.ts b/src/app/common/progress/progress.service.spec.ts
index 23a76f08..52a714a9 100644
--- a/src/app/common/progress/progress.service.spec.ts
+++ b/src/app/common/progress/progress.service.spec.ts
@@ -7,7 +7,7 @@ describe('ProgressService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [ProgressService]
+ providers: [ProgressService],
});
progressService = TestBed.get(ProgressService);
@@ -30,7 +30,7 @@ describe('ProgressService', () => {
});
it('should propagate event on error', () => {
- const error = {error: 'Error'};
+ const error = { error: 'Error' };
progressService.setError(error);
expect(progressService.state.next).toHaveBeenCalledWith(new State(false, error.error));
});
diff --git a/src/app/components/adbutler/adbutler.component.html b/src/app/components/adbutler/adbutler.component.html
index 709874a7..7a714376 100644
--- a/src/app/components/adbutler/adbutler.component.html
+++ b/src/app/components/adbutler/adbutler.component.html
@@ -1,11 +1,11 @@
-