Merge branch 'wip/fx26-ci' into wip/platform-org-wiring

Author: waleedlatif1

apps/sim/app/(product)/_components/workspace/workflows/command-list/command-list.tsx

@@ -62,7 +62,7 @@ export function CommandList() {
    * Mirrors the behavior of the corresponding global keyboard shortcuts:
    * - New Agent: add an agent block to the canvas
    * - Logs: navigate to workspace logs
-   * - Search Blocks: focus the toolbar's block search
+   * - Search blocks: focus the toolbar's block search
    *
    * @param label - Command label that was clicked.
    */
@@ -78,7 +78,7 @@ export function CommandList() {
             router.push(hrefFor(workspacePath(workspaceId, 'logs')))
             return
           }
-          case 'Search Blocks': {
+          case 'Search blocks': {
             invokeGlobalCommand('focus-toolbar-search')
             return
           }

apps/sim/app/(product)/o/[organizationId]/integrations/_components/integration-capabilities/integration-capabilities.tsx

@@ -72,7 +72,7 @@ export function IntegrationCapabilities({
             instructions: skill.content,
             source: { providerId, name: skill.name },
           }}
-          createLabel='Add to Skills'
+          createLabel='Add to skills'
           deleteLabel='Remove from Skills'
           onSave={onSave}
           onClose={() => setSkill(null)}

apps/sim/platform/checks/integration-center.spec.ts

@@ -202,14 +202,14 @@ test('shared creation needs a recipient and deletion affects only the confirmed
   ).toBeVisible()
   const savedEditor = editor
   await savedEditor.getByRole('button', { name: 'Delete skill', exact: true }).click()
-  const confirmation = page.getByRole('dialog', {
-    name: 'Delete Daily account brief?',
-    exact: true,
-  })
+  const confirmation = page.getByRole('dialog', { name: 'Delete skill', exact: true })
+  await expect(confirmation).toContainText(
+    'This removes Daily account brief from your integrations.'
+  )
   await confirmation.getByRole('button', { name: 'Cancel', exact: true }).click()
   await expect(savedEditor).toBeVisible()
   await savedEditor.getByRole('button', { name: 'Delete skill', exact: true }).click()
-  await confirmation.getByRole('button', { name: 'Delete skill', exact: true }).click()
+  await confirmation.getByRole('button', { name: 'Delete', exact: true }).click()
   await expect(added).toHaveCount(0)
   await expect(main.getByRole('link', { name: /^Weekly customer review / })).toBeVisible()
 })

apps/sim/platform/checks/integrations.spec.ts

@@ -72,7 +72,7 @@ test('app discovery preserves editable installed skills and sends templates to t
     'Confirm the target vault, retrieve the secret, and report only its item reference.'
   await editor.getByRole('textbox', { name: 'Name', exact: true }).fill('runtime-vault-lookup')
   await editor.getByRole('textbox', { name: 'Instructions', exact: true }).fill(editedInstructions)
-  await editor.getByRole('button', { name: 'Save changes', exact: true }).click()
+  await editor.getByRole('button', { name: 'Save', exact: true }).click()
   await main
     .getByRole('navigation', { name: 'Skills navigation', exact: true })
     .getByRole('link')
@@ -131,7 +131,7 @@ test('adding another credential preserves existing accounts and its details surv
   await list
     .getByRole('textbox', { name: 'Display name', exact: true })
     .fill('Gmail account review')
-  await list.getByRole('button', { name: 'Save changes', exact: true }).click()
+  await list.getByRole('button', { name: 'Save', exact: true }).click()
   await list
     .getByRole('navigation', { name: 'Gmail navigation', exact: true })
     .getByRole('link')
@@ -300,16 +300,15 @@ test('shared family credential edits and access changes propagate without removi
   await page.getByRole('menuitemradio', { name: 'Admin', exact: true }).click()
   await people.getByRole('button', { name: 'Manage access for Nina Patel', exact: true }).click()
   await page.getByRole('menuitem', { name: 'Remove', exact: true }).click()
-  await page
-    .getByRole('dialog', { name: 'Remove Nina Patel?', exact: true })
-    .getByRole('button', { name: 'Remove', exact: true })
-    .click()
+  const removal = page.getByRole('dialog', { name: 'Remove member', exact: true })
+  await expect(removal).toContainText('Nina Patel will lose access to this credential.')
+  await removal.getByRole('button', { name: 'Remove', exact: true }).click()
   await expect(people.getByText('Nina Patel', { exact: true })).toHaveCount(0)
   await main.getByRole('tab', { name: 'Details', exact: true }).click()
   await main
     .getByRole('textbox', { name: 'Display name', exact: true })
     .fill('Shared Google operations')
-  await main.getByRole('button', { name: 'Save changes', exact: true }).click()
+  await main.getByRole('button', { name: 'Save', exact: true }).click()
   await main
     .getByRole('navigation', { name: 'Gmail navigation', exact: true })
     .getByRole('link')
@@ -690,7 +689,10 @@ test('managed, unconfigured and retained connections expose only the actions the
   await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
   await page.keyboard.press('Escape')
   await expect(main.getByRole('radio')).toHaveCount(0)
-  await main.getByRole('link', { name: 'Back to Fireflies', exact: true }).click()
+  await main
+    .getByRole('navigation', { name: 'Fireflies navigation', exact: true })
+    .getByRole('link', { name: 'Fireflies', exact: true })
+    .click()
   await main.getByRole('link', { name: 'Integrations', exact: true }).click()
   for (const provider of ['GitLab', 'Slack', 'Granola', 'Zoom']) {
     await main.getByRole('link', { name: new RegExp(`^${provider} `) }).click()

apps/sim/platform/checks/live/home.spec.ts

@@ -377,7 +377,7 @@ test.describe('Home with connected accounts', () => {
       const email = page.getByRole('region', { name: 'Email', exact: true })
       await email.getByRole('button', { name: 'Email options' }).click()
       await page.getByRole('menuitem', { name: 'Disconnect Email' }).click()
-      const dialog = page.getByRole('dialog', { name: 'Disconnect Email?' })
+      const dialog = page.getByRole('dialog', { name: 'Disconnect Email', exact: true })
       await dialog.getByRole('button', { name: 'Disconnect', exact: true }).click()
       await expect(dialog).toBeHidden()
       await expect(email.getByText('Connect your email', { exact: true })).toBeVisible()

apps/sim/platform/checks/live/integrations.spec.ts

@@ -95,7 +95,7 @@ test('a workspace credential renames from its page, and the name survives a relo
         new URL(response.url()).pathname === `/api/credentials/${credential.id}`
     )
     await name.fill(renamed)
-    await details.getByRole('button', { name: 'Save changes', exact: true }).click()
+    await details.getByRole('button', { name: 'Save', exact: true }).click()
     const response = await saved
     expect(response.ok()).toBe(true)
     expect(new URL(response.url()).searchParams.get('workspaceId')).toBe(WORKSPACE_ID)

apps/sim/platform/checks/manual-credentials.spec.ts

@@ -47,13 +47,13 @@ test('manual secrets link to apps, start private and clear values across type ch
   await page.getByRole('option', { name: 'Service account JSON', exact: true }).click()
   await expect(modal.getByLabel('JSON key', { exact: true })).toHaveValue('')
   await modal.getByLabel('JSON key', { exact: true }).fill('[]')
-  await modal.getByRole('button', { name: 'Create', exact: true }).click()
+  await modal.getByRole('button', { name: 'Create credential', exact: true }).click()
   await expect(modal.getByRole('alert')).toContainText('non-empty object')
   await modal.getByRole('combobox', { name: 'Type', exact: true }).click()
   await page.getByRole('option', { name: 'Refresh token', exact: true }).click()
   await expect(modal.getByLabel('Value', { exact: true })).toHaveValue('')
   await modal.getByLabel('Value', { exact: true }).fill('manual-refresh-token-never-retained')
-  await modal.getByRole('button', { name: 'Create', exact: true }).click()
+  await modal.getByRole('button', { name: 'Create credential', exact: true }).click()
   await main.getByRole('button', { name: /^Operations vault / }).click()
   const id = await main.getByLabel('Credential ID', { exact: true }).inputValue()
   await main.getByRole('tab', { name: 'Access', exact: true }).click()
@@ -67,7 +67,10 @@ test('manual secrets link to apps, start private and clear values across type ch
   await page.keyboard.press('Escape')
   await main.getByRole('button', { name: 'Add people', exact: true }).click()
   await expect(table.getByRole('row', { name: /Nina Patel/ })).toBeVisible()
-  await main.getByRole('link', { name: 'Back to 1Password', exact: true }).click()
+  await main
+    .getByRole('navigation', { name: '1Password navigation', exact: true })
+    .getByRole('link', { name: '1Password', exact: true })
+    .click()
   await expect(main.getByRole('button', { name: /^Operations vault / })).toBeVisible()
   await expect(main.getByText(/^Used by /)).toHaveCount(0)
   await main.getByRole('link', { name: 'Integrations', exact: true }).click()

apps/sim/scripts/org-redesign-e2e/checks/integrations.ts

@@ -167,6 +167,10 @@ export async function integrationChecks() {
     async () => {
       await withSession(CONNECTED, async ({ page }) => {
         await page.goto(url(org.integrations))
+        // evaluateAll does not wait, so read the order only once the directory has painted.
+        await expect(
+          page.getByRole('main').getByRole('region', { name: 'Available', exact: true })
+        ).toBeVisible()
         const groups = await page
           .getByRole('main')
           .getByRole('region')
@@ -190,7 +194,7 @@ export async function integrationChecks() {
         )
         await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
         await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
-        const modal = dialog(page, `Disconnect ${CONNECTED.email}?`)
+        const modal = dialog(page, `Disconnect ${CONNECTED.email}`)
         await expect(
           modal.getByText('People and workflows using this credential will lose access.')
         ).toBeVisible()
@@ -243,7 +247,7 @@ export async function integrationChecks() {
             await expect(page.getByRole('heading', { level: 1, name: second })).toBeVisible()
             await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
             await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
-            const modal = dialog(page, `Disconnect ${second}?`)
+            const modal = dialog(page, `Disconnect ${second}`)
             await expect(modal).toContainText(second)
             await expect(modal).not.toContainText(CONNECTED.email)
             await modal.getByRole('button', { name: 'Cancel', exact: true }).click()

apps/sim/scripts/org-redesign-e2e/checks/links.ts

@@ -245,13 +245,13 @@ export async function linksChecks() {
             await modal.getByRole('textbox', { name: 'Name' }).fill('Hand Book')
             await expect(modal.getByRole('textbox', { name: 'Name' })).not.toHaveValue('Hand Book')
             await modal.getByRole('textbox', { name: 'Name' }).fill(NAMED_LINKS.handbook.name)
-            await modal.getByRole('button', { name: 'Create', exact: true }).click()
+            await modal.getByRole('button', { name: 'Create link', exact: true }).click()
             await expect(modal.getByText(/already exists/)).toBeVisible()
             await modal.getByRole('textbox', { name: 'Name' }).fill('parts-lookup')
             await expect(
               modal.getByRole('checkbox', { name: 'Hide from the links page' })
             ).toBeEnabled()
-            await modal.getByRole('button', { name: 'Create', exact: true }).click()
+            await modal.getByRole('button', { name: 'Create link', exact: true }).click()
             await expect(modal).toHaveCount(0)
             await expect(page).toHaveURL((address) => !address.searchParams.has('create'))
             await search(page).fill('parts-lookup')
@@ -285,7 +285,7 @@ export async function linksChecks() {
         withSession(MEMBER, async ({ page }) => {
           await page.goto(`${linksUrl}?create=held-link`)
           const modal = dialog(page, 'New link')
-          await modal.getByRole('button', { name: 'Create', exact: true }).click()
+          await modal.getByRole('button', { name: 'Create link', exact: true }).click()
           await expect(modal.getByRole('textbox', { name: 'Destination URL' })).toHaveAttribute(
             'aria-invalid',
             'true'
@@ -300,7 +300,7 @@ export async function linksChecks() {
             await release.promise
             await route.continue()
           })
-          await modal.getByRole('button', { name: 'Create', exact: true }).click()
+          await modal.getByRole('button', { name: 'Create link', exact: true }).click()
           await saving.promise
           await page.keyboard.press('Escape')
           await pageTurn(page)

apps/sim/scripts/org-redesign-e2e/checks/settings.ts

@@ -609,7 +609,7 @@ export async function settingsChecks() {
     })
   })
   await check(
-    'Single sign-on: inline errors stop a bad Save, and a good one posts',
+    'Single sign-on: inline errors stop adding a bad provider, and a good one posts',
     async () => {
       await withSession(ADMIN, async ({ page }) => {
         const bodies: unknown[] = []
@@ -620,7 +620,7 @@ export async function settingsChecks() {
         await page.goto(settingsUrl('sso'))
         const issuer = page.getByRole('textbox', { name: 'Issuer URL' })
         await issuer.fill('not a url')
-        await page.getByRole('button', { name: 'Save', exact: true }).click()
+        await page.getByRole('button', { name: 'Add provider', exact: true }).click()
         await expect(
           page.getByText(/Enter a valid issuer URL|Issuer URL must/).first()
         ).toBeVisible()
@@ -641,7 +641,7 @@ export async function settingsChecks() {
         const secret = page.getByRole('textbox', { name: 'Client secret' })
         await secret.focus()
         await secret.fill('e2e-secret')
-        await page.getByRole('button', { name: 'Save', exact: true }).click()
+        await page.getByRole('button', { name: 'Add provider', exact: true }).click()
         await expect.poll(() => bodies.length).toBe(1)
         assert.equal(toRecord(bodies[0]).providerId, 'e2e-oidc')
         assert.match(JSON.stringify(bodies[0]), /e2e-secret/)
@@ -650,7 +650,7 @@ export async function settingsChecks() {
     { allow: [/500 POST .*sso\/register/] }
   )
   await check(
-    'Single sign-on: a pending Save holds the form and the page, and a failed one keeps the draft',
+    'Single sign-on: a pending add holds the form and the page, and a failed one keeps the draft',
     async () => {
       await withSession(ADMIN, async ({ page }) => {
         const bodies: unknown[] = []
@@ -676,9 +676,9 @@ export async function settingsChecks() {
         const secret = page.getByRole('textbox', { name: 'Client secret' })
         await secret.focus()
         await secret.fill('e2e-secret')
-        await page.getByRole('button', { name: 'Save', exact: true }).click()
+        await page.getByRole('button', { name: 'Add provider', exact: true }).click()
         await expect.poll(() => bodies.length).toBe(1)
-        await expect(page.getByRole('button', { name: 'Saving…', exact: true })).toBeDisabled()
+        await expect(page.getByRole('button', { name: 'Adding…', exact: true })).toBeDisabled()
         await expect(issuer).toBeDisabled()
 
         // Submitting again, or leaving for another section, does nothing while the first is out.
@@ -688,19 +688,19 @@ export async function settingsChecks() {
           .getByRole('link', { name: 'General', exact: true })
         await general.click()
         await pageTurn(page)
-        assert.equal(bodies.length, 1, 'A second Save went out while the first was pending')
+        assert.equal(bodies.length, 1, 'A second add went out while the first was pending')
         await expect(page).toHaveURL(settingsUrl('sso'))
         await expect(dialog(page, 'Unsaved changes')).toHaveCount(0)
 
         answerFirst.resolve()
-        await expect(page.getByRole('button', { name: 'Save', exact: true })).toBeEnabled()
+        await expect(page.getByRole('button', { name: 'Add provider', exact: true })).toBeEnabled()
         await expect(clientId).toHaveValue('e2e-client')
         // The failed draft is still a draft: leaving now asks first.
         await general.click()
         const unsaved = dialog(page, 'Unsaved changes')
         await unsaved.getByRole('button', { name: 'Cancel', exact: true }).click()
         await expect(unsaved).toHaveCount(0)
-        await page.getByRole('button', { name: 'Save', exact: true }).click()
+        await page.getByRole('button', { name: 'Add provider', exact: true }).click()
         await expect.poll(() => bodies.length).toBe(2)
       })
     },
@@ -788,7 +788,7 @@ export async function settingsChecks() {
         const create = page.waitForRequest(
           (request) => request.method() === 'POST' && pathOf(request.url()).endsWith('/data-drains')
         )
-        await page.getByRole('button', { name: 'Create', exact: true }).click()
+        await page.getByRole('button', { name: 'Create drain', exact: true }).click()
         await create
       })
     },