diff --git a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts index 10425ca7..f6d4867d 100644 --- a/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts +++ b/src/app/components/bundled-controller-finder/bundled-controller-finder.component.ts @@ -31,7 +31,7 @@ export class BundledControllerFinderComponent implements OnInit { port = 80; } - this.controllerService.getLocalController(this.document.location.hostname, port).then((controller:Controller ) => { + this.controllerService.getLocalController(this.document.location.hostname, port).then((controller: Controller ) => { this.router.navigate(['/controller', controller.id, 'projects']); this.progressService.deactivate(); }); diff --git a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts index 42b9ae19..1ba8b21e 100644 --- a/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts +++ b/src/app/components/controllers/add-controller-dialog/add-controller-dialog.component.ts @@ -124,7 +124,7 @@ export class AddControllerDialogComponent implements OnInit { return; } - const controller:Controller = Object.assign({}, this.controllerForm.value); + const controller: Controller = Object.assign({}, this.controllerForm.value); this.controllerService.checkControllerVersion(controller).subscribe( (controllerInfo) => { if (controllerInfo.version.split('.')[0] >= 3) { diff --git a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts index 56effa01..de8f1738 100644 --- a/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts +++ b/src/app/components/controllers/controller-discovery/controller-discovery.component.spec.ts @@ -112,7 +112,7 @@ describe('discovery', () => { }); describe('discoverFirstAvailableController', () => { - let controller:Controller ; + let controller: Controller; beforeEach(function () { controller = new Controller (); @@ -142,7 +142,7 @@ describe('discoverFirstAvailableController', () => { }); describe('accepting and ignoring found controller', () => { - let controller:Controller ; + let controller: Controller; beforeEach(() => { controller = new Controller (); (controller.host = '199.111.111.1'), (controller.port = 3333); diff --git a/src/app/components/controllers/controllers.component.ts b/src/app/components/controllers/controllers.component.ts index 9bae27f1..18c932ea 100644 --- a/src/app/components/controllers/controllers.component.ts +++ b/src/app/components/controllers/controllers.component.ts @@ -7,7 +7,7 @@ import { ChildProcessService } from 'ngx-childprocess'; import { ElectronService } from 'ngx-electron'; import { merge, Observable, Subscription } from 'rxjs'; import { map } from 'rxjs/operators'; -import {Controller , ControllerProtocol } from '../../models/controller'; +import {Controller, ControllerProtocol } from '../../models/controller'; import { ControllerManagementService } from '../../services/controller-management.service'; import { ControllerDatabase } from '../../services/controller.database'; import { ControllerService } from '../../services/controller.service'; @@ -41,7 +41,7 @@ export class ControllersComponent implements OnInit, OnDestroy { getControllers() { const runningControllerNames = this.controllerManagement.getRunningControllers(); - this.controllerService.findAll().then((controllers:Controller []) => { + this.controllerService.findAll().then((controllers: Controller []) => { controllers.forEach((controller) => { const controllerIndex = runningControllerNames.findIndex((controllerName) => controller.name === controllerName); if (controllerIndex >= 0) { @@ -122,14 +122,14 @@ export class ControllersComponent implements OnInit, OnDestroy { dialogRef.afterClosed().subscribe((controller) => { if (controller) { - this.controllerService.create(controller).then((created:Controller ) => { + this.controllerService.create(controller).then((created: Controller ) => { this.controllerDatabase.addController(created); }); } }); } - getControllerStatus(controller:Controller ) { + getControllerStatus(controller: Controller ) { if (controller.location === 'local') { if (controller.status === undefined) { return 'stopped'; @@ -138,7 +138,7 @@ export class ControllersComponent implements OnInit, OnDestroy { } } - deleteController(controller:Controller ) { + deleteController(controller: Controller ) { this.bottomSheet.open(ConfirmationBottomSheetComponent); let bottomSheetRef = this.bottomSheet._openedBottomSheetRef; bottomSheetRef.instance.message = 'Do you want to delete the controller?'; @@ -151,11 +151,11 @@ export class ControllersComponent implements OnInit, OnDestroy { }); } - async startController(controller:Controller ) { + async startController(controller: Controller ) { await this.controllerManagement.start(controller); } - async stopController(controller:Controller ) { + async stopController(controller: Controller ) { await this.controllerManagement.stop(controller); } } diff --git a/src/app/components/direct-link/direct-link.component.ts b/src/app/components/direct-link/direct-link.component.ts index abbe8c04..4932bfc3 100644 --- a/src/app/components/direct-link/direct-link.component.ts +++ b/src/app/components/direct-link/direct-link.component.ts @@ -72,7 +72,7 @@ export class DirectLinkComponent implements OnInit { return; } - let controllerToAdd:Controller = new Controller (); + let controllerToAdd: Controller = new Controller (); controllerToAdd.host = this.controllerIp; controllerToAdd.port = this.controllerPort; @@ -80,7 +80,7 @@ export class DirectLinkComponent implements OnInit { controllerToAdd.location = this.controllerForm.get('location').value; controllerToAdd.protocol = this.controllerForm.get('protocol').value; - this.controllerService.create(controllerToAdd).then((addedController:Controller ) => { + this.controllerService.create(controllerToAdd).then((addedController: Controller ) => { this.router.navigate(['/controller', addedController.id, 'project', this.projectId]); }); } diff --git a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts index eb01de4d..f5a50fce 100644 --- a/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts +++ b/src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.ts @@ -15,7 +15,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./drawing-dragged.component.scss'], }) export class DrawingDraggedComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; private drawingDragged: Subscription; diff --git a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts index 670fe498..951ba714 100644 --- a/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts +++ b/src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.ts @@ -15,7 +15,7 @@ import { DrawingService } from '../../../services/drawing.service'; styleUrls: ['./drawing-resized.component.scss'], }) export class DrawingResizedComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; private drawingResized: Subscription; constructor( diff --git a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts index b0d45986..a7ae4e77 100644 --- a/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts +++ b/src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.ts @@ -14,7 +14,7 @@ import { LinkService } from '../../../services/link.service'; styleUrls: ['./interface-label-dragged.component.scss'], }) export class InterfaceLabelDraggedComponent { - @Input() controller:Controller ; + @Input() controller: Controller; private interfaceDragged: Subscription; constructor( diff --git a/src/app/components/drawings-listeners/link-created/link-created.component.ts b/src/app/components/drawings-listeners/link-created/link-created.component.ts index 234ae14f..0b4f7abe 100644 --- a/src/app/components/drawings-listeners/link-created/link-created.component.ts +++ b/src/app/components/drawings-listeners/link-created/link-created.component.ts @@ -17,7 +17,7 @@ import { ProjectService } from '../../../services/project.service'; styleUrls: ['./link-created.component.scss'], }) export class LinkCreatedComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; private linkCreated: Subscription; diff --git a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts index 2b833de0..fea5821b 100644 --- a/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts +++ b/src/app/components/drawings-listeners/node-dragged/node-dragged.component.ts @@ -15,7 +15,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./node-dragged.component.scss'], }) export class NodeDraggedComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; private nodeDragged: Subscription; diff --git a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts index 8e56920c..5df8205c 100644 --- a/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts +++ b/src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.ts @@ -15,7 +15,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./node-label-dragged.component.scss'], }) export class NodeLabelDraggedComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; private nodeLabelDragged: Subscription; constructor( diff --git a/src/app/components/export-portable-project/export-portable-project.component.ts b/src/app/components/export-portable-project/export-portable-project.component.ts index 32ed612f..56998e18 100644 --- a/src/app/components/export-portable-project/export-portable-project.component.ts +++ b/src/app/components/export-portable-project/export-portable-project.component.ts @@ -16,7 +16,7 @@ export class ExportPortableProjectComponent implements OnInit { compression_methods: any = []; compression_level: any = []; compression_filter_value: any = []; - controller:Controller ; + controller: Controller; project: Project; index: number = 4; fileName: string; diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts index 537499c6..ab2e56c7 100644 --- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts +++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.spec.ts @@ -17,7 +17,7 @@ import { MockedToasterService } from 'app/services/toaster.service.spec'; import { MatSnackBarModule } from '@angular/material/snack-bar'; export class MockedImageManagerService { - public getImages(controller:Controller ) { + public getImages(controller: Controller ) { return of(); } diff --git a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts index 754ea1dd..a7d60477 100644 --- a/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts +++ b/src/app/components/image-manager/add-image-dialog/add-image-dialog.component.ts @@ -20,7 +20,7 @@ import { ToasterService } from '../../../services/toaster.service'; ], }) export class AddImageDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; isInstallAppliance: boolean = false; install_appliance: boolean = false; selectFile: any = []; diff --git a/src/app/components/image-manager/image-manager.component.spec.ts b/src/app/components/image-manager/image-manager.component.spec.ts index 28e95a9a..e5e482c5 100644 --- a/src/app/components/image-manager/image-manager.component.spec.ts +++ b/src/app/components/image-manager/image-manager.component.spec.ts @@ -23,11 +23,11 @@ import { ToasterService } from 'app/services/toaster.service'; import { MockedToasterService } from 'app/services/toaster.service.spec'; export class MockedImageManagerService { - public getImages(controller:Controller ) { + public getImages(controller: Controller ) { return of(); } - public deleteFile(controller:Controller , image_path) { + public deleteFile(controller: Controller, image_path) { return of(); } diff --git a/src/app/components/image-manager/image-manager.component.ts b/src/app/components/image-manager/image-manager.component.ts index ce688d44..67ac9e9a 100644 --- a/src/app/components/image-manager/image-manager.component.ts +++ b/src/app/components/image-manager/image-manager.component.ts @@ -20,7 +20,7 @@ import { QuestionDialogComponent } from "@components/dialogs/question-dialog/que styleUrls: ['./image-manager.component.scss'] }) export class ImageManagerComponent implements OnInit { - controller:Controller ; + controller: Controller; public version: string; dataSource: imageDataSource; imageDatabase = new imageDatabase(); @@ -41,7 +41,7 @@ export class ImageManagerComponent implements OnInit { ngOnInit(): void { let controller_id = parseInt(this.route.snapshot.paramMap.get('controller_id')); - this.controllerService.get(controller_id).then((controller:Controller ) => { + this.controllerService.get(controller_id).then((controller: Controller ) => { this.controller = controller; if (controller.authToken) { this.getImages() diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts index 7e707b30..4ad1c114 100644 --- a/src/app/components/login/login.component.ts +++ b/src/app/components/login/login.component.ts @@ -18,7 +18,7 @@ import { VersionService } from '../../services/version.service'; encapsulation: ViewEncapsulation.None, }) export class LoginComponent implements OnInit, DoCheck { - private controller:Controller ; + private controller: Controller; public version: string; public isLightThemeEnabled: boolean = false; public loginError: boolean = false; @@ -45,7 +45,7 @@ export class LoginComponent implements OnInit, DoCheck { async ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/'; - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; if (controller.authToken) { diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts index 181dac7a..2e913581 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesAddTemplateComponent } from './cloud-nodes-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller:Controller , cloudTemplate: CloudTemplate) { + public addTemplate(controller: Controller, cloudTemplate: CloudTemplate) { return of(cloudTemplate); } } @@ -80,7 +80,7 @@ describe('CloudNodesAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.formGroup.controls['templateName'].setValue('template name'); component.addTemplate(); @@ -92,7 +92,7 @@ describe('CloudNodesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as CloudTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ''; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 cf29c5c4..59dbc64d 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 @@ -17,7 +17,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./cloud-nodes-add-template.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesAddTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; formGroup: UntypedFormGroup; isLocalComputerChosen: boolean = true; @@ -39,7 +39,7 @@ export class CloudNodesAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts index d9e6620e..23ebb889 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesTemplateDetailsComponent } from './cloud-nodes-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({ ports_mapping: [] } as CloudTemplate); } - public saveTemplate(controller:Controller , cloudTemplate: CloudTemplate) { + public saveTemplate(controller: Controller, cloudTemplate: CloudTemplate) { return of(cloudTemplate); } } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts index 8aa39084..431c221d 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../../../preferences.component.scss'], }) export class CloudNodesTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; cloudNodeTemplate: CloudTemplate; isSymbolSelectionOpened: boolean = false; @@ -49,7 +49,7 @@ export class CloudNodesTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts index 5c616a85..65f9e5f5 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { CloudNodesTemplatesComponent } from './cloud-nodes-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as CloudTemplate]); } } diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts index 209ee2b3..bcfee35e 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./cloud-nodes-templates.component.scss', '../../../preferences.component.scss'], }) export class CloudNodesTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; cloudNodesTemplates: CloudTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -24,7 +24,7 @@ export class CloudNodesTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); 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 c556042c..e705424c 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 @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsAddTemplateComponent } from './ethernet-hubs-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller:Controller , ethernetHubTemplate: EthernetHubTemplate) { + public addTemplate(controller: Controller, ethernetHubTemplate: EthernetHubTemplate) { return of(ethernetHubTemplate); } } @@ -83,7 +83,7 @@ describe('EthernetHubsAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1'); @@ -96,7 +96,7 @@ describe('EthernetHubsAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ''; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -108,7 +108,7 @@ describe('EthernetHubsAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetHubTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = 'sample name'; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 183a5cad..65a1bea4 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,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-hubs-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsAddTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; formGroup: UntypedFormGroup; isLocalComputerChosen: boolean = true; @@ -40,7 +40,7 @@ export class EthernetHubsAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts index d917ea6b..81dc3aaa 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsTemplateDetailsComponent } from './ethernet-hubs-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({ ports_mapping: [] } as EthernetHubTemplate); } - public saveTemplate(controller:Controller , cloudTemplate: EthernetHubTemplate) { + public saveTemplate(controller: Controller, cloudTemplate: EthernetHubTemplate) { return of(cloudTemplate); } } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts index 96425189..d1697348 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-hubs-template-details.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; ethernetHubTemplate: EthernetHubTemplate; numberOfPorts: number; inputForm: UntypedFormGroup; @@ -41,7 +41,7 @@ export class EthernetHubsTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.categories = this.builtInTemplatesConfigurationService.getCategoriesForEthernetHubs(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts index 1d0664fd..527aaddf 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetHubsTemplatesComponent } from './ethernet-hubs-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as EthernetHubTemplate]); } } diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts index bd9c912d..2a999b61 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./ethernet-hubs-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetHubsTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; ethernetHubsTemplates: EthernetHubTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -24,7 +24,7 @@ export class EthernetHubsTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); 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 07ba23bf..c0c8b3ce 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 @@ -24,7 +24,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesAddTemplateComponent } from './ethernet-switches-add-template.component'; export class MockedBuiltInTemplatesService { - public addTemplate(controller:Controller , ethernetHubTemplate: EthernetSwitchTemplate) { + public addTemplate(controller: Controller, ethernetHubTemplate: EthernetSwitchTemplate) { return of(ethernetHubTemplate); } } @@ -83,7 +83,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { it('should call add template', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); component.templateName = 'sample name'; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.formGroup.controls['templateName'].setValue('template name'); component.formGroup.controls['numberOfPorts'].setValue('1'); @@ -96,7 +96,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); spyOn(mockedToasterService, 'error'); component.formGroup.controls['numberOfPorts'].setValue('1'); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -108,7 +108,7 @@ describe('EthernetSwitchesAddTemplateComponent', () => { spyOn(mockedBuiltInTemplatesService, 'addTemplate').and.returnValue(of({} as EthernetSwitchTemplate)); spyOn(mockedToasterService, 'error'); component.formGroup.controls['templateName'].setValue('template name'); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 fb4172e3..b09b3dd0 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,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['./ethernet-switches-add-template.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesAddTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; formGroup: UntypedFormGroup; isLocalComputerChosen: boolean = true; @@ -40,7 +40,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts index 5c13b02e..9338e139 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts @@ -24,11 +24,11 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesTemplateDetailsComponent } from './ethernet-switches-template-details.component'; export class MockedBuiltInTemplatesService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({ ports_mapping: [] } as EthernetSwitchTemplate); } - public saveTemplate(controller:Controller , cloudTemplate: EthernetSwitchTemplate) { + public saveTemplate(controller: Controller, cloudTemplate: EthernetSwitchTemplate) { return of(cloudTemplate); } } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts index 44ab057a..c63e7dee 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.ts @@ -16,7 +16,7 @@ import { PortsComponent } from '../../../common/ports/ports.component'; }) export class EthernetSwitchesTemplateDetailsComponent implements OnInit { @ViewChild(PortsComponent) portsComponent: PortsComponent; - controller:Controller ; + controller: Controller; ethernetSwitchTemplate: EthernetSwitchTemplate; inputForm: UntypedFormGroup; isSymbolSelectionOpened: boolean = false; @@ -42,7 +42,7 @@ export class EthernetSwitchesTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts index c94175ef..b07600b1 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../../preferences.component.spec'; import { EthernetSwitchesTemplatesComponent } from './ethernet-switches-templates.component'; export class MockedBuiltInTemplatesService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as EthernetSwitchTemplate]); } } diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts index f8a1a647..c8b0640f 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../../common/delete-template-compone styleUrls: ['./ethernet-switches-templates.component.scss', '../../../preferences.component.scss'], }) export class EthernetSwitchesTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; ethernetSwitchesTemplates: EthernetSwitchTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -24,7 +24,7 @@ export class EthernetSwitchesTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts index 6973c8d2..f4a8e0b4 100644 --- a/src/app/components/preferences/common/delete-template-component/delete-template.component.ts +++ b/src/app/components/preferences/common/delete-template-component/delete-template.component.ts @@ -11,7 +11,7 @@ import { DeleteConfirmationDialogComponent } from '../delete-confirmation-dialog styleUrls: ['./delete-template.component.scss'], }) export class DeleteTemplateComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Output() deleteEvent = new EventEmitter(); constructor( diff --git a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts index 82ea8659..cc1bbea8 100644 --- a/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts +++ b/src/app/components/preferences/common/symbols-menu/symbols-menu.component.ts @@ -7,7 +7,7 @@ import { Controller } from '../../../../models/controller'; styleUrls: ['./symbols-menu.component.scss', '../../preferences.component.scss'], }) export class SymbolsMenuComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() symbol: string; @Output() symbolChangedEmitter = new EventEmitter(); diff --git a/src/app/components/preferences/common/symbols/symbols.component.ts b/src/app/components/preferences/common/symbols/symbols.component.ts index df487406..96561922 100644 --- a/src/app/components/preferences/common/symbols/symbols.component.ts +++ b/src/app/components/preferences/common/symbols/symbols.component.ts @@ -10,7 +10,7 @@ import { SymbolService } from '../../../../services/symbol.service'; styleUrls: ['./symbols.component.scss'], }) export class SymbolsComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() symbol: string; @Output() symbolChanged = new EventEmitter(); diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts index 0d814907..3cb729bb 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts @@ -31,7 +31,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddDockerTemplateComponent } from './add-docker-template.component'; export class MockedDockerService { - public addTemplate(controller:Controller , dockerTemplate: DockerTemplate) { + public addTemplate(controller: Controller, dockerTemplate: DockerTemplate) { return of(dockerTemplate); } } 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 7e26455d..7f42b7da 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 @@ -19,7 +19,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-docker-template.component.scss', '../../preferences.component.scss'], }) export class AddDockerTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; dockerTemplate: DockerTemplate; consoleTypes: string[] = []; auxConsoleTypes: string[] = []; @@ -61,7 +61,7 @@ export class AddDockerTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.consoleTypes = this.configurationService.getConsoleTypes(); diff --git a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts index e526e694..972a5952 100644 --- a/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts +++ b/src/app/components/preferences/docker/copy-docker-template/copy-docker-template.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-docker-template.component.scss', '../../preferences.component.scss'], }) export class CopyDockerTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; dockerTemplate: DockerTemplate; templateNameForm: UntypedFormGroup; @@ -35,7 +35,7 @@ export class CopyDockerTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.dockerService.getTemplate(this.controller, template_id).subscribe((dockerTemplate: DockerTemplate) => { diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts index 0dd43364..a6efb141 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { DockerTemplateDetailsComponent } from './docker-template-details.component'; export class MockedDockerService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as DockerTemplate); } - public saveTemplate(controller:Controller , dockerTemplate: DockerTemplate) { + public saveTemplate(controller: Controller, dockerTemplate: DockerTemplate) { return of(dockerTemplate); } } diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts index 5758eca9..c2a83810 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./docker-template-details.component.scss', '../../preferences.component.scss'], }) export class DockerTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; dockerTemplate: DockerTemplate; isSymbolSelectionOpened: boolean = false; @@ -49,7 +49,7 @@ export class DockerTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts index a3a9d06e..c3eaad3a 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { DockerTemplatesComponent } from './docker-templates.component'; export class MockedDockerService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as DockerTemplate]); } } diff --git a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts index 86739dec..8b481851 100644 --- a/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts +++ b/src/app/components/preferences/docker/docker-templates/docker-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./docker-templates.component.scss', '../../preferences.component.scss'], }) export class DockerTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; dockerTemplates: DockerTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -25,7 +25,7 @@ export class DockerTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts index 83b21228..dea743d4 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts @@ -29,7 +29,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddIosTemplateComponent } from './add-ios-template.component'; export class MockedIosService { - public addTemplate(controller:Controller , iosTemplate: IosTemplate) { + public addTemplate(controller: Controller, iosTemplate: IosTemplate) { return of(iosTemplate); } } @@ -95,7 +95,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -109,7 +109,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -122,7 +122,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); component.iosMemoryForm.controls['memory'].setValue(0); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -135,7 +135,7 @@ xdescribe('AddIosTemplateComponent', () => { component.iosNameForm.controls['templateName'].setValue('template name'); component.iosNameForm.controls['platform'].setValue('platform'); component.iosNameForm.controls['chassis'].setValue('chassis'); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 7fc7bc80..3063c456 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 @@ -25,7 +25,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-ios-template.component.scss', '../../preferences.component.scss'], }) export class AddIosTemplateComponent implements OnInit, OnDestroy { - controller:Controller ; + controller: Controller; iosTemplate: IosTemplate; isEtherSwitchRouter: boolean = false; @@ -115,7 +115,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy { }) const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getImages(); diff --git a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts index 41c8f526..5c03cdc7 100644 --- a/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/copy-ios-template/copy-ios-template.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-ios-template.component.scss', '../../preferences.component.scss'], }) export class CopyIosTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; iosTemplate: IosTemplate; formGroup: UntypedFormGroup; @@ -35,7 +35,7 @@ export class CopyIosTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.iosService.getTemplate(this.controller, template_id).subscribe((iosTemplate: IosTemplate) => { diff --git a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts index 31597bd7..c490efb2 100644 --- a/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts +++ b/src/app/components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component.ts @@ -10,7 +10,7 @@ import { ControllerService } from '../../../../services/controller.service'; styleUrls: ['./dynamips-preferences.component.scss'], }) export class DynamipsPreferencesComponent implements OnInit { - controller:Controller ; + controller: Controller; dynamipsPath: string; constructor( @@ -21,7 +21,7 @@ export class DynamipsPreferencesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts index f5c70042..22dd9b73 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts @@ -24,11 +24,11 @@ import { MockedProgressService } from "@components/project-map/project-map.compo import {ProgressService} from "../../../../common/progress/progress.service"; export class MockedIosService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as IosTemplate); } - public saveTemplate(controller:Controller , iosTemplate: IosTemplate) { + public saveTemplate(controller: Controller, iosTemplate: IosTemplate) { return of(iosTemplate); } } diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts index cbf01821..f9bb4011 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.ts @@ -74,7 +74,7 @@ export class IosTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts index 49ef83cb..5909faba 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IosTemplatesComponent } from './ios-templates.component'; export class MockedIosService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as IosTemplate]); } } diff --git a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts index d3b022c9..aa91acc8 100644 --- a/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts +++ b/src/app/components/preferences/dynamips/ios-templates/ios-templates.component.ts @@ -13,7 +13,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./ios-templates.component.scss', '../../preferences.component.scss'], }) export class IosTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; iosTemplates: IosTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -26,7 +26,7 @@ export class IosTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts index e735a1f6..5b187f4b 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts @@ -29,7 +29,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddIouTemplateComponent } from './add-iou-template.component'; export class MockedIouService { - public addTemplate(controller:Controller , iouTemplate: IouTemplate) { + public addTemplate(controller: Controller, iouTemplate: IouTemplate) { return of(iouTemplate); } } @@ -93,7 +93,7 @@ xdescribe('AddIouTemplateComponent', () => { component.templateNameForm.controls['templateName'].setValue('sample name'); component.imageForm.controls['imageName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -104,7 +104,7 @@ xdescribe('AddIouTemplateComponent', () => { spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); component.imageForm.controls['imageName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -115,7 +115,7 @@ xdescribe('AddIouTemplateComponent', () => { spyOn(mockedIouService, 'addTemplate').and.returnValue(of({} as IouTemplate)); component.templateNameForm.controls['templateName'].setValue('sample name'); component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 9a798eb8..39f59043 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 @@ -23,7 +23,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-iou-template.component.scss', '../../preferences.component.scss'], }) export class AddIouTemplateComponent implements OnInit, OnDestroy { - controller:Controller ; + controller: Controller; iouTemplate: IouTemplate; isRemoteComputerChosen: boolean = false; newImageSelected: boolean = false; @@ -85,7 +85,7 @@ export class AddIouTemplateComponent implements OnInit, OnDestroy { }; const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getImages(); this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => { diff --git a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts index cbdff8b5..d7f9eeb1 100644 --- a/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-iou-template.component.scss', '../../preferences.component.scss'], }) export class CopyIouTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; iouTemplate: IouTemplate; templateNameForm: UntypedFormGroup; @@ -35,7 +35,7 @@ export class CopyIouTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.qemuService.getTemplate(this.controller, template_id).subscribe((iouTemplate: IouTemplate) => { diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts index 8f864a31..6fc87ba6 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IouTemplateDetailsComponent } from './iou-template-details.component'; export class MockedIouService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as IouTemplate); } - public saveTemplate(controller:Controller , iouTemplate: IouTemplate) { + public saveTemplate(controller: Controller, iouTemplate: IouTemplate) { return of(iouTemplate); } } diff --git a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts index 03b8a79e..c72aeea0 100644 --- a/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./iou-template-details.component.scss', '../../preferences.component.scss'], }) export class IouTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; iouTemplate: IouTemplate; isSymbolSelectionOpened: boolean = false; @@ -53,7 +53,7 @@ export class IouTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts index 1233f1e8..69ff0ccb 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { IouTemplatesComponent } from './iou-templates.component'; export class MockedIouService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as IouTemplate]); } } diff --git a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts index b193a4e6..df480ea8 100644 --- a/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts +++ b/src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./iou-templates.component.scss', '../../preferences.component.scss'], }) export class IouTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; iouTemplates: IouTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -25,7 +25,7 @@ export class IouTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts index 2b902e4a..6f5a25ec 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts @@ -28,11 +28,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddQemuVmTemplateComponent } from './add-qemu-vm-template.component'; export class MockedQemuService { - public addTemplate(controller:Controller , qemuTemplate: QemuTemplate) { + public addTemplate(controller: Controller, qemuTemplate: QemuTemplate) { return of(qemuTemplate); } - public getImages(controller:Controller ) { + public getImages(controller: Controller ) { return of([]); } } @@ -102,7 +102,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -117,7 +117,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -131,7 +131,7 @@ xdescribe('AddQemuVmTemplateComponent', () => { component.diskForm.controls['fileName'].setValue('file name'); component.chosenImage = 'path'; component.newImageSelected = true; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); 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 77370875..9f502146 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 @@ -24,7 +24,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./add-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class AddQemuVmTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; selectPlatform: string[] = []; selectedPlatform: string; ramMemory: number; @@ -100,7 +100,7 @@ export class AddQemuVmTemplateComponent implements OnInit { }; const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.templateMocksService.getQemuTemplate().subscribe((qemuTemplate: QemuTemplate) => { diff --git a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts index 1d4cee3f..4fca2096 100644 --- a/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component.ts @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./copy-qemu-vm-template.component.scss', '../../preferences.component.scss'], }) export class CopyQemuVmTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; qemuTemplate: QemuTemplate; nameForm: UntypedFormGroup; @@ -36,7 +36,7 @@ export class CopyQemuVmTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.qemuService.getTemplate(this.controller, template_id).subscribe((qemuTemplate: QemuTemplate) => { diff --git a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts index d7fd2bfa..e89c3267 100644 --- a/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts +++ b/src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./qemu-preferences.component.scss'], }) export class QemuPreferencesComponent implements OnInit { - controller:Controller ; + controller: Controller; settings: QemuSettings; constructor( @@ -24,7 +24,7 @@ export class QemuPreferencesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.controllerSettingsService.getSettingsForQemu(this.controller).subscribe((settings: QemuSettings) => { diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts index 19c906b5..bdf79e04 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts @@ -23,16 +23,16 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { QemuVmTemplateDetailsComponent } from './qemu-vm-template-details.component'; export class MockedQemuService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as QemuTemplate); } - public saveTemplate(controller:Controller , qemuTemplate: QemuTemplate) { + public saveTemplate(controller: Controller, qemuTemplate: QemuTemplate) { return of(qemuTemplate); } - public getImages(controller:Controller ) { + public getImages(controller: Controller ) { return of([]); } } diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts index 5eb6cf2b..3328cd29 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts @@ -17,7 +17,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./qemu-vm-template-details.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; qemuTemplate: QemuTemplate; isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; @@ -58,7 +58,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts index 5e021535..e42ed6f7 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { QemuVmTemplatesComponent } from './qemu-vm-templates.component'; export class MockedQemuService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as QemuTemplate]); } } diff --git a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts index c1d7c9ac..c79e8205 100644 --- a/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./qemu-vm-templates.component.scss', '../../preferences.component.scss'], }) export class QemuVmTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; qemuTemplates: QemuTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -25,7 +25,7 @@ export class QemuVmTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts index 701042c0..41ab0c46 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVirtualBoxTemplateComponent } from './add-virtual-box-template.component'; export class MockedVirtualBoxService { - public addTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate) { + public addTemplate(controller: Controller, virtualBoxTemplate: VirtualBoxTemplate) { return of(virtualBoxTemplate); } - public getVirtualMachines(controller:Controller ) { + public getVirtualMachines(controller: Controller ) { return of([]); } } @@ -106,7 +106,7 @@ describe('AddVirtualBoxTemplateComponent', () => { }; component.virtualBoxTemplate = {} as VirtualBoxTemplate; component.selectedVM = template; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.vmForm.controls['vm'].setValue('virtual machine'); component.addTemplate(); @@ -116,7 +116,7 @@ describe('AddVirtualBoxTemplateComponent', () => { it('should not call save template when virtual machine is not selected', () => { spyOn(mockedVirtualBoxService, 'addTemplate').and.returnValue(of({} as VirtualBoxTemplate)); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts index 93ca59d6..1ef1ebb3 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.ts @@ -16,7 +16,7 @@ import { VirtualBoxService } from '../../../../services/virtual-box.service'; styleUrls: ['./add-virtual-box-template.component.scss', '../../preferences.component.scss'], }) export class AddVirtualBoxTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; virtualMachines: VirtualBoxVm[]; selectedVM: VirtualBoxVm; virtualBoxTemplate: VirtualBoxTemplate; @@ -39,7 +39,7 @@ export class AddVirtualBoxTemplateComponent implements OnInit { ngOnInit() { this.toasterService.error(`VirtualBox VM support is deprecated and will be removed in a future version, please use Qemu VMs instead`); const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.virtualBoxService.getVirtualMachines(this.controller).subscribe((virtualMachines: VirtualBoxVm[]) => { diff --git a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts index 5550fae8..6c0b905f 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component.ts @@ -9,14 +9,14 @@ import { ControllerService } from '../../../../services/controller.service'; styleUrls: ['./virtual-box-preferences.component.scss'], }) export class VirtualBoxPreferencesComponent implements OnInit { - controller:Controller ; + controller: Controller; vboxManagePath: string; constructor(private route: ActivatedRoute, private controllerService: ControllerService) {} ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts index 656951a4..94c63b50 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxTemplateDetailsComponent } from './virtual-box-template-details.component'; export class MockedVirtualBoxService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as VirtualBoxTemplate); } - public saveTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate) { + public saveTemplate(controller: Controller, virtualBoxTemplate: VirtualBoxTemplate) { return of(virtualBoxTemplate); } } diff --git a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts index 2086eb7b..0760b0d3 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.ts @@ -16,7 +16,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./virtual-box-template-details.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; virtualBoxTemplate: VirtualBoxTemplate; isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; @@ -57,7 +57,7 @@ export class VirtualBoxTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts index b587cf99..de42d9ac 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VirtualBoxTemplatesComponent } from './virtual-box-templates.component'; export class MockedVirtualBoxService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as VirtualBoxTemplate]); } } diff --git a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts index 370daefd..a96f3289 100644 --- a/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts +++ b/src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.ts @@ -13,7 +13,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./virtual-box-templates.component.scss', '../../preferences.component.scss'], }) export class VirtualBoxTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; virtualBoxTemplates: VirtualBoxTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -25,7 +25,7 @@ export class VirtualBoxTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts index ae3c5993..c91a8c9c 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware-template.component.ts @@ -16,7 +16,7 @@ import { VmwareService } from '../../../../services/vmware.service'; styleUrls: ['./add-vmware-template.component.scss', '../../preferences.component.scss'], }) export class AddVmwareTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; virtualMachines: VmwareVm[]; selectedVM: VmwareVm; vmwareTemplate: VmwareTemplate; @@ -39,7 +39,7 @@ export class AddVmwareTemplateComponent implements OnInit { ngOnInit() { this.toasterService.error(`VMware VM support is deprecated and will be removed in a future version, please use Qemu VMs instead`); const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.vmwareService.getVirtualMachines(this.controller).subscribe((virtualMachines: VmwareVm[]) => { diff --git a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts index a86b739d..6602c9f8 100644 --- a/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts +++ b/src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVmwareTemplateComponent } from './add-vmware-template.component'; export class MockedVmwareService { - public addTemplate(controller:Controller , vmwareTemplate: VmwareTemplate) { + public addTemplate(controller: Controller, vmwareTemplate: VmwareTemplate) { return of(vmwareTemplate); } - public getVirtualMachines(controller:Controller ) { + public getVirtualMachines(controller: Controller ) { return of([]); } } @@ -87,7 +87,7 @@ describe('AddVmwareTemplateComponent', () => { component.vmwareTemplate = {} as VmwareTemplate; component.selectedVM = template; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.templateNameForm.controls['templateName'].setValue('template name'); component.addTemplate(); @@ -97,7 +97,7 @@ describe('AddVmwareTemplateComponent', () => { it('should not call save template when virtual machine is not selected', () => { spyOn(mockedVmwareService, 'addTemplate').and.returnValue(of({} as VmwareTemplate)); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); diff --git a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts index ba2c9398..2046ecd2 100644 --- a/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts +++ b/src/app/components/preferences/vmware/vmware-preferences/vmware-preferences.component.ts @@ -9,7 +9,7 @@ import { ControllerService } from '../../../../services/controller.service'; styleUrls: ['./vmware-preferences.component.scss'], }) export class VmwarePreferencesComponent implements OnInit { - controller:Controller ; + controller: Controller; vmrunPath: string; constructor(private route: ActivatedRoute, private controllerService: ControllerService) {} @@ -17,7 +17,7 @@ export class VmwarePreferencesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts index e2cff759..f7828424 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts @@ -23,11 +23,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwareTemplateDetailsComponent } from './vmware-template-details.component'; export class MockedVmwareService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as VmwareTemplate); } - public saveTemplate(controller:Controller , vmwareTemplate: VmwareTemplate) { + public saveTemplate(controller: Controller, vmwareTemplate: VmwareTemplate) { return of(vmwareTemplate); } } diff --git a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts index 1ef9e066..7aa873a7 100644 --- a/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts +++ b/src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.ts @@ -16,7 +16,7 @@ import { CustomAdaptersComponent } from '../../common/custom-adapters/custom-ada styleUrls: ['./vmware-template-details.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; vmwareTemplate: VmwareTemplate; generalSettingsForm: UntypedFormGroup; displayedColumns: string[] = ['adapter_number', 'port_name', 'adapter_type', 'actions']; @@ -49,7 +49,7 @@ export class VmwareTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts index a92736bf..9e4be843 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VmwareTemplatesComponent } from './vmware-templates.component'; export class MockedVmwareService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as VmwareTemplate]); } } diff --git a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts index dead974f..6448d751 100644 --- a/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts +++ b/src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./vmware-templates.component.scss', '../../preferences.component.scss'], }) export class VmwareTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; vmwareTemplates: VmwareTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -24,7 +24,7 @@ export class VmwareTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts index 02992704..1e92c525 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.spec.ts @@ -23,13 +23,13 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { AddVpcsTemplateComponent } from './add-vpcs-template.component'; export class MockedComputeService { - getComputes(controller:Controller ) { + getComputes(controller: Controller ) { return of([]); } } export class MockedVpcsService { - public addTemplate(controller:Controller , vpcsTemplate: VpcsTemplate) { + public addTemplate(controller: Controller, vpcsTemplate: VpcsTemplate) { return of(vpcsTemplate); } } @@ -86,7 +86,7 @@ describe('AddVpcsTemplateComponent', () => { spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); component.templateName = 'sample name'; component.templateNameForm.controls['templateName'].setValue('template name'); - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); @@ -97,7 +97,7 @@ describe('AddVpcsTemplateComponent', () => { spyOn(mockedVpcsService, 'addTemplate').and.returnValue(of({} as VpcsTemplate)); spyOn(mockedToasterService, 'error'); component.templateName = ' '; - component.controller = { id: 1 } as Controller ; + component.controller = { id: 1 } as Controller; component.addTemplate(); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts index 0b8a4136..b14a4ef6 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts @@ -17,7 +17,7 @@ import { VpcsService } from '../../../../services/vpcs.service'; styleUrls: ['./add-vpcs-template.component.scss', '../../preferences.component.scss'], }) export class AddVpcsTemplateComponent implements OnInit { - controller:Controller ; + controller: Controller; templateName: string = ''; templateNameForm: UntypedFormGroup; isLocalComputerChosen: boolean = true; @@ -39,7 +39,7 @@ export class AddVpcsTemplateComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts index bfa826f2..dfb47f9a 100644 --- a/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.ts @@ -9,7 +9,7 @@ import { ControllerService } from '../../../../services/controller.service'; styleUrls: ['./vpcs-preferences.component.scss'], }) export class VpcsPreferencesComponent implements OnInit { - controller:Controller ; + controller: Controller; vpcsExecutable: string; constructor(private route: ActivatedRoute, private controllerService: ControllerService) {} @@ -17,7 +17,7 @@ export class VpcsPreferencesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; }); } diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts index ec359000..e52db125 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts @@ -22,11 +22,11 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsTemplateDetailsComponent } from './vpcs-template-details.component'; export class MockedVpcsService { - public getTemplate(controller:Controller , template_id: string) { + public getTemplate(controller: Controller, template_id: string) { return of({} as VpcsTemplate); } - public saveTemplate(controller:Controller , vpcsTemplate: VpcsTemplate) { + public saveTemplate(controller: Controller, vpcsTemplate: VpcsTemplate) { return of(vpcsTemplate); } } diff --git a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts index 388d0dd3..2afdad9c 100644 --- a/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.ts @@ -14,7 +14,7 @@ import { VpcsService } from '../../../../services/vpcs.service'; styleUrls: ['./vpcs-template-details.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplateDetailsComponent implements OnInit { - controller:Controller ; + controller: Controller; vpcsTemplate: VpcsTemplate; inputForm: UntypedFormGroup; isSymbolSelectionOpened: boolean = false; @@ -41,7 +41,7 @@ export class VpcsTemplateDetailsComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); const template_id = this.route.snapshot.paramMap.get('template_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getConfiguration(); diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts index a719d053..8d2d3f64 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts @@ -18,7 +18,7 @@ import { MockedActivatedRoute } from '../../preferences.component.spec'; import { VpcsTemplatesComponent } from './vpcs-templates.component'; export class MockedVpcsService { - public getTemplates(controller:Controller ) { + public getTemplates(controller: Controller ) { return of([{} as VpcsTemplate]); } } diff --git a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts index 5e105d8f..66a1ea30 100644 --- a/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts +++ b/src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.ts @@ -12,7 +12,7 @@ import { DeleteTemplateComponent } from '../../common/delete-template-component/ styleUrls: ['./vpcs-templates.component.scss', '../../preferences.component.scss'], }) export class VpcsTemplatesComponent implements OnInit { - controller:Controller ; + controller: Controller; vpcsTemplates: VpcsTemplate[] = []; @ViewChild(DeleteTemplateComponent) deleteComponent: DeleteTemplateComponent; @@ -20,7 +20,7 @@ export class VpcsTemplatesComponent implements OnInit { ngOnInit() { const controller_id = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { this.controller = controller; this.getTemplates(); }); diff --git a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts index f5b3e6e3..27814cc0 100644 --- a/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts +++ b/src/app/components/project-map/change-hostname-dialog/change-hostname-dialog.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./change-hostname-dialog.component.scss'], }) export class ChangeHostnameDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; inputForm: UntypedFormGroup; name: string; diff --git a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts index 18bf854d..acdf5a6b 100644 --- a/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts +++ b/src/app/components/project-map/change-symbol-dialog/change-symbol-dialog.component.ts @@ -10,7 +10,7 @@ import { NodeService } from '../../../services/node.service'; styleUrls: ['./change-symbol-dialog.component.scss'], }) export class ChangeSymbolDialogComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; symbol: string; diff --git a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts index b69a6e6a..c170b8d9 100644 --- a/src/app/components/project-map/console-wrapper/console-wrapper.component.ts +++ b/src/app/components/project-map/console-wrapper/console-wrapper.component.ts @@ -14,7 +14,7 @@ import { ThemeService } from '../../../services/theme.service'; styleUrls: ['./console-wrapper.component.scss'], }) export class ConsoleWrapperComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Output() closeConsole = new EventEmitter(); diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts index 9fe993e7..d15f4d4c 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.spec.ts @@ -62,7 +62,7 @@ describe('ContextConsoleMenuComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ContextConsoleMenuComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Controller ; + component.controller = { location: 'local' } as Controller; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts index bb4c56ef..9018c655 100644 --- a/src/app/components/project-map/context-console-menu/context-console-menu.component.ts +++ b/src/app/components/project-map/context-console-menu/context-console-menu.component.ts @@ -29,7 +29,7 @@ import { ConsoleDeviceActionComponent } from '../context-menu/actions/console-de }) export class ContextConsoleMenuComponent implements OnInit { @Input() project: Project; - @Input() controller:Controller ; + @Input() controller: Controller; @ViewChild(MatMenuTrigger) contextConsoleMenu: MatMenuTrigger; @ViewChild('container', { read: ViewContainerRef }) container; componentRef: ComponentRef; diff --git a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts index a2a91c90..ac2756da 100644 --- a/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts +++ b/src/app/components/project-map/context-menu/actions/align-horizontally/align-horizontally.component.ts @@ -9,7 +9,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './align-horizontally.component.html', }) export class AlignHorizontallyActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} diff --git a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts index feef318a..b67ed317 100644 --- a/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts +++ b/src/app/components/project-map/context-menu/actions/align_vertically/align-vertically.component.ts @@ -9,7 +9,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './align-vertically.component.html', }) export class AlignVerticallyActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; constructor(private nodesDataSource: NodesDataSource, private nodeService: NodeService) {} diff --git a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts index e32c7a1b..6ddb3571 100644 --- a/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/auto-idle-pc-action/auto-idle-pc-action.component.ts @@ -10,7 +10,7 @@ import { ProgressService } from "../../../../../common/progress/progress.service templateUrl: './auto-idle-pc-action.component.html', }) export class AutoIdlePcActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor( diff --git a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts index b1577634..c4aa93c8 100644 --- a/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.ts @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './bring-to-front-action.component.html', }) export class BringToFrontActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts index 125c8c9c..6eb5565e 100644 --- a/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-hostname/change-hostname-action.component.ts @@ -9,7 +9,7 @@ import { ChangeHostnameDialogComponent } from '../../../change-hostname-dialog/c templateUrl: './change-hostname-action.component.html', }) export class ChangeHostnameActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts index 34afab8b..cf18f65e 100644 --- a/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/change-symbol/change-symbol-action.component.ts @@ -9,7 +9,7 @@ import { ChangeSymbolDialogComponent } from '../../../change-symbol-dialog/chang templateUrl: './change-symbol-action.component.html', }) export class ChangeSymbolActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts index 027a96a8..83621420 100644 --- a/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/config-action/config-action.component.ts @@ -21,7 +21,7 @@ import { ConfiguratorDialogVpcsComponent } from '../../../node-editors/configura templateUrl: './config-action.component.html', }) export class ConfigActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; private conf = { autoFocus: false, diff --git a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts index d0da55c0..9cb6d7c8 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component.ts @@ -13,7 +13,7 @@ import * as ipaddr from 'ipaddr.js'; templateUrl: './console-device-action-browser.component.html', }) export class ConsoleDeviceActionBrowserComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor( diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts index 337b10a1..59cb21fa 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts @@ -16,7 +16,7 @@ describe('ConsoleDeviceActionComponent', () => { let component: ConsoleDeviceActionComponent; let fixture: ComponentFixture; let electronService; - let controller:Controller ; + let controller: Controller; let settingsService: SettingsService; let mockedControllerService: MockedControllerService; let mockedToaster: MockedToasterService; @@ -37,7 +37,7 @@ describe('ConsoleDeviceActionComponent', () => { mockedControllerService = new MockedControllerService(); mockedToaster = new MockedToasterService(); - controller = { host: 'localhost', port: 222 } as Controller ; + controller = { host: 'localhost', port: 222 } as Controller; }); beforeEach(async() => { diff --git a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts index 96b95162..c7c666aa 100644 --- a/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './console-device-action.component.html', }) export class ConsoleDeviceActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; constructor( diff --git a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts index 0171234c..56605971 100644 --- a/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.ts @@ -18,7 +18,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './delete-action.component.html', }) export class DeleteActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; @Input() drawings: Drawing[]; @Input() links: Link[]; diff --git a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts index 917845d9..06d6a86e 100644 --- a/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.ts @@ -14,7 +14,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './duplicate-action.component.html', }) export class DuplicateActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() drawings: Drawing[]; @Input() nodes: Node[]; diff --git a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts index a46a6f98..c55657fb 100644 --- a/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-config/edit-config-action.component.ts @@ -10,7 +10,7 @@ import { ConfigEditorDialogComponent } from '../../../node-editors/config-editor templateUrl: './edit-config-action.component.html', }) export class EditConfigActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() node: Node; diff --git a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts index 7ad43365..63e1428f 100644 --- a/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-link-style-action/edit-link-style-action.component.ts @@ -11,7 +11,7 @@ import { LinkStyleEditorDialogComponent } from '../../../drawings-editors/link-s templateUrl: './edit-link-style-action.component.html', }) export class EditLinkStyleActionComponent implements OnChanges { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts index 8f90b180..723f7ad2 100644 --- a/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts @@ -11,7 +11,7 @@ import { StyleEditorDialogComponent } from '../../../drawings-editors/style-edit templateUrl: './edit-style-action.component.html', }) export class EditStyleActionComponent implements OnChanges { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() drawing: Drawing; isImageDrawing: boolean = false; diff --git a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts index 72f5bc18..d26b21cd 100644 --- a/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts @@ -14,7 +14,7 @@ import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor templateUrl: './edit-text-action.component.html', }) export class EditTextActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() drawing: Drawing; @Input() node: Node; diff --git a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts index 28dfc208..63db5b5c 100644 --- a/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/export-config/export-config-action.component.ts @@ -10,7 +10,7 @@ import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog templateUrl: './export-config-action.component.html', }) export class ExportConfigActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private nodeService: NodeService, private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts index 3d0bed8a..c7a56594 100644 --- a/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component.ts @@ -8,7 +8,7 @@ import { Controller } from '../../../../../models/controller'; templateUrl: './http-console-new-tab-action.component.html', }) export class HttpConsoleNewTabActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; constructor(private nodeConsoleService: NodeConsoleService) {} diff --git a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts index 2c208bd6..e0577259 100644 --- a/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/http-console/http-console-action.component.ts @@ -8,7 +8,7 @@ import { NodeConsoleService } from '../../../../../services/nodeConsole.service' templateUrl: './http-console-action.component.html', }) export class HttpConsoleActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; constructor(private nodeConsoleService: NodeConsoleService) {} diff --git a/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts index 040f0461..4760fbec 100644 --- a/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/idle-pc-action/idle-pc-action.component.ts @@ -10,7 +10,7 @@ import { NodeService } from "@services/node.service"; templateUrl: './idle-pc-action.component.html', }) export class IdlePcActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private nodeService: NodeService, private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts index 9e6392da..738b60f5 100644 --- a/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.ts @@ -12,7 +12,7 @@ import { ConfigDialogComponent } from '../../dialogs/config-dialog/config-dialog styleUrls: ['./import-config-action.component.scss'], }) export class ImportConfigActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; @ViewChild('fileInput') fileInput: ElementRef; configType: string; diff --git a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts index 731eafc0..6d0b0b1c 100644 --- a/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/isolate-node-action/isolate-node-action.component.ts @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './isolate-node-action.component.html', }) export class IsolateNodeActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private nodeService: NodeService, private toasterService: ToasterService) {} diff --git a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts index 9be1d770..4923b415 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component.ts @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './move-layer-down-action.component.html', }) export class MoveLayerDownActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts index 8c9f3bd8..33d2342e 100644 --- a/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component.ts @@ -12,7 +12,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './move-layer-up-action.component.html', }) export class MoveLayerUpActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; @Input() drawings: Drawing[]; diff --git a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts index f7ae3d63..ff746c07 100644 --- a/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component.ts @@ -8,7 +8,7 @@ import { Controller } from '../../../../../models/controller'; templateUrl: './open-file-explorer-action.component.html', }) export class OpenFileExplorerActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private electronService: ElectronService) {} diff --git a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts index ec5d22c4..55306e1b 100644 --- a/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component.ts @@ -10,7 +10,7 @@ import { PacketFiltersDialogComponent } from '../../../packet-capturing/packet-f templateUrl: './packet-filters-action.component.html', }) export class PacketFiltersActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts index af495df8..33d1ae59 100644 --- a/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/reload-node-action/reload-node-action.component.ts @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './reload-node-action.component.html', }) export class ReloadNodeActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; filteredNodes: Node[] = []; diff --git a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts index 75c98bd4..9b4263c0 100644 --- a/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/resume-link-action/resume-link-action.component.ts @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './resume-link-action.component.html', }) export class ResumeLinkActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts index d9c50730..6af82bcd 100644 --- a/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/show-node-action/show-node-action.component.ts @@ -10,7 +10,7 @@ import { InfoDialogComponent } from '../../../info-dialog/info-dialog.component' }) export class ShowNodeActionComponent { @Input() node: Node; - @Input() controller:Controller ; + @Input() controller: Controller; constructor(private dialog: MatDialog) {} diff --git a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts index d663eff8..8415330f 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component.ts @@ -9,7 +9,7 @@ import { PacketCaptureService } from '../../../../../services/packet-capture.ser templateUrl: './start-capture-on-started-link.component.html', }) export class StartCaptureOnStartedLinkActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts index daf6572f..32178e6d 100644 --- a/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-capture/start-capture-action.component.ts @@ -10,7 +10,7 @@ import { StartCaptureDialogComponent } from '../../../packet-capturing/start-cap templateUrl: './start-capture-action.component.html', }) export class StartCaptureActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() link: Link; diff --git a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts index 024f9855..ca43e689 100644 --- a/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/start-node-action/start-node-action.component.ts @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './start-node-action.component.html', }) export class StartNodeActionComponent implements OnInit, OnChanges { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; isNodeWithStoppedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts index b3416ca0..2ce178b0 100644 --- a/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-capture/stop-capture-action.component.ts @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './stop-capture-action.component.html', }) export class StopCaptureActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts index d9d4838e..83b5d8cb 100644 --- a/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/stop-node-action/stop-node-action.component.ts @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './stop-node-action.component.html', }) export class StopNodeActionComponent implements OnInit, OnChanges { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; isNodeWithStartedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts index b11e7304..1b360325 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-link/suspend-link-action.component.ts @@ -8,7 +8,7 @@ import { LinkService } from '../../../../../services/link.service'; templateUrl: './suspend-link-action.component.html', }) export class SuspendLinkActionComponent { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() link: Link; constructor(private linkService: LinkService) {} diff --git a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts index 12b299c0..8c8bbbc3 100644 --- a/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component.ts @@ -8,7 +8,7 @@ import { NodeService } from '../../../../../services/node.service'; templateUrl: './suspend-node-action.component.html', }) export class SuspendNodeActionComponent implements OnInit, OnChanges { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() nodes: Node[]; isNodeWithStartedStatus: boolean; diff --git a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts index e0107fde..da968b32 100644 --- a/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts +++ b/src/app/components/project-map/context-menu/actions/unisolate-node-action/unisolate-node-action.component.ts @@ -9,7 +9,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; templateUrl: './unisolate-node-action.component.html', }) export class UnisolateNodeActionComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; constructor(private nodeService: NodeService, private toasterService: ToasterService) {} diff --git a/src/app/components/project-map/context-menu/context-menu.component.spec.ts b/src/app/components/project-map/context-menu/context-menu.component.spec.ts index d25e911b..7981bbfe 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.spec.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.spec.ts @@ -35,7 +35,7 @@ describe('ContextMenuComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ContextMenuComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Controller ; + component.controller = { location: 'local' } as Controller; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/context-menu/context-menu.component.ts b/src/app/components/project-map/context-menu/context-menu.component.ts index 3e99ae2d..e0d60aae 100644 --- a/src/app/components/project-map/context-menu/context-menu.component.ts +++ b/src/app/components/project-map/context-menu/context-menu.component.ts @@ -19,7 +19,7 @@ import { ProjectService } from '../../../services/project.service'; }) export class ContextMenuComponent implements OnInit { @Input() project: Project; - @Input() controller:Controller ; + @Input() controller: Controller; @ViewChild(MatMenuTrigger) contextMenu: MatMenuTrigger; diff --git a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts index 61eeaa31..1f140d11 100644 --- a/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/link-style-editor/link-style-editor.component.ts @@ -17,7 +17,7 @@ import { LinkToMapLinkConverter } from '../../../../cartography/converters/map/l styleUrls: ['./link-style-editor.component.scss'], }) export class LinkStyleEditorDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; link: Link; formGroup: UntypedFormGroup; diff --git a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts index 431ee467..0260c1fa 100644 --- a/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts +++ b/src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts @@ -30,7 +30,7 @@ import { RotationValidator } from '../../../../validators/rotation-validator'; export class TextEditorDialogComponent implements OnInit { @ViewChild('textArea', { static: true }) textArea: ElementRef; - controller:Controller ; + controller: Controller; project: Project; drawing: Drawing; node: Node; diff --git a/src/app/components/project-map/import-appliance/import-appliance.component.ts b/src/app/components/project-map/import-appliance/import-appliance.component.ts index fe2304ca..c27820a4 100644 --- a/src/app/components/project-map/import-appliance/import-appliance.component.ts +++ b/src/app/components/project-map/import-appliance/import-appliance.component.ts @@ -20,7 +20,7 @@ import { ToasterService } from '../../../services/toaster.service'; }) export class ImportApplianceComponent implements OnInit { @Input('project') project: Project; - @Input('controller') controller:Controller ; + @Input('controller') controller: Controller; uploader: FileUploader; template; @@ -150,7 +150,7 @@ export class ImportApplianceComponent implements OnInit { fileReader.readAsText(file); } - private getUploadPath(controller:Controller , filename: string) { + private getUploadPath(controller: Controller, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } } diff --git a/src/app/components/project-map/info-dialog/info-dialog.component.ts b/src/app/components/project-map/info-dialog/info-dialog.component.ts index 8af19a5c..edf1d6fe 100644 --- a/src/app/components/project-map/info-dialog/info-dialog.component.ts +++ b/src/app/components/project-map/info-dialog/info-dialog.component.ts @@ -10,7 +10,7 @@ import { InfoService } from '../../../services/info.service'; styleUrls: ['./info-dialog.component.scss'], }) export class InfoDialogComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() node: Node; infoList: string[] = []; usage: string = ''; diff --git a/src/app/components/project-map/log-console/log-console.component.spec.ts b/src/app/components/project-map/log-console/log-console.component.spec.ts index a161f46c..0545f0ef 100644 --- a/src/app/components/project-map/log-console/log-console.component.spec.ts +++ b/src/app/components/project-map/log-console/log-console.component.spec.ts @@ -70,7 +70,7 @@ describe('LogConsoleComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(LogConsoleComponent); component = fixture.componentInstance; - component.controller = { location: 'local' } as Controller ; + component.controller = { location: 'local' } as Controller; fixture.detectChanges(); }); diff --git a/src/app/components/project-map/log-console/log-console.component.ts b/src/app/components/project-map/log-console/log-console.component.ts index 36341ba7..354e9978 100644 --- a/src/app/components/project-map/log-console/log-console.component.ts +++ b/src/app/components/project-map/log-console/log-console.component.ts @@ -36,7 +36,7 @@ import * as ipaddr from 'ipaddr.js'; styleUrls: ['./log-console.component.scss'], }) export class LogConsoleComponent implements OnInit, AfterViewInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @ViewChild('console') console: ElementRef; diff --git a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts index 5b7b8082..f63b1b63 100644 --- a/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts @@ -47,7 +47,7 @@ import { environment } from 'environments/environment'; ], }) export class NewTemplateDialogComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; uploader: FileUploader; diff --git a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts index be1d1ada..05b0627d 100644 --- a/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts +++ b/src/app/components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component.ts @@ -16,7 +16,7 @@ import { ProjectNameValidator } from '../../../projects/models/projectNameValida providers: [ProjectNameValidator], }) export class TemplateNameDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; templateNameForm: UntypedFormGroup; constructor( diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts index d73f7b98..d2aec52a 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts @@ -16,7 +16,7 @@ import { ConfigEditorDialogComponent } from './config-editor.component'; describe('ConfigEditorDialogComponent', () => { let component: ConfigEditorDialogComponent; let fixture: ComponentFixture; - let controller:Controller ; + let controller: Controller; let node: Node; let toaster = { success: jasmine.createSpy('success'), diff --git a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts index 2e361694..f750eda1 100644 --- a/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts +++ b/src/app/components/project-map/node-editors/config-editor/config-editor.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../services/toaster.service'; styleUrls: ['./config-editor.component.scss'], }) export class ConfigEditorDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; node: Node; diff --git a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts index 86019a49..13cb34fe 100644 --- a/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogAtmSwitchComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; nameForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts index 4f61fbcd..0688fbe4 100644 --- a/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts +++ b/src/app/components/project-map/node-editors/configurator/cloud/configurator-cloud.component.ts @@ -16,7 +16,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogCloudComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index 53936516..b575d324 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -16,7 +16,7 @@ import { NonNegativeValidator } from '../../../../../validators/non-negative-val styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogDockerComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts index c976dc2b..cacde14d 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component.ts @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['./configure-custom-adapters.component.scss'], }) export class ConfigureCustomAdaptersDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; displayedColumns: string[] = ['adapter_number', 'port_name']; adapters: CustomAdapter[] = []; diff --git a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts index 1e115796..51dc78bc 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component.ts @@ -11,7 +11,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['./edit-network-configuration.component.scss'], }) export class EditNetworkConfigurationDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; configuration: string; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts index 7ec90d43..f2bd691e 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component.ts @@ -15,7 +15,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; }) export class ConfiguratorDialogEthernetSwitchComponent implements OnInit { @ViewChild(PortsComponent) portsComponent: PortsComponent; - controller:Controller ; + controller: Controller; node: Node; name: string; inputForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts index 41d4072f..7bebde5a 100644 --- a/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component.ts @@ -13,7 +13,7 @@ import { VpcsConfigurationService } from '../../../../../services/vpcs-configura styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogEthernetHubComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; numberOfPorts: number; inputForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts index 9821a486..895daa50 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.ts @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIosComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts index f7c061fe..fd302949 100644 --- a/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts +++ b/src/app/components/project-map/node-editors/configurator/iou/configurator-iou.component.ts @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogIouComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts index 53bcd7bd..5505d369 100644 --- a/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts +++ b/src/app/components/project-map/node-editors/configurator/nat/configurator-nat.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogNatComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts index 4a17f44a..ba30cad0 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.ts @@ -18,7 +18,7 @@ import { QemuImageCreatorComponent } from './qemu-image-creator/qemu-image-creat styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogQemuComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts index 8ecabe57..53b5d5e4 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts +++ b/src/app/components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component.ts @@ -13,7 +13,7 @@ import { ToasterService } from '../../../../../../services/toaster.service'; styleUrls: ['../../configurator.component.scss'], }) export class QemuImageCreatorComponent implements OnInit { - controller:Controller ; + controller: Controller; qemuImg: QemuImg; formatOptions: string[] = ['qcow2', 'qcow', 'vhd', 'vdi', 'vmdk', 'raw']; diff --git a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts index 0d0200e3..15d52ef5 100644 --- a/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts +++ b/src/app/components/project-map/node-editors/configurator/switch/configurator-switch.component.ts @@ -12,7 +12,7 @@ import { ToasterService } from '../../../../../services/toaster.service'; styleUrls: ['../configurator.component.scss', '../../../../preferences/preferences.component.scss'], }) export class ConfiguratorDialogSwitchComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; nameForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts index 143b4c4e..a407320a 100644 --- a/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts +++ b/src/app/components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component.ts @@ -14,7 +14,7 @@ import { VirtualBoxConfigurationService } from '../../../../../services/virtual- styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVirtualBoxComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts index a6301bc9..485282fd 100644 --- a/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vmware/configurator-vmware.component.ts @@ -14,7 +14,7 @@ import { VmwareConfigurationService } from '../../../../../services/vmware-confi styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVmwareComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; generalSettingsForm: UntypedFormGroup; diff --git a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts index 23b47472..c088a1b1 100644 --- a/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts +++ b/src/app/components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component.ts @@ -13,7 +13,7 @@ import { VpcsConfigurationService } from '../../../../../services/vpcs-configura styleUrls: ['../configurator.component.scss'], }) export class ConfiguratorDialogVpcsComponent implements OnInit { - controller:Controller ; + controller: Controller; node: Node; name: string; inputForm: UntypedFormGroup; diff --git a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts index d9d871ec..e064727f 100644 --- a/src/app/components/project-map/nodes-menu/nodes-menu.component.ts +++ b/src/app/components/project-map/nodes-menu/nodes-menu.component.ts @@ -20,7 +20,7 @@ import { NodesMenuConfirmationDialogComponent } from './nodes-menu-confirmation- }) export class NodesMenuComponent { @Input('project') project: Project; - @Input('controller') controller:Controller ; + @Input('controller') controller: Controller; constructor( private nodeService: NodeService, diff --git a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts index 5f637b5c..680c4dd0 100644 --- a/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts +++ b/src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.ts @@ -15,7 +15,7 @@ import { HelpDialogComponent } from '../../help-dialog/help-dialog.component'; styleUrls: ['./packet-filters.component.scss'], }) export class PacketFiltersDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; link: Link; filters: Filter; diff --git a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts index 8bae038a..d1fc3be7 100644 --- a/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts +++ b/src/app/components/project-map/packet-capturing/start-capture/start-capture.component.ts @@ -18,7 +18,7 @@ import { PacketFiltersDialogComponent } from '../packet-filters/packet-filters.c styleUrls: ['./start-capture.component.scss'], }) export class StartCaptureDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; link: Link; linkTypes = []; diff --git a/src/app/components/project-map/project-map.component.spec.ts b/src/app/components/project-map/project-map.component.spec.ts index 11e9c556..781afab4 100644 --- a/src/app/components/project-map/project-map.component.spec.ts +++ b/src/app/components/project-map/project-map.component.spec.ts @@ -89,55 +89,55 @@ export class MockedNodeService { return of(this.node); } - delete(controller:Controller , node: Node) { + delete(controller: Controller, node: Node) { return of(); } - startAll(controller:Controller , project: Project) { + startAll(controller: Controller, project: Project) { return of(); } - stopAll(controller:Controller , project: Project) { + stopAll(controller: Controller, project: Project) { return of(); } - suspendAll(controller:Controller , project: Project) { + suspendAll(controller: Controller, project: Project) { return of(); } - reloadAll(controller:Controller , project: Project) { + reloadAll(controller: Controller, project: Project) { return of(); } - start(controller:Controller , node: Node) { + start(controller: Controller, node: Node) { return of(); } - stop(controller:Controller , node: Node) { + stop(controller: Controller, node: Node) { return of(); } - suspend(controller:Controller , node: Node) { + suspend(controller: Controller, node: Node) { return of(); } - reload(controller:Controller , node: Node) { + reload(controller: Controller, node: Node) { return of(); } - duplicate(controller:Controller , node: Node) { + duplicate(controller: Controller, node: Node) { return of(node); } - getStartupConfiguration(controller:Controller , node: Node) { + getStartupConfiguration(controller: Controller, node: Node) { return of('sample config'); } - saveConfiguration(controller:Controller , node: Node, configuration: string) { + saveConfiguration(controller: Controller, node: Node, configuration: string) { return of(configuration); } - update(controller:Controller , node: Node) { + update(controller: Controller, node: Node) { return of(node); } } @@ -146,31 +146,31 @@ export class MockedDrawingService { public drawing = {} as Drawing; constructor() {} - add(_controller:Controller , _project_id: string, _x: number, _y: number, _svg: string) { + add(_controller: Controller, _project_id: string, _x: number, _y: number, _svg: string) { return of(this.drawing); } - duplicate(controller:Controller , project_id: string, drawing: Drawing) { + duplicate(controller: Controller, project_id: string, drawing: Drawing) { return of(drawing); } - updatePosition(_controller:Controller , _project: Project, _drawing: Drawing, _x: number, _y: number) { + updatePosition(_controller: Controller, _project: Project, _drawing: Drawing, _x: number, _y: number) { return of(this.drawing); } - updateSizeAndPosition(_controller:Controller , _drawing: Drawing, _x: number, _y: number, _svg: string) { + updateSizeAndPosition(_controller: Controller, _drawing: Drawing, _x: number, _y: number, _svg: string) { return of(this.drawing); } - update(_controller:Controller , _drawing: Drawing) { + update(_controller: Controller, _drawing: Drawing) { return of(this.drawing); } - delete(_controller:Controller , _drawing: Drawing) { + delete(_controller: Controller, _drawing: Drawing) { return of(this.drawing); } - updateText(_controller:Controller , _drawing: Drawing, _svg: string): Observable { + updateText(_controller: Controller, _drawing: Drawing, _svg: string): Observable { return of(this.drawing); } } @@ -178,15 +178,15 @@ export class MockedDrawingService { export class MockedLinkService { constructor() {} - getLink(controller:Controller , projectId: string, linkId: string) { + getLink(controller: Controller, projectId: string, linkId: string) { return of({}); } - deleteLink(_controller:Controller , link: Link) { + deleteLink(_controller: Controller, link: Link) { return of({}); } - updateLink(controller:Controller , link: Link) { + updateLink(controller: Controller, link: Link) { return of({}); } @@ -198,11 +198,11 @@ export class MockedLinkService { return of({}); } - startCaptureOnLink(controller:Controller , link: Link, settings: CapturingSettings) { + startCaptureOnLink(controller: Controller, link: Link, settings: CapturingSettings) { return of({}); } - getAvailableFilters(controller:Controller , link: Link) { + getAvailableFilters(controller: Controller, link: Link) { return of({}); } } diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts index 00061727..f566817c 100644 --- a/src/app/components/project-map/project-map.component.ts +++ b/src/app/components/project-map/project-map.component.ts @@ -104,7 +104,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { public drawings: Drawing[] = []; public symbols: Symbol[] = []; public project: Project; - public controller:Controller ; + public controller: Controller; public projectws: WebSocket; public ws: WebSocket; public isProjectMapMenuVisible: boolean = false; @@ -333,7 +333,7 @@ export class ProjectMapComponent implements OnInit, OnDestroy { from(this.controllerService.get(controller_id)) .pipe( - mergeMap((controller:Controller ) => { + mergeMap((controller: Controller ) => { if (!controller) this.router.navigate(['/controllers']); this.controller = controller; return this.projectService.get(controller, paramMap.get('project_id')).pipe( diff --git a/src/app/components/project-map/project-readme/project-readme.component.ts b/src/app/components/project-map/project-readme/project-readme.component.ts index dfed275c..e6143415 100644 --- a/src/app/components/project-map/project-readme/project-readme.component.ts +++ b/src/app/components/project-map/project-readme/project-readme.component.ts @@ -14,7 +14,7 @@ import { ViewChild } from '@angular/core'; styleUrls: ['./project-readme.component.scss'] }) export class ProjectReadmeComponent implements AfterViewInit { - controller:Controller ; + controller: Controller; project: Project; @ViewChild('text', {static: false}) text: ElementRef; diff --git a/src/app/components/project-map/web-console/web-console.component.ts b/src/app/components/project-map/web-console/web-console.component.ts index 385f9da4..66b3f4e5 100644 --- a/src/app/components/project-map/web-console/web-console.component.ts +++ b/src/app/components/project-map/web-console/web-console.component.ts @@ -15,7 +15,7 @@ import { ThemeService } from '../../../services/theme.service'; styleUrls: ['../../../../../node_modules/xterm/css/xterm.css', './web-console.component.scss'], }) export class WebConsoleComponent implements OnInit, AfterViewInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Input() node: Node; diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts index 03a41f2d..0a2566e0 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts @@ -53,7 +53,7 @@ export class MockedProjectService { describe('AddBlankProjectDialogComponent', () => { let component: AddBlankProjectDialogComponent; let fixture: ComponentFixture; - let controller:Controller ; + let controller: Controller; let router = { navigate: jasmine.createSpy('navigate'), }; diff --git a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts index 0de2d6cd..2ad465db 100644 --- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts +++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.ts @@ -18,7 +18,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; providers: [ProjectNameValidator], }) export class AddBlankProjectDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; projectNameForm: UntypedFormGroup; uuid: string; onAddProject = new EventEmitter(); diff --git a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts index 9cb5120e..ee59212b 100644 --- a/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts +++ b/src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts @@ -16,7 +16,7 @@ import { ReadmeEditorComponent } from './readme-editor/readme-editor.component'; export class EditProjectDialogComponent implements OnInit { @ViewChild('editor') editor: ReadmeEditorComponent; - controller:Controller ; + controller: Controller; project: Project; formGroup: UntypedFormGroup; variableFormGroup: UntypedFormGroup; diff --git a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts index 0257359c..90cbd970 100644 --- a/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts +++ b/src/app/components/projects/edit-project-dialog/readme-editor/readme-editor.component.ts @@ -11,7 +11,7 @@ import { Project } from '../../../../models/project'; styleUrls: ['./readme-editor.component.scss'] }) export class ReadmeEditorComponent implements OnInit { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; public markdown = ``; diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts index 7553fd31..726d448d 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts @@ -51,11 +51,11 @@ export class MockedProjectService { return of(this.projects); } - getUploadPath(controller:Controller , uuid: string, project_name: string) { + getUploadPath(controller: Controller, uuid: string, project_name: string) { return `http://${controller.host}:${controller.port}/${environment.current_version}/projects/${uuid}/import?name=${project_name}`; } - getExportPath(controller:Controller , project: Project) { + getExportPath(controller: Controller, project: Project) { return `http://${controller.host}:${controller.port}/${environment.current_version}/projects/${project.project_id}/export`; } } @@ -63,7 +63,7 @@ export class MockedProjectService { describe('ImportProjectDialogComponent', () => { let component: ImportProjectDialogComponent; let fixture: ComponentFixture; - let controller:Controller ; + let controller: Controller; let debugElement: DebugElement; let fileSelectDirective: FileSelectDirective; let mockedToasterService = new MockedToasterService() diff --git a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts index 19a7e9f4..870a0bbf 100644 --- a/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts +++ b/src/app/components/projects/import-project-dialog/import-project-dialog.component.ts @@ -23,7 +23,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; export class ImportProjectDialogComponent implements OnInit { uploader: FileUploader; uploadProgress: number = 0; - controller:Controller ; + controller: Controller; isImportEnabled: boolean = false; isFinishEnabled: boolean = false; isDeleteVisible: boolean = false; diff --git a/src/app/components/projects/projects.component.spec.ts b/src/app/components/projects/projects.component.spec.ts index 1b0c7129..b8ad32ca 100644 --- a/src/app/components/projects/projects.component.spec.ts +++ b/src/app/components/projects/projects.component.spec.ts @@ -33,7 +33,7 @@ xdescribe('ProjectsComponent', () => { let settingsService: SettingsService; let projectService: ProjectService; let controllerService: ControllerService; - let controller:Controller ; + let controller: Controller; let progressService: ProgressService; let mockedProjectService: MockedProjectService = new MockedProjectService(); let electronService; diff --git a/src/app/components/projects/projects.component.ts b/src/app/components/projects/projects.component.ts index 29548447..f530e910 100644 --- a/src/app/components/projects/projects.component.ts +++ b/src/app/components/projects/projects.component.ts @@ -28,7 +28,7 @@ import { NavigationDialogComponent } from './navigation-dialog/navigation-dialog styleUrls: ['./projects.component.scss'], }) export class ProjectsComponent implements OnInit { - controller:Controller ; + controller: Controller; projectDatabase = new ProjectDatabase(); dataSource: ProjectDataSource; displayedColumns = ['select', 'name', 'actions', 'delete']; diff --git a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts index a40a9027..45570324 100644 --- a/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts +++ b/src/app/components/projects/save-project-dialog/save-project-dialog.component.ts @@ -15,7 +15,7 @@ import { ProjectNameValidator } from '../models/projectNameValidator'; providers: [ProjectNameValidator], }) export class SaveProjectDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; projectNameForm: UntypedFormGroup; onAddProject = new EventEmitter(); diff --git a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts index 70f27d47..e557b541 100644 --- a/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts +++ b/src/app/components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component.ts @@ -15,7 +15,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./create-snapshot-dialog.component.scss'], }) export class CreateSnapshotDialogComponent { - controller:Controller ; + controller: Controller; project: Project; snapshot: Snapshot = new Snapshot(); inputForm: UntypedFormGroup; diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts index 876bf9b7..282b485e 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts @@ -47,15 +47,15 @@ export class MockedActivatedRoute { } export class MockedSnapshotService { - public list(controller:Controller , project_id: string) { + public list(controller: Controller, project_id: string) { return of([]); } - public delete(controller:Controller , project_id: string, snapshot_id: string) { + public delete(controller: Controller, project_id: string, snapshot_id: string) { return of({}); } - public restore(controller:Controller , project_id: string, snapshot_id: string) { + public restore(controller: Controller, project_id: string, snapshot_id: string) { return of({}); } } diff --git a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts index 940d7868..3563bed0 100644 --- a/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts +++ b/src/app/components/snapshots/list-of-snapshots/list-of-snapshots.component.ts @@ -15,7 +15,7 @@ import { ToasterService } from '../../../services/toaster.service'; styleUrls: ['./list-of-snapshots.component.scss'], }) export class ListOfSnapshotsComponent implements OnInit { - controller:Controller ; + controller: Controller; projectId: string; snapshots: Snapshot[]; displayedColumns = ['name', 'creationDate', 'actions']; diff --git a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts index 6f719caa..03b8d8b2 100644 --- a/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts +++ b/src/app/components/snapshots/snapshot-menu-item/snapshot-menu-item.component.ts @@ -16,7 +16,7 @@ import { CreateSnapshotDialogComponent } from '../create-snapshot-dialog/create- }) export class SnapshotMenuItemComponent implements OnInit { @Input('project') project: Project; - @Input('controller') controller:Controller ; + @Input('controller') controller: Controller; constructor( private dialog: MatDialog, diff --git a/src/app/components/system-status/status-info/status-info.component.ts b/src/app/components/system-status/status-info/status-info.component.ts index 775d3e0b..966a1843 100644 --- a/src/app/components/system-status/status-info/status-info.component.ts +++ b/src/app/components/system-status/status-info/status-info.component.ts @@ -29,7 +29,7 @@ export class StatusInfoComponent implements OnInit { } getStatistics() { - this.controllerService.get(Number(this.controllerId)).then((controller:Controller ) => { + this.controllerService.get(Number(this.controllerId)).then((controller: Controller ) => { this.computeService.getStatistics(controller).subscribe((statistics: ComputeStatistics[]) => { this.computeStatistics = statistics; setTimeout(() => { diff --git a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts index 9bad6ca2..6aa59cfc 100644 --- a/src/app/components/template/template-list-dialog/template-list-dialog.component.ts +++ b/src/app/components/template/template-list-dialog/template-list-dialog.component.ts @@ -17,7 +17,7 @@ import { NonNegativeValidator } from '../../../validators/non-negative-validator styleUrls: ['./template-list-dialog.component.scss'], }) export class TemplateListDialogComponent implements OnInit { - controller:Controller ; + controller: Controller; project: Project; templateTypes: string[] = [ 'cloud', @@ -136,7 +136,7 @@ export class TemplateDatabase { return this.dataChange.value; } - constructor(private controller:Controller , private templateService: TemplateService) { + constructor(private controller: Controller, private templateService: TemplateService) { this.templateService.list(this.controller).subscribe((templates) => { this.dataChange.next(templates); }); diff --git a/src/app/components/template/template.component.ts b/src/app/components/template/template.component.ts index 15af63b3..eba5bea8 100644 --- a/src/app/components/template/template.component.ts +++ b/src/app/components/template/template.component.ts @@ -18,7 +18,7 @@ import { DomSanitizer } from '@angular/platform-browser'; styleUrls: ['./template.component.scss'], }) export class TemplateComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Output() onNodeCreation = new EventEmitter(); overlay; diff --git a/src/app/components/topology-summary/topology-summary.component.spec.ts b/src/app/components/topology-summary/topology-summary.component.spec.ts index b638fb7d..706c7647 100644 --- a/src/app/components/topology-summary/topology-summary.component.spec.ts +++ b/src/app/components/topology-summary/topology-summary.component.spec.ts @@ -20,7 +20,7 @@ import { MockedLinksDataSource, MockedNodesDataSource } from '../project-map/pro import { TopologySummaryComponent } from './topology-summary.component'; export class MockedComputeService { - getComputes(controller:Controller ) { + getComputes(controller: Controller ) { return of([]); } } diff --git a/src/app/components/topology-summary/topology-summary.component.ts b/src/app/components/topology-summary/topology-summary.component.ts index fbf944c0..e38a0ca8 100644 --- a/src/app/components/topology-summary/topology-summary.component.ts +++ b/src/app/components/topology-summary/topology-summary.component.ts @@ -19,7 +19,7 @@ import { ThemeService } from '../../services/theme.service'; changeDetection: ChangeDetectionStrategy.Default, }) export class TopologySummaryComponent implements OnInit, OnDestroy { - @Input() controller:Controller ; + @Input() controller: Controller; @Input() project: Project; @Output() closeTopologySummary = new EventEmitter(); diff --git a/src/app/components/users/logged-user/logged-user.component.ts b/src/app/components/users/logged-user/logged-user.component.ts index 801939b1..bc8ad577 100644 --- a/src/app/components/users/logged-user/logged-user.component.ts +++ b/src/app/components/users/logged-user/logged-user.component.ts @@ -15,7 +15,7 @@ import { MatDialog } from "@angular/material/dialog"; }) export class LoggedUserComponent implements OnInit { public user: User; - public controller:Controller ; + public controller: Controller; constructor( private route: ActivatedRoute, @@ -27,7 +27,7 @@ export class LoggedUserComponent implements OnInit { ngOnInit() { let controllerId = this.route.snapshot.paramMap.get('controller_id'); - this.controllerService.get(+controllerId).then((controller:Controller ) => { + this.controllerService.get(+controllerId).then((controller: Controller ) => { this.controller = controller; this.userService.getInformationAboutLoggedUser(controller).subscribe((response: any) => { this.user = response; diff --git a/src/app/components/web-console-full-window/web-console-full-window.component.ts b/src/app/components/web-console-full-window/web-console-full-window.component.ts index 67d6bad8..d24910a4 100644 --- a/src/app/components/web-console-full-window/web-console-full-window.component.ts +++ b/src/app/components/web-console-full-window/web-console-full-window.component.ts @@ -22,7 +22,7 @@ export class WebConsoleFullWindowComponent implements OnInit { private projectId: string; private nodeId: string; private subscriptions: Subscription = new Subscription(); - private controller:Controller ; + private controller: Controller; private node: Node; public term: Terminal = new Terminal(); @@ -59,7 +59,7 @@ export class WebConsoleFullWindowComponent implements OnInit { this.fitAddon.fit(); }); - this.controllerService.get(+this.controllerId).then((controller:Controller ) => { + this.controllerService.get(+this.controllerId).then((controller: Controller ) => { this.controller = controller; this.nodeService.getNodeById(this.controller, this.projectId, this.nodeId).subscribe((node: Node) => { this.node = node; diff --git a/src/app/filters/authImageFilter.ts b/src/app/filters/authImageFilter.ts index c70dd5d6..ef7f53b8 100644 --- a/src/app/filters/authImageFilter.ts +++ b/src/app/filters/authImageFilter.ts @@ -15,7 +15,7 @@ export class AuthImageFilter implements PipeTransform { private domSanitizer: DomSanitizer ) { } - async transform(src: string, controller:Controller ) { + async transform(src: string, controller: Controller ) { let url = src.split(`${environment.current_version}`)[1]; const imageBlob: Blob = await this.httpController.getBlob(controller, url).toPromise(); const reader = new FileReader(); diff --git a/src/app/guards/login-guard.ts b/src/app/guards/login-guard.ts index c3411eb4..e8215a35 100644 --- a/src/app/guards/login-guard.ts +++ b/src/app/guards/login-guard.ts @@ -15,7 +15,7 @@ export class LoginGuard implements CanActivate { try { await this.loginService.getLoggedUser(controller); } catch (e) {} - return this.controllerService.get(parseInt(controller_id, 10)).then((controller:Controller ) => { + return this.controllerService.get(parseInt(controller_id, 10)).then((controller: Controller ) => { if (controller.authToken && !controller.tokenExpired) { return true; } diff --git a/src/app/services/appliances.service.ts b/src/app/services/appliances.service.ts index f6903515..6d33d775 100644 --- a/src/app/services/appliances.service.ts +++ b/src/app/services/appliances.service.ts @@ -9,19 +9,19 @@ import { HttpController } from './http-controller.service'; export class ApplianceService { constructor(private httpController: HttpController) {} - getAppliances(controller:Controller ): Observable { + getAppliances(controller: Controller ): Observable { return this.httpController.get(controller, '/appliances') as Observable; } - getAppliance(controller:Controller , url): Observable { + getAppliance(controller: Controller, url): Observable { return this.httpController.get(controller, url) as Observable; } - getUploadPath(controller:Controller, filename: string) { + getUploadPath(controller: Controller, filename: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - updateAppliances(controller:Controller ): Observable { + updateAppliances(controller: Controller ): Observable { return this.httpController.get(controller, '/appliances?update=yes') as Observable; } } diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts index 7ea8e0d0..8b043498 100644 --- a/src/app/services/built-in-templates.service.spec.ts +++ b/src/app/services/built-in-templates.service.spec.ts @@ -14,7 +14,7 @@ describe('BuiltInTemplatesService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/built-in-templates.service.ts b/src/app/services/built-in-templates.service.ts index ad81c335..7cbaa059 100644 --- a/src/app/services/built-in-templates.service.ts +++ b/src/app/services/built-in-templates.service.ts @@ -7,19 +7,19 @@ import { HttpController } from './http-controller.service'; export class BuiltInTemplatesService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller:Controller , builtInTemplate: any): Observable { + addTemplate(controller: Controller, builtInTemplate: any): Observable { return this.httpController.post(controller, `/templates`, builtInTemplate) as Observable; } - saveTemplate(controller:Controller , builtInTemplate: any): Observable { + saveTemplate(controller: Controller, builtInTemplate: any): Observable { return this.httpController.put( controller, `/templates/${builtInTemplate.template_id}`, diff --git a/src/app/services/compute.service.ts b/src/app/services/compute.service.ts index 69658b64..35de2620 100644 --- a/src/app/services/compute.service.ts +++ b/src/app/services/compute.service.ts @@ -10,11 +10,11 @@ import { HttpController } from './http-controller.service'; export class ComputeService { constructor(private httpController: HttpController) {} - getComputes(controller:Controller ): Observable { + getComputes(controller: Controller ): Observable { return this.httpController.get(controller, '/computes') as Observable; } - getStatistics(controller:Controller ): Observable { + getStatistics(controller: Controller ): Observable { return this.httpController.get(controller, `/statistics`); } } diff --git a/src/app/services/controller-management.service.ts b/src/app/services/controller-management.service.ts index d75f7b29..095f990c 100644 --- a/src/app/services/controller-management.service.ts +++ b/src/app/services/controller-management.service.ts @@ -25,7 +25,7 @@ export class ControllerManagementService implements OnDestroy { return 'local-controller-status-events'; } - async start(controller:Controller ) { + async start(controller: Controller ) { var startingEvent: ControllerStateEvent = { controllerName: controller.name, status: 'starting', @@ -35,7 +35,7 @@ export class ControllerManagementService implements OnDestroy { return await this.electronService.remote.require('./local-controller.js').startLocalController(controller); } - async stop(controller:Controller ) { + async stop(controller: Controller ) { return await this.electronService.remote.require('./local-controller.js').stopLocalController(controller); } diff --git a/src/app/services/controller-settings.service.spec.ts b/src/app/services/controller-settings.service.spec.ts index 95bdb237..31e40281 100644 --- a/src/app/services/controller-settings.service.spec.ts +++ b/src/app/services/controller-settings.service.spec.ts @@ -8,11 +8,11 @@ import { HttpController } from './http-controller.service'; import { ControllerSettingsService } from './controller-settings.service'; export class MockedControllerSettingsService { - getSettingsForQemu(controller:Controller ) { + getSettingsForQemu(controller: Controller ) { return of([]); } - updateSettingsForQemu(controller:Controller , qemuSettings: QemuSettings) { + updateSettingsForQemu(controller: Controller, qemuSettings: QemuSettings) { return of([]); } } diff --git a/src/app/services/controller-settings.service.ts b/src/app/services/controller-settings.service.ts index d1a38eed..aaa35e39 100644 --- a/src/app/services/controller-settings.service.ts +++ b/src/app/services/controller-settings.service.ts @@ -8,19 +8,19 @@ import { HttpController } from './http-controller.service'; export class ControllerSettingsService { constructor(private httpController: HttpController) {} - get(controller:Controller ) { + get(controller: Controller ) { return this.httpController.get(controller, `/settings`); } - update(controller:Controller , controllerSettings: ControllerSettings) { + update(controller: Controller, controllerSettings: ControllerSettings) { return this.httpController.post(controller, `/settings`, controllerSettings); } - getSettingsForQemu(controller:Controller ) { + getSettingsForQemu(controller: Controller ) { return this.httpController.get(controller, `/settings/qemu`); } - updateSettingsForQemu(controller:Controller , qemuSettings: QemuSettings) { + updateSettingsForQemu(controller: Controller, qemuSettings: QemuSettings) { return this.httpController.put(controller, `/settings/qemu`, { enable_hardware_acceleration: qemuSettings.enable_hardware_acceleration, require_hardware_acceleration: qemuSettings.require_hardware_acceleration, diff --git a/src/app/services/controller.database.ts b/src/app/services/controller.database.ts index 93a350fc..9d179491 100644 --- a/src/app/services/controller.database.ts +++ b/src/app/services/controller.database.ts @@ -8,21 +8,21 @@ export class ControllerDatabase { constructor() {} - get data():Controller [] { + get data(): Controller [] { return this.dataChange.value; } - public addController(controller:Controller ) { + public addController(controller: Controller ) { const controllers = this.data.slice(); controllers.push(controller); this.dataChange.next(controllers); } - public addControllers(controllers:Controller []) { + public addControllers(controllers: Controller []) { this.dataChange.next(controllers); } - public remove(controller:Controller ) { + public remove(controller: Controller ) { const index = this.data.indexOf(controller); if (index >= 0) { this.data.splice(index, 1); @@ -38,7 +38,7 @@ export class ControllerDatabase { return this.data.findIndex((controller) => controller.name === controllerName); } - public update(controller:Controller ) { + public update(controller: Controller ) { const index = this.findIndex(controller.name); if (index >= 0) { this.data[index] = controller; diff --git a/src/app/services/controller.service.spec.ts b/src/app/services/controller.service.spec.ts index 624f90f9..6ba3ebef 100644 --- a/src/app/services/controller.service.spec.ts +++ b/src/app/services/controller.service.spec.ts @@ -1,9 +1,9 @@ import { Controller } from '../models/controller'; export class MockedControllerService { - public controllers:Controller [] = []; + public controllers: Controller [] = []; - public create(controller:Controller ) { + public create(controller: Controller ) { return new Promise((resolve, reject) => { this.controllers.push(controller); resolve(controller); @@ -30,7 +30,7 @@ export class MockedControllerService { }); } - public getControllerUrl(controller:Controller) { + public getControllerUrl(controller: Controller) { return `${controller.host}:${controller.port}`; } } diff --git a/src/app/services/controller.service.ts b/src/app/services/controller.service.ts index 6984d822..fd7dd657 100644 --- a/src/app/services/controller.service.ts +++ b/src/app/services/controller.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import {Controller , ControllerProtocol } from '../models/controller'; +import {Controller, ControllerProtocol } from '../models/controller'; import { HttpController } from './http-controller.service'; @Injectable() @@ -29,14 +29,14 @@ export class ControllerService { } public get(id: number): Promise { - let controller:Controller = JSON.parse(localStorage.getItem(`controller-${id}`)); + let controller: Controller = JSON.parse(localStorage.getItem(`controller-${id}`)); let promise = new Promise((resolve) => { resolve(controller); }); return promise; } - public create(controller:Controller ) { + public create(controller: Controller ) { controller.id = this.controllerIds.length + 1; localStorage.setItem(`controller-${controller.id}`, JSON.stringify(controller)); @@ -49,7 +49,7 @@ export class ControllerService { return promise; } - public update(controller:Controller ) { + public update(controller: Controller ) { localStorage.removeItem(`controller-${controller.id}`); localStorage.setItem(`controller-${controller.id}`, JSON.stringify(controller)); @@ -61,9 +61,9 @@ export class ControllerService { public findAll() { let promise = new Promise((resolve) => { - let controllers:Controller [] = []; + let controllers: Controller [] = []; this.controllerIds.forEach((n) => { - let controller:Controller = JSON.parse(localStorage.getItem(n)); + let controller: Controller = JSON.parse(localStorage.getItem(n)); controllers.push(controller); }); resolve(controllers); @@ -71,7 +71,7 @@ export class ControllerService { return promise; } - public delete(controller:Controller ) { + public delete(controller: Controller ) { localStorage.removeItem(`controller-${controller.id}`); this.controllerIds = this.controllerIds.filter((n) => n !== `controller-${controller.id}`); this.updatecontrollerIds(); @@ -82,17 +82,17 @@ export class ControllerService { return promise; } - public getControllerUrl(controller:Controller) { + public getControllerUrl(controller: Controller) { return `${controller.protocol}//${controller.host}:${controller.port}/`; } - public checkControllerVersion(controller:Controller): Observable { + public checkControllerVersion(controller: Controller): Observable { return this.httpController.get(controller, '/version'); } public getLocalController(host: string, port: number) { const promise = new Promise((resolve, reject) => { - this.findAll().then((controllers:Controller []) => { + this.findAll().then((controllers: Controller []) => { const local = controllers.find((controller) => controller.location === 'bundled'); if (local) { local.host = host; diff --git a/src/app/services/docker.service.ts b/src/app/services/docker.service.ts index 6d57f34f..336d005a 100644 --- a/src/app/services/docker.service.ts +++ b/src/app/services/docker.service.ts @@ -10,23 +10,23 @@ import { HttpController } from './http-controller.service'; export class DockerService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - getImages(controller:Controller ): Observable { + getImages(controller: Controller ): Observable { return this.httpController.get(controller, `/computes/${environment.compute_id}/docker/images`) as Observable; } - addTemplate(controller:Controller , dockerTemplate: any): Observable { + addTemplate(controller: Controller, dockerTemplate: any): Observable { return this.httpController.post(controller, `/templates`, dockerTemplate) as Observable; } - saveTemplate(controller:Controller , dockerTemplate: any): Observable { + saveTemplate(controller: Controller, dockerTemplate: any): Observable { return this.httpController.put( controller, `/templates/${dockerTemplate.template_id}`, diff --git a/src/app/services/drawing.service.spec.ts b/src/app/services/drawing.service.spec.ts index c097b4a9..4ff38f0c 100644 --- a/src/app/services/drawing.service.spec.ts +++ b/src/app/services/drawing.service.spec.ts @@ -15,7 +15,7 @@ describe('DrawingService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; let project: Project = new Project(); beforeEach(() => { diff --git a/src/app/services/drawing.service.ts b/src/app/services/drawing.service.ts index b304b74d..f8e18e3a 100644 --- a/src/app/services/drawing.service.ts +++ b/src/app/services/drawing.service.ts @@ -11,7 +11,7 @@ import { HttpController } from './http-controller.service'; export class DrawingService { constructor(private httpController: HttpController, private svgToDrawingConverter: SvgToDrawingConverter) {} - add(controller:Controller , project_id: string, x: number, y: number, svg: string) { + add(controller: Controller, project_id: string, x: number, y: number, svg: string) { return this.httpController.post(controller, `/projects/${project_id}/drawings`, { svg: svg, x: Math.round(x), @@ -20,7 +20,7 @@ export class DrawingService { }); } - duplicate(controller:Controller , project_id: string, drawing: Drawing) { + duplicate(controller: Controller, project_id: string, drawing: Drawing) { return this.httpController.post(controller, `/projects/${project_id}/drawings`, { svg: drawing.svg, rotation: drawing.rotation, @@ -30,7 +30,7 @@ export class DrawingService { }); } - updatePosition(controller:Controller , project: Project, drawing: Drawing, x: number, y: number): Observable { + updatePosition(controller: Controller, project: Project, drawing: Drawing, x: number, y: number): Observable { let xPosition: number = Math.round(x); let yPosition: number = Math.round(y); @@ -52,7 +52,7 @@ export class DrawingService { }); } - updateSizeAndPosition(controller:Controller , drawing: Drawing, x: number, y: number, svg: string): Observable { + updateSizeAndPosition(controller: Controller, drawing: Drawing, x: number, y: number, svg: string): Observable { return this.httpController.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { svg: svg, x: Math.round(x), @@ -60,7 +60,7 @@ export class DrawingService { }); } - updateText(controller:Controller , drawing: Drawing, svg: string): Observable { + updateText(controller: Controller, drawing: Drawing, svg: string): Observable { return this.httpController.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { svg: svg, x: Math.round(drawing.x), @@ -69,7 +69,7 @@ export class DrawingService { }); } - update(controller:Controller , drawing: Drawing): Observable { + update(controller: Controller, drawing: Drawing): Observable { return this.httpController.put(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { locked: drawing.locked, svg: drawing.svg, @@ -80,15 +80,15 @@ export class DrawingService { }); } - delete(controller:Controller , drawing: Drawing) { + delete(controller: Controller, drawing: Drawing) { return this.httpController.delete(controller, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`); } - lockAllNodes(controller:Controller,project:Project){ + lockAllNodes(controller: Controller,project:Project){ return this.httpController.post(controller, `/projects/${project.project_id}/lock`,{}); } - unLockAllNodes(controller:Controller,project:Project){ + unLockAllNodes(controller: Controller,project:Project){ return this.httpController.post(controller, `/projects/${project.project_id}/unlock`,{}); } diff --git a/src/app/services/http-controller.service.spec.ts b/src/app/services/http-controller.service.spec.ts index 49f60985..d680d94e 100644 --- a/src/app/services/http-controller.service.spec.ts +++ b/src/app/services/http-controller.service.spec.ts @@ -55,7 +55,7 @@ describe('HttpController', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let service: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/http-controller.service.ts b/src/app/services/http-controller.service.ts index 09d961ed..83f964dc 100644 --- a/src/app/services/http-controller.service.ts +++ b/src/app/services/http-controller.service.ts @@ -3,7 +3,7 @@ import { EventEmitter, Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import {Controller , ControllerProtocol } from '../models/controller'; +import {Controller, ControllerProtocol } from '../models/controller'; /* tslint:disable:interface-over-type-literal */ export type JsonOptions = { @@ -103,7 +103,7 @@ export class HttpController { constructor(private http: HttpClient, private errorHandler: ControllerErrorHandler) {} - get(controller:Controller , url: string, options?: JsonOptions): Observable { + get(controller: Controller, url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -113,7 +113,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - getText(controller:Controller , url: string, options?: TextOptions): Observable { + getText(controller: Controller, url: string, options?: TextOptions): Observable { options = this.getTextOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -123,7 +123,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)); } - getBlob(controller:Controller , url: string, options?: BlobOptions): Observable { + getBlob(controller: Controller, url: string, options?: BlobOptions): Observable { options = this.getBlobOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`GET ${intercepted.url}`); @@ -133,7 +133,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)); } - post(controller:Controller , url: string, body: any | null, options?: JsonOptions): Observable { + post(controller: Controller, url: string, body: any | null, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`POST ${intercepted.url}`); @@ -143,7 +143,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - put(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { + put(controller: Controller, url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`PUT ${intercepted.url}`); @@ -153,7 +153,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - delete(controller:Controller , url: string, options?: JsonOptions): Observable { + delete(controller: Controller, url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); this.requestsNotificationEmitter.emit(`DELETE ${intercepted.url}`); @@ -163,7 +163,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - patch(controller:Controller , url: string, body: any, options?: JsonOptions): Observable { + patch(controller: Controller, url: string, body: any, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); return this.http @@ -171,7 +171,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - head(controller:Controller , url: string, options?: JsonOptions): Observable { + head(controller: Controller, url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); return this.http @@ -179,7 +179,7 @@ export class HttpController { .pipe(catchError(this.errorHandler.handleError)) as Observable; } - options(controller:Controller , url: string, options?: JsonOptions): Observable { + options(controller: Controller, url: string, options?: JsonOptions): Observable { options = this.getJsonOptions(options); const intercepted = this.getOptionsForController(controller, url, options); return this.http @@ -214,7 +214,7 @@ export class HttpController { return options; } - private getOptionsForController(controller:Controller , url: string, options: T) { + private getOptionsForController(controller: Controller, url: string, options: T) { if (controller && controller.host && controller.port) { if (!controller.protocol) { controller.protocol = location.protocol as ControllerProtocol; diff --git a/src/app/services/image-manager.service.spec.ts b/src/app/services/image-manager.service.spec.ts index 37d7eb93..5e557d73 100644 --- a/src/app/services/image-manager.service.spec.ts +++ b/src/app/services/image-manager.service.spec.ts @@ -14,7 +14,7 @@ describe('ImageManagerService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/info.service.ts b/src/app/services/info.service.ts index 43783fd5..f8da7dda 100644 --- a/src/app/services/info.service.ts +++ b/src/app/services/info.service.ts @@ -5,7 +5,7 @@ import { Controller } from '../models/controller'; @Injectable() export class InfoService { - getInfoAboutNode(node: Node, controller:Controller ): string[] { + getInfoAboutNode(node: Node, controller: Controller ): string[] { let infoList: string[] = []; if (node.node_type === 'cloud') { infoList.push(`Cloud ${node.name} is always on.`); diff --git a/src/app/services/ios.service.ts b/src/app/services/ios.service.ts index 43453345..b712adf0 100644 --- a/src/app/services/ios.service.ts +++ b/src/app/services/ios.service.ts @@ -10,27 +10,27 @@ import { HttpController } from './http-controller.service'; export class IosService { constructor(private httpController: HttpController) {} - getImages(controller:Controller ): Observable { + getImages(controller: Controller ): Observable { return this.httpController.get(controller, '/images?image_type=ios') as Observable; } - getImagePath(controller:Controller , filename: string): string { + getImagePath(controller: Controller, filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller:Controller , iosTemplate: IosTemplate): Observable { + addTemplate(controller: Controller, iosTemplate: IosTemplate): Observable { return this.httpController.post(controller, `/templates`, iosTemplate) as Observable; } - saveTemplate(controller:Controller , iosTemplate: IosTemplate): Observable { + saveTemplate(controller: Controller, iosTemplate: IosTemplate): Observable { return this.httpController.put( controller, `/templates/${iosTemplate.template_id}`, @@ -38,7 +38,7 @@ export class IosService { ) as Observable; } - findIdlePC(controller:Controller, body: any) { + findIdlePC(controller: Controller, body: any) { return this.httpController.post(controller, `/computes/${environment.compute_id}/dynamips/auto_idlepc`, body); } diff --git a/src/app/services/iou.service.ts b/src/app/services/iou.service.ts index b986f46e..0b53e11e 100644 --- a/src/app/services/iou.service.ts +++ b/src/app/services/iou.service.ts @@ -10,27 +10,27 @@ import { HttpController } from './http-controller.service'; export class IouService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - getImages(controller:Controller ): Observable { + getImages(controller: Controller ): Observable { return this.httpController.get(controller, '/images?image_type=iou') as Observable; } - getImagePath(controller:Controller , filename: string): string { + getImagePath(controller: Controller, filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/images/upload/${filename}`; } - addTemplate(controller:Controller , iouTemplate: any): Observable { + addTemplate(controller: Controller, iouTemplate: any): Observable { return this.httpController.post(controller, `/templates`, iouTemplate) as Observable; } - saveTemplate(controller:Controller , iouTemplate: any): Observable { + saveTemplate(controller: Controller, iouTemplate: any): Observable { return this.httpController.put( controller, `/templates/${iouTemplate.template_id}`, diff --git a/src/app/services/link.service.spec.ts b/src/app/services/link.service.spec.ts index 92815f1b..a32ccfbb 100644 --- a/src/app/services/link.service.spec.ts +++ b/src/app/services/link.service.spec.ts @@ -14,7 +14,7 @@ describe('LinkService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/link.service.ts b/src/app/services/link.service.ts index d41ffb0d..c833414f 100644 --- a/src/app/services/link.service.ts +++ b/src/app/services/link.service.ts @@ -14,7 +14,7 @@ export class LinkService { constructor(private httpController: HttpController) {} createLink( - controller:Controller , + controller: Controller, source_node: Node, source_port: Port, target_node: Node, @@ -54,30 +54,30 @@ export class LinkService { }); } - getLink(controller:Controller , projectId: string, linkId: string) { + getLink(controller: Controller, projectId: string, linkId: string) { return this.httpController.get(controller, `/projects/${projectId}/links/${linkId}`); } - deleteLink(controller:Controller , link: Link) { + deleteLink(controller: Controller, link: Link) { return this.httpController.delete(controller, `/projects/${link.project_id}/links/${link.link_id}`); } - updateLink(controller:Controller , link: Link) { + updateLink(controller: Controller, link: Link) { return this.httpController.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, link); } - updateLinkStyle(controller:Controller , link: Link) { + updateLinkStyle(controller: Controller, link: Link) { return this.httpController.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, link); } - getAvailableFilters(controller:Controller , link: Link) { + getAvailableFilters(controller: Controller, link: Link) { return this.httpController.get( controller, `/projects/${link.project_id}/links/${link.link_id}/available_filters` ); } - updateNodes(controller:Controller , link: Link, nodes: LinkNode[]) { + updateNodes(controller: Controller, link: Link, nodes: LinkNode[]) { const requestNodes = nodes.map((linkNode) => { return { node_id: linkNode.node_id, @@ -96,19 +96,19 @@ export class LinkService { return this.httpController.put(controller, `/projects/${link.project_id}/links/${link.link_id}`, { nodes: requestNodes }); } - startCaptureOnLink(controller:Controller , link: Link, settings: CapturingSettings) { + startCaptureOnLink(controller: Controller, link: Link, settings: CapturingSettings) { return this.httpController.post(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/start`, settings); } - stopCaptureOnLink(controller:Controller , link: Link) { + stopCaptureOnLink(controller: Controller, link: Link) { return this.httpController.post(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/stop`, {}); } - resetLink(controller:Controller , link: Link) { + resetLink(controller: Controller, link: Link) { return this.httpController.post(controller, `/projects/${link.project_id}/links/${link.link_id}/reset`, {}); } - streamPcap(controller:Controller , link: Link) { + streamPcap(controller: Controller, link: Link) { return this.httpController.get(controller, `/projects/${link.project_id}/links/${link.link_id}/capture/stream`); } } diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts index 61f079da..3bc4765b 100644 --- a/src/app/services/login.service.ts +++ b/src/app/services/login.service.ts @@ -10,7 +10,7 @@ export class LoginService { controller_id:string ='' constructor(private httpController: HttpController) {} - login(controller:Controller , username: string, password: string) { + login(controller: Controller, username: string, password: string) { const payload = new HttpParams() .set('username', username) .set('password', password); @@ -22,10 +22,10 @@ export class LoginService { return this.httpController.post(controller, '/access/users/login', payload, options); } - getLoggedUser(controller:Controller ) { + getLoggedUser(controller: Controller ) { return this.httpController.get(controller, "/access/users/me").toPromise() } - async getLoggedUserRefToken(controller:Controller ,current_user):Promise { + async getLoggedUserRefToken(controller: Controller,current_user):Promise { return await this.httpController.post(controller, "/access/users/authenticate", {"username":current_user.username,"password":current_user.password}).toPromise() } } diff --git a/src/app/services/node.service.spec.ts b/src/app/services/node.service.spec.ts index fd06fc22..a9eb9306 100644 --- a/src/app/services/node.service.spec.ts +++ b/src/app/services/node.service.spec.ts @@ -17,7 +17,7 @@ describe('NodeService', () => { let httpTestingController: HttpTestingController; let httpController: HttpController; let service: NodeService; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/node.service.ts b/src/app/services/node.service.ts index b5785baa..d490255e 100644 --- a/src/app/services/node.service.ts +++ b/src/app/services/node.service.ts @@ -12,55 +12,55 @@ import { HttpController } from './http-controller.service'; export class NodeService { constructor(private httpController: HttpController) {} - getNodeById(controller:Controller , projectId: string, nodeId: string) { + getNodeById(controller: Controller, projectId: string, nodeId: string) { return this.httpController.get(controller, `/projects/${projectId}/nodes/${nodeId}`); } - isolate(controller:Controller , node: Node) { + isolate(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/isolate`, {}); } - unisolate(controller:Controller , node: Node) { + unisolate(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/unisolate`, {}); } - start(controller:Controller , node: Node) { + start(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/start`, {}); } - startAll(controller:Controller , project: Project) { + startAll(controller: Controller, project: Project) { return this.httpController.post(controller, `/projects/${project.project_id}/nodes/start`, {}); } - stop(controller:Controller , node: Node) { + stop(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/stop`, {}); } - stopAll(controller:Controller , project: Project) { + stopAll(controller: Controller, project: Project) { return this.httpController.post(controller, `/projects/${project.project_id}/nodes/stop`, {}); } - suspend(controller:Controller , node: Node) { + suspend(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/suspend`, {}); } - suspendAll(controller:Controller , project: Project) { + suspendAll(controller: Controller, project: Project) { return this.httpController.post(controller, `/projects/${project.project_id}/nodes/suspend`, {}); } - reload(controller:Controller , node: Node) { + reload(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/reload`, {}); } - reloadAll(controller:Controller , project: Project) { + reloadAll(controller: Controller, project: Project) { return this.httpController.post(controller, `/projects/${project.project_id}/nodes/reload`, {}); } - resetAllNodes(controller:Controller , project: Project) { + resetAllNodes(controller: Controller, project: Project) { return this.httpController.post(controller, `/projects/${project.project_id}/nodes/console/reset`, {}); } createFromTemplate( - controller:Controller , + controller: Controller, project: Project, template: Template, x: number, @@ -81,7 +81,7 @@ export class NodeService { }); } - updatePosition(controller:Controller , project: Project, node: Node, x: number, y: number): Observable { + updatePosition(controller: Controller, project: Project, node: Node, x: number, y: number): Observable { let xPosition: number = Math.round(x); let yPosition: number = Math.round(y); @@ -99,7 +99,7 @@ export class NodeService { }); } - updateLabel(controller:Controller , node: Node, label: Label): Observable { + updateLabel(controller: Controller, node: Node, label: Label): Observable { return this.httpController.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { label: { rotation: label.rotation, @@ -111,13 +111,13 @@ export class NodeService { }); } - updateSymbol(controller:Controller , node: Node, changedSymbol: string): Observable { + updateSymbol(controller: Controller, node: Node, changedSymbol: string): Observable { return this.httpController.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { symbol: changedSymbol, }); } - update(controller:Controller , node: Node): Observable { + update(controller: Controller, node: Node): Observable { return this.httpController.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { x: Math.round(node.x), y: Math.round(node.y), @@ -125,7 +125,7 @@ export class NodeService { }); } - updateNode(controller:Controller , node: Node): Observable { + updateNode(controller: Controller, node: Node): Observable { return this.httpController.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { console_type: node.console_type, console_auto_start: node.console_auto_start, @@ -135,7 +135,7 @@ export class NodeService { }); } - updateNodeWithCustomAdapters(controller:Controller , node: Node): Observable { + updateNodeWithCustomAdapters(controller: Controller, node: Node): Observable { return this.httpController.put(controller, `/projects/${node.project_id}/nodes/${node.node_id}`, { console_type: node.console_type, console_auto_start: node.console_auto_start, @@ -145,11 +145,11 @@ export class NodeService { }); } - delete(controller:Controller , node: Node) { + delete(controller: Controller, node: Node) { return this.httpController.delete(controller, `/projects/${node.project_id}/nodes/${node.node_id}`); } - duplicate(controller:Controller , node: Node) { + duplicate(controller: Controller, node: Node) { return this.httpController.post(controller, `/projects/${node.project_id}/nodes/${node.node_id}/duplicate`, { x: node.x + 10, y: node.y + 10, @@ -157,7 +157,7 @@ export class NodeService { }); } - getNode(controller:Controller , node: Node) { + getNode(controller: Controller, node: Node) { return this.httpController.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}`); } @@ -165,7 +165,7 @@ export class NodeService { return `putty.exe -telnet \%h \%p -wt \"\%d\" -gns3 5 -skin 4`; } - getNetworkConfiguration(controller:Controller , node: Node) { + getNetworkConfiguration(controller: Controller, node: Node) { return this.httpController.get( controller, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, @@ -173,7 +173,7 @@ export class NodeService { ); } - saveNetworkConfiguration(controller:Controller , node: Node, configuration: string) { + saveNetworkConfiguration(controller: Controller, node: Node, configuration: string) { return this.httpController.post( controller, `/projects/${node.project_id}/nodes/${node.node_id}/files/etc/network/interfaces`, @@ -181,7 +181,7 @@ export class NodeService { ); } - getStartupConfiguration(controller:Controller , node: Node) { + getStartupConfiguration(controller: Controller, node: Node) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'vpcs') { @@ -195,7 +195,7 @@ export class NodeService { return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' }); } - getPrivateConfiguration(controller:Controller , node: Node) { + getPrivateConfiguration(controller: Controller, node: Node) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'iou') { @@ -207,7 +207,7 @@ export class NodeService { return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' }); } - saveConfiguration(controller:Controller , node: Node, configuration: string) { + saveConfiguration(controller: Controller, node: Node, configuration: string) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'vpcs') { @@ -221,7 +221,7 @@ export class NodeService { return this.httpController.post(controller, urlPath, configuration); } - savePrivateConfiguration(controller:Controller , node: Node, configuration: string) { + savePrivateConfiguration(controller: Controller, node: Node, configuration: string) { let urlPath: string = `/projects/${node.project_id}/nodes/${node.node_id}`; if (node.node_type === 'iou') { @@ -233,11 +233,11 @@ export class NodeService { return this.httpController.post(controller, urlPath, configuration); } - getIdlePCProposals(controller:Controller, node: Node) { + getIdlePCProposals(controller: Controller, node: Node) { return this.httpController.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}/dynamips/idlepc_proposals`); } - getAutoIdlePC(controller:Controller, node: Node) { + getAutoIdlePC(controller: Controller, node: Node) { return this.httpController.get(controller, `/projects/${node.project_id}/nodes/${node.node_id}/dynamips/auto_idlepc`); } } diff --git a/src/app/services/nodeConsole.service.ts b/src/app/services/nodeConsole.service.ts index ee2afd59..f893ddbd 100644 --- a/src/app/services/nodeConsole.service.ts +++ b/src/app/services/nodeConsole.service.ts @@ -66,7 +66,7 @@ export class NodeConsoleService { return this.defaultConsoleHeight / this.defaultNumberOfRows; } - getUrl(controller:Controller , node: Node) { + getUrl(controller: Controller, node: Node) { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index da4e9263..ebb54c25 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -4,7 +4,7 @@ import { Controller } from '../models/controller'; @Injectable() export class NotificationService { - notificationsPath(controller:Controller ): string { + notificationsPath(controller: Controller ): string { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" @@ -14,7 +14,7 @@ export class NotificationService { } - projectNotificationsPath(controller:Controller , project_id: string): string { + projectNotificationsPath(controller: Controller, project_id: string): string { let protocol:string = "ws" if (controller.protocol === "https:") { protocol = "wss" diff --git a/src/app/services/project.service.spec.ts b/src/app/services/project.service.spec.ts index e839c8c1..1e3dc11e 100644 --- a/src/app/services/project.service.spec.ts +++ b/src/app/services/project.service.spec.ts @@ -18,15 +18,15 @@ import { getTestController } from './testing'; export class MockedProjectService { public projects: Project[] = []; - list(controller:Controller ) { + list(controller: Controller ) { return of(this.projects); } - open(controller:Controller , project: Project) { + open(controller: Controller, project: Project) { return of(project); } - close(controller:Controller , project: Project) { + close(controller: Controller, project: Project) { return of(project); } @@ -34,22 +34,22 @@ export class MockedProjectService { return project.readonly; } - links(controller:Controller , project_id: string) { + links(controller: Controller, project_id: string) { return of([]); } - delete(controller:Controller , project_id: string) { + delete(controller: Controller, project_id: string) { return of(project_id); } - duplicate(controller:Controller , project_id: string) { + duplicate(controller: Controller, project_id: string) { return of(project_id); } - getStatistics(controller:Controller , project_id: string) { + getStatistics(controller: Controller, project_id: string) { return of({}); } - exportPortableProject(controller:Controller , formData:{}) { + exportPortableProject(controller: Controller, formData:{}) { return of({}); } getCompression() { @@ -65,7 +65,7 @@ describe('ProjectService', () => { let httpTestingController: HttpTestingController; let httpController: HttpController; let service: ProjectService; - let controller:Controller ; + let controller: Controller; let settingsService: SettingsService; beforeEach(() => { diff --git a/src/app/services/project.service.ts b/src/app/services/project.service.ts index 81363378..83506645 100644 --- a/src/app/services/project.service.ts +++ b/src/app/services/project.service.ts @@ -44,48 +44,48 @@ export class ProjectService { this.projectListSubject.next(true); } - getReadmeFile(controller:Controller , project_id: string) { + getReadmeFile(controller: Controller, project_id: string) { return this.httpController.getText(controller, `/projects/${project_id}/files/README.txt`); } - postReadmeFile(controller:Controller , project_id: string, readme: string) { + postReadmeFile(controller: Controller, project_id: string, readme: string) { return this.httpController.post(controller, `/projects/${project_id}/files/README.txt`, readme); } - get(controller:Controller , project_id: string) { + get(controller: Controller, project_id: string) { return this.httpController.get(controller, `/projects/${project_id}`); } - open(controller:Controller , project_id: string) { + open(controller: Controller, project_id: string) { return this.httpController.post(controller, `/projects/${project_id}/open`, {}); } - close(controller:Controller , project_id: string) { + close(controller: Controller, project_id: string) { this.recentlyOpenedProjectService.removeData(); return this.httpController.post(controller, `/projects/${project_id}/close`, {}); } - list(controller:Controller ) { + list(controller: Controller ) { return this.httpController.get(controller, '/projects'); } - nodes(controller:Controller , project_id: string) { + nodes(controller: Controller, project_id: string) { return this.httpController.get(controller, `/projects/${project_id}/nodes`); } - links(controller:Controller , project_id: string) { + links(controller: Controller, project_id: string) { return this.httpController.get(controller, `/projects/${project_id}/links`); } - drawings(controller:Controller , project_id: string) { + drawings(controller: Controller, project_id: string) { return this.httpController.get(controller, `/projects/${project_id}/drawings`); } - add(controller:Controller , project_name: string, project_id: string): Observable { + add(controller: Controller, project_name: string, project_id: string): Observable { return this.httpController.post(controller, `/projects`, { name: project_name, project_id: project_id }); } - update(controller:Controller , project: Project): Observable { + update(controller: Controller, project: Project): Observable { return this.httpController.put(controller, `/projects/${project.project_id}`, { auto_close: project.auto_close, auto_open: project.auto_open, @@ -99,27 +99,27 @@ export class ProjectService { }); } - delete(controller:Controller , project_id: string): Observable { + delete(controller: Controller, project_id: string): Observable { return this.httpController.delete(controller, `/projects/${project_id}`); } - getUploadPath(controller:Controller , uuid: string, project_name: string) { + getUploadPath(controller: Controller, uuid: string, project_name: string) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${uuid}/import?name=${project_name}`; } - getExportPath(controller:Controller , project: Project) { + getExportPath(controller: Controller, project: Project) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${project.project_id}/export`; } - export(controller:Controller , project_id: string): Observable { + export(controller: Controller, project_id: string): Observable { return this.httpController.get(controller, `/projects/${project_id}/export`); } - getStatistics(controller:Controller , project_id: string): Observable { + getStatistics(controller: Controller, project_id: string): Observable { return this.httpController.get(controller, `/projects/${project_id}/stats`); } - duplicate(controller:Controller , project_id: string, project_name): Observable { + duplicate(controller: Controller, project_id: string, project_name): Observable { return this.httpController.post(controller, `/projects/${project_id}/duplicate`, { name: project_name }); } @@ -138,7 +138,7 @@ export class ProjectService { }; - getexportPortableProjectPath(controller :Controller, project_id: string,formData:any={}) { + getexportPortableProjectPath(controller : Controller, project_id: string,formData:any={}) { if (formData.compression_level != null && formData.compression_level !='') { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/projects/${project_id}/export?include_snapshots=${formData.include_snapshots}&include_images=${formData.include_base_image}&reset_mac_addresses=${formData.reset_mac_address}&compression=${formData.compression}&compression_level=${formData.compression_level}&token=${controller.authToken}`; } else { @@ -147,7 +147,7 @@ export class ProjectService { } } -getProjectStatus(controller :Controller, project_id: string): Observable { +getProjectStatus(controller : Controller, project_id: string): Observable { return this.get(controller,`${project_id}/locked`) } diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index 996b8b76..84533060 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -13,7 +13,7 @@ describe('QemuService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/qemu.service.ts b/src/app/services/qemu.service.ts index e42c87f5..e27f8592 100644 --- a/src/app/services/qemu.service.ts +++ b/src/app/services/qemu.service.ts @@ -11,32 +11,32 @@ import { HttpController } from './http-controller.service'; export class QemuService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - getImagePath(controller:Controller , filename: string): string { + getImagePath(controller: Controller, filename: string): string { return `${controller.protocol}//${controller.host}:${controller.port}/images/upload/${filename}`; } - getImages(controller:Controller ): Observable { + getImages(controller: Controller ): Observable { return this.httpController.get(controller, '/images?image_type=qemu') as Observable; } - addImage(controller:Controller , qemuImg: QemuImg): Observable { + addImage(controller: Controller, qemuImg: QemuImg): Observable { return this.httpController.post(controller, '/images/upload', qemuImg) as Observable; } - addTemplate(controller:Controller , qemuTemplate: QemuTemplate): Observable { + addTemplate(controller: Controller, qemuTemplate: QemuTemplate): Observable { return this.httpController.post(controller, `/templates`, qemuTemplate) as Observable; } - saveTemplate(controller:Controller , qemuTemplate: QemuTemplate): Observable { + saveTemplate(controller: Controller, qemuTemplate: QemuTemplate): Observable { return this.httpController.put( controller, `/templates/${qemuTemplate.template_id}`, diff --git a/src/app/services/snapshot.service.spec.ts b/src/app/services/snapshot.service.spec.ts index 9d8dab6a..4f56159a 100644 --- a/src/app/services/snapshot.service.spec.ts +++ b/src/app/services/snapshot.service.spec.ts @@ -14,7 +14,7 @@ describe('SnapshotService', () => { let httpTestingController: HttpTestingController; let httpController: HttpController; let service: SnapshotService; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/snapshot.service.ts b/src/app/services/snapshot.service.ts index 43747f5f..59dcde1e 100644 --- a/src/app/services/snapshot.service.ts +++ b/src/app/services/snapshot.service.ts @@ -7,19 +7,19 @@ import { HttpController } from './http-controller.service'; export class SnapshotService { constructor(private httpController: HttpController) {} - create(controller:Controller , project_id: string, snapshot: Snapshot) { + create(controller: Controller, project_id: string, snapshot: Snapshot) { return this.httpController.post(controller, `/projects/${project_id}/snapshots`, snapshot); } - delete(controller:Controller , project_id: string, snapshot_id: string) { + delete(controller: Controller, project_id: string, snapshot_id: string) { return this.httpController.delete(controller, `/projects/${project_id}/snapshots/${snapshot_id}`); } - list(controller:Controller , project_id: string) { + list(controller: Controller, project_id: string) { return this.httpController.get(controller, `/projects/${project_id}/snapshots`); } - restore(controller:Controller , project_id: string, snapshot_id: string) { + restore(controller: Controller, project_id: string, snapshot_id: string) { return this.httpController.post(controller, `/projects/${project_id}/snapshots/${snapshot_id}/restore`, {}); } } diff --git a/src/app/services/symbol.service.spec.ts b/src/app/services/symbol.service.spec.ts index d36ab9ca..e7603b9d 100644 --- a/src/app/services/symbol.service.spec.ts +++ b/src/app/services/symbol.service.spec.ts @@ -14,7 +14,7 @@ describe('SymbolService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/symbol.service.ts b/src/app/services/symbol.service.ts index 8436cf5e..de7aa651 100644 --- a/src/app/services/symbol.service.ts +++ b/src/app/services/symbol.service.ts @@ -26,7 +26,7 @@ export class SymbolService { return this.symbols.getValue().find((symbol: Symbol) => symbol.symbol_id === symbol_id); } - getDimensions(controller:Controller , symbol_id: string): Observable { + getDimensions(controller: Controller, symbol_id: string): Observable { const encoded_uri = encodeURI(symbol_id); return this.httpController.get(controller, `/symbols/${encoded_uri}/dimensions`); } @@ -43,16 +43,16 @@ export class SymbolService { return this.symbols.getValue().find((symbol: Symbol) => symbol.filename === symbol_filename); } - add(controller:Controller, symbolName: string, symbol: string) { + add(controller: Controller, symbolName: string, symbol: string) { this.cache = null; return this.httpController.post(controller, `/symbols/${symbolName}/raw`, symbol); } - load(controller:Controller ): Observable { + load(controller: Controller ): Observable { return this.httpController.get(controller, '/symbols'); } - list(controller:Controller ) { + list(controller: Controller ) { if (!this.cache) { this.cache = this.load(controller).pipe(shareReplay(CACHE_SIZE)); } @@ -60,12 +60,12 @@ export class SymbolService { return this.cache; } - raw(controller:Controller , symbol_id: string) { + raw(controller: Controller, symbol_id: string) { const encoded_uri = encodeURI(symbol_id); return this.httpController.getText(controller, `/symbols/${encoded_uri}/raw`); } - getSymbolFromTemplate(controller:Controller , template: Template) { + getSymbolFromTemplate(controller: Controller, template: Template) { return `${controller.protocol}//${controller.host}:${controller.port}/${environment.current_version}/symbols/${template.symbol}/raw`; } } diff --git a/src/app/services/template.service.ts b/src/app/services/template.service.ts index 2711141c..6c499a3e 100644 --- a/src/app/services/template.service.ts +++ b/src/app/services/template.service.ts @@ -11,11 +11,11 @@ export class TemplateService { constructor(private httpController: HttpController) {} - list(controller:Controller ): Observable { + list(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - deleteTemplate(controller:Controller , templateId: string): Observable { + deleteTemplate(controller: Controller, templateId: string): Observable { return this.httpController.delete(controller, `/templates/${templateId}`, { observe: 'body' }); } } diff --git a/src/app/services/testing.ts b/src/app/services/testing.ts index 90ccb094..d92b327d 100644 --- a/src/app/services/testing.ts +++ b/src/app/services/testing.ts @@ -1,6 +1,6 @@ import { Controller } from '../models/controller'; -export function getTestController():Controller { +export function getTestController(): Controller { const controller = new Controller (); controller.host = '127.0.0.1'; controller.port = 3080; diff --git a/src/app/services/version.service.spec.ts b/src/app/services/version.service.spec.ts index b692d897..4500f76c 100644 --- a/src/app/services/version.service.spec.ts +++ b/src/app/services/version.service.spec.ts @@ -12,7 +12,7 @@ import { VersionService } from './version.service'; export class MockedVersionService { public response: Observable; - public get(controller:Controller ) { + public get(controller: Controller ) { return this.response; } } @@ -22,7 +22,7 @@ describe('VersionService', () => { let httpTestingController: HttpTestingController; let httpController: HttpController; let service: VersionService; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/version.service.ts b/src/app/services/version.service.ts index acd070b8..b6e5eb45 100644 --- a/src/app/services/version.service.ts +++ b/src/app/services/version.service.ts @@ -8,7 +8,7 @@ import { HttpController } from './http-controller.service'; export class VersionService { constructor(private httpController: HttpController) {} - get(controller:Controller ) { + get(controller: Controller ) { return this.httpController.get(controller, '/version'); } } diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts index 82988cd1..fe55daab 100644 --- a/src/app/services/virtual-box.service.spec.ts +++ b/src/app/services/virtual-box.service.spec.ts @@ -13,7 +13,7 @@ describe('VirtualBoxService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/virtual-box.service.ts b/src/app/services/virtual-box.service.ts index 7c0f82db..0cecd131 100644 --- a/src/app/services/virtual-box.service.ts +++ b/src/app/services/virtual-box.service.ts @@ -10,18 +10,18 @@ import { HttpController } from './http-controller.service'; export class VirtualBoxService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get( controller, `/templates/${template_id}` ) as Observable; } - addTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate): Observable { + addTemplate(controller: Controller, virtualBoxTemplate: VirtualBoxTemplate): Observable { return this.httpController.post( controller, `/templates`, @@ -29,7 +29,7 @@ export class VirtualBoxService { ) as Observable; } - saveTemplate(controller:Controller , virtualBoxTemplate: VirtualBoxTemplate): Observable { + saveTemplate(controller: Controller, virtualBoxTemplate: VirtualBoxTemplate): Observable { return this.httpController.put( controller, `/templates/${virtualBoxTemplate.template_id}`, @@ -37,7 +37,7 @@ export class VirtualBoxService { ) as Observable; } - getVirtualMachines(controller:Controller ): Observable { + getVirtualMachines(controller: Controller ): Observable { return this.httpController.get(controller, `/computes/${environment.compute_id}/virtualbox/vms`) as Observable; } } diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts index 0d5b97a8..c12cb190 100644 --- a/src/app/services/vmware.service.spec.ts +++ b/src/app/services/vmware.service.spec.ts @@ -13,7 +13,7 @@ describe('VmwareService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/vmware.service.ts b/src/app/services/vmware.service.ts index a5a7536d..a103de2b 100644 --- a/src/app/services/vmware.service.ts +++ b/src/app/services/vmware.service.ts @@ -10,19 +10,19 @@ import { HttpController } from './http-controller.service'; export class VmwareService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller:Controller , vmwareTemplate: VmwareTemplate): Observable { + addTemplate(controller: Controller, vmwareTemplate: VmwareTemplate): Observable { return this.httpController.post(controller, `/templates`, vmwareTemplate) as Observable; } - saveTemplate(controller:Controller , vmwareTemplate: VmwareTemplate): Observable { + saveTemplate(controller: Controller, vmwareTemplate: VmwareTemplate): Observable { return this.httpController.put( controller, `/templates/${vmwareTemplate.template_id}`, @@ -30,7 +30,7 @@ export class VmwareService { ) as Observable; } - getVirtualMachines(controller:Controller ): Observable { + getVirtualMachines(controller: Controller ): Observable { return this.httpController.get(controller, `/computes/${environment.compute_id}/vmware/vms`) as Observable; } } diff --git a/src/app/services/vpcs.service.spec.ts b/src/app/services/vpcs.service.spec.ts index ba889f01..4b62a44e 100644 --- a/src/app/services/vpcs.service.spec.ts +++ b/src/app/services/vpcs.service.spec.ts @@ -13,7 +13,7 @@ describe('VpcsService', () => { let httpClient: HttpClient; let httpTestingController: HttpTestingController; let httpController: HttpController; - let controller:Controller ; + let controller: Controller; beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/app/services/vpcs.service.ts b/src/app/services/vpcs.service.ts index 95cfa70e..0fb72c95 100644 --- a/src/app/services/vpcs.service.ts +++ b/src/app/services/vpcs.service.ts @@ -8,19 +8,19 @@ import { HttpController } from './http-controller.service'; export class VpcsService { constructor(private httpController: HttpController) {} - getTemplates(controller:Controller ): Observable { + getTemplates(controller: Controller ): Observable { return this.httpController.get(controller, '/templates') as Observable; } - getTemplate(controller:Controller , template_id: string): Observable { + getTemplate(controller: Controller, template_id: string): Observable { return this.httpController.get(controller, `/templates/${template_id}`) as Observable; } - addTemplate(controller:Controller , vpcsTemplate: VpcsTemplate): Observable { + addTemplate(controller: Controller, vpcsTemplate: VpcsTemplate): Observable { return this.httpController.post(controller, `/templates`, vpcsTemplate) as Observable; } - saveTemplate(controller:Controller , vpcsTemplate: VpcsTemplate): Observable { + saveTemplate(controller: Controller, vpcsTemplate: VpcsTemplate): Observable { return this.httpController.put( controller, `/templates/${vpcsTemplate.template_id}`, diff --git a/src/app/validators/project-name-async-validator.ts b/src/app/validators/project-name-async-validator.ts index a2516dc9..72c4fc3e 100644 --- a/src/app/validators/project-name-async-validator.ts +++ b/src/app/validators/project-name-async-validator.ts @@ -4,7 +4,7 @@ import { map, switchMap } from 'rxjs/operators'; import { Controller } from '../models/controller'; import { ProjectService } from '../services/project.service'; -export const projectNameAsyncValidator = (controller:Controller , projectService: ProjectService) => { +export const projectNameAsyncValidator = (controller: Controller, projectService: ProjectService) => { return (control: UntypedFormControl) => { return timer(500).pipe( switchMap(() => projectService.list(controller)), diff --git a/src/app/validators/template-name-async-validator.ts b/src/app/validators/template-name-async-validator.ts index 52f5d240..b8db2055 100644 --- a/src/app/validators/template-name-async-validator.ts +++ b/src/app/validators/template-name-async-validator.ts @@ -4,7 +4,7 @@ import { map, switchMap } from 'rxjs/operators'; import { Controller } from '../models/controller'; import { TemplateService } from '../services/template.service'; -export const templateNameAsyncValidator = (controller:Controller , templateService: TemplateService) => { +export const templateNameAsyncValidator = (controller: Controller, templateService: TemplateService) => { return (control: UntypedFormControl) => { return timer(500).pipe( switchMap(() => templateService.list(controller)),