Delete button added

This commit is contained in:
Piotr Pekala 2019-08-07 05:59:24 -07:00
parent 031291612f
commit c9bdfeba8f
3 changed files with 18 additions and 4 deletions

View File

@ -46,6 +46,10 @@
<mat-icon>developer_board</mat-icon>
<span>Servers</span>
</button>
<button mat-menu-item (click)="deleteProject()">
<mat-icon>delete</mat-icon>
<span>Delete project</span>
</button>
</mat-menu>
<mat-toolbar-row>

View File

@ -20,7 +20,7 @@ import { DrawingsDataSource } from '../../cartography/datasources/drawings-datas
import { CommonModule } from '@angular/common';
import { ANGULAR_MAP_DECLARATIONS } from '../../cartography/angular-map.imports';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { MockedSettingsService } from '../../services/settings.service.spec';
import { MockedServerService } from '../../services/server.service.spec';
import { MockedProjectService } from '../../services/project.service.spec';
@ -52,6 +52,7 @@ import { MapSettingService } from '../../services/mapsettings.service';
import { ProjectMapMenuComponent } from './project-map-menu/project-map-menu.component';
import { MockedToasterService } from '../../services/toaster.service.spec';
import { ToasterService } from '../../services/toaster.service';
import { MockedActivatedRoute } from '../snapshots/list-of-snapshots/list-of-snaphshots.component.spec';
export class MockedProgressService {
public activate() {}
@ -202,6 +203,7 @@ describe('ProjectMapComponent', () => {
let linksDataSource = new MockedLinksDataSource();
let mockedToasterService = new MockedToasterService();
let nodeCreatedLabelStylesFixer;
let mockedRouter = new MockedActivatedRoute;
beforeEach(async(() => {
nodeCreatedLabelStylesFixer = {
@ -245,7 +247,8 @@ describe('ProjectMapComponent', () => {
{ provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer},
{ provide: MapScaleService },
{ provide: NodeCreatedLabelStylesFixer, useValue: nodeCreatedLabelStylesFixer},
{ provide: ToasterService, useValue: mockedToasterService }
{ provide: ToasterService, useValue: mockedToasterService },
{ provide: Router, useValue: mockedRouter }
],
declarations: [ProjectMapComponent, ProjectMapMenuComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS],
schemas: [NO_ERRORS_SCHEMA]

View File

@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { ActivatedRoute, ParamMap } from '@angular/router';
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
import { Observable, Subject, Subscription, from } from 'rxjs';
import { webSocket } from 'rxjs/webSocket';
@ -115,7 +115,8 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
private movingEventSource: MovingEventSource,
private mapScaleService: MapScaleService,
private nodeCreatedLabelStylesFixer: NodeCreatedLabelStylesFixer,
private toasterService: ToasterService
private toasterService: ToasterService,
private router: Router,
) {}
ngOnInit() {
@ -408,6 +409,12 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
imageToUpload.src = window.URL.createObjectURL(file);
}
public deleteProject() {
this.projectService.delete(this.server, this.project.project_id).subscribe(() => {
this.router.navigate(['/server', this.server.id, 'projects']);
});
}
public ngOnDestroy() {
this.drawingsDataSource.clear();
this.nodesDataSource.clear();