Skip to content

Enable Boolean op deletion from the feature tree #6637

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
pierremtb merged 3 commits into from
May 2, 2025
Merged

Enable Boolean op deletion from the feature tree #6637

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
524bffe
Can't Delete Union From Feature Tree
pierremtb May 1, 2025
39fbda4
Merge branch 'main' into pierremtb/issue6584-Cant-Delete-Union-From-F…
pierremtb May 2, 2025
eab8efb
Change tests to right-click > Delete
pierremtb May 2, 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
16 changes: 16 additions & 0 deletions e2e/playwright/boolean.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,22 @@ test.describe('Point and click for boolean workflows', () => {

await editor.expectEditor.toContain(operation.code)
})

await test.step(`Delete ${operationName} operation via feature tree selection`, async () => {
await toolbar.openPane('feature-tree')
const ftOp = await toolbar.getFeatureTreeOperation(operationName, 0)
await ftOp.click({ button: 'left' })
await page.keyboard.press('Delete')
await scene.settled(cmdBar)
await toolbar.closePane('feature-tree')

// Expect changes in ft and code
await toolbar.openPane('code')
await editor.expectEditor.not.toContain(operation.code)
await expect(
await toolbar.getFeatureTreeOperation(operationName, 0)
).not.toBeVisible()
})
Copy link
Contributor Author

@pierremtb pierremtb May 1, 2025

Choose a reason for hiding this comment

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

Somehow this wasn't working well locally

Copy link
Contributor

@franknoirot franknoirot May 2, 2025

Choose a reason for hiding this comment

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

Which line was failing? I'm guessing this one?

        await editor.expectEditor.not.toContain(operation.code)

Copy link
Contributor Author

@pierremtb pierremtb May 2, 2025

Choose a reason for hiding this comment

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

It just doesn't delete in the test, so weird. Working on it now

Copy link
Contributor Author

@pierremtb pierremtb May 2, 2025

Choose a reason for hiding this comment

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

Went with right click -> Delete and that seems much better

Copy link
Contributor

@franknoirot franknoirot May 2, 2025

Choose a reason for hiding this comment

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

Or is it possible that execution and population of the feature tree were taking longer than the test could allow?

Copy link
Contributor Author

@pierremtb pierremtb May 2, 2025

Choose a reason for hiding this comment

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

I also added scene.settled, should be better I think!

})
}
})
2 changes: 2 additions & 0 deletions src/lang/modifyAst/deleteFromSelection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ export async function deleteFromSelection(
varDec.node.init.type === 'PipeExpression') ||
selection.artifact?.type === 'sweep' ||
selection.artifact?.type === 'plane' ||
selection.artifact?.type === 'compositeSolid' ||
selection.artifact?.type === 'helix' ||
!selection.artifact // aka expected to be a shell at this point
) {
Expand All @@ -170,6 +171,7 @@ export async function deleteFromSelection(
selection.artifact &&
selection.artifact.type !== 'sweep' &&
selection.artifact.type !== 'plane' &&
selection.artifact.type !== 'compositeSolid' &&
Copy link
Contributor Author

@pierremtb pierremtb May 1, 2025

Choose a reason for hiding this comment

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

@Irev-Dev I just added to the existing codepath here for point and click var declarations 🤷

selection.artifact.type !== 'helix'
) {
const varDecName = varDec.node.id.name
Expand Down
Loading