Fix: Can't go back to Profiles arg in Extrude, Revolve, Loft (#7106)

* Revert "Update failing E2E tests with new behavior, which allows skip with preselection" This reverts commit d72bee8637. * Fix: Can't go back to Profiles step in sweep commands Fixes #7080 * Make it better but still not quite there * I think I got it: this was likely the real bug making submit fire twice * Bring timemouts back
2025-05-20 16:07:56 -04:00
parent 36c8ad439d
commit 09699afe82
6 changed files with 107 additions and 11 deletions
--- a/e2e/playwright/command-bar-tests.spec.ts
+++ b/e2e/playwright/command-bar-tests.spec.ts
@ -45,15 +45,16 @@ test.describe('Command bar tests', () => {
    await cmdBar.expectState({
      stage: 'arguments',
      commandName: 'Extrude',
-      currentArgKey: 'length',
-      currentArgValue: '5',
+      currentArgKey: 'sketches',
+      currentArgValue: '',
      headerArguments: {
-        Profiles: '1 profile',
+        Profiles: '',
        Length: '',
      },
-      highlightedHeaderArg: 'length',
+      highlightedHeaderArg: 'Profiles',
    })
    await cmdBar.progressCmdBar()
+    await cmdBar.progressCmdBar()
    await cmdBar.expectState({
      stage: 'review',
      commandName: 'Extrude',
--- a/e2e/playwright/editor-tests.spec.ts
+++ b/e2e/playwright/editor-tests.spec.ts
@ -1134,6 +1134,7 @@ sketch001 = startSketchOn(XZ)
    // Wait for the selection to register (TODO: we need a definitive way to wait for this)
    await page.waitForTimeout(200)
    await toolbar.extrudeButton.click()
+    await cmdBar.progressCmdBar()
    await cmdBar.expectState({
      stage: 'arguments',
      currentArgKey: 'length',
@ -1355,9 +1356,7 @@ sketch001 = startSketchOn(XZ)
      const u = await getUtils(page)
      const projectLink = page.getByRole('link', { name: 'cube' })
      const gizmo = page.locator('[aria-label*=gizmo]')
-      const resetCameraButton = page.getByRole('button', {
-        name: 'Reset view',
-      })
+      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
      const locationToHaveColor = async (
        position: { x: number; y: number },
        color: [number, number, number]
--- a/e2e/playwright/point-click.spec.ts
+++ b/e2e/playwright/point-click.spec.ts
@ -74,6 +74,15 @@ test.describe('Point-and-click tests', () => {

    await test.step('do extrude flow and check extrude code is added to editor', async () => {
      await toolbar.extrudeButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: { Profiles: '', Length: '' },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'length',
@ -1645,6 +1654,15 @@ sketch002 = startSketchOn(plane001)

        await test.step(`Go through the command bar flow with preselected sketches`, async () => {
          await toolbar.loftButton.click()
+          await cmdBar.expectState({
+            stage: 'arguments',
+            currentArgKey: 'sketches',
+            currentArgValue: '',
+            headerArguments: { Profiles: '' },
+            highlightedHeaderArg: 'Profiles',
+            commandName: 'Loft',
+          })
+          await cmdBar.progressCmdBar()
          await cmdBar.expectState({
            stage: 'review',
            headerArguments: { Profiles: '2 profiles' },
@ -2092,6 +2110,18 @@ extrude001 = extrude(sketch001, length = -12)
    await test.step(`Apply fillet to the preselected edge`, async () => {
      await page.waitForTimeout(100)
      await toolbar.filletButton.click()
+      await cmdBar.expectState({
+        commandName: 'Fillet',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Radius: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
      await cmdBar.expectState({
        commandName: 'Fillet',
        highlightedHeaderArg: 'radius',
@ -2621,6 +2651,18 @@ extrude001 = extrude(profile001, length = 5)
      await test.step(`Apply fillet`, async () => {
        await page.waitForTimeout(100)
        await toolbar.filletButton.click()
+        await cmdBar.expectState({
+          commandName: 'Fillet',
+          highlightedHeaderArg: 'selection',
+          currentArgKey: 'selection',
+          currentArgValue: '',
+          headerArguments: {
+            Selection: '',
+            Radius: '',
+          },
+          stage: 'arguments',
+        })
+        await cmdBar.progressCmdBar()
        await cmdBar.expectState({
          commandName: 'Fillet',
          highlightedHeaderArg: 'radius',
@ -2726,6 +2768,19 @@ extrude001 = extrude(sketch001, length = -12)
    await test.step(`Apply chamfer to the preselected edge`, async () => {
      await page.waitForTimeout(100)
      await toolbar.chamferButton.click()
+      await cmdBar.expectState({
+        commandName: 'Chamfer',
+        highlightedHeaderArg: 'selection',
+        currentArgKey: 'selection',
+        currentArgValue: '',
+        headerArguments: {
+          Selection: '',
+          Length: '',
+        },
+        stage: 'arguments',
+      })
+      await cmdBar.progressCmdBar()
+      await page.waitForTimeout(1000)
      await cmdBar.expectState({
        commandName: 'Chamfer',
        highlightedHeaderArg: 'length',
@ -3209,6 +3264,8 @@ extrude001 = extrude(sketch001, length = 30)
        await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {
          await toolbar.shellButton.click()
          await cmdBar.progressCmdBar()
+          await page.waitForTimeout(500)
+          await cmdBar.progressCmdBar()
          await cmdBar.expectState({
            stage: 'review',
            headerArguments: {
@ -3642,13 +3699,12 @@ tag=$rectangleSegmentC002,
      // revolve
      await editor.scrollToText(codeToSelection)
      await page.getByText(codeToSelection).click()
-      // Wait for the selection to register (TODO: we need a definitive way to wait for this)
-      await page.waitForTimeout(200)
      await toolbar.revolveButton.click()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
      await cmdBar.progressCmdBar()
+      await cmdBar.progressCmdBar()

      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = X)`
      expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
@ -4577,6 +4633,18 @@ path001 = startProfile(sketch001, at = [0, 0])

    await test.step('Go through command bar flow', async () => {
      await toolbar.extrudeButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Profiles: '',
+          Length: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Extrude',
+      })
+      await cmdBar.progressCmdBar()
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'length',
@ -4659,6 +4727,19 @@ path001 = startProfile(sketch001, at = [0, 0])

    await test.step('Go through command bar flow', async () => {
      await toolbar.sweepButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Profiles: '',
+          Path: '',
+          Sectional: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Sweep',
+      })
+      await cmdBar.progressCmdBar()
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'path',
@ -4743,6 +4824,19 @@ path001 = startProfile(sketch001, at = [0, 0])
    await test.step('Go through command bar flow', async () => {
      await toolbar.closePane('code')
      await toolbar.revolveButton.click()
+      await cmdBar.expectState({
+        stage: 'arguments',
+        currentArgKey: 'sketches',
+        currentArgValue: '',
+        headerArguments: {
+          Profiles: '',
+          AxisOrEdge: '',
+          Angle: '',
+        },
+        highlightedHeaderArg: 'Profiles',
+        commandName: 'Revolve',
+      })
+      await cmdBar.progressCmdBar()
      await cmdBar.expectState({
        stage: 'arguments',
        currentArgKey: 'axisOrEdge',
--- a/e2e/playwright/sketch-tests.spec.ts
+++ b/e2e/playwright/sketch-tests.spec.ts
@ -1016,6 +1016,7 @@ profile001 = startProfile(sketch001, at = [${roundOff(scale * 69.6)}, ${roundOff

    // sketch selection should already have been made.
    // otherwise the cmdbar would be waiting for a selection.
+    await cmdBar.progressCmdBar()
    await cmdBar.expectState({
      stage: 'arguments',
      currentArgKey: 'length',
--- a/e2e/playwright/various.spec.ts
+++ b/e2e/playwright/various.spec.ts
@ -573,6 +573,7 @@ profile001 = startProfile(sketch002, at = [-12.34, 12.34])
  await expect(page.getByTestId('command-bar')).toBeVisible()
  await page.waitForTimeout(100)

+  await cmdBar.progressCmdBar()
  await cmdBar.progressCmdBar()
  await expect(page.getByText('Confirm Extrude')).toBeVisible()
  await cmdBar.progressCmdBar()
--- a/src/components/CommandBar/CommandBarSelectionInput.tsx
+++ b/src/components/CommandBar/CommandBarSelectionInput.tsx
@ -139,7 +139,7 @@ function CommandBarSelectionInput({
        data: {
          selectionType: 'singleCodeCursor',
        },
-      })
+      }) &&
      setHasClearedSelection(true)
  }, [arg])