mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
Neil
77f23b013f
#14397 split `shared/types.ts` into 46 per-domain modules but kept the path as a re-export barrel so the import sites did not have to change. This removes the barrel: every consumer now imports from the module that actually declares the type, and `src/shared/types.ts` is deleted. Barrels hide where a type lives, make every consumer look like it depends on the whole domain, and let an unrelated edit invalidate a module that ~2,000 files transitively import. 2,323 import declarations across 2,321 files. Rewritten mechanically: each specifier was resolved to an absolute path via the TypeScript AST and recomputed, rather than string-substituted, so alias forms (`@/../../shared/ types`) and per-specifier `type` modifiers survive. Four cases the mechanical pass had to handle, each found by a gate rather than by reading the diff: - Modules inside `src/shared` import the barrel as `./types`, not `shared/types`. A pre-filter on the latter string skipped 176 of them and left imports dangling at a deleted file, which surfaced as confusing `Property 'x' is optional in type 'Repo' but required in Pick<Repo, ...>` errors rather than "module not found". - The barrel RENAMED one type on the way through (`WorkspaceSource as WorkspaceCreateTelemetrySource`), so the original name in the owning module has to be re-aliased at each consumer. - Three test files put `;(globalThis as ...)` on the line after the import. TypeScript parses that `;` as the import statement's terminator, so replacing through `statement.getEnd()` deletes it and breaks ASI. The rewrite now stops at the module specifier. - A file that already imported directly from a module got a SECOND import from it, because the barrel re-exported those same names — which trips `import/no-duplicates` under `--deny-warnings`. A post-pass merges declarations sharing a specifier and type-only-ness; the `import type` plus `import` pair from one module is left alone, since that form is allowed. Splitting one barrel import into several genuinely adds lines, which pushed `terminal-layout-pty-ownership.ts` to 301 counted lines: its 107-character import must wrap, and neither local type collapses onto one line (101 and 116 characters). Rather than contort a type declaration to fit a line budget, `collectLeafIds` and `pruneLeaves` move to `terminal-pane-layout-tree.ts` — they are pure structural operations on the layout tree and independent of PTY ownership. `visible-worktrees.ts` similarly loses its own mini-barrel re-export of `isDefaultBranchWorkspace`, with the four real consumers repointed at the declaring module. No `max-lines` bypass added. Verified: cold `tsc --noEmit` green on node, cli, and web (buildinfo deleted first — these projects are `composite: true` and reuse stale caches); the full `pnpm lint` green, not just bare oxlint — the narrower local check is what let the duplicate imports reach CI; max-lines ratchet OK at 344.
95 lines
3.7 KiB
TypeScript
95 lines
3.7 KiB
TypeScript
import { test, expect } from './helpers/orca-app'
|
|
import { waitForSessionReady } from './helpers/store'
|
|
import type { GlobalSettings } from '../../src/shared/global-settings-types'
|
|
|
|
async function getSettings(
|
|
page: Parameters<typeof waitForSessionReady>[0]
|
|
): Promise<GlobalSettings> {
|
|
return page.evaluate(() => window.api.settings.get())
|
|
}
|
|
|
|
async function openNotificationSettings(
|
|
page: Parameters<typeof waitForSessionReady>[0]
|
|
): Promise<void> {
|
|
await page.evaluate(() => {
|
|
const state = window.__store!.getState()
|
|
state.openSettingsTarget({ pane: 'notifications', repoId: null })
|
|
state.openSettingsPage()
|
|
})
|
|
await expect(page.getByPlaceholder('Search settings')).toBeVisible({ timeout: 10_000 })
|
|
const featureTipDialog = page.getByRole('dialog', { name: 'Voice Dictation is here' })
|
|
if (await featureTipDialog.isVisible().catch(() => false)) {
|
|
await page.getByRole('button', { name: 'Maybe Later' }).click()
|
|
}
|
|
await expect(
|
|
page
|
|
.locator('[data-settings-section="notifications"]')
|
|
.getByRole('heading', { name: 'Notifications', exact: true })
|
|
).toBeInViewport({ timeout: 10_000 })
|
|
}
|
|
|
|
test.describe('Notification settings', () => {
|
|
test.beforeEach(async ({ orcaPage }) => {
|
|
await waitForSessionReady(orcaPage)
|
|
})
|
|
|
|
test('can be toggled from settings and disables child controls', async ({ orcaPage }) => {
|
|
await openNotificationSettings(orcaPage)
|
|
|
|
const notificationsSection = orcaPage.locator('[data-settings-section="notifications"]')
|
|
const enableNotificationsSwitch = notificationsSection.getByRole('switch', {
|
|
name: 'Enable Notifications'
|
|
})
|
|
const agentTaskCompleteSwitch = notificationsSection.getByRole('switch', {
|
|
name: 'Agent Task Complete'
|
|
})
|
|
const terminalBellSwitch = notificationsSection.getByRole('switch', { name: 'Terminal Bell' })
|
|
const suppressWhileFocusedSwitch = notificationsSection.getByRole('switch', {
|
|
name: 'Suppress While Focused'
|
|
})
|
|
const sendTestButton = notificationsSection.getByRole('button', {
|
|
name: 'Send Test Notification'
|
|
})
|
|
|
|
await expect(enableNotificationsSwitch).toHaveAttribute('aria-checked', 'true')
|
|
await expect(agentTaskCompleteSwitch).toBeEnabled()
|
|
await expect(terminalBellSwitch).toBeEnabled()
|
|
await expect(suppressWhileFocusedSwitch).toBeEnabled()
|
|
await expect(sendTestButton).toBeEnabled()
|
|
|
|
await agentTaskCompleteSwitch.click()
|
|
await expect(agentTaskCompleteSwitch).toHaveAttribute('aria-checked', 'false')
|
|
await expect
|
|
.poll(async () => (await getSettings(orcaPage)).notifications.agentTaskComplete, {
|
|
timeout: 5_000,
|
|
message: 'agent task-complete notification setting did not persist after disabling'
|
|
})
|
|
.toBe(false)
|
|
|
|
await enableNotificationsSwitch.click()
|
|
await expect(enableNotificationsSwitch).toHaveAttribute('aria-checked', 'false')
|
|
await expect(agentTaskCompleteSwitch).toBeDisabled()
|
|
await expect(terminalBellSwitch).toBeDisabled()
|
|
await expect(suppressWhileFocusedSwitch).toBeDisabled()
|
|
await expect(sendTestButton).toBeDisabled()
|
|
await expect
|
|
.poll(async () => (await getSettings(orcaPage)).notifications.enabled, {
|
|
timeout: 5_000,
|
|
message: 'master notification setting did not persist after disabling'
|
|
})
|
|
.toBe(false)
|
|
|
|
await enableNotificationsSwitch.click()
|
|
await agentTaskCompleteSwitch.click()
|
|
await expect
|
|
.poll(async () => {
|
|
const settings = await getSettings(orcaPage)
|
|
return {
|
|
enabled: settings.notifications.enabled,
|
|
agentTaskComplete: settings.notifications.agentTaskComplete
|
|
}
|
|
})
|
|
.toEqual({ enabled: true, agentTaskComplete: true })
|
|
})
|
|
})
|