keep old format

Author: Kr0nox

src/features/constraintMenu/ConstraintMenu.ts

@@ -49,8 +49,8 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
             if (this.editor) {
                 const editorText = this.editor.getValue();
                 // Only update the editor if the constraints have changed
-                if (editorText !== this.constraintRegistry.getConstraints()) {
-                    this.editor.setValue(this.constraintRegistry.getConstraints() || "");
+                if (editorText !== this.constraintRegistry.getConstraintsAsText()) {
+                    this.editor.setValue(this.constraintRegistry.getConstraintsAsText() || "");
                 }
             }
         });
@@ -124,7 +124,7 @@ export class ConstraintMenu extends AbstractUIExtension implements Switchable {
             readOnly: this.forceReadOnly,
         });
 
-        this.editor?.setValue(this.constraintRegistry.getConstraints() || "");
+        this.editor?.setValue(this.constraintRegistry.getConstraintsAsText() || "");
 
         this.editor?.onDidChangeModelContent(() => {
             if (!this.editor) {

src/features/constraintMenu/constraintRegistry.ts

@@ -1,17 +1,57 @@
 import { injectable } from "inversify";
+import { generateRandomSprottyId } from "../../utils";
+
+export interface Constraint {
+    id: string;
+    name: string;
+    constraint: string;
+}
 
 @injectable()
 export class ConstraintRegistry {
-    private constraints: string = "";
+    private constraints: Constraint[] = [];
     private updateCallbacks: (() => void)[] = [];
 
     public setConstraints(constraints: string): void {
-        this.constraints = constraints;
+        this.constraints = constraints.split("\r?\n").map(this.constraintFromLine);
+        this.constraintListChanged();
+    }
+
+    public setConstraintsFromArray(constraints: Constraint[]): void {
+        this.constraints = constraints.map((c) => ({
+            id: c.id || generateRandomSprottyId(),
+            name: c.name,
+            constraint: c.constraint,
+        }));
         this.constraintListChanged();
     }
 
+    private constraintFromLine(line: string): Constraint {
+        const parts = line.split(" ");
+        if (parts.length < 2) {
+            return {
+                id: generateRandomSprottyId(),
+                name: "",
+                constraint: "",
+            };
+        }
+        const name = parts[1].endsWith(":") ? parts[1].slice(0, -1) : parts[1];
+        if (parts.length < 3) {
+            return {
+                id: generateRandomSprottyId(),
+                name: name,
+                constraint: "",
+            };
+        }
+        return {
+            id: generateRandomSprottyId(),
+            name: name,
+            constraint: parts.slice(2).join(" "),
+        };
+    }
+
     public clearConstraints(): void {
-        this.constraints = "";
+        this.constraints = [];
         this.constraintListChanged();
     }
 
@@ -23,7 +63,11 @@ export class ConstraintRegistry {
         this.updateCallbacks.push(callback);
     }
 
-    public getConstraints(): string {
+    public getConstraintsAsText(): string {
+        return this.constraints.map((c) => `- ${c.name}: ${c.constraint}`).join("\n");
+    }
+
+    public getConstraintList(): Constraint[] {
         return this.constraints;
     }
 }

src/features/serialize/analyze.ts

@@ -60,7 +60,7 @@ export class AnalyzeDiagramCommand extends Command {
         const diagram: SavedDiagram = {
             model: modelCopy,
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
-            constraints: this.constraintRegistry?.getConstraints(),
+            constraints: this.constraintRegistry?.getConstraintList(),
             mode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);

src/features/serialize/defaultDiagram.json

@@ -612,6 +612,12 @@
             ]
         }
     ],
-    "constraints": "- default: data Sensitivity.Personal neverFlows vertex Location.nonEU",
+    "constraints": [
+        {
+            "id": "j4nz39",
+            "name": "Test",
+            "constraint": "data Sensitivity.Personal neverFlows vertex Location.nonEU"
+        }
+    ],
     "mode": "edit"
 }

src/features/serialize/load.ts

@@ -18,7 +18,7 @@ import { SavedDiagram } from "./save";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { LayoutModelAction } from "../autoLayout/command";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ConstraintRegistry } from "../constraintMenu/constraintRegistry";
+import { Constraint, ConstraintRegistry } from "../constraintMenu/constraintRegistry";
 import { LoadingIndicator } from "../../common/loadingIndicator";
 
 export interface LoadDiagramAction extends Action {
@@ -84,8 +84,8 @@ export class LoadDiagramCommand extends Command {
     private newEditorMode: EditorMode | undefined;
     private oldFileName: string | undefined;
     private newFileName: string | undefined;
-    private oldConstrains: string | undefined;
-    private newConstrains: string | undefined;
+    private oldConstrains: Constraint[] | undefined;
+    private newConstrains: Constraint[] | undefined;
 
     /**
      * Gets the model file from the action or opens a file picker dialog if no file is provided.
@@ -213,11 +213,11 @@ export class LoadDiagramCommand extends Command {
 
             if (this.constraintRegistry) {
                 // Load label types
-                this.oldConstrains = this.constraintRegistry.getConstraints();
+                this.oldConstrains = this.constraintRegistry.getConstraintList();
                 this.newConstrains = newDiagram?.constraints;
                 this.constraintRegistry.clearConstraints();
                 if (newDiagram?.constraints) {
-                    this.constraintRegistry.setConstraints(newDiagram.constraints);
+                    this.constraintRegistry.setConstraintsFromArray(newDiagram.constraints);
 
                     this.logger.info(this, "Constraints loaded successfully");
                 }
@@ -281,7 +281,7 @@ export class LoadDiagramCommand extends Command {
         }
         this.constraintRegistry?.clearConstraints();
         if (this.oldConstrains) {
-            this.constraintRegistry?.setConstraints(this.oldConstrains);
+            this.constraintRegistry?.setConstraintsFromArray(this.oldConstrains);
         }
         setFileNameInPageTitle(this.oldFileName);
 
@@ -302,7 +302,7 @@ export class LoadDiagramCommand extends Command {
         }
         this.constraintRegistry?.clearConstraints();
         if (this.newConstrains) {
-            this.constraintRegistry?.setConstraints(this.newConstrains);
+            this.constraintRegistry?.setConstraintsFromArray(this.newConstrains);
         }
         setFileNameInPageTitle(this.newFileName);
 

src/features/serialize/loadDefaultDiagram.ts

@@ -95,7 +95,7 @@ export class LoadDefaultDiagramCommand extends Command {
             // Load label types
             this.constraintRegistry.clearConstraints();
             if (defaultDiagram?.constraints) {
-                this.constraintRegistry.setConstraints(defaultDiagram.constraints);
+                this.constraintRegistry.setConstraintsFromArray(defaultDiagram.constraints);
                 this.logger.info(this, "Constraints loaded successfully");
             }
         }

src/features/serialize/save.ts

@@ -4,7 +4,7 @@ import { Action, SModelRoot } from "sprotty-protocol";
 import { LabelType, LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { DynamicChildrenProcessor } from "../dfdElements/dynamicChildren";
 import { EditorMode, EditorModeController } from "../editorMode/editorModeController";
-import { ConstraintRegistry } from "../constraintMenu/constraintRegistry";
+import { Constraint, ConstraintRegistry } from "../constraintMenu/constraintRegistry";
 
 /**
  * Type that contains all data related to a diagram.
@@ -13,7 +13,7 @@ import { ConstraintRegistry } from "../constraintMenu/constraintRegistry";
 export interface SavedDiagram {
     model: SModelRoot;
     labelTypes?: LabelType[];
-    constraints?: string;
+    constraints?: Constraint[];
     mode?: EditorMode;
 }
 
@@ -64,7 +64,7 @@ export class SaveDiagramCommand extends Command {
         const diagram: SavedDiagram = {
             model: modelCopy,
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
-            constraints: this.constraintRegistry?.getConstraints(),
+            constraints: this.constraintRegistry?.getConstraintList(),
             mode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);

src/features/serialize/saveDFDandDD.ts

@@ -56,7 +56,7 @@ export class SaveDFDandDDCommand extends Command {
         const diagram: SavedDiagram = {
             model: modelCopy,
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
-            constraints: this.constraintRegistry?.getConstraints(),
+            constraints: this.constraintRegistry?.getConstraintList(),
             mode: this.editorModeController?.getCurrentMode(),
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);