type edits as a non empty array

Author: paula-stacho

packages/compass-data-modeling/src/components/diagram-card.spec.tsx

@@ -2,14 +2,33 @@ import React from 'react';
 import { expect } from 'chai';
 import { render, screen } from '@mongodb-js/testing-library-compass';
 import { DiagramCard } from './diagram-card';
+import type { Edit } from '../services/data-model-storage';
 
 describe('DiagramCard', () => {
   const props = {
     diagram: {
       id: 'test-diagram',
       connectionId: 'test-connection',
       name: 'Test Diagram',
-      edits: [],
+      edits: [
+        {
+          id: 'edit-id',
+          timestamp: '2023-10-01T00:00:00.000Z',
+          type: 'SetModel',
+          model: {
+            collections: [
+              {
+                ns: 'db.collection',
+                indexes: [],
+                displayPosition: [0, 0],
+                shardKey: {},
+                jsonSchema: { bsonType: 'object' },
+              },
+            ],
+            relationships: [],
+          },
+        },
+      ] as [Edit],
       lastModified: new Date('2025-01-01').getTime(),
       databases: 'someDatabase',
     },

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

@@ -79,8 +79,8 @@ export function DiagramCard({
   onDelete,
 }: {
   diagram: MongoDBDataModelDescription & {
-    lastModified?: number;
-    databases?: string;
+    lastModified: number;
+    databases: string;
   };
   onOpen: (diagram: MongoDBDataModelDescription) => void;
   onRename: (id: string) => void;

packages/compass-data-modeling/src/components/saved-diagrams-list.spec.tsx

@@ -15,23 +15,41 @@ const storageItems: MongoDBDataModelDescription[] = [
   {
     id: '1',
     name: 'One',
-    edits: [],
+    edits: [
+      {
+        id: 'edit-id-1',
+        timestamp: '2023-10-01T00:00:00.000Z',
+        type: 'SetModel',
+        model: {
+          collections: [
+            {
+              ns: 'db1.collection1',
+              indexes: [],
+              displayPosition: [1, 1],
+              shardKey: {},
+              jsonSchema: { bsonType: 'object' },
+            },
+          ],
+          relationships: [],
+        },
+      },
+    ],
     connectionId: null,
   },
   {
     id: '2',
     name: 'Two',
     edits: [
       {
-        id: 'edit-id',
+        id: 'edit-id-2',
         timestamp: '2023-10-01T00:00:00.000Z',
         type: 'SetModel',
         model: {
           collections: [
             {
               ns: 'db2.collection2',
               indexes: [],
-              displayPosition: [0, 0],
+              displayPosition: [2, 2],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
             },
@@ -45,7 +63,25 @@ const storageItems: MongoDBDataModelDescription[] = [
   {
     id: '3',
     name: 'Three',
-    edits: [],
+    edits: [
+      {
+        id: 'edit-id-3',
+        timestamp: '2023-10-01T00:00:00.000Z',
+        type: 'SetModel',
+        model: {
+          collections: [
+            {
+              ns: 'db3.collection3',
+              indexes: [],
+              displayPosition: [3, 3],
+              shardKey: {},
+              jsonSchema: { bsonType: 'object' },
+            },
+          ],
+          relationships: [],
+        },
+      },
+    ],
     connectionId: null,
   },
 ];

packages/compass-data-modeling/src/components/saved-diagrams-list.tsx

@@ -141,13 +141,11 @@ export const SavedDiagramsList: React.FunctionComponent<{
   const { items, status } = useDataModelSavedItems();
   const decoratedItems = useMemo<
     (MongoDBDataModelDescription & {
-      lastModified?: number;
-      databases?: string;
+      lastModified: number;
+      databases: string;
     })[]
   >(() => {
     return items.map((item) => {
-      if (!item.edits.length) return item;
-
       const databases = new Set(
         getCurrentModel(item).collections.map(({ ns }) => toNS(ns).database)
       );

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

@@ -88,7 +88,7 @@ export const MongoDBDataModelDescriptionSchema = z.object({
    */
   connectionId: z.string().nullable(),
 
-  edits: z.array(EditSchema).default([]),
+  edits: z.array(EditSchema).nonempty(),
 });
 
 export type MongoDBDataModelDescription = z.output<

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

@@ -12,11 +12,15 @@ import { memoize } from 'lodash';
 import type { DataModelingState, DataModelingThunkAction } from './reducer';
 import { showConfirmation, showPrompt } from '@mongodb-js/compass-components';
 
+function isNonEmptyArray<T>(arr: T[]): arr is [T, ...T[]] {
+  return Array.isArray(arr) && arr.length > 0;
+}
+
 export type DiagramState =
   | (Omit<MongoDBDataModelDescription, 'edits'> & {
       edits: {
         prev: Edit[][];
-        current: Edit[];
+        current: [Edit, ...Edit[]];
         next: Edit[][];
       };
       editErrors?: string[];
@@ -154,8 +158,8 @@ export const diagramReducer: Reducer<DiagramState> = (
     };
   }
   if (isAction(action, DiagramActionTypes.UNDO_EDIT)) {
-    const newCurrent = state.edits.prev.pop();
-    if (!newCurrent) {
+    const newCurrent = state.edits.prev.pop() || [];
+    if (!isNonEmptyArray(newCurrent)) {
       return state;
     }
     return {
@@ -168,8 +172,8 @@ export const diagramReducer: Reducer<DiagramState> = (
     };
   }
   if (isAction(action, DiagramActionTypes.REDO_EDIT)) {
-    const newCurrent = state.edits.next.pop();
-    if (!newCurrent) {
+    const newCurrent = state.edits.next.pop() || [];
+    if (!isNonEmptyArray(newCurrent)) {
       return state;
     }
     return {