Merge branch 'master' into Export/import-project

This commit is contained in:
Piotr Pekala 2019-08-20 02:21:54 -07:00
commit 12f31987d4
2 changed files with 12 additions and 2 deletions

View File

@ -62,6 +62,10 @@
<mat-icon>call_received</mat-icon>
<span>Import portable project</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

@ -122,11 +122,11 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
private nodeCreatedLabelStylesFixer: NodeCreatedLabelStylesFixer,
private toasterService: ToasterService,
private dialog: MatDialog,
private router: Router,
private mapNodesDataSource: MapNodesDataSource,
private mapLinksDataSource: MapLinksDataSource,
private mapDrawingsDataSource: MapDrawingsDataSource,
private mapSymbolsDataSource: MapSymbolsDataSource,
private router: Router
private mapSymbolsDataSource: MapSymbolsDataSource
) {}
ngOnInit() {
@ -492,6 +492,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();