Skip to content

feat(data-modeling): allow inline field type changes COMPASS-9799 #7514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mabaasit wants to merge 6 commits into
base: main
Choose a base branch
from
+192 −56
Open

feat(data-modeling): allow inline field type changes COMPASS-9799 #7514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83e7177
dump lg select and fix tests
mabaasit Oct 29, 2025
3e6cfaa
integrate with local version
mabaasit Oct 29, 2025
b3ddf53
Merge branch 'main' of https://github.com/mongodb-js/compass into COM…
mabaasit Dec 11, 2025
56d6196
bootstrap
mabaasit Dec 11, 2025
39bc533
undo irrelevant changes
mabaasit Dec 11, 2025
a7e3113
pr feedback
mabaasit Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 156 additions & 45 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/compass-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@lg-chat/leafygreen-chat-provider": "^5.0.2",
"@lg-chat/message": "^8.2.0",
"@mongodb-js/compass-context-menu": "^0.3.1",
"@mongodb-js/diagramming": "^2.2.1",
"@mongodb-js/diagramming": "^2.2.2",
"@react-aria/interactions": "^3.9.1",
"@react-aria/utils": "^3.13.1",
"@react-aria/visually-hidden": "^3.3.1",
Expand Down
25 changes: 25 additions & 0 deletions packages/compass-data-modeling/src/components/diagram-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
deleteRelationship,
removeField,
renameField,
changeFieldType,
toggleCollectionExpanded,
} from '../store/diagram';
import type {
Expand Down Expand Up @@ -60,6 +61,7 @@ import {
relationshipToDiagramEdge,
} from '../utils/nodes-and-edges';
import toNS from 'mongodb-ns';
import { FIELD_TYPES } from '../utils/field-types';
import { getNamespaceRelationships } from '../utils/utils';
import { usePreference } from 'compass-preferences-model/provider';

Expand Down Expand Up @@ -185,6 +187,12 @@ const DiagramContent: React.FunctionComponent<{
newName: string;
source: 'diagram';
}) => void;
onChangeFieldType: (data: {
ns: string;
fieldPath: FieldPath;
newTypes: string[];
source: 'diagram';
}) => void;
onDiagramBackgroundClicked: () => void;
onDeleteCollection: (ns: string) => void;
onDeleteRelationship: (rId: string) => void;
Expand Down Expand Up @@ -214,6 +222,7 @@ const DiagramContent: React.FunctionComponent<{
onRelationshipSelect,
onFieldSelect,
onRenameField,
onChangeFieldType,
onDiagramBackgroundClicked,
onCreateNewRelationship,
onRelationshipDrawn,
Expand Down Expand Up @@ -414,6 +423,18 @@ const DiagramContent: React.FunctionComponent<{
[onAddFieldToObjectField]
);

const onFieldTypeChange = useCallback(
(ns: string, fieldPath: FieldPath, newTypes: string[]) => {
onChangeFieldType({
ns,
fieldPath,
newTypes,
source: 'diagram',
});
},
[onChangeFieldType]
);

const deleteItem = useCallback(() => {
switch (selectedItems?.type) {
case 'collection':
Expand Down Expand Up @@ -463,11 +484,13 @@ const DiagramContent: React.FunctionComponent<{
onFieldClick,
onFieldNameChange: (ns, field, newName) =>
onRenameField({ ns, field, newName, source: 'diagram' }),
onFieldTypeChange,
onNodeDragStop,
onConnect,
onNodeExpandToggle: isCollapseFlagEnabled
? handleNodeExpandedToggle
: undefined,
fieldTypes: FIELD_TYPES,
Copy link

Copilot AI Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new fieldTypes prop being passed to the diagram is not covered by tests. Consider adding test coverage to verify that the field types are correctly passed and rendered in the diagram component.

Copilot uses AI. Check for mistakes.
} satisfies DiagramProps),
[
isDarkMode,
Expand All @@ -481,6 +504,7 @@ const DiagramContent: React.FunctionComponent<{
onEdgeClick,
onFieldClick,
onRenameField,
onFieldTypeChange,
onNodeDragStop,
onConnect,
handleNodeExpandedToggle,
Expand Down Expand Up @@ -547,6 +571,7 @@ const ConnectedDiagramContent = connect(
onRelationshipSelect: selectRelationship,
onFieldSelect: selectField,
onRenameField: renameField,
onChangeFieldType: changeFieldType,
onDiagramBackgroundClicked: selectBackground,
onCreateNewRelationship: createNewRelationship,
onDeleteCollection: deleteCollection,
Expand Down
Loading
Loading