Apply code style

2025-06-20 23:55:04 +00:00 · 2019-01-15 11:15:54 +01:00
parent fd8fbf3919
commit 74b84a13f0
357 changed files with 5859 additions and 6469 deletions
--- a/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html
+++ b/src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.html
@ -1,12 +1,22 @@
 <h1 mat-dialog-title>Create new project</h1>
 <form [formGroup]="projectNameForm" class="file-name-form">
-    <mat-form-field class="file-name-form-field">
-        <input matInput type="text" formControlName="projectName"  [ngClass]="{ 'is-invalid': form.projectName?.errors }" placeholder="Please enter name" />
-        <mat-error *ngIf="form.projectName?.touched && form.projectName?.errors && form.projectName?.errors.required">Project name is required</mat-error>
-        <mat-error *ngIf="form.projectName?.touched && form.projectName?.errors && form.projectName?.errors.invalidName">Project name is incorrect</mat-error>
-    </mat-form-field>
-    <div mat-dialog-actions>
-        <button mat-button (click)="onNoClick()" color="accent">Cancel</button>
-        <button mat-button (click)="onAddClick()" tabindex="2" mat-raised-button color="primary">Add project</button>
-    </div>
+  <mat-form-field class="file-name-form-field">
+    <input
+      matInput
+      type="text"
+      formControlName="projectName"
+      [ngClass]="{ 'is-invalid': form.projectName?.errors }"
+      placeholder="Please enter name"
+    />
+    <mat-error *ngIf="form.projectName?.touched && form.projectName?.errors && form.projectName?.errors.required"
+      >Project name is required</mat-error
+    >
+    <mat-error *ngIf="form.projectName?.touched && form.projectName?.errors && form.projectName?.errors.invalidName"
+      >Project name is incorrect</mat-error
+    >
+  </mat-form-field>
+  <div mat-dialog-actions>
+    <button mat-button (click)="onNoClick()" color="accent">Cancel</button>
+    <button mat-button (click)="onAddClick()" tabindex="2" mat-raised-button color="primary">Add project</button>
+  </div>
 </form>
--- 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
@ -1,8 +1,15 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { AddBlankProjectDialogComponent } from "./add-blank-project-dialog.component";
-import { Server } from "../../../models/server";
+import { AddBlankProjectDialogComponent } from './add-blank-project-dialog.component';
+import { Server } from '../../../models/server';
 import { ReactiveFormsModule, FormsModule } from '@angular/forms';
-import { MatDialogModule, MatInputModule, MatFormFieldModule, MatDialogRef, MAT_DIALOG_DATA, MatSnackBarModule } from '@angular/material';
+import {
+  MatDialogModule,
+  MatInputModule,
+  MatFormFieldModule,
+  MatDialogRef,
+  MAT_DIALOG_DATA,
+  MatSnackBarModule
+} from '@angular/material';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ProjectService } from '../../../services/project.service';
 import { ToasterService } from '../../../services/toaster.service';
@ -11,122 +18,123 @@ import { Project } from '../../../models/project';
 import { Router } from '@angular/router';

 export class MockedProjectService {
-    public projects: Project[] = [{
-        auto_close: false,
-        auto_open: false,
-        auto_start: false,
-        filename: "blank",
-        name: "blank",
-        path: "",
-        project_id: "",
-        scene_height: 100,
-        scene_width: 100,
-        status: "opened",
-        readonly: false,
-        show_interface_labels: false,
-        show_layers: false,
-        show_grid: false,
-        snap_to_grid: false,
-    }];
-  
-    list() {
-      return of(this.projects);
+  public projects: Project[] = [
+    {
+      auto_close: false,
+      auto_open: false,
+      auto_start: false,
+      filename: 'blank',
+      name: 'blank',
+      path: '',
+      project_id: '',
+      scene_height: 100,
+      scene_width: 100,
+      status: 'opened',
+      readonly: false,
+      show_interface_labels: false,
+      show_layers: false,
+      show_grid: false,
+      snap_to_grid: false
    }
+  ];

-    add(){
-        return of(this.projects.pop);
-    }
+  list() {
+    return of(this.projects);
+  }
+
+  add() {
+    return of(this.projects.pop);
+  }
 }

 describe('AddBlankProjectDialogComponent', () => {
-    let component: AddBlankProjectDialogComponent;
-    let fixture: ComponentFixture<AddBlankProjectDialogComponent>;
-    let server: Server;
-    let router = {
-        navigate: jasmine.createSpy('navigate')
-    };
-    let toaster = {
-        success: jasmine.createSpy('success')
-    };
-    let dialogRef = {
-        close: jasmine.createSpy('close')
-    };
+  let component: AddBlankProjectDialogComponent;
+  let fixture: ComponentFixture<AddBlankProjectDialogComponent>;
+  let server: Server;
+  let router = {
+    navigate: jasmine.createSpy('navigate')
+  };
+  let toaster = {
+    success: jasmine.createSpy('success')
+  };
+  let dialogRef = {
+    close: jasmine.createSpy('close')
+  };

-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            imports: [
-                MatDialogModule,
-                MatFormFieldModule,
-                MatInputModule,
-                NoopAnimationsModule,
-                FormsModule,
-                ReactiveFormsModule,
-                MatSnackBarModule
-            ],
-            providers: [
-                { provide: MatDialogRef, useValue: dialogRef },
-                { provide: MAT_DIALOG_DATA },
-                { provide: ProjectService, useClass: MockedProjectService },
-                { provide: ToasterService, useValue: toaster },
-                { provide: Router, useValue: router }
-            ],
-            declarations : [AddBlankProjectDialogComponent]
-        })
-        .compileComponents();
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        MatDialogModule,
+        MatFormFieldModule,
+        MatInputModule,
+        NoopAnimationsModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MatSnackBarModule
+      ],
+      providers: [
+        { provide: MatDialogRef, useValue: dialogRef },
+        { provide: MAT_DIALOG_DATA },
+        { provide: ProjectService, useClass: MockedProjectService },
+        { provide: ToasterService, useValue: toaster },
+        { provide: Router, useValue: router }
+      ],
+      declarations: [AddBlankProjectDialogComponent]
+    }).compileComponents();

-        server = new Server();
-        server.ip = "localhost";
-        server.port = 80;
-    }));
+    server = new Server();
+    server.ip = 'localhost';
+    server.port = 80;
+  }));

-    beforeEach(() => {
-        fixture = TestBed.createComponent(AddBlankProjectDialogComponent);
-        component = fixture.componentInstance;
-        component.server = server;
-        component.projectNameForm.controls['projectName'].setValue("ValidName");
-        fixture.detectChanges();
-    })
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddBlankProjectDialogComponent);
+    component = fixture.componentInstance;
+    component.server = server;
+    component.projectNameForm.controls['projectName'].setValue('ValidName');
+    fixture.detectChanges();
+  });

-    it('should be created', () => {
-        expect(fixture).toBeDefined();
-        expect(component).toBeTruthy();
-    });
+  it('should be created', () => {
+    expect(fixture).toBeDefined();
+    expect(component).toBeTruthy();
+  });

-    it('should call adding project when name is valid', () => {
-        spyOn(component, "addProject");
+  it('should call adding project when name is valid', () => {
+    spyOn(component, 'addProject');

-        component.onAddClick();
+    component.onAddClick();

-        expect(component.addProject).toHaveBeenCalled();
-    });
+    expect(component.addProject).toHaveBeenCalled();
+  });

-    it('should sanitize file name input', () => {
-        component.projectNameForm.controls['projectName'].setValue("[][]");
-        fixture.detectChanges();
-        spyOn(component, "addProject");
+  it('should sanitize file name input', () => {
+    component.projectNameForm.controls['projectName'].setValue('[][]');
+    fixture.detectChanges();
+    spyOn(component, 'addProject');

-        component.onAddClick();
+    component.onAddClick();

-        expect(component.addProject).not.toHaveBeenCalled();
-        expect(component.projectNameForm.valid).toBeFalsy();
-    });
+    expect(component.addProject).not.toHaveBeenCalled();
+    expect(component.projectNameForm.valid).toBeFalsy();
+  });

-    it('should open confirmation dialog if project with the same exists', () => {
-        component.projectNameForm.controls['projectName'].setValue("blank");
-        spyOn(component, "openConfirmationDialog");
+  it('should open confirmation dialog if project with the same exists', () => {
+    component.projectNameForm.controls['projectName'].setValue('blank');
+    spyOn(component, 'openConfirmationDialog');

-        component.onAddClick();
+    component.onAddClick();

-        expect(component.openConfirmationDialog).toHaveBeenCalled();
-    });
+    expect(component.openConfirmationDialog).toHaveBeenCalled();
+  });

-    it('should redirect to newly created project', () => {
-        component.projectNameForm.controls['projectName'].setValue("validName");
-        
-        component.addProject();
+  it('should redirect to newly created project', () => {
+    component.projectNameForm.controls['projectName'].setValue('validName');

-        expect(dialogRef.close).toHaveBeenCalled();
-        expect(toaster.success).toHaveBeenCalled();
-        expect(router.navigate).toHaveBeenCalled();
-    });
+    component.addProject();
+
+    expect(dialogRef.close).toHaveBeenCalled();
+    expect(toaster.success).toHaveBeenCalled();
+    expect(router.navigate).toHaveBeenCalled();
+  });
 });
--- 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
@ -11,82 +11,82 @@ import { ProjectNameValidator } from '../models/projectNameValidator';
 import { ToasterService } from '../../../services/toaster.service';

@Component({
-    selector: 'app-add-blank-project-dialog',
-    templateUrl: './add-blank-project-dialog.component.html',
-    styleUrls: ['./add-blank-project-dialog.component.css'],
-    providers: [ProjectNameValidator]
+  selector: 'app-add-blank-project-dialog',
+  templateUrl: './add-blank-project-dialog.component.html',
+  styleUrls: ['./add-blank-project-dialog.component.css'],
+  providers: [ProjectNameValidator]
 })
 export class AddBlankProjectDialogComponent implements OnInit {
-    server: Server;
-    projectNameForm: FormGroup;
+  server: Server;
+  projectNameForm: FormGroup;

-    constructor(
-        public dialogRef: MatDialogRef<AddBlankProjectDialogComponent>,
-        private router: Router,
-        private dialog: MatDialog,
-        private projectService: ProjectService,
-        private toasterService: ToasterService,
-        private formBuilder: FormBuilder,
-        private projectNameValidator: ProjectNameValidator) {
-            this.projectNameForm = this.formBuilder.group({
-                projectName: new FormControl(null, [Validators.required, projectNameValidator.get])
-            });
-        }
+  constructor(
+    public dialogRef: MatDialogRef<AddBlankProjectDialogComponent>,
+    private router: Router,
+    private dialog: MatDialog,
+    private projectService: ProjectService,
+    private toasterService: ToasterService,
+    private formBuilder: FormBuilder,
+    private projectNameValidator: ProjectNameValidator
+  ) {
+    this.projectNameForm = this.formBuilder.group({
+      projectName: new FormControl(null, [Validators.required, projectNameValidator.get])
+    });
+  }

-    ngOnInit() {}
+  ngOnInit() {}

-    get form() {
-        return this.projectNameForm.controls;
+  get form() {
+    return this.projectNameForm.controls;
+  }
+
+  onAddClick(): void {
+    if (this.projectNameForm.invalid) {
+      return;
    }
+    this.projectService.list(this.server).subscribe((projects: Project[]) => {
+      const projectName = this.projectNameForm.controls['projectName'].value;
+      let existingProject = projects.find(project => project.name === projectName);

-    onAddClick() : void{
-        if (this.projectNameForm.invalid){
-            return;
-        }
-        this.projectService
-            .list(this.server)
-            .subscribe((projects: Project[]) => {
-                const projectName = this.projectNameForm.controls['projectName'].value;
-                let existingProject = projects.find(project => project.name === projectName);
+      if (existingProject) {
+        this.openConfirmationDialog(existingProject);
+      } else {
+        this.addProject();
+      }
+    });
+  }

-                if (existingProject){
-                    this.openConfirmationDialog(existingProject);
-                } else {
-                    this.addProject();  
-                }
-            });  
-    }
+  onNoClick(): void {
+    this.dialogRef.close();
+  }

-    onNoClick() : void{
+  addProject(): void {
+    this.projectService
+      .add(this.server, this.projectNameForm.controls['projectName'].value, uuid())
+      .subscribe((project: Project) => {
        this.dialogRef.close();
-    }
+        this.toasterService.success(`Project ${project.name} added`);
+        this.router.navigate(['/server', this.server.id, 'project', project.project_id]);
+      });
+  }

-    addProject() : void{
-        this.projectService.add(this.server, this.projectNameForm.controls['projectName'].value, uuid())
-            .subscribe((project: Project) => {
-                this.dialogRef.close();
-                this.toasterService.success(`Project ${project.name} added`)
-                this.router.navigate(['/server', this.server.id, 'project', project.project_id]);
-            });
-    }
+  openConfirmationDialog(existingProject: Project) {
+    const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
+      width: '300px',
+      height: '150px',
+      data: {
+        existingProject: existingProject
+      }
+    });

-    openConfirmationDialog(existingProject: Project) {
-        const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
-          width: '300px',
-          height: '150px',
-          data: {
-            'existingProject': existingProject
-          }
+    dialogRef.afterClosed().subscribe((answer: boolean) => {
+      if (answer) {
+        this.projectService.close(this.server, existingProject.project_id).subscribe(() => {
+          this.projectService.delete(this.server, existingProject.project_id).subscribe(() => {
+            this.addProject();
+          });
        });
-    
-        dialogRef.afterClosed().subscribe((answer: boolean) => {
-          if (answer) {
-            this.projectService.close(this.server, existingProject.project_id).subscribe(() => {
-                this.projectService.delete(this.server, existingProject.project_id).subscribe(() => {
-                    this.addProject();
-                });
-            });
-          }
-        });
-    }
+      }
+    });
+  }
 }