Merge branch 'wip/fx7-ci-e2e' into wip/platform-org-wiring

Author: waleedlatif1

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

@@ -66,11 +66,13 @@ test('Mod+B collapses the sidebar, the choice survives a reload, and Expand rest
   await signInAsAdmin(page, liveRoute('/home'))
   const sidebar = page.getByRole('complementary', { name: 'Platform sidebar' })
   await expect(sidebar).toBeVisible()
-  // Home's composer takes focus as it mounts and Mod+B leaves a focused field alone, as legacy did.
-  await expect(page.getByRole('textbox', { name: /Ask about your business/ })).toBeFocused()
+  // Mod+B leaves a focused field alone, as legacy did, so the press starts off any field. The
+  // server paints the sidebar before the shortcut listens: press again only while it is showing.
   await page.locator('body').click({ position: { x: 700, y: 20 } })
-  await pressShortcut(page, 'ControlOrMeta+b')
-  await expect(sidebar).toBeHidden()
+  await expect(async () => {
+    if (await sidebar.isVisible()) await pressShortcut(page, 'ControlOrMeta+b')
+    await expect(sidebar).toBeHidden({ timeout: 1_000 })
+  }).toPass()
   await page.reload()
   await expect(sidebar).toBeHidden()
   await page.getByRole('button', { name: 'Expand sidebar' }).click()

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

@@ -165,10 +165,15 @@ test.describe('Home for the seeded administrator', () => {
     await expect(
       page.getByRole('region', { name: 'Needs your attention', exact: true })
     ).toHaveCount(0)
-    await page
-      .getByRole('region', { name: 'Chats', exact: true })
-      .getByRole('link', { name: 'Vendor renewals' })
-      .click()
+    const chats = page.getByRole('region', { name: 'Chats', exact: true })
+    const vendorRenewals = chats.getByRole('link', { name: 'Vendor renewals' })
+    // Chats the other live checks start sort above the seeded one, a page or more down the rail.
+    await expect(async () => {
+      if ((await vendorRenewals.count()) === 0)
+        await chats.getByRole('button', { name: 'See more', exact: true }).click()
+      await expect(vendorRenewals).toBeVisible({ timeout: 1_000 })
+    }).toPass()
+    await vendorRenewals.click()
     await expect(page).toHaveURL(liveRoutePattern('/search/chat/22222222-'))
     await expect(page.getByText('Here is what I found about Vendor renewals.')).toBeVisible()
   })
@@ -340,21 +345,21 @@ test.describe('Home with connected accounts', () => {
         await withLiveDatabase((sql) =>
           sql.begin(async (tx) => {
             await tx`insert into permissions (id, user_id, entity_type, entity_id, permission_type)
-            select ${person.id} || '-' || entity_id, ${person.id}, entity_type, entity_id, permission_type
+            select ${person.id}::text || '-' || entity_id, ${person.id}, entity_type, entity_id, permission_type
             from permissions
             where user_id = (select id from "user" where email = ${connectedEmail()})
               and entity_type = 'workspace'`
             await tx`insert into credential_group_enrollment
             select (jsonb_populate_record(null::credential_group_enrollment, to_jsonb(e) || jsonb_build_object(
-              'id', ${`${person.id}-enrollment`}, 'user_id', ${person.id}, 'email', ${person.email},
-              'invitation_token_hash', ${`${person.id}-token`}))).*
+              'id', ${`${person.id}-enrollment`}::text, 'user_id', ${person.id}::text,
+              'email', ${person.email}::text, 'invitation_token_hash', ${`${person.id}-token`}::text))).*
             from credential_group_enrollment e where e.id = 'platform-live-enrollment'`
             for (const grant of [GRANT, CALENDAR_GRANT]) {
               await tx`insert into credential
               select (jsonb_populate_record(null::credential, to_jsonb(c) || jsonb_build_object(
-                'id', ${`${person.id}-${grant}`}, 'created_by', ${person.id},
-                'credential_group_enrollment_id', ${`${person.id}-enrollment`},
-                'display_name', ${person.email}))).*
+                'id', ${`${person.id}-${grant}`}::text, 'created_by', ${person.id}::text,
+                'credential_group_enrollment_id', ${`${person.id}-enrollment`}::text,
+                'display_name', ${person.email}::text))).*
               from credential c where c.id = ${grant}`
             }
           })

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

@@ -24,11 +24,8 @@ const REDIRECTS: readonly (readonly [string, string])[] = [
   [liveRoute('/links?search=hand'), liveRoute('/settings/links?search=hand')],
   [`${WORKSPACE}/w`, `${WORKSPACE}/workflows`],
   [`${WORKSPACE}/home`, liveRoute('/home')],
-  // The upgrade prompt carries why it was shown and nothing else.
-  [
-    `${WORKSPACE}/upgrade?reason=credits&ref=x`,
-    liveRoute('/settings/billing/plans?reason=credits'),
-  ],
+  // The seeded organization is on Enterprise, whose plans page exits to Billing, as legacy's did.
+  [`${WORKSPACE}/upgrade?reason=credits&ref=x`, liveRoute('/settings/billing')],
 ]
 
 for (const [from, to] of REDIRECTS) {
@@ -62,7 +59,11 @@ const QUERY_REDIRECTS: readonly (readonly [string, string])[] = [
   [`${WORKSPACE}/settings/apikeys?from=mail`, `${WORKSPACE}/settings/api-keys?from=mail`],
   [
     `${WORKSPACE}/access-requests?requestId=req-1`,
-    `${WORKSPACE}/settings/requests?requestId=req-1`,
+    `${WORKSPACE}/settings/requests?view=requests&requestId=req-1`,
+  ],
+  [
+    `${WORKSPACE}/upgrade?reason=credits&ref=x`,
+    liveRoute('/settings/billing/plans?reason=credits&ref=x'),
   ],
 ]
 
@@ -112,14 +113,19 @@ test('every legacy sub-path of a workspace the viewer cannot open is a branded n
   }
 })
 
-test('an organization the viewer does not belong to is the branded not-found, not a failed read', async ({
+test('an organization the viewer does not belong to is the access denial, not a failed read', async ({
   page,
 }) => {
   await signInAsAdmin(page, liveRoute('/home'))
   const outside = `/o/${organizationId()}-outside`
   for (const route of ['/home', '/settings/members']) {
     await page.goto(`${outside}${route}`)
-    await expect(page.getByRole('heading', { name: 'Page not found' }), route).toBeVisible()
+    await expect(
+      page.getByRole('heading', { name: 'Organization access denied' }),
+      route
+    ).toBeVisible()
+    await expect(page.getByRole('button', { name: 'View your workspaces' }), route).toBeVisible()
+    await expect(page.getByRole('heading', { name: 'Something went wrong' }), route).toHaveCount(0)
   }
 })
 

apps/sim/platform/checks/live/self-hosted/surfaces.spec.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+import { SIM_SITE_URL } from '@sim/utils/site'
 import { signInAsAdmin } from '@/platform/checks/live/session'
 import { firstHopFrom } from '@/platform/checks/live/support/navigation'
 import { liveRoute, liveRoutePattern } from '@/platform/checks/routes'
@@ -30,15 +31,19 @@ test('a self-hosted shell renders every section a member uses', async ({ page })
   }
 })
 
-test('self-hosted settings offer no billing section, and a saved billing link is not found', async ({
+test('self-hosted settings offer no billing section, a saved billing link is not found, and plans go to the hosted app', async ({
   page,
 }) => {
   await signInAsAdmin(page, liveRoute('/settings'))
   await expect(page.getByRole('link', { name: 'Billing', exact: true })).toHaveCount(0)
-  for (const route of ['/settings/billing', '/settings/billing/plans']) {
-    await page.goto(liveRoute(route))
-    await expect(page.getByRole('heading', { name: 'Page not found' }), route).toBeVisible()
-  }
+  await page.goto(liveRoute('/settings/billing'))
+  await expect(page.getByRole('heading', { name: 'Page not found' })).toBeVisible()
+  // A self-hosted deployment buys its plan on the hosted app, as the legacy upgrade page sent it.
+  await page.route(`${SIM_SITE_URL}/**`, (route) =>
+    route.fulfill({ status: 200, contentType: 'text/html', body: 'Hosted upgrade stand-in' })
+  )
+  await page.goto(liveRoute('/settings/billing/plans?reason=credits'))
+  await expect(page).toHaveURL(`${SIM_SITE_URL}/upgrade?reason=credits`)
 })
 
 for (const [from, to] of [

apps/sim/platform/checks/live/support/database.ts

@@ -62,18 +62,18 @@ export async function seedPerson(
  */
 async function removePerson(person: SeededPerson) {
   await withLiveDatabase(async (sql) => {
-    await sql`delete from organization where kind = 'personal' and id in (
-      select organization_id from member where user_id = ${person.id})`
-    const owned = await sql<{ id: string; projectId: string | null }[]>`
-      select id, project_id as "projectId" from workspace where owner_id = ${person.id}`
+    const owned = await sql<{ id: string }[]>`
+      select id from workspace where owner_id = ${person.id}`
     if (owned.length > 0) {
       const workspaceIds = owned.map(({ id }) => id)
       await sql`delete from permissions
         where entity_type = 'workspace' and entity_id in ${sql(workspaceIds)}`
       await sql`delete from workspace where id in ${sql(workspaceIds)}`
-      const projects = owned.flatMap(({ projectId }) => (projectId ? [projectId] : []))
-      if (projects.length > 0) await sql`delete from project where id in ${sql(projects)}`
     }
+    // A project restricts deleting its organization and its owner, so it goes before both.
+    await sql`delete from project where owner_id = ${person.id}`
+    await sql`delete from organization where kind = 'personal' and id in (
+      select organization_id from member where user_id = ${person.id})`
     await sql`delete from "user" where id = ${person.id}`
   })
 }

apps/sim/platform/styles/bootstrap.css

@@ -14,3 +14,10 @@
 [data-sim-desktop-title-bar] [data-desktop-drag] :is(button, a, input, textarea, [role="tab"]) {
   -webkit-app-region: no-drag;
 }
+
+/* iOS zooms the page into a focused text field set below 16px, so a touch phone reads them at 16px. */
+@media (pointer: coarse) and (width < 48rem) {
+  [data-emcn] :is(input, textarea)[data-type] {
+    font-size: var(--text-reading);
+  }
+}

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

@@ -285,7 +285,7 @@ export async function homeChecks() {
         })
     )
   })
-  await check('Recents collapse repeats, and every chip has a mark', async () => {
+  await check('Recents collapse repeats, and only a provider chip has a mark', async () => {
     const [before] =
       await sql`select sources from organization_search_history where user_id = ${ADMIN.userId} and organization_id = ${ORGANIZATION_ID}`
     const viewedAt = new Date().toISOString()
@@ -317,9 +317,9 @@ export async function homeChecks() {
             sources[0].url,
             'A collapsed chip must link its latest visit'
           )
-          for (const link of await links.all()) {
-            await expect(link.locator('svg, img').first()).toBeVisible()
-          }
+          // The design owner's row draws a provider's mark and no favicon for a plain site.
+          await expect(links.first().locator('svg, img').first()).toBeVisible()
+          await expect(links.nth(1).locator('svg, img')).toHaveCount(0)
           const channelChip = links.first()
           await channelChip.hover()
           await recents.getByRole('button', { name: 'Remove #candidates from recents' }).click()

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

@@ -73,26 +73,23 @@ export async function landingChecks() {
     })
   })
   await check(
-    "a member's agent chat opens as a chat, is absent under Search, and lists in the rail",
+    "a member's agent chat opens as a chat, Search hands it back to the chat, and it lists in the rail",
     async () => {
       await withSession(MEMBER, async (session) => {
         const { page } = session
         const transcript = page.getByText(`Here is what I found about ${MEMBER_CHATS.agent.title}.`)
         await page.goto(url(org.chat(MEMBER_CHATS.agent.id)))
         await expect(page).toHaveURL(url(org.chat(MEMBER_CHATS.agent.id)))
         await expect(transcript).toBeVisible()
-        // Search only opens assistant chats, so an agent chat there is absent, as in legacy.
+        // Search opens only assistant chats; a Search URL for an agent chat returns to the chat.
         await page.goto(url(org.searchChat(MEMBER_CHATS.agent.id)))
-        await expectPageNotFound(page)
-        await expect(transcript).toHaveCount(0)
+        await expect(page).toHaveURL(url(org.chat(MEMBER_CHATS.agent.id)))
+        await expect(transcript).toBeVisible()
+        await expect(searchField(page)).toHaveCount(0)
         await page.goto(url(org.home))
         await session.settle()
         await expect(railLink(page, MEMBER_CHATS.agent.title)).toBeVisible()
       })
-    },
-    {
-      // The member's own agent chat, which Search does not open.
-      allow: [refused(404, 'GET', org.searchChat(MEMBER_CHATS.agent.id))],
     }
   )
   await check(

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

@@ -100,8 +100,13 @@ export async function sidebarChecks() {
   await check('hover warms Integrations through its own reads', async () => {
     await withSession(MEMBER, async (session) => {
       const { page } = session
-      await page.goto(url(org.home))
+      // Home reads the member's accounts itself, so the hover starts from Search, which does not.
+      await page.goto(url(org.search))
       await session.settle()
+      assert(
+        !session.requests.some(({ path }) => path.includes('/connected-accounts')),
+        'Search must not read the accounts the hover is meant to warm'
+      )
       session.requests.length = 0
       await mainNav(page).getByRole('link', { name: 'Integrations', exact: true }).hover()
       await expect
@@ -134,11 +139,13 @@ export async function sidebarChecks() {
         await page.reload()
         await expect(rail).toBeHidden()
         await expect(opener).toBeVisible()
-        // The server renders the attribute, so only this says the shortcut is listening.
-        await expect(composer(page)).toBeFocused()
+        // The server renders the collapsed rail before the shortcut listens, so a press before
+        // hydration does nothing: press again only while the rail is still hidden.
         await page.locator('body').click({ position: { x: 700, y: 20 } })
-        await page.keyboard.press('Control+b')
-        await expect(rail).toBeVisible()
+        await expect(async () => {
+          if (await rail.isHidden()) await page.keyboard.press('Control+b')
+          await expect(rail).toBeVisible({ timeout: 1_000 })
+        }).toPass()
         await composer(page).click()
         await page.keyboard.press('Control+b')
         await expect(rail).toBeVisible()

apps/sim/scripts/test-assistant-actions-e2e.ts

@@ -608,7 +608,8 @@ try {
     await expect(connectIntegration).toHaveCount(0)
     const policy = page.getByRole('group', { name: 'Create Task in Salesforce permission' })
     await expect(policy).toBeVisible({ timeout: 180_000 })
-    await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
+    // This deployment has no Salesforce or Jira OAuth client, so its accounts cannot reconnect.
+    await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toHaveCount(0)
     await capture('integration-account-actions')
     await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
     const confirmation = page.getByRole('dialog', {
@@ -704,7 +705,7 @@ try {
       await expect(
         page.getByRole('heading', { name: 'launch-team@acme.example', exact: true })
       ).toBeVisible()
-      await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toBeVisible()
+      await expect(page.getByRole('button', { name: 'Reconnect', exact: true })).toHaveCount(0)
       await capture('integration-selected-account-actions')
       await page.getByRole('button', { name: 'Disconnect', exact: true }).click()
       const confirmation = page.getByRole('dialog', {