From 6a12f61921e573d9ba4fa490651622a8ff9c40e4 Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Mon, 7 Feb 2022 13:22:53 +0100
Subject: [PATCH] [editor] Remove IDService from places other than the unit
service
It is better to hide that abstraction in the unit service.
---
projects/editor/src/app/app.component.ts | 3 ---
.../editor/src/app/components/toolbar/toolbar.component.ts | 7 +------
projects/editor/src/app/services/unit.service.ts | 1 +
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/projects/editor/src/app/app.component.ts b/projects/editor/src/app/app.component.ts
index 7d7276a34..8755780ad 100644
--- a/projects/editor/src/app/app.component.ts
+++ b/projects/editor/src/app/app.component.ts
@@ -4,7 +4,6 @@ import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { VeronaAPIService, VoeStartCommand } from './services/verona-api.service';
import { UnitService } from './services/unit.service';
-import { IdService } from './services/id.service';
@Component({
selector: 'editor-aspect',
@@ -22,7 +21,6 @@ export class AppComponent implements OnInit {
isStandalone = (): boolean => window === window.parent;
constructor(private unitService: UnitService,
- private idService: IdService,
private translateService: TranslateService,
private veronaApiService: VeronaAPIService) {
translateService.addLangs(['de']);
@@ -32,7 +30,6 @@ export class AppComponent implements OnInit {
ngOnInit(): void {
this.veronaApiService.voeStartCommand
.subscribe((message: VoeStartCommand): void => {
- this.idService.reset();
this.unitService.loadUnitDefinition(message.unitDefinition);
});
this.veronaApiService.voeGetDefinitionRequest
diff --git a/projects/editor/src/app/components/toolbar/toolbar.component.ts b/projects/editor/src/app/components/toolbar/toolbar.component.ts
index 10b5af1a2..e9e91c3d4 100644
--- a/projects/editor/src/app/components/toolbar/toolbar.component.ts
+++ b/projects/editor/src/app/components/toolbar/toolbar.component.ts
@@ -1,6 +1,5 @@
import { Component } from '@angular/core';
import { UnitService } from '../../services/unit.service';
-import { IdService } from '../../services/id.service';
@Component({
selector: 'app-toolbar',
@@ -11,17 +10,13 @@ import { IdService } from '../../services/id.service';
]
})
export class ToolbarComponent {
- constructor(
- private unitService: UnitService,
- private idService: IdService
- ) { }
+ constructor(private unitService: UnitService) { }
save(): void {
this.unitService.saveUnit();
}
async load(): Promise<void> {
- this.idService.reset();
await this.unitService.loadUnitFromFile();
}
}
diff --git a/projects/editor/src/app/services/unit.service.ts b/projects/editor/src/app/services/unit.service.ts
index ee7cf5a85..285fbf0c4 100644
--- a/projects/editor/src/app/services/unit.service.ts
+++ b/projects/editor/src/app/services/unit.service.ts
@@ -49,6 +49,7 @@ export class UnitService {
loadUnitDefinition(unitDefinition: string): void {
if (unitDefinition) {
+ this.idService.reset();
this.unit = new Unit(JSON.parse(unitDefinition));
}
}
--
GitLab