fix after rebase

Author: paula-stacho

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

@@ -174,7 +174,8 @@ const DiagramContent: React.FunctionComponent<{
         !!selectedItems &&
         selectedItems.type === 'collection' &&
         selectedItems.id === coll.ns;
-      return collectionToDiagramNode(coll, {
+      return collectionToDiagramNode({
+        ...coll,
         highlightedFields,
         selectedField:
           selectedItems?.type === 'field' && selectedItems.namespace === coll.ns

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

@@ -57,12 +57,6 @@ const EditSchemaVariants = z.discriminatedUnion('type', [
     type: z.literal('SetModel'),
     model: StaticModelSchema,
   }),
-  z.object({
-    type: z.literal('AddField'),
-    ns: z.string(),
-    field: z.array(z.string()),
-    jsonSchema: z.custom<MongoDBJSONSchema>(),
-  }),
   z.object({
     type: z.literal('AddRelationship'),
     relationship: RelationshipSchema,

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

@@ -27,7 +27,10 @@ import {
 } from '../services/open-and-download-diagram';
 import type { MongoDBJSONSchema } from 'mongodb-schema';
 import { getCoordinatesForNewNode } from '@mongodb-js/diagramming';
-import { collectionToDiagramNode } from '../utils/nodes-and-edges';
+import {
+  collectionToBaseNodeForLayout,
+  collectionToDiagramNode,
+} from '../utils/nodes-and-edges';
 import toNS from 'mongodb-ns';
 import { traverseSchema } from '../utils/schema-traversal';
 import { addFieldToJSONSchema, getNewUnusedFieldName } from '../utils/schema';
@@ -690,9 +693,9 @@ function getPositionForNewCollection(
   newCollection: Omit<DataModelCollection, 'displayPosition'>
 ): [number, number] {
   const existingNodes = existingCollections.map((collection) =>
-    collectionToDiagramNode(collection)
+    collectionToBaseNodeForLayout(collection)
   );
-  const newNode = collectionToDiagramNode({
+  const newNode = collectionToBaseNodeForLayout({
     ns: newCollection.ns,
     jsonSchema: newCollection.jsonSchema,
     displayPosition: [0, 0],