Skip to content

Commit 10d7147

Browse files
committed
fix after rebase
1 parent 3730b00 commit 10d7147

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ const DiagramContent: React.FunctionComponent<{
174174
!!selectedItems &&
175175
selectedItems.type === 'collection' &&
176176
selectedItems.id === coll.ns;
177-
return collectionToDiagramNode(coll, {
177+
return collectionToDiagramNode({
178+
...coll,
178179
highlightedFields,
179180
selectedField:
180181
selectedItems?.type === 'field' && selectedItems.namespace === coll.ns

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ import {
2727
} from '../services/open-and-download-diagram';
2828
import type { MongoDBJSONSchema } from 'mongodb-schema';
2929
import { getCoordinatesForNewNode } from '@mongodb-js/diagramming';
30-
import { collectionToDiagramNode } from '../utils/nodes-and-edges';
30+
import {
31+
collectionToBaseNodeForLayout,
32+
collectionToDiagramNode,
33+
} from '../utils/nodes-and-edges';
3134
import toNS from 'mongodb-ns';
3235
import { traverseSchema } from '../utils/schema-traversal';
3336
import { applyEdit as _applyEdit } from './apply-edit';
@@ -716,9 +719,9 @@ function getPositionForNewCollection(
716719
newCollection: Omit<DataModelCollection, 'displayPosition'>
717720
): [number, number] {
718721
const existingNodes = existingCollections.map((collection) =>
719-
collectionToDiagramNode(collection)
722+
collectionToBaseNodeForLayout(collection)
720723
);
721-
const newNode = collectionToDiagramNode({
724+
const newNode = collectionToBaseNodeForLayout({
722725
ns: newCollection.ns,
723726
jsonSchema: newCollection.jsonSchema,
724727
displayPosition: [0, 0],

0 commit comments

Comments
 (0)