Skip to content

feat(data-modeling): show previous edits when opening the diagram COMPASS-9544 #7106

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

Merged
merged 3 commits into from
Jul 14, 2025
Merged

feat(data-modeling): show previous edits when opening the diagram COMPASS-9544 #7106

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
326b817
allow previous edits
mabaasit Jul 11, 2025
ee7c8f5
add test
mabaasit Jul 11, 2025
68c85f6
Merge branch 'main' into COMPASS-9544-allow-prev-state-on-diagram-open
mabaasit Jul 11, 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
7 changes: 5 additions & 2 deletions packages/compass-data-modeling/src/store/diagram.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,14 @@ export const diagramReducer: Reducer<DiagramState> = (
action
) => {
if (isAction(action, DiagramActionTypes.OPEN_DIAGRAM)) {
const current = action.diagram.edits;
Copy link

Copilot AI Jul 11, 2025

Choose a reason for hiding this comment

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

This logic creates an array of progressively longer slices but could be clearer. Consider adding a comment explaining that this reconstructs the edit history states for undo functionality.

Suggested change
const current = action.diagram.edits;
const current = action.diagram.edits;
// Reconstruct the edit history states for undo functionality by creating an array of progressively longer slices of the `current` edits array.

Copilot uses AI. Check for mistakes.
const prev = current.map((_item, index, arr) => arr.slice(0, index + 1));
prev.shift(); // Remove the first item, which is initial SetModel and there's no previous edit for it.
return {
...action.diagram,
edits: {
prev: [],
current: action.diagram.edits,
prev,
current,
next: [],
},
};
Expand Down
48 changes: 48 additions & 0 deletions packages/compass-e2e-tests/tests/data-modeling-tab.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,54 @@ describe('Data Modeling tab', function () {
.waitForDisplayed({ reverse: true });
});

it('allows undo after opening a diagram', async function () {
const dataModelName = 'Test Data Model - Undo After Open';
await setupDiagram(browser, {
diagramName: dataModelName,
connectionName: DEFAULT_CONNECTION_NAME_1,
databaseName: 'test',
});

const dataModelEditor = browser.$(Selectors.DataModelEditor);
await dataModelEditor.waitForDisplayed();

const testCollection1 = browser.$(
Selectors.DataModelPreviewCollection('test.testCollection-one')
);
const startPosition = await testCollection1.getLocation();
const nodeSize = await testCollection1.getSize();

await browser
.action('pointer')
.move({
x: Math.round(startPosition.x + nodeSize.width / 2),
y: Math.round(startPosition.y + nodeSize.height / 2),
})
.down({ button: 0 }) // Left mouse button
.move({ x: 100, y: 0, duration: 1000, origin: 'pointer' })
.pause(1000)
.move({ x: 100, y: 0, duration: 1000, origin: 'pointer' })
.up({ button: 0 }) // Release the left mouse button
.perform();
await browser.waitForAnimations(dataModelEditor);

// Open the saved diagram in new tab
await browser.openNewTab();
await browser.clickVisible(Selectors.DataModelsListItem(dataModelName));
await browser.$(Selectors.DataModelEditor).waitForDisplayed();

// Ensure that undo button is enabled
await browser.waitForAriaDisabled(Selectors.DataModelUndoButton, false);

// Undo the change
await browser.clickVisible(Selectors.DataModelUndoButton);
await browser.waitForAnimations(dataModelEditor);

// Ensure that undo button is now disabled and redo is enabled
await browser.waitForAriaDisabled(Selectors.DataModelUndoButton, true);
await browser.waitForAriaDisabled(Selectors.DataModelRedoButton, false);
});

it('exports the data model to JSON', async function () {
const dataModelName = 'Test Export Model - JSON';
exportFileName = `${dataModelName}.json`;
Expand Down
Loading