Feat: adjust commands

Author: 01Parzival10

src/features/constraintMenu/ConstraintMenu.ts

@@ -1,7 +1,7 @@
 import { inject, injectable, optional } from "inversify";
 import "./constraintMenu.css";
 import { AbstractUIExtension, IActionDispatcher, LocalModelSource, TYPES } from "sprotty";
-import { Constraint, ConstraintRegistry } from "./constraintRegistry";
+import { ConstraintRegistry } from "./constraintRegistry";
 
 // Enable hover feature that is used to show validation errors.
 // Inline completions are enabled to allow autocompletion of keywords and inputs/label types/label values.
@@ -19,7 +19,7 @@ import { LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { EditorModeController } from "../editorMode/editorModeController";
 import { Switchable, ThemeManager } from "../settingsMenu/themeManager";
 import { AnalyzeDiagramAction } from "../serialize/analyze";
-import { ChooseConstraintAction } from "./actions";
+import { ChooseConstraintAction } from "./actions";
 
 @injectable()
 export class ConstraintMenu extends AbstractUIExtension implements Switchable {
@@ -236,7 +236,7 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
         const btn = document.createElement("button");
         btn.id = "constraint-options-button";
         btn.title = "Filter…";
-        btn.innerHTML = "⋮";                // or insert a font-awesome icon
+        btn.innerHTML = "⋮"; // or insert a font-awesome icon
         btn.onclick = () => this.toggleOptionsMenu();
         return btn;
     }
@@ -253,46 +253,39 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
         this.optionsMenu = document.createElement("div");
         this.optionsMenu.id = "constraint-options-menu";
 
-        // 2) add the “All constraints” checkbox at the top
-        const allConstraints = document.createElement("label");
-        allConstraints.classList.add("options-item");
-
-        const allCb = document.createElement("input");
-        allCb.type = "checkbox";
-        allCb.value = "ALL";
-        // initially checked if no specific constraint is selected
-        allCb.checked = this.constraintRegistry.getSelectedConstraints().includes("ALL");
-
-        allCb.onchange = () => {
-            if (!this.optionsMenu) return;
-            if (allCb.checked) {
-                // uncheck every other constraint-checkbox
-                this.optionsMenu
-                    .querySelectorAll<HTMLInputElement>("input[type=checkbox]")
-                    .forEach(cb => {
-                        if (cb !== allCb) cb.checked = false;
-                    });
-                // dispatch with empty array to mean “all”
-                this.dispatcher.dispatch(
-                    ChooseConstraintAction.create(["ALL"])
-                );
-            } else {
-                this.dispatcher.dispatch(
-                    ChooseConstraintAction.create([])
-                );
-            }
-            
-        };
-
-        allConstraints.appendChild(allCb);
-        allConstraints.appendChild(document.createTextNode("All constraints"));
+        // 2) add the “All constraints” checkbox at the top
+        const allConstraints = document.createElement("label");
+        allConstraints.classList.add("options-item");
+
+        const allCb = document.createElement("input");
+        allCb.type = "checkbox";
+        allCb.value = "ALL";
+        // initially checked if no specific constraint is selected
+        allCb.checked = this.constraintRegistry.getSelectedConstraints().includes("ALL");
+
+        allCb.onchange = () => {
+            if (!this.optionsMenu) return;
+            if (allCb.checked) {
+                // uncheck every other constraint-checkbox
+                this.optionsMenu.querySelectorAll<HTMLInputElement>("input[type=checkbox]").forEach((cb) => {
+                    if (cb !== allCb) cb.checked = false;
+                });
+                // dispatch with empty array to mean “all”
+                this.dispatcher.dispatch(ChooseConstraintAction.create(["ALL"]));
+            } else {
+                this.dispatcher.dispatch(ChooseConstraintAction.create([]));
+            }
+        };
+
+        allConstraints.appendChild(allCb);
+        allConstraints.appendChild(document.createTextNode("All constraints"));
         this.optionsMenu.appendChild(allConstraints);
 
         // 2) pull your dynamic items (replace with your real API)
         const items = this.constraintRegistry.getConstraintList();
 
         // 3) for each item build a checkbox
-        items.forEach(item => {
+        items.forEach((item) => {
             const label = document.createElement("label");
             label.classList.add("options-item");
 
@@ -305,14 +298,12 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
                 if (cb.checked) allCb.checked = false;
 
                 const selected = Array.from(
-                    this.optionsMenu!.querySelectorAll<HTMLInputElement>("input[type=checkbox]:checked")
-                ).map(cb => cb.value);
+                    this.optionsMenu!.querySelectorAll<HTMLInputElement>("input[type=checkbox]:checked"),
+                ).map((cb) => cb.value);
 
                 // dispatch your action with either an array or
                 // a comma-joined string—whatever your action expects
-                this.dispatcher.dispatch(
-                    ChooseConstraintAction.create(selected)
-                );
+                this.dispatcher.dispatch(ChooseConstraintAction.create(selected));
             };
 
             label.appendChild(cb);
@@ -324,8 +315,11 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
 
         // optional: click-outside handler
         const onClickOutside = (e: MouseEvent) => {
-            if (this.optionsMenu && !this.optionsMenu.contains(e.target as Node)
-                && !(e.target as Element).matches("#constraint-options-button")) {
+            if (
+                this.optionsMenu &&
+                !this.optionsMenu.contains(e.target as Node) &&
+                !(e.target as Element).matches("#constraint-options-button")
+            ) {
                 this.toggleOptionsMenu();
                 document.removeEventListener("click", onClickOutside);
             }

src/features/editorMode/command.ts

@@ -23,7 +23,7 @@ export class ChangeEditorModeCommand extends Command {
     static readonly KIND = ChangeEditorModeAction.KIND;
 
     private oldMode?: EditorMode;
-    private oldNodeAnnotations: Map<string, DfdNodeAnnotation> = new Map();
+    private oldNodeAnnotations: Map<string, DfdNodeAnnotation[]> = new Map();
 
     @inject(EditorModeController)
     private readonly controller?: EditorModeController;
@@ -65,9 +65,9 @@ export class ChangeEditorModeCommand extends Command {
 
             this.oldNodeAnnotations.clear();
             context.root.index.all().forEach((element) => {
-                if (element instanceof DfdNodeImpl && element.annotation) {
-                    this.oldNodeAnnotations.set(element.id, element.annotation);
-                    element.annotation = undefined;
+                if (element instanceof DfdNodeImpl && element.annotations) {
+                    this.oldNodeAnnotations.set(element.id, element.annotations);
+                    element.annotations = [];
                 }
             });
         }
@@ -79,7 +79,7 @@ export class ChangeEditorModeCommand extends Command {
             this.oldNodeAnnotations.forEach((annotation, id) => {
                 const element = context.root.index.getById(id);
                 if (element instanceof DfdNodeImpl) {
-                    element.annotation = annotation;
+                    element.annotations = annotation;
                 }
             });
         }