test and cleanup

Author: paula-stacho

packages/compass-data-modeling/src/components/diagram-editor.tsx

@@ -221,7 +221,6 @@ const DiagramEditor: React.FunctionComponent<{
 
   const applyInitialLayout = useCallback(
     async (storedNodes: NodeProps[]) => {
-      console.log('INITIAL STATE: applying layout');
       try {
         const { nodes: positionedNodes } = await applyLayout(
           storedNodes,

packages/compass-data-modeling/src/services/data-model-storage.ts

@@ -100,8 +100,6 @@ export const MongoDBDataModelDescriptionSchema = z.object({
   updatedAt: z.string().datetime(),
 });
 
-type SetModelEdit = Extract<Edit, { type: 'SetModel' }>;
-
 export type MongoDBDataModelDescription = z.output<
   typeof MongoDBDataModelDescriptionSchema
 >;

packages/compass-data-modeling/src/store/diagram.spec.ts

@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { type DataModelingStore, setupStore } from '../../test/setup-store';
 import {
   applyEdit,
+  applyInitialLayout,
   getCurrentDiagramFromState,
   openDiagram,
   redoEdit,
@@ -67,17 +68,83 @@ describe('Data Modeling store', function () {
     store = setupStore();
   });
 
-  it('openDiagram', function () {
-    store.dispatch(openDiagram(loadedDiagram));
+  describe('New Diagram', function () {
+    it('handles analysis finished + initial positions', function () {
+      // ANALYSIS FINISHED
+      const newDiagram = {
+        name: 'New Diagram',
+        connectionId: 'connection-id',
+        collections: [
+          { ns: 'collection1', schema: model.collections[0].jsonSchema },
+          { ns: 'collection2', schema: model.collections[1].jsonSchema },
+        ],
+        relations: model.relationships,
+      };
+      store.dispatch({
+        type: 'data-modeling/analysis-stats/ANALYSIS_FINISHED',
+        ...newDiagram,
+      });
 
-    const diagram = getCurrentDiagramFromState(store.getState());
-    expect(diagram.id).to.equal(loadedDiagram.id);
-    expect(diagram.name).to.equal(loadedDiagram.name);
-    expect(diagram.connectionId).to.equal(loadedDiagram.connectionId);
-    expect(diagram.edits).to.deep.equal(loadedDiagram.edits);
+      const initialDiagram = getCurrentDiagramFromState(store.getState());
+      expect(initialDiagram.name).to.equal(newDiagram.name);
+      expect(initialDiagram.connectionId).to.equal(newDiagram.connectionId);
+      expect(initialDiagram.edits).to.have.length(1);
+      expect(initialDiagram.edits[0].type).to.equal('SetModel');
+      expect(initialDiagram.edits[0].model.collections[0]).to.deep.include({
+        ns: newDiagram.collections[0].ns,
+        jsonSchema: newDiagram.collections[0].schema,
+        displayPosition: [-1, -1],
+      });
+      expect(initialDiagram.edits[0].model.collections[1]).to.deep.include({
+        ns: newDiagram.collections[1].ns,
+        jsonSchema: newDiagram.collections[1].schema,
+        displayPosition: [-1, -1],
+      });
+      expect(initialDiagram.edits[0].model.relationships).to.deep.equal(
+        newDiagram.relations
+      );
+
+      // INITIAL LAYOUT
+      const positions: Record<string, [number, number]> = {
+        [newDiagram.collections[0].ns]: [10, 10],
+        [newDiagram.collections[1].ns]: [50, 50],
+      };
+      store.dispatch(applyInitialLayout(positions));
+
+      const diagramWithLayout = getCurrentDiagramFromState(store.getState());
+      expect(diagramWithLayout.name).to.equal(newDiagram.name);
+      expect(diagramWithLayout.connectionId).to.equal(newDiagram.connectionId);
+      expect(diagramWithLayout.edits).to.have.length(1);
+      expect(diagramWithLayout.edits[0].type).to.equal('SetModel');
+      expect(diagramWithLayout.edits[0].model.collections[0]).to.deep.include({
+        ns: newDiagram.collections[0].ns,
+        jsonSchema: newDiagram.collections[0].schema,
+        displayPosition: positions[newDiagram.collections[0].ns],
+      });
+      expect(diagramWithLayout.edits[0].model.collections[1]).to.deep.include({
+        ns: newDiagram.collections[1].ns,
+        jsonSchema: newDiagram.collections[1].schema,
+        displayPosition: positions[newDiagram.collections[1].ns],
+      });
+      expect(diagramWithLayout.edits[0].model.relationships).to.deep.equal(
+        newDiagram.relations
+      );
+    });
+  });
+
+  describe('Existing Diagram', function () {
+    it('openDiagram', function () {
+      store.dispatch(openDiagram(loadedDiagram));
+
+      const diagram = getCurrentDiagramFromState(store.getState());
+      expect(diagram.id).to.equal(loadedDiagram.id);
+      expect(diagram.name).to.equal(loadedDiagram.name);
+      expect(diagram.connectionId).to.equal(loadedDiagram.connectionId);
+      expect(diagram.edits).to.deep.equal(loadedDiagram.edits);
+    });
   });
 
-  describe('applyEdit', function () {
+  describe('Editing', function () {
     it('should apply a valid SetModel edit', function () {
       store.dispatch(openDiagram(loadedDiagram));