fix: temporarily revert DM collapse functionality

packages/compass-components/src/index.ts

@@ -242,7 +242,6 @@ export {
 export type {
   EdgeProps,
   NodeProps,
-  FieldId,
   DiagramInstance,
   NodeField,
   NodeGlyph,

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

@@ -25,7 +25,6 @@ describe('DiagramCard', () => {
                 displayPosition: [0, 0],
                 shardKey: {},
                 jsonSchema: { bsonType: 'object' },
-                isExpanded: true,
               },
             ],
             relationships: [],

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

@@ -44,15 +44,13 @@ const storageItems: MongoDBDataModelDescription[] = [
               displayPosition: [50, 50],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
             {
               ns: 'db1.collection2',
               indexes: [],
               displayPosition: [150, 150],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ],
           relationships: [],
@@ -79,15 +77,13 @@ const storageItems: MongoDBDataModelDescription[] = [
               displayPosition: [0, 0],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
             {
               ns: 'db1.collection2',
               indexes: [],
               displayPosition: [0, 0],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ],
           relationships: [],

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

@@ -19,13 +19,8 @@ import {
   createNewRelationship,
   addCollection,
   selectField,
-  toggleCollectionExpanded,
 } from '../store/diagram';
-import type {
-  EdgeProps,
-  NodeProps,
-  FieldId,
-} from '@mongodb-js/compass-components';
+import type { EdgeProps, NodeProps } from '@mongodb-js/compass-components';
 import {
   Banner,
   CancelLoader,
@@ -152,7 +147,6 @@ const DiagramContent: React.FunctionComponent<{
   }) => void;
   onRelationshipDrawn: () => void;
   DiagramComponent?: typeof Diagram;
-  onToggleCollectionExpanded: (namespace: string) => void;
 }> = ({
   diagramLabel,
   database,
@@ -171,7 +165,6 @@ const DiagramContent: React.FunctionComponent<{
   onRelationshipDrawn,
   selectedItems,
   DiagramComponent = Diagram,
-  onToggleCollectionExpanded,
 }) => {
   const isDarkMode = useDarkMode();
   const diagram = useRef(useDiagram());
@@ -217,7 +210,6 @@ const DiagramContent: React.FunctionComponent<{
             : undefined,
         selected,
         isInRelationshipDrawingMode,
-        isExpanded: coll.isExpanded,
       });
     });
   }, [
@@ -300,24 +292,9 @@ const DiagramContent: React.FunctionComponent<{
   );
 
   const onFieldClick = useCallback(
-    (
-      _evt: React.MouseEvent,
-      { id, nodeId: namespace }: { id: FieldId; nodeId: string }
-    ) => {
-      // Diagramming package accepts both string ids and array of string ids for
-      // fields (to represent the field path better). While all current code in
-      // compass always uses array of strings as field id, some older saved
-      // diagrams might not. Also handling this explicitly is sort of needed
-      // anyway to convinve typescript that we're doing the right thing
-      const fieldPath = Array.isArray(id)
-        ? id
-        : typeof id === 'string'
-        ? [id]
-        : undefined;
-      if (!fieldPath) {
-        return;
-      }
+    (_evt: React.MouseEvent, { id: fieldPath, nodeId: namespace }) => {
       _evt.stopPropagation(); // TODO(COMPASS-9659): should this be handled by the diagramming package?
+      if (!Array.isArray(fieldPath)) return; // TODO(COMPASS-9659): could be avoided with generics in the diagramming package
       onFieldSelect(namespace, fieldPath);
       openDrawer(DATA_MODELING_DRAWER_ID);
     },
@@ -357,15 +334,6 @@ const DiagramContent: React.FunctionComponent<{
     [onAddFieldToObjectField]
   );
 
-  const handleNodeExpandedToggle = useCallback(
-    (evt: React.MouseEvent, nodeId: string) => {
-      evt.preventDefault();
-      evt.stopPropagation();
-      onToggleCollectionExpanded(nodeId);
-    },
-    [onToggleCollectionExpanded]
-  );
-
   const diagramProps = useMemo(
     () => ({
       isDarkMode,
@@ -380,7 +348,6 @@ const DiagramContent: React.FunctionComponent<{
       onFieldClick,
       onNodeDragStop,
       onConnect,
-      onNodeExpandToggle: handleNodeExpandedToggle,
     }),
     [
       isDarkMode,
@@ -395,7 +362,6 @@ const DiagramContent: React.FunctionComponent<{
       onFieldClick,
       onNodeDragStop,
       onConnect,
-      handleNodeExpandedToggle,
     ]
   );
 
@@ -458,7 +424,6 @@ const ConnectedDiagramContent = connect(
     onFieldSelect: selectField,
     onDiagramBackgroundClicked: selectBackground,
     onCreateNewRelationship: createNewRelationship,
-    onToggleCollectionExpanded: toggleCollectionExpanded,
   }
 )(DiagramContent);
 

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

@@ -30,7 +30,6 @@ const storageItems: MongoDBDataModelDescription[] = [
               displayPosition: [1, 1],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ],
           relationships: [],
@@ -57,7 +56,6 @@ const storageItems: MongoDBDataModelDescription[] = [
               displayPosition: [2, 2],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ],
           relationships: [],
@@ -84,7 +82,6 @@ const storageItems: MongoDBDataModelDescription[] = [
               displayPosition: [3, 3],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ],
           relationships: [],

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

@@ -36,7 +36,6 @@ const CollectionSchema = z.object({
   shardKey: z.record(z.unknown()).optional(),
   displayPosition: z.tuple([z.number(), z.number()]),
   note: z.string().optional(),
-  isExpanded: z.boolean().default(false),
 });
 
 export type DataModelCollection = z.output<typeof CollectionSchema>;
@@ -133,10 +132,6 @@ const EditSchemaVariants = z.discriminatedUnion('type', [
     field: FieldPathSchema,
     jsonSchema: z.custom<MongoDBJSONSchema>(),
   }),
-  z.object({
-    type: z.literal('ToggleExpandCollection'),
-    ns: z.string(),
-  }),
 ]);
 
 export const EditSchema = z.intersection(EditSchemaBase, EditSchemaVariants);

packages/compass-data-modeling/src/store/analysis-process.ts

@@ -162,7 +162,6 @@ async function getInitialLayout({
       ns: coll.ns,
       jsonSchema: coll.schema,
       displayPosition: [0, 0],
-      isExpanded: false,
     });
   });
   return await applyLayout({

packages/compass-data-modeling/src/store/apply-edit.ts

@@ -46,7 +46,6 @@ export function applyEdit(edit: Edit, model?: StaticModel): StaticModel {
         jsonSchema: edit.initialSchema,
         displayPosition: edit.position,
         indexes: [],
-        isExpanded: false,
       };
       return {
         ...model,
@@ -246,20 +245,6 @@ export function applyEdit(edit: Edit, model?: StaticModel): StaticModel {
         }),
       };
     }
-    case 'ToggleExpandCollection': {
-      return {
-        ...model,
-        collections: model.collections.map((collection) => {
-          if (collection.ns !== edit.ns) {
-            return collection;
-          }
-          return {
-            ...collection,
-            isExpanded: !collection.isExpanded,
-          };
-        }),
-      };
-    }
     default: {
       return model;
     }

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

@@ -27,15 +27,13 @@ const model: StaticModel = {
       displayPosition: [0, 0],
       shardKey: {},
       jsonSchema: { bsonType: 'object' },
-      isExpanded: true,
     },
     {
       ns: 'db.collection2',
       indexes: [],
       displayPosition: [1, 1],
       shardKey: {},
       jsonSchema: { bsonType: 'object' },
-      isExpanded: true,
     },
   ],
   relationships: [
@@ -150,7 +148,6 @@ describe('Data Modeling store', function () {
               displayPosition: [0, 0],
               shardKey: {},
               jsonSchema: { bsonType: 'object' },
-              isExpanded: true,
             },
           ] as StaticModel['collections'],
           relationships: [] as StaticModel['relationships'],
@@ -437,7 +434,6 @@ describe('Data Modeling store', function () {
                     field3: { bsonType: 'int' },
                   },
                 },
-                isExpanded: true,
               },
             ],
             relationships: [],
@@ -464,7 +460,6 @@ describe('Data Modeling store', function () {
                 indexes: [],
                 displayPosition: [0, 0],
                 shardKey: {},
-                isExpanded: true,
                 jsonSchema: {
                   bsonType: 'object',
                   properties: {

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

@@ -189,13 +189,9 @@ export const diagramReducer: Reducer<DiagramState> = (
               collections: action.collections.map((collection) => ({
                 ns: collection.ns,
                 jsonSchema: collection.schema,
-                displayPosition: [
-                  collection.position.x,
-                  collection.position.y,
-                ] as const,
+                displayPosition: [collection.position.x, collection.position.y],
                 indexes: [],
                 shardKey: undefined,
-                isExpanded: false,
               })),
               relationships: action.relations,
             },
@@ -451,10 +447,6 @@ export function selectBackground(): DiagramBackgroundSelectedAction {
   };
 }
 
-export function toggleCollectionExpanded(namespace: string) {
-  return applyEdit({ type: 'ToggleExpandCollection', ns: namespace });
-}
-
 export function createNewRelationship({
   localNamespace,
   foreignNamespace = null,
@@ -851,7 +843,6 @@ function getPositionForNewCollection(
     ns: newCollection.ns,
     jsonSchema: newCollection.jsonSchema,
     displayPosition: [0, 0],
-    isExpanded: newCollection.isExpanded,
   });
   const xyposition = getCoordinatesForNewNode(existingNodes, newNode);
   return [xyposition.x, xyposition.y];
@@ -884,17 +875,12 @@ export function addCollection(
     const existingCollections = selectCurrentModelFromState(
       getState()
     ).collections;
-
-    if (!ns) {
-      ns = getNameForNewCollection(existingCollections);
-    }
-
+    if (!ns) ns = getNameForNewCollection(existingCollections);
     if (!position) {
       position = getPositionForNewCollection(existingCollections, {
         ns,
         jsonSchema: {} as MongoDBJSONSchema,
         indexes: [],
-        isExpanded: false,
       });
     }