Merge pull request #160 from DataFlowAnalysis/json-version

add version to json

Author: sebinside

src/features/serialize/analyze.ts

@@ -6,7 +6,7 @@ import { DynamicChildrenProcessor } from "../dfdElements/dynamicChildren";
 import { EditorModeController } from "../editorMode/editorModeController";
 import { sendMessage } from "./webSocketHandler";
 import { ConstraintRegistry } from "../constraintMenu/constraintRegistry";
-import { SavedDiagram } from "./save";
+import { CURRENT_VERSION, SavedDiagram } from "./save";
 import { LoadingIndicator } from "../../common/loadingIndicator";
 
 export interface AnalyzeDiagramAction extends Action {
@@ -62,6 +62,7 @@ export class AnalyzeDiagramCommand extends Command {
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
             constraints: this.constraintRegistry?.getConstraints(),
             mode: this.editorModeController?.getCurrentMode(),
+            version: CURRENT_VERSION,
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
         sendMessage("Json:" + diagramJson);

src/features/serialize/defaultDiagram.json

@@ -619,5 +619,6 @@
             "constraint": "data Sensitivity.Personal neverFlows vertex Location.nonEU"
         }
     ],
-    "mode": "edit"
+    "mode": "edit",
+    "version": 1
 }

src/features/serialize/save.ts

@@ -15,7 +15,9 @@ export interface SavedDiagram {
     labelTypes?: LabelType[];
     constraints?: Constraint[];
     mode?: EditorMode;
+    version: number;
 }
+export const CURRENT_VERSION = 1;
 
 export interface SaveDiagramAction extends Action {
     kind: typeof SaveDiagramAction.KIND;
@@ -66,6 +68,7 @@ export class SaveDiagramCommand extends Command {
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
             constraints: this.constraintRegistry?.getConstraints(),
             mode: this.editorModeController?.getCurrentMode(),
+            version: CURRENT_VERSION,
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
         const jsonBlob = new Blob([diagramJson], { type: "application/json" });

src/features/serialize/saveDFDandDD.ts

@@ -5,7 +5,7 @@ import { LabelTypeRegistry } from "../labels/labelTypeRegistry";
 import { DynamicChildrenProcessor } from "../dfdElements/dynamicChildren";
 import { EditorModeController } from "../editorMode/editorModeController";
 import { sendMessage } from "./webSocketHandler";
-import { SavedDiagram } from "./save";
+import { CURRENT_VERSION, SavedDiagram } from "./save";
 import { ConstraintRegistry } from "../constraintMenu/constraintRegistry";
 import { getModelFileName } from "../../index";
 
@@ -58,6 +58,7 @@ export class SaveDFDandDDCommand extends Command {
             labelTypes: this.labelTypeRegistry?.getLabelTypes(),
             constraints: this.constraintRegistry?.getConstraints(),
             mode: this.editorModeController?.getCurrentMode(),
+            version: CURRENT_VERSION,
         };
         const diagramJson = JSON.stringify(diagram, undefined, 4);
         sendMessage("Json2DFD:" + getModelFileName() + ":" + diagramJson);