From f87cd5eb7f1461fb0d7150e16b0c8366a44719a3 Mon Sep 17 00:00:00 2001
From: rhenck <richard.henck@iqb.hu-berlin.de>
Date: Mon, 25 Oct 2021 15:53:41 +0200
Subject: [PATCH] [editor] Code cleanup
Use proper types and remove unused vars.
---
.../src/app/unit-view/page-view/canvas/canvas.component.ts | 4 ++--
.../unit-view/page-view/canvas/section-dynamic.component.ts | 3 ++-
.../unit-view/page-view/canvas/section-static.component.ts | 3 ++-
.../new-ui-element-panel/ui-element-toolbox.component.ts | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
index da070a160..95d1b6f4b 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/canvas.component.ts
@@ -108,8 +108,8 @@ export class CanvasComponent implements OnInit, OnDestroy {
return this.page.sections.reduce(reduceFct, 0);
}
- addSection(index: number | null = null): void {
- this.unitService.addSection(this.page, index);
+ addSection(): void {
+ this.unitService.addSection(this.page);
this.selectionService.selectedPageSectionIndex = this.page.sections.length - 1;
}
diff --git a/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
index ee42bead3..09e1af999 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/section-dynamic.component.ts
@@ -5,6 +5,7 @@ import { CdkDragDrop } from '@angular/cdk/drag-drop/drag-events';
import { DragItemData, DropListData } from './canvas.component';
import { UnitService } from '../../../unit.service';
import { Section } from '../../../../../../common/models/section';
+import { UIElementType } from '../../../../../../common/models/uI-element';
@Component({
selector: 'app-section-dynamic',
@@ -129,7 +130,7 @@ export class SectionDynamicComponent {
newElementDropped(event: DragEvent, gridX: number, gridY: number): void {
event.preventDefault();
this.unitService.addElementToSection(
- event.dataTransfer?.getData('elementType') as string,
+ event.dataTransfer?.getData('elementType') as UIElementType,
this.section,
{ x: gridX, y: gridY }
);
diff --git a/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
index 83776be2d..ef49ec58f 100644
--- a/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/canvas/section-static.component.ts
@@ -3,6 +3,7 @@ import {
} from '@angular/core';
import { UnitService } from '../../../unit.service';
import { Section } from '../../../../../../common/models/section';
+import { UIElementType } from '../../../../../../common/models/uI-element';
@Component({
selector: 'app-section-static',
@@ -33,7 +34,7 @@ export class SectionStaticComponent {
event.preventDefault();
const sectionRect = this.sectionElement.nativeElement.getBoundingClientRect();
this.unitService.addElementToSection(
- event.dataTransfer?.getData('elementType') as string,
+ event.dataTransfer?.getData('elementType') as UIElementType,
this.section,
{ x: event.clientX - Math.round(sectionRect.left), y: event.clientY - Math.round(sectionRect.top) }
);
diff --git a/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
index ee8749421..ce6cf9705 100644
--- a/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
+++ b/projects/editor/src/app/unit-view/page-view/new-ui-element-panel/ui-element-toolbox.component.ts
@@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { UnitService } from '../../../unit.service';
import { SelectionService } from '../../../selection.service';
+import { UIElementType } from '../../../../../../common/models/uI-element';
@Component({
selector: 'app-ui-element-toolbox',
@@ -16,7 +17,7 @@ import { SelectionService } from '../../../selection.service';
export class UiElementToolboxComponent {
constructor(private selectionService: SelectionService, public unitService: UnitService) { }
- async addUIElement(elementType: string): Promise<void> {
+ async addUIElement(elementType: UIElementType): Promise<void> {
this.unitService.addElementToSectionByIndex(elementType,
this.selectionService.selectedPageIndex,
this.selectionService.selectedPageSectionIndex);
--
GitLab