enhancement: added more fields to compageJson interface

Author: mahendraintelops

app/src/routes/code-operations.ts

@@ -39,6 +39,7 @@ codeOperationsRouter.post('/generate', requireUserNameMiddleware, async (request
     const cleanup = (downloadedPrjPath: string) => {
         // remove directory created, delete directory recursively
         rimraf(downloadedPrjPath).then((result: any) => {
+            Logger.debug(`Result: ${result}`);
             Logger.debug(`${downloadedPrjPath} is cleaned up`);
         });
     };
@@ -53,8 +54,8 @@ codeOperationsRouter.post('/generate', requireUserNameMiddleware, async (request
     if (!projectResource.spec.json
         || projectResource.spec.json === '{}'
         || projectResource.spec.json.length === 0
-        || !JSON.parse(projectResource.spec.json).nodes
-        || JSON.parse(projectResource.spec.json).nodes?.length === 0) {
+        || !JSON.parse(projectResource.spec.json)?.nodes
+        || JSON.parse(projectResource.spec.json)?.nodes?.length === 0) {
         const message = `unable to generate code, have at least a node added to your project: ${projectResource.spec.displayName}[${projectId}].`;
         return resource.status(500).json(getGenerateCodeError(message));
     }

app/src/routes/models.ts

@@ -88,7 +88,14 @@ export interface CompageEdge {
 export interface CompageJson {
     edges: Map<string, CompageEdge>;
     nodes: Map<string, CompageNode>;
-    version: string;
+    version?: string;
+    workspace?: any;
+    undoHistory?: any;
+    potentialNode?: any;
+    potentialEdge?: any;
+    plugins?: any;
+    panels?: any;
+    editor?: any;
 }
 
 export interface Repository {
@@ -202,7 +209,14 @@ export const initializeEmptyProjectEntity = () => {
     const json: CompageJson = {
         edges: new Map<string, CompageEdge>(),
         nodes: new Map<string, CompageNode>(),
-        version: ''
+        version: '',
+        editor: {},
+        panels: {},
+        plugins: {},
+        undoHistory: {},
+        workspace: {},
+        potentialEdge: {},
+        potentialNode: {}
     };
     const projectEntity: ProjectEntity = {
         displayName: '',

ui/src/components/diagram-maker/diagram-maker-container.tsx

@@ -71,7 +71,7 @@ import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import {getCurrentUserName} from "../../utils/sessionstorage-client";
 import {useNavigate} from "react-router-dom";
-import {CompageEdge, CompageJson, CompageJsonConfig, CompageNode} from "./models";
+import {CompageEdge, CompageJson, CompageNode} from "./models";
 
 interface ArgTypes {
     initialData?: DiagramMakerData<{}, {}>;
@@ -360,7 +360,7 @@ export const DiagramMakerContainer = ({
                         if (diagramMakerAction.payload.edgeIds.length > 0 || diagramMakerAction.payload.nodeIds.length > 0) {
                             if (window.confirm(message)) {
                                 // delete the sourceNodes info from destination nodes for the edges getting deleted.
-                                const parsedCurrentConfig: CompageJsonConfig = getParsedCurrentConfig();
+                                const parsedCurrentConfig: CompageJson = getParsedCurrentConfig();
                                 const parsedModifiedState: CompageJson = getParsedModifiedState();
                                 for (const item of diagramMakerAction.payload.edgeIds) {
                                     // iterate over edges and extract nodes and modify the clients

ui/src/components/diagram-maker/helper/helper.ts

@@ -1,5 +1,5 @@
 import {getCurrentConfig, getModifiedState, setModifiedState} from "../../../utils/localstorage-client";
-import {CompageEdge, CompageJson, CompageJsonConfig, CompageNode} from "../models";
+import {CompageEdge, CompageJson, CompageNode} from "../models";
 
 export const cleanse = (state: string) => {
     if (state === undefined || state === null || (!state || state === "{}")) {
@@ -97,7 +97,7 @@ export const getParsedModifiedState = (): CompageJson => {
 };
 
 
-export const getParsedCurrentConfig = (): CompageJsonConfig => {
+export const getParsedCurrentConfig = (): CompageJson => {
     const currentConfig = getCurrentConfig();
 
     if (currentConfig && currentConfig !== "{}") {

ui/src/components/diagram-maker/models.ts

@@ -91,19 +91,13 @@ export interface CompageJson {
     edges: Map<string, CompageEdge>;
     nodes: Map<string, CompageNode>;
     version?: string;
-}
-
-export interface CompageJsonConfig {
-    edges: Map<string, CompageEdge>;
-    nodes: Map<string, CompageNode>;
-    version?: string;
-    workspace: any;
-    undoHistory: any;
-    potentialNode: any;
-    potentialEdge: any;
-    plugins: any;
-    panels: any;
-    editor: any;
+    workspace?: any;
+    undoHistory?: any;
+    potentialNode?: any;
+    potentialEdge?: any;
+    plugins?: any;
+    panels?: any;
+    editor?: any;
 }
 
 // empty interfaces