From 46e18f5e2e59559588694a8957c63e31529e47be Mon Sep 17 00:00:00 2001 From: Thomas Luizon Rodrigues Gregorio Date: Fri, 14 Aug 2026 19:54:09 -0300 Subject: [PATCH 01/10] feat: remove AI memory client surfaces --- .../__tests__/app/use-user-facts.test.tsx | 288 ------------ .../components/ai-settings-sections.test.tsx | 290 +----------- .../upgrade/plan-comparison-cards.test.tsx | 2 + .../__tests__/lib/offline-mutations.test.ts | 111 +++-- .../__tests__/lib/queued-api-mutation.test.ts | 12 +- apps/mobile/app/ai-settings-sections.tsx | 443 +----------------- apps/mobile/app/ai-settings-styles.ts | 120 ----- apps/mobile/app/ai-settings.tsx | 111 +---- apps/mobile/app/use-user-facts.ts | 157 ------- .../onboarding/feature-guide-drawer.tsx | 2 - apps/mobile/eslint-suppressions.json | 5 - apps/mobile/lib/offline-mutations.ts | 6 - apps/mobile/lib/offline-queue.ts | 2 - apps/web/__tests__/actions/profile.test.ts | 23 - apps/web/__tests__/actions/user-facts.test.ts | 31 -- .../ai-settings/ai-feature-toggles.test.tsx | 58 +-- .../components/ai-settings/fact-item.test.tsx | 118 ----- .../ai-settings/facts-pagination.test.tsx | 55 --- .../ai-settings/facts-select-bar.test.tsx | 101 ---- .../ai-settings/use-user-facts.test.ts | 127 ----- .../ai-settings/user-facts-list.test.tsx | 89 ---- .../onboarding/feature-guide-drawer.test.tsx | 14 + .../profile/delete-account-modal.test.tsx | 1 - .../profile/fresh-start-modal.test.tsx | 1 - .../profile/subscription-card.test.tsx | 1 - .../upgrade/plan-comparison-cards.test.tsx | 6 + .../__tests__/pages/ai-settings-page.test.tsx | 110 ++--- .../_components/ai-feature-toggles.tsx | 35 +- .../ai-settings/_components/fact-item.tsx | 108 ----- .../_components/facts-pagination.tsx | 56 --- .../_components/facts-select-bar.tsx | 118 ----- .../ai-settings/_components/use-user-facts.ts | 105 ----- .../_components/user-facts-list.tsx | 134 ------ apps/web/app/(app)/ai-settings/page.tsx | 119 +---- apps/web/app/actions/profile.ts | 8 - apps/web/app/actions/user-facts.ts | 15 - .../onboarding/feature-guide-drawer.tsx | 2 - .../e2e/visual/mock-api/fixtures/profile.ts | 1 - apps/web/eslint-suppressions.json | 25 - architecture.html | 2 +- architecture.json | 152 +----- .../src/__tests__/chat-composer-core.test.ts | 17 + .../shared/src/__tests__/data-export.test.ts | 15 +- .../shared/src/__tests__/endpoints.test.ts | 12 - packages/shared/src/__tests__/factories.ts | 1 - packages/shared/src/__tests__/query.test.ts | 12 - packages/shared/src/__tests__/social.test.ts | 2 - packages/shared/src/__tests__/types.test.ts | 89 ++-- packages/shared/src/__tests__/upgrade.test.ts | 5 + .../shared/src/__tests__/user-facts.test.ts | 19 - packages/shared/src/api/endpoints.ts | 7 - .../shared/src/hooks/chat-composer-core.ts | 2 - packages/shared/src/i18n/en.json | 40 -- packages/shared/src/i18n/pt-BR.json | 40 -- packages/shared/src/index.ts | 3 - packages/shared/src/query/index.ts | 1 - packages/shared/src/query/keys.ts | 5 - packages/shared/src/types/config.ts | 2 - packages/shared/src/types/data-export.ts | 8 - packages/shared/src/types/index.ts | 1 - packages/shared/src/types/profile.ts | 7 - packages/shared/src/types/sync.ts | 5 +- packages/shared/src/types/user-fact.ts | 11 - packages/shared/src/utils/fresh-start.ts | 1 - packages/shared/src/utils/index.ts | 5 - packages/shared/src/utils/upgrade.ts | 1 - packages/shared/src/utils/user-facts.ts | 16 - 67 files changed, 248 insertions(+), 3243 deletions(-) delete mode 100644 apps/mobile/__tests__/app/use-user-facts.test.tsx delete mode 100644 apps/mobile/app/use-user-facts.ts delete mode 100644 apps/web/__tests__/actions/user-facts.test.ts delete mode 100644 apps/web/__tests__/components/ai-settings/fact-item.test.tsx delete mode 100644 apps/web/__tests__/components/ai-settings/facts-pagination.test.tsx delete mode 100644 apps/web/__tests__/components/ai-settings/facts-select-bar.test.tsx delete mode 100644 apps/web/__tests__/components/ai-settings/use-user-facts.test.ts delete mode 100644 apps/web/__tests__/components/ai-settings/user-facts-list.test.tsx delete mode 100644 apps/web/app/(app)/ai-settings/_components/fact-item.tsx delete mode 100644 apps/web/app/(app)/ai-settings/_components/facts-pagination.tsx delete mode 100644 apps/web/app/(app)/ai-settings/_components/facts-select-bar.tsx delete mode 100644 apps/web/app/(app)/ai-settings/_components/use-user-facts.ts delete mode 100644 apps/web/app/(app)/ai-settings/_components/user-facts-list.tsx delete mode 100644 apps/web/app/actions/user-facts.ts delete mode 100644 packages/shared/src/__tests__/user-facts.test.ts delete mode 100644 packages/shared/src/types/user-fact.ts delete mode 100644 packages/shared/src/utils/user-facts.ts diff --git a/apps/mobile/__tests__/app/use-user-facts.test.tsx b/apps/mobile/__tests__/app/use-user-facts.test.tsx deleted file mode 100644 index 36324601d0..0000000000 --- a/apps/mobile/__tests__/app/use-user-facts.test.tsx +++ /dev/null @@ -1,288 +0,0 @@ -import React from 'react' -import { beforeEach, describe, expect, it, vi } from 'vitest' -import { API } from '@orbit/shared/api' -import { userFactKeys } from '@orbit/shared/query' - -import { useUserFacts, type UserFact } from '@/app/use-user-facts' - -const TestRenderer = require('react-test-renderer') - -interface CapturedQuery { - queryKey: readonly unknown[] - queryFn: () => unknown -} - -const mocks = vi.hoisted(() => { - const store = new Map() - const queryClient = { - cancelQueries: vi.fn(async () => {}), - invalidateQueries: vi.fn(async () => {}), - getQueryData: vi.fn((key: readonly unknown[]) => store.get(JSON.stringify(key))), - setQueryData: vi.fn((key: readonly unknown[], updater: unknown) => { - const serialized = JSON.stringify(key) - const next = - typeof updater === 'function' - ? (updater as (old: unknown) => unknown)(store.get(serialized)) - : updater - store.set(serialized, next) - return next - }), - } - return { - store, - queryClient, - queryConfigs: [] as CapturedQuery[], - isOnline: true, - factsData: undefined as UserFact[] | undefined, - performQueuedApiMutation: vi.fn(async () => undefined), - apiClient: vi.fn(), - } -}) - -vi.mock('@tanstack/react-query', () => ({ - useQuery: vi.fn((config: CapturedQuery) => { - mocks.queryConfigs.push(config) - return { data: mocks.factsData } - }), - useMutation: vi.fn((config: unknown) => config), - useQueryClient: vi.fn(() => mocks.queryClient), -})) - -vi.mock('@/hooks/use-offline', () => ({ - useOffline: () => ({ isOnline: mocks.isOnline }), -})) - -vi.mock('@/lib/queued-api-mutation', () => ({ - performQueuedApiMutation: mocks.performQueuedApiMutation, -})) - -vi.mock('@/lib/api-client', () => ({ - apiClient: mocks.apiClient, -})) - -type UserFactsApi = ReturnType - -function fact(id: string): UserFact { - return { id, factText: `fact ${id}`, category: null } -} - -function seedLists(facts: UserFact[]): void { - mocks.store.set(JSON.stringify(userFactKeys.lists()), facts) - mocks.factsData = facts -} - -function renderUserFacts(hasProAccess = true): { current: UserFactsApi } { - const ref: { current: UserFactsApi | null } = { current: null } - function Harness() { - ref.current = useUserFacts(hasProAccess) - return null - } - TestRenderer.act(() => { - TestRenderer.create(React.createElement(Harness)) - }) - if (!ref.current) throw new Error('useUserFacts did not render') - return ref as { current: UserFactsApi } -} - -function currentList(): UserFact[] { - return (mocks.store.get(JSON.stringify(userFactKeys.lists())) as UserFact[]) ?? [] -} - -interface CapturedMutation { - mutationFn: (variables: unknown) => Promise - onMutate?: (variables: unknown) => Promise | unknown - onError?: (error: unknown, variables: unknown, context: unknown) => void - onSuccess?: (data: unknown, variables: unknown, context: unknown) => void -} - -function asMutation(mutation: unknown): CapturedMutation { - return mutation as CapturedMutation -} - -describe('useUserFacts', () => { - beforeEach(() => { - mocks.store.clear() - mocks.queryConfigs = [] - mocks.isOnline = true - mocks.factsData = undefined - mocks.queryClient.cancelQueries.mockClear() - mocks.queryClient.invalidateQueries.mockClear() - mocks.queryClient.getQueryData.mockClear() - mocks.queryClient.setQueryData.mockClear() - mocks.performQueuedApiMutation.mockClear() - }) - - it('loads the facts list from the user-facts endpoint', async () => { - mocks.apiClient.mockResolvedValue([fact('a')]) - renderUserFacts() - - await mocks.queryConfigs.at(-1)?.queryFn() - - expect(mocks.apiClient).toHaveBeenCalledWith(API.userFacts.list) - }) - - it('wires the delete and bulk-delete mutations to their queued endpoints', async () => { - const hook = renderUserFacts() - - await asMutation(hook.current.deleteMutation).mutationFn('a') - expect(mocks.performQueuedApiMutation).toHaveBeenCalledWith( - expect.objectContaining({ - type: 'deleteUserFact', - endpoint: API.userFacts.delete('a'), - method: 'DELETE', - dedupeKey: 'user-fact-delete-a', - }), - ) - - await asMutation(hook.current.bulkDeleteMutation).mutationFn(['a', 'b']) - expect(mocks.performQueuedApiMutation).toHaveBeenCalledWith( - expect.objectContaining({ - type: 'bulkDeleteUserFacts', - endpoint: API.userFacts.bulk, - method: 'DELETE', - payload: { ids: ['a', 'b'] }, - }), - ) - }) - - it('gates facts behind pro access', () => { - seedLists([fact('a')]) - const nonPro = renderUserFacts(false) - expect(nonPro.current.facts).toEqual([]) - expect(nonPro.current.totalFactsPages).toBe(1) - - const pro = renderUserFacts(true) - expect(pro.current.facts).toHaveLength(1) - }) - - it('paginates facts five per page', () => { - seedLists(Array.from({ length: 7 }, (_unused, index) => fact(String(index)))) - const hook = renderUserFacts() - - expect(hook.current.totalFactsPages).toBe(2) - expect(hook.current.pagedFacts).toHaveLength(5) - - TestRenderer.act(() => { - hook.current.setFactsPage(2) - }) - expect(hook.current.pagedFacts).toHaveLength(2) - }) - - it('clamps the page number when it exceeds the available pages', () => { - seedLists([fact('a'), fact('b')]) - const hook = renderUserFacts() - - TestRenderer.act(() => { - hook.current.setFactsPage(9) - }) - - expect(hook.current.factsPage).toBe(1) - }) - - it('optimistically removes a fact and rolls back on error', async () => { - seedLists([fact('a'), fact('b'), fact('c')]) - const hook = renderUserFacts() - - const deleteMutation = asMutation(hook.current.deleteMutation) - let context: unknown - await TestRenderer.act(async () => { - context = await deleteMutation.onMutate?.('b') - }) - - expect(currentList().map((entry) => entry.id)).toEqual(['a', 'c']) - expect(mocks.queryClient.cancelQueries).toHaveBeenCalledWith({ - queryKey: userFactKeys.lists(), - }) - - TestRenderer.act(() => { - deleteMutation.onError?.(new Error('boom'), 'b', context) - }) - - expect(currentList().map((entry) => entry.id)).toEqual(['a', 'b', 'c']) - }) - - it('invalidates queries after a successful delete only when online', () => { - seedLists([fact('a')]) - const hook = renderUserFacts() - - asMutation(hook.current.deleteMutation).onSuccess?.(undefined, 'a', undefined) - expect(mocks.queryClient.invalidateQueries).toHaveBeenCalledWith({ - queryKey: userFactKeys.all, - }) - - mocks.queryClient.invalidateQueries.mockClear() - mocks.isOnline = false - const offlineHook = renderUserFacts() - asMutation(offlineHook.current.deleteMutation).onSuccess?.(undefined, 'a', undefined) - expect(mocks.queryClient.invalidateQueries).not.toHaveBeenCalled() - }) - - it('optimistically bulk-deletes and rolls back on error', async () => { - seedLists([fact('a'), fact('b'), fact('c')]) - const hook = renderUserFacts() - - const bulkDeleteMutation = asMutation(hook.current.bulkDeleteMutation) - let context: unknown - await TestRenderer.act(async () => { - context = await bulkDeleteMutation.onMutate?.(['a', 'c']) - }) - - expect(currentList().map((entry) => entry.id)).toEqual(['b']) - - TestRenderer.act(() => { - bulkDeleteMutation.onError?.(new Error('boom'), ['a', 'c'], context) - }) - - expect(currentList().map((entry) => entry.id)).toEqual(['a', 'b', 'c']) - }) - - it('exits select mode after a bulk delete empties the list', async () => { - seedLists([fact('a'), fact('b')]) - const hook = renderUserFacts() - - TestRenderer.act(() => { - hook.current.toggleSelectMode() - }) - TestRenderer.act(() => { - hook.current.toggleSelectAll() - }) - expect(hook.current.selectMode).toBe(true) - expect(hook.current.selectedFactIds.size).toBe(2) - - const bulkDeleteMutation = asMutation(hook.current.bulkDeleteMutation) - await TestRenderer.act(async () => { - await bulkDeleteMutation.onMutate?.(['a', 'b']) - }) - TestRenderer.act(() => { - bulkDeleteMutation.onSuccess?.(undefined, ['a', 'b'], undefined) - }) - - expect(hook.current.selectedFactIds.size).toBe(0) - expect(hook.current.selectMode).toBe(false) - }) - - it('toggles individual and all-fact selection', () => { - seedLists([fact('a'), fact('b'), fact('c')]) - const hook = renderUserFacts() - - TestRenderer.act(() => { - hook.current.toggleFactSelection('b') - }) - expect([...hook.current.selectedFactIds]).toEqual(['b']) - - TestRenderer.act(() => { - hook.current.toggleFactSelection('b') - }) - expect(hook.current.selectedFactIds.size).toBe(0) - - TestRenderer.act(() => { - hook.current.toggleSelectAll() - }) - expect(hook.current.selectedFactIds.size).toBe(3) - - TestRenderer.act(() => { - hook.current.toggleSelectAll() - }) - expect(hook.current.selectedFactIds.size).toBe(0) - }) -}) diff --git a/apps/mobile/__tests__/components/ai-settings-sections.test.tsx b/apps/mobile/__tests__/components/ai-settings-sections.test.tsx index 9656ce81ad..02ecfe8d7d 100644 --- a/apps/mobile/__tests__/components/ai-settings-sections.test.tsx +++ b/apps/mobile/__tests__/components/ai-settings-sections.test.tsx @@ -1,25 +1,16 @@ import React from 'react' import { describe, expect, it, vi } from 'vitest' +import { createTokensV2 } from '@/lib/theme' +import { AiFeatureToggles } from '@/app/ai-settings-sections' vi.mock('@/components/ui/pro-badge', () => ({ ProBadge: () => null, })) -import { createTokensV2 } from '@/lib/theme' -import { createStyles as createSectionStyles } from '@/app/ai-settings-styles' -import { - AiFeatureToggles, - FactsSelectBar, - UserFactsList, -} from '@/app/ai-settings-sections' -import type { UserFact } from '@/app/use-user-facts' - const TestRenderer = require('react-test-renderer') const tokens = createTokensV2('purple', 'dark') -const styles = createSectionStyles() -const translate = (key: string, params?: Record) => - params ? `${key}(${JSON.stringify(params)})` : key +const translate = (key: string) => key interface TestNode { type: unknown @@ -30,6 +21,7 @@ type TestTree = { root: { findAll: (predicate: (node: TestNode) => boolean) => TestNode[] } } +const SUMMARY_LABEL = 'profile.aiSummary.title' const PROACTIVE_LABEL = 'profile.proactiveAstra.title' function baseProps() { @@ -37,20 +29,17 @@ function baseProps() { tokens, t: translate, hasProAccess: true, - aiMemoryEnabled: true, aiSummaryEnabled: true, proactiveAstraEnabled: false, - memoryPending: false, summaryPending: false, proactivePending: false, - onToggleMemory: vi.fn(), onToggleSummary: vi.fn(), onToggleProactive: vi.fn(), onUpgrade: vi.fn(), } } -function renderToggles(props: ReturnType): TestTree { +function renderToggles(props = baseProps()): TestTree { let tree: TestTree TestRenderer.act(() => { tree = TestRenderer.create() @@ -58,32 +47,16 @@ function renderToggles(props: ReturnType): TestTree { return tree! } -function render(element: React.ReactElement): TestTree { - let tree: TestTree - TestRenderer.act(() => { - tree = TestRenderer.create(element) - }) - return tree! -} - -function switches(tree: TestTree): TestNode[] { +function nodesWithRole(tree: TestTree, role: string): TestNode[] { return tree.root.findAll( - (node) => - typeof node.type === 'string' && node.props.accessibilityRole === 'switch', + (node) => typeof node.type === 'string' && node.props.accessibilityRole === role, ) } -function findNode( - tree: TestTree, - role: string, - label: string, -): TestNode | undefined { - return tree.root.findAll( - (node) => - typeof node.type === 'string' && - node.props.accessibilityRole === role && - node.props.accessibilityLabel === label, - )[0] +function findNode(tree: TestTree, role: string, label: string): TestNode | undefined { + return nodesWithRole(tree, role).find( + (node) => node.props.accessibilityLabel === label, + ) } function press(node: TestNode | undefined) { @@ -92,31 +65,12 @@ function press(node: TestNode | undefined) { }) } -function exercisePressCallbacks(tree: TestTree) { - for (const node of tree.root.findAll(() => true)) { - const style = node.props.style - if (typeof style === 'function') { - style({ pressed: true }) - style({ pressed: false }) - } - const children = node.props.children - if (typeof children === 'function') { - ;(children as (state: { pressed: boolean }) => unknown)({ pressed: true }) - } - } -} - -function texts(tree: TestTree): unknown[] { - return tree.root - .findAll((node) => node.type === 'Text') - .map((node) => node.props.children) -} - describe('mobile AiFeatureToggles', () => { - it('renders a proactive-check-ins switch reflecting its off state for Pro users', () => { - const tree = renderToggles(baseProps()) - expect(switches(tree)).toHaveLength(3) - + it('renders exactly the daily summary and proactive switches for Pro users', () => { + const tree = renderToggles() + const switches = nodesWithRole(tree, 'switch') + expect(switches).toHaveLength(2) + expect(findNode(tree, 'switch', SUMMARY_LABEL)).toBeDefined() const proactive = findNode(tree, 'switch', PROACTIVE_LABEL) expect(proactive).toBeDefined() expect( @@ -124,218 +78,22 @@ describe('mobile AiFeatureToggles', () => { ).toBe(false) }) - it('calls onToggleProactive when the proactive switch is pressed', () => { + it('calls both surviving callbacks from their switches', () => { const props = baseProps() const tree = renderToggles(props) + press(findNode(tree, 'switch', SUMMARY_LABEL)) press(findNode(tree, 'switch', PROACTIVE_LABEL)) + expect(props.onToggleSummary).toHaveBeenCalledTimes(1) expect(props.onToggleProactive).toHaveBeenCalledTimes(1) }) - it('locks the proactive row behind an upgrade prompt for non-pro users', () => { + it('renders exactly two locked upgrade rows for free users', () => { const props = { ...baseProps(), hasProAccess: false } const tree = renderToggles(props) - expect(switches(tree)).toHaveLength(0) - - const lockedRow = findNode(tree, 'button', PROACTIVE_LABEL) - expect(lockedRow).toBeDefined() - press(lockedRow) + expect(nodesWithRole(tree, 'switch')).toHaveLength(0) + const rows = nodesWithRole(tree, 'button') + expect(rows).toHaveLength(2) + press(rows[0]) expect(props.onUpgrade).toHaveBeenCalledTimes(1) }) }) - -function selectBarProps() { - return { - tokens, - t: translate, - styles, - selectMode: false, - selectedCount: 0, - allSelected: false, - bulkDeletePending: false, - showPaging: false, - page: 1, - totalPages: 3, - onPreviousPage: vi.fn(), - onNextPage: vi.fn(), - onToggleSelectAll: vi.fn(), - onBulkDelete: vi.fn(), - onToggleSelectMode: vi.fn(), - } -} - -describe('mobile FactsSelectBar', () => { - it('shows the select entry point when idle and enters select mode on press', () => { - const props = selectBarProps() - const tree = render() - const selectButton = findNode(tree, 'button', 'profile.facts.select') - expect(selectButton).toBeDefined() - press(selectButton) - expect(props.onToggleSelectMode).toHaveBeenCalledTimes(1) - exercisePressCallbacks(tree) - }) - - it('renders paging controls and steps to the next page', () => { - const props = { ...selectBarProps(), showPaging: true, page: 1 } - const tree = render() - expect(texts(tree)).toContain('profile.facts.count({"n":1,"max":3})') - press(findNode(tree, 'button', 'common.next')) - expect(props.onNextPage).toHaveBeenCalledTimes(1) - press(findNode(tree, 'button', 'common.previous')) - expect(props.onPreviousPage).toHaveBeenCalledTimes(1) - exercisePressCallbacks(tree) - }) - - it('disables the next control when on the last page', () => { - const props = { ...selectBarProps(), showPaging: true, page: 3, totalPages: 3 } - const tree = render() - expect(findNode(tree, 'button', 'common.next')?.props.disabled).toBe(true) - exercisePressCallbacks(tree) - }) - - it('offers select-all and bulk-delete when items are selected', () => { - const props = { - ...selectBarProps(), - selectMode: true, - selectedCount: 2, - allSelected: false, - } - const tree = render() - press(findNode(tree, 'button', 'profile.facts.selectAll')) - expect(props.onToggleSelectAll).toHaveBeenCalledTimes(1) - press(findNode(tree, 'button', 'profile.facts.deleteSelectedShort')) - expect(props.onBulkDelete).toHaveBeenCalledTimes(1) - press(findNode(tree, 'button', 'profile.facts.cancel')) - expect(props.onToggleSelectMode).toHaveBeenCalledTimes(1) - exercisePressCallbacks(tree) - }) - - it('switches select-all to deselect and hides bulk-delete when nothing is selected', () => { - const props = { - ...selectBarProps(), - selectMode: true, - selectedCount: 0, - allSelected: true, - } - const tree = render() - expect(findNode(tree, 'button', 'profile.facts.deselectAll')).toBeDefined() - expect( - findNode(tree, 'button', 'profile.facts.deleteSelectedShort'), - ).toBeUndefined() - exercisePressCallbacks(tree) - }) -}) - -const factWithCategory: UserFact = { - id: 'fact-1', - factText: 'Prefers mornings', - category: 'routine', -} -const factWithoutCategory: UserFact = { - id: 'fact-2', - factText: 'Drinks tea', - category: null, -} - -function listProps(overrides: Partial> = {}) { - return { - tokens, - t: translate, - styles, - hasProAccess: true, - factsQuery: { isLoading: false, error: null, refetch: vi.fn() }, - facts: [factWithCategory, factWithoutCategory], - pagedFacts: [factWithCategory, factWithoutCategory], - selectMode: false, - selectedFactIds: new Set(), - onToggleSelection: vi.fn(), - onDelete: vi.fn(), - onAskAstra: vi.fn(), - ...overrides, - } -} - -describe('mobile UserFactsList', () => { - it('renders the locked hint for non-pro users', () => { - const tree = render() - expect(texts(tree)).toContain('profile.facts.lockedHint') - }) - - it('renders skeleton placeholders while loading', () => { - const tree = render( - , - ) - expect(texts(tree)).toHaveLength(0) - }) - - it('surfaces an error state whose retry refetches', () => { - const refetch = vi.fn() - const tree = render( - , - ) - expect(texts(tree)).toContain('profile.facts.factsError') - press( - tree.root.findAll( - (node) => - typeof node.type === 'string' && node.props.accessibilityRole === 'button', - )[0], - ) - expect(refetch).toHaveBeenCalledTimes(1) - }) - - it('renders an empty state that routes to Astra', () => { - const onAskAstra = vi.fn() - const tree = render( - , - ) - expect(texts(tree)).toContain('profile.facts.empty') - press( - tree.root.findAll( - (node) => - typeof node.type === 'string' && node.props.accessibilityRole === 'button', - )[0], - ) - expect(onAskAstra).toHaveBeenCalledTimes(1) - }) - - it('lists facts with categories and deletes on the trash control', () => { - const onDelete = vi.fn() - const tree = render() - const flatTexts = texts(tree) - expect(flatTexts).toContain('Prefers mornings') - expect(flatTexts).toContain('Drinks tea') - expect( - flatTexts.some( - (value) => typeof value === 'string' && value.startsWith('PROFILE.FACTS.'), - ), - ).toBe(true) - press(findNode(tree, 'button', 'profile.facts.delete')) - expect(onDelete).toHaveBeenCalledWith('fact-1') - exercisePressCallbacks(tree) - }) - - it('toggles selection when a card is pressed in select mode', () => { - const onToggleSelection = vi.fn() - const tree = render( - , - ) - const card = tree.root.findAll( - (node) => - typeof node.type === 'string' && node.props.accessibilityRole === 'checkbox', - )[0] - press(card) - expect(onToggleSelection).toHaveBeenCalledWith('fact-1') - exercisePressCallbacks(tree) - }) -}) diff --git a/apps/mobile/__tests__/components/upgrade/plan-comparison-cards.test.tsx b/apps/mobile/__tests__/components/upgrade/plan-comparison-cards.test.tsx index de8b5caa19..7de13004ee 100644 --- a/apps/mobile/__tests__/components/upgrade/plan-comparison-cards.test.tsx +++ b/apps/mobile/__tests__/components/upgrade/plan-comparison-cards.test.tsx @@ -37,5 +37,7 @@ describe('PlanComparisonCards (mobile)', () => { expect(expanded).toContain('upgrade.features.retrospective.label') expect(expanded).toContain('upgrade.matrix.yearlyTag') expect(expanded).toContain('upgrade.matrix.notIncluded') + const retiredKey = ['upgrade.features.ai', 'Memory.label'].join('') + expect(expanded).not.toContain(retiredKey) }) }) diff --git a/apps/mobile/__tests__/lib/offline-mutations.test.ts b/apps/mobile/__tests__/lib/offline-mutations.test.ts index 1654b7b5cd..67f6345cd2 100644 --- a/apps/mobile/__tests__/lib/offline-mutations.test.ts +++ b/apps/mobile/__tests__/lib/offline-mutations.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { QueuedMutation } from '@orbit/shared/types/sync' +import type { MutationType, QueuedMutation } from '@orbit/shared/types/sync' import { logHabitResponseSchema } from '@orbit/shared/types/habit' import { @@ -15,7 +15,6 @@ import { subscribeDroppedMutations, withQueuedMarker, } from '@/lib/offline-mutations' -import type { MutationType } from '@orbit/shared/types/sync' import { consumePendingIdempotencyKey } from '@/lib/idempotency-key' const mocks = vi.hoisted(() => { @@ -79,27 +78,30 @@ const mocks = vi.hoisted(() => { } }) - const upsertOfflineEntity = vi.fn(async () => {}) - const setOfflineEntityStatus = vi.fn(async () => {}) - const clearOfflineEntity = vi.fn(async () => {}) - const markOfflineTombstone = vi.fn(async () => {}) - const resolveOfflineEntity = vi.fn(async (_entityType: string, oldId: string, newId: string) => { + const upsertOfflineEntity = vi.fn(() => Promise.resolve()) + const setOfflineEntityStatus = vi.fn(() => Promise.resolve()) + const clearOfflineEntity = vi.fn(() => Promise.resolve()) + const markOfflineTombstone = vi.fn(() => Promise.resolve()) + const resolveOfflineEntity = vi.fn((_entityType: string, oldId: string, newId: string) => { resolvedIds.set(oldId, newId) + return Promise.resolve() }) - const getResolvedEntityId = vi.fn(async (_entityType: string, id: string) => resolvedIds.get(id) ?? id) + const getResolvedEntityId = vi.fn((_entityType: string, id: string) => + Promise.resolve(resolvedIds.get(id) ?? id), + ) - const persistQueryCache = vi.fn(async () => {}) - const invalidateQueries = vi.fn(async () => {}) + const persistQueryCache = vi.fn(() => Promise.resolve()) + const invalidateQueries = vi.fn(() => Promise.resolve()) - const apiClient = vi.fn(async (endpoint: string) => { + const apiClient = vi.fn((endpoint: string): Promise<{ id: string } | null> => { if (endpoint === '/api/habits') { - return { id: 'habit-1' } + return Promise.resolve({ id: 'habit-1' }) } - return null + return Promise.resolve(null) }) - const getCurrentConnectivity = vi.fn(async () => online) + const getCurrentConnectivity = vi.fn(() => Promise.resolve(online)) return { queued, @@ -183,8 +185,8 @@ describe('offline mutations', () => { mocks.persistQueryCache.mockClear() mocks.invalidateQueries.mockClear() mocks.apiClient.mockReset() - mocks.apiClient.mockImplementation(async (endpoint: string) => - endpoint === '/api/habits' ? { id: 'habit-1' } : null, + mocks.apiClient.mockImplementation((endpoint: string) => + Promise.resolve(endpoint === '/api/habits' ? { id: 'habit-1' } : null), ) mocks.getCurrentConnectivity.mockClear() cancelScheduledFlush() @@ -204,9 +206,7 @@ describe('offline mutations', () => { const queuedAck = { queued: true as const } const result = await queueOrExecute({ mutation, - execute: async () => { - throw new Error('should not execute while offline') - }, + execute: () => Promise.reject(new Error('should not execute while offline')), queuedResult: queuedAck, }) @@ -273,9 +273,9 @@ describe('offline mutations', () => { let keyDuringExecute: string | null = null await queueOrExecute({ mutation, - execute: async () => { + execute: () => { keyDuringExecute = consumePendingIdempotencyKey() - return { id: 'tag-1' } + return Promise.resolve({ id: 'tag-1' }) }, queuedResult: { queued: true as const }, }) @@ -295,7 +295,7 @@ describe('offline mutations', () => { await queueOrExecute({ mutation, - execute: async () => ({ id: 'tag-1' }), + execute: () => Promise.resolve({ id: 'tag-1' }), queuedResult: { queued: true as const }, }) @@ -314,7 +314,7 @@ describe('offline mutations', () => { payload: { language: 'en' }, dedupeKey: 'profile-language', }, - execute: async () => undefined, + execute: () => Promise.resolve(undefined), }) expect(result).toMatchObject({ @@ -337,7 +337,7 @@ describe('offline mutations', () => { targetEntityId: 'offline-habit-1', }) - const execute = vi.fn(async () => ({ ok: true })) + const execute = vi.fn(() => Promise.resolve({ ok: true })) const queuedAck = { queued: true as const } const result = await queueOrExecute({ @@ -365,7 +365,7 @@ describe('offline mutations', () => { clientEntityId: 'offline-habit-1', }) - const execute = vi.fn(async () => ({ id: 'habit-1' })) + const execute = vi.fn(() => Promise.resolve({ id: 'habit-1' })) const result = await queueOrExecute({ mutation, @@ -391,7 +391,7 @@ describe('offline mutations', () => { dependsOn: ['offline-tag-1'], }) - const execute = vi.fn(async () => ({ ok: true })) + const execute = vi.fn(() => Promise.resolve({ ok: true })) const queuedAck = { queued: true as const } const result = await queueOrExecute({ @@ -420,9 +420,7 @@ describe('offline mutations', () => { await expect(queueOrExecute({ mutation, - execute: async () => { - throw new Error('Validation failed') - }, + execute: () => Promise.reject(new Error('Validation failed')), queuedResult: { queued: true as const }, })).rejects.toThrow('Validation failed') @@ -482,12 +480,12 @@ describe('offline mutations', () => { it('flushes payload-only dependencies after earlier offline ids are rewritten', async () => { mocks.setOnline(true) - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { if (endpoint === '/api/tags') { - return { id: 'tag-1' } + return Promise.resolve({ id: 'tag-1' }) } - return null + return Promise.resolve(null) }) mocks.queued.push( @@ -585,11 +583,11 @@ describe('offline mutations', () => { it('drops a validation-rejected mutation, keeps flushing the rest, and reports the dropped one', async () => { mocks.setOnline(true) - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { if (endpoint === '/api/habits/habit-bad') { - throw new Error('400 validation failed') + return Promise.reject(new Error('400 validation failed')) } - return { id: 'habit-good' } + return Promise.resolve({ id: 'habit-good' }) }) const droppedCandidate = { @@ -652,11 +650,11 @@ describe('offline mutations', () => { it('notifies subscribers on every dropped mutation and stops after unsubscribe', async () => { mocks.setOnline(true) - mocks.apiClient.mockImplementation(async () => { - throw new Error('400 validation failed') - }) + mocks.apiClient.mockImplementation(() => + Promise.reject(new Error('400 validation failed')), + ) - const dropped: Array<{ id: string; type: string }> = [] + const dropped: { id: string; type: string }[] = [] const unsubscribe = subscribeDroppedMutations((drop) => { dropped.push({ id: drop.id, type: drop.type }) }) @@ -722,9 +720,9 @@ describe('offline mutations', () => { let executedWith: QueuedMutation | null = null await queueOrExecute({ mutation, - execute: async (resolved) => { + execute: (resolved) => { executedWith = resolved - return { ok: true } + return Promise.resolve({ ok: true }) }, queuedResult: { queued: true as const }, }) @@ -755,9 +753,7 @@ describe('offline mutations', () => { method: 'PUT', payload: { title: 'Retry' }, }), - execute: async () => { - throw new TypeError('Network request failed') - }, + execute: () => Promise.reject(new TypeError('Network request failed')), queuedResult: queuedAck, }) @@ -778,7 +774,7 @@ describe('offline mutations', () => { entityType: 'habit', targetEntityId: 'habit-7', }), - execute: async () => undefined, + execute: () => Promise.resolve(undefined), queuedResult: { queued: true as const }, }) @@ -970,9 +966,9 @@ describe('offline mutations', () => { it('replays 120 queued mutations in enqueue order, applying every one with none dropped', async () => { mocks.setOnline(true) const flushOrder: string[] = [] - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { flushOrder.push(endpoint) - return null + return Promise.resolve(null) }) const total = 120 @@ -1005,13 +1001,13 @@ describe('offline mutations', () => { mocks.setOnline(true) const flushOrder: string[] = [] let dropThirdOnce = true - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { flushOrder.push(endpoint) if (endpoint === '/api/habits/habit-c' && dropThirdOnce) { dropThirdOnce = false - throw new Error('Network request failed') + return Promise.reject(new Error('Network request failed')) } - return null + return Promise.resolve(null) }) for (const suffix of ['a', 'b', 'c', 'd']) { @@ -1052,12 +1048,12 @@ describe('offline mutations', () => { it('keeps unacknowledged mutations queued and unsent when a flush times out mid-batch', async () => { mocks.setOnline(true) const flushOrder: string[] = [] - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { flushOrder.push(endpoint) if (endpoint === '/api/habits/habit-slow') { - throw new Error('The request timed out') + return Promise.reject(new Error('The request timed out')) } - return null + return Promise.resolve(null) }) mocks.queued.push( @@ -1118,10 +1114,10 @@ describe('offline mutations', () => { it('defers a dependent mutation until its offline dependency resolves, even when queued ahead of the create', async () => { mocks.setOnline(true) const flushOrder: string[] = [] - mocks.apiClient.mockImplementation(async (endpoint: string) => { + mocks.apiClient.mockImplementation((endpoint: string) => { flushOrder.push(endpoint) - if (endpoint === '/api/tags') return { id: 'tag-1' } - return null + if (endpoint === '/api/tags') return Promise.resolve({ id: 'tag-1' }) + return Promise.resolve(null) }) mocks.queued.push( @@ -1204,12 +1200,11 @@ describe('offline mutation helpers', () => { }) it('maps every mutation type group to its invalidation scope', () => { - const cases: Array<[MutationType, string]> = [ + const cases: [MutationType, string][] = [ ['createGoal', 'goals'], ['linkGoalHabits', 'goals'], ['assignTags', 'tags'], ['markNotificationRead', 'notifications'], - ['bulkDeleteUserFacts', 'userFacts'], ['createApiKey', 'apiKeys'], ['dismissCalendarPrompt', 'calendar'], ['setLanguage', 'profile'], diff --git a/apps/mobile/__tests__/lib/queued-api-mutation.test.ts b/apps/mobile/__tests__/lib/queued-api-mutation.test.ts index 8cd9f2287f..9e41475bfe 100644 --- a/apps/mobile/__tests__/lib/queued-api-mutation.test.ts +++ b/apps/mobile/__tests__/lib/queued-api-mutation.test.ts @@ -101,16 +101,16 @@ describe('performQueuedApiMutation', () => { }) it('respects a custom executor override', async () => { - const execute = vi.fn(async () => 'done') - mocks.runQueuedMutation.mockImplementation(async ({ execute: forwardedExecute, mutation }: { + const execute = vi.fn(() => Promise.resolve('done')) + mocks.runQueuedMutation.mockImplementation(({ execute: forwardedExecute, mutation }: { execute: (mutation: { endpoint: string; method: string; payload: unknown }) => Promise mutation: { endpoint: string; method: string; payload: unknown } }) => forwardedExecute(mutation)) const result = await performQueuedApiMutation({ - type: 'setAiMemory', + type: 'setAiSummary', scope: 'profile', - endpoint: '/api/profile/ai-memory', + endpoint: '/api/profile/ai-summary', method: 'PUT', payload: { enabled: true }, execute, @@ -118,9 +118,9 @@ describe('performQueuedApiMutation', () => { }) expect(execute).toHaveBeenCalledWith({ - type: 'setAiMemory', + type: 'setAiSummary', scope: 'profile', - endpoint: '/api/profile/ai-memory', + endpoint: '/api/profile/ai-summary', method: 'PUT', payload: { enabled: true }, }) diff --git a/apps/mobile/app/ai-settings-sections.tsx b/apps/mobile/app/ai-settings-sections.tsx index 0471d5d1ec..b0db43bdba 100644 --- a/apps/mobile/app/ai-settings-sections.tsx +++ b/apps/mobile/app/ai-settings-sections.tsx @@ -1,53 +1,19 @@ -import { View, Text, Pressable } from 'react-native' -import Animated, { FadeInDown, ReduceMotion } from 'react-native-reanimated' -import { - BellRing, - Brain, - CheckCheck, - ChevronLeft, - ChevronRight, - ListChecks, - Lock, - Satellite, - Sparkles, - SquareX, - Trash2, - X, -} from 'lucide-react-native' -import { normalizeUserFactCategory } from '@orbit/shared/utils' -import { tintFromPrimary } from '@/lib/theme' +import { BellRing, Lock, Satellite } from 'lucide-react-native' import { SectionLabel } from '@/components/ui/section-label' import { SettingsRow, Switch } from '@/components/ui/settings-row' -import { RadioGlyph } from '@/components/ui/select-check' -import { SatelliteGlyph } from '@/components/ui/satellite-glyph' -import { SkeletonLine } from '@/components/ui/skeleton' -import { PillButton } from '@/components/ui/pill-button' import { ProBadge } from '@/components/ui/pro-badge' -import type { UseQueryResult } from '@tanstack/react-query' -import { createStyles, type Tokens } from './ai-settings-styles' -import type { UserFact } from './use-user-facts' +import type { Tokens } from './ai-settings-styles' type TranslationFn = (key: string, params?: Record) => string -type Styles = ReturnType - -function rowEntrance(index: number) { - return FadeInDown.duration(280) - .delay(Math.min(index, 8) * 40) - .reduceMotion(ReduceMotion.System) -} - interface AiFeatureTogglesProps { tokens: Tokens t: TranslationFn hasProAccess: boolean - aiMemoryEnabled: boolean aiSummaryEnabled: boolean proactiveAstraEnabled: boolean - memoryPending: boolean summaryPending: boolean proactivePending: boolean - onToggleMemory: () => void onToggleSummary: () => void onToggleProactive: () => void onUpgrade: () => void @@ -57,13 +23,10 @@ export function AiFeatureToggles({ tokens, t, hasProAccess, - aiMemoryEnabled, aiSummaryEnabled, proactiveAstraEnabled, - memoryPending, summaryPending, proactivePending, - onToggleMemory, onToggleSummary, onToggleProactive, onUpgrade, @@ -73,33 +36,6 @@ export function AiFeatureToggles({ }> {t('profile.sections.aiFeatures')} - {hasProAccess ? ( - - - - ) : ( - - - - )} {hasProAccess ? ( ) } - -interface FactsSelectBarProps { - tokens: Tokens - t: TranslationFn - styles: Styles - selectMode: boolean - selectedCount: number - allSelected: boolean - bulkDeletePending: boolean - showPaging: boolean - page: number - totalPages: number - onPreviousPage: () => void - onNextPage: () => void - onToggleSelectAll: () => void - onBulkDelete: () => void - onToggleSelectMode: () => void -} - -export function FactsSelectBar({ - tokens, - t, - styles, - selectMode, - selectedCount, - allSelected, - bulkDeletePending, - showPaging, - page, - totalPages, - onPreviousPage, - onNextPage, - onToggleSelectAll, - onBulkDelete, - onToggleSelectMode, -}: Readonly) { - return ( - - {showPaging ? ( - <> - - {t('profile.facts.count', { n: page, max: totalPages })} - - [ - styles.pageBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - page === 1 ? { opacity: 0.4 } : null, - pressed ? styles.pageBtnPressed : null, - ]} - > - - - [ - styles.pageBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - page === totalPages ? { opacity: 0.4 } : null, - pressed ? styles.pageBtnPressed : null, - ]} - > - - - - ) : null} - - {selectMode ? ( - <> - [ - styles.iconBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - pressed ? styles.actionChipPressed : null, - ]} - > - {allSelected ? ( - - ) : ( - - )} - - {selectedCount > 0 ? ( - [ - styles.actionChip, - { - backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev, - borderColor: tokens.hairline, - }, - pressed ? styles.actionChipPressed : null, - bulkDeletePending && { opacity: 0.45 }, - ]} - > - - - {selectedCount} - - - ) : null} - [ - styles.iconBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - pressed ? styles.actionChipPressed : null, - ]} - > - - - - ) : ( - [ - styles.iconBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - pressed ? styles.actionChipPressed : null, - ]} - > - - - )} - - ) -} - -interface FactItemProps { - tokens: Tokens - t: TranslationFn - styles: Styles - fact: UserFact - index: number - selectMode: boolean - selected: boolean - onToggleSelection: (id: string) => void - onDelete: (id: string) => void -} - -function FactItem({ - tokens, - t, - styles, - fact, - index, - selectMode, - selected, - onToggleSelection, - onDelete, -}: Readonly) { - function categoryLabel(category: string | null): string { - const norm = normalizeUserFactCategory(category) - return t(`profile.facts.${norm}`, { defaultValue: norm }).toUpperCase() - } - - return ( - - onToggleSelection(fact.id) : undefined} - accessibilityRole={selectMode ? 'checkbox' : 'none'} - accessibilityState={selectMode ? { checked: selected } : undefined} - style={({ pressed }) => [ - styles.factCard, - selected && selectMode - ? { - backgroundColor: tintFromPrimary(tokens, 0.08), - borderColor: tintFromPrimary(tokens, 0.28), - } - : { - backgroundColor: - pressed && selectMode - ? tokens.bgElevPressed - : tokens.bgCard, - borderColor: tokens.hairline, - }, - pressed && selectMode ? styles.factCardPressed : null, - ]} - > - {selectMode ? ( - - - - ) : null} - - {fact.category ? ( - - - {categoryLabel(fact.category)} - - - ) : null} - - {fact.factText} - - - {!selectMode ? ( - onDelete(fact.id)} - accessibilityRole="button" - accessibilityLabel={t('profile.facts.delete')} - hitSlop={{ top: 6, bottom: 6, left: 6, right: 6 }} - style={({ pressed }) => [ - styles.deleteBtn, - { backgroundColor: pressed ? tokens.bgElev2 : tokens.bgElev }, - pressed ? styles.actionChipPressed : null, - ]} - > - {({ pressed }) => ( - - )} - - ) : null} - - - ) -} - -interface UserFactsListProps { - tokens: Tokens - t: TranslationFn - styles: Styles - hasProAccess: boolean - factsQuery: Pick, 'isLoading' | 'error' | 'refetch'> - facts: UserFact[] - pagedFacts: UserFact[] - selectMode: boolean - selectedFactIds: Set - onToggleSelection: (id: string) => void - onDelete: (id: string) => void - onAskAstra: () => void -} - -export function UserFactsList({ - tokens, - t, - styles, - hasProAccess, - factsQuery, - facts, - pagedFacts, - selectMode, - selectedFactIds, - onToggleSelection, - onDelete, - onAskAstra, -}: Readonly) { - if (!hasProAccess) { - return ( - - - {t('profile.facts.lockedHint')} - - - ) - } - - if (factsQuery.isLoading) { - return ( - - - - - ) - } - - if (factsQuery.error) { - return ( - - - - {t('profile.facts.factsError')} - - {/* eslint-disable-next-line local/no-fullbleed-button -- empty-state retry CTA */} - void factsQuery.refetch()}> - {t('profile.facts.retry')} - - - ) - } - - if (facts.length === 0) { - return ( - - - - {t('profile.facts.empty')} - - - } - > - {t('summary.askAstra')} - - - ) - } - - return ( - - {pagedFacts.map((fact, index) => ( - - ))} - - ) -} diff --git a/apps/mobile/app/ai-settings-styles.ts b/apps/mobile/app/ai-settings-styles.ts index 5e75cc4b02..0d123f7b00 100644 --- a/apps/mobile/app/ai-settings-styles.ts +++ b/apps/mobile/app/ai-settings-styles.ts @@ -8,125 +8,5 @@ export function createStyles() { safeArea: { flex: 1 }, container: { flex: 1 }, scrollContent: { paddingBottom: 40 }, - lockedBlock: { - paddingHorizontal: 20, - paddingVertical: 10, - }, - lockedText: { - fontFamily: 'Rubik_400Regular', - fontSize: 13, - }, - emptyBlock: { - alignItems: 'center', - paddingHorizontal: 36, - paddingVertical: 40, - gap: 18, - }, - emptyBody: { - fontFamily: 'Rubik_400Regular', - fontSize: 15, - lineHeight: 22.5, - textAlign: 'center', - maxWidth: 320, - }, - headerControls: { - flexDirection: 'row', - alignItems: 'center', - gap: 4, - }, - pagingText: { - fontFamily: 'Roboto_400Regular', - fontSize: 11, - fontVariant: ['tabular-nums'], - }, - pageBtn: { - width: 30, - height: 30, - borderRadius: 999, - alignItems: 'center', - justifyContent: 'center', - }, - pageBtnPressed: { - transform: [{ scale: 0.92 }], - }, - skelStack: { - paddingHorizontal: 20, - gap: 10, - }, - skelBar: { - height: 56, - borderRadius: 16, - }, - actionChip: { - flexDirection: 'row', - borderRadius: 999, - borderWidth: 1, - paddingVertical: 6, - paddingHorizontal: 11, - gap: 4, - alignItems: 'center', - justifyContent: 'center', - }, - actionChipPressed: { - transform: [{ scale: 0.96 }], - }, - iconBtn: { - width: 32, - height: 32, - borderRadius: 999, - alignItems: 'center', - justifyContent: 'center', - }, - selectActionText: { - fontFamily: 'Rubik_500Medium', - fontSize: 12, - }, - factsList: { - paddingHorizontal: 20, - gap: 10, - }, - factCard: { - flexDirection: 'row', - alignItems: 'flex-start', - gap: 12, - paddingHorizontal: 16, - paddingVertical: 14, - borderRadius: 16, - borderWidth: 1, - }, - factCardPressed: { - transform: [{ scale: 0.99 }], - }, - checkSlot: { - paddingTop: 2, - }, - factBody: { - flex: 1, - gap: 6, - }, - categoryPill: { - alignSelf: 'flex-start', - paddingHorizontal: 7, - paddingVertical: 2, - borderRadius: 999, - borderWidth: 1, - }, - categoryText: { - fontFamily: 'Roboto_500Medium', - fontSize: 10, - letterSpacing: 0.6, - }, - factText: { - fontFamily: 'Rubik_400Regular', - fontSize: 15, - lineHeight: 21.75, - }, - deleteBtn: { - width: 36, - height: 36, - borderRadius: 999, - alignItems: 'center', - justifyContent: 'center', - }, }) } diff --git a/apps/mobile/app/ai-settings.tsx b/apps/mobile/app/ai-settings.tsx index fe10fd3113..d0ede26c59 100644 --- a/apps/mobile/app/ai-settings.tsx +++ b/apps/mobile/app/ai-settings.tsx @@ -1,4 +1,4 @@ -import { useMemo, useState } from 'react' +import { useMemo } from 'react' import { View, ScrollView } from 'react-native' import { useRouter } from 'expo-router' import { useTranslation } from 'react-i18next' @@ -13,15 +13,8 @@ import { createTokensV2 } from '@/lib/theme' import { useAppTheme } from '@/lib/use-app-theme' import { useGoBackOrFallback } from '@/hooks/use-go-back-or-fallback' import { AppBar } from '@/components/ui/app-bar' -import { SectionLabel } from '@/components/ui/section-label' -import { ConfirmDialog } from '@/components/ui/confirm-dialog' import { createStyles } from './ai-settings-styles' -import { useUserFacts } from './use-user-facts' -import { - AiFeatureToggles, - FactsSelectBar, - UserFactsList, -} from './ai-settings-sections' +import { AiFeatureToggles } from './ai-settings-sections' export default function AiSettingsScreen() { const { t } = useTranslation() @@ -36,37 +29,9 @@ export default function AiSettingsScreen() { ) const styles = useMemo(() => createStyles(), []) const hasProAccess = profile?.hasProAccess ?? false - const aiMemoryEnabled = hasProAccess && (profile?.aiMemoryEnabled ?? false) const aiSummaryEnabled = hasProAccess && (profile?.aiSummaryEnabled ?? false) const proactiveAstraEnabled = hasProAccess && (profile?.proactiveAstraEnabled ?? false) - // react-doctor-disable-next-line query-mutation-missing-invalidation -- Deliberate optimistic update: patchProfile() in onMutate writes the toggle to the profile cache and rolls back on error; the server stores the boolean verbatim, so no post-success refetch is needed. https://github.com/thomasluizon/orbit-ui-mobile/issues/243 - const aiMemoryMutation = useMutation({ - mutationFn: (enabled: boolean) => - performQueuedApiMutation({ - type: 'setAiMemory', - scope: 'profile', - endpoint: API.profile.aiMemory, - method: 'PUT', - payload: { enabled }, - dedupeKey: 'profile-ai-memory', - }), - onMutate: (enabled) => { - const previous = profile?.aiMemoryEnabled - patchProfile({ aiMemoryEnabled: enabled }) - return { previous } - }, - onError: ( - _err: unknown, - _enabled: boolean, - context: { previous?: boolean } | undefined, - ) => { - if (context?.previous !== undefined) { - patchProfile({ aiMemoryEnabled: context.previous }) - } - }, - }) - const aiSummaryMutation = useMutation({ mutationFn: (enabled: boolean) => performQueuedApiMutation({ @@ -123,46 +88,6 @@ export default function AiSettingsScreen() { }, }) - const { - factsQuery, - facts, - pagedFacts, - selectMode, - selectedFactIds, - deleteMutation, - bulkDeleteMutation, - factsPage, - setFactsPage, - totalFactsPages, - toggleSelectMode, - toggleFactSelection, - toggleSelectAll, - } = useUserFacts(hasProAccess) - - const showPaging = totalFactsPages > 1 && !selectMode - const [bulkDeleteConfirmOpen, setBulkDeleteConfirmOpen] = useState(false) - - const factsTrailing = - !hasProAccess || facts.length === 0 ? undefined : ( - setFactsPage((p) => Math.max(1, p - 1))} - onNextPage={() => setFactsPage((p) => Math.min(totalFactsPages, p + 1))} - onToggleSelectAll={toggleSelectAll} - onBulkDelete={() => setBulkDeleteConfirmOpen(true)} - onToggleSelectMode={toggleSelectMode} - /> - ) - return ( aiMemoryMutation.mutate(!aiMemoryEnabled)} onToggleSummary={() => aiSummaryMutation.mutate(!aiSummaryEnabled)} onToggleProactive={() => proactiveAstraMutation.mutate(!proactiveAstraEnabled)} onUpgrade={() => router.push(buildUpgradeHref('/ai-settings'))} /> - - - {t('profile.facts.title')} - - - deleteMutation.mutate(id)} - onAskAstra={() => router.push('/chat')} - /> - - - bulkDeleteMutation.mutate([...selectedFactIds])} - /> ) } diff --git a/apps/mobile/app/use-user-facts.ts b/apps/mobile/app/use-user-facts.ts deleted file mode 100644 index d32db6f954..0000000000 --- a/apps/mobile/app/use-user-facts.ts +++ /dev/null @@ -1,157 +0,0 @@ -import { useMemo, useState } from 'react' -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' -import { API } from '@orbit/shared/api' -import { userFactKeys } from '@orbit/shared/query' -import { USER_FACTS_PER_PAGE } from '@orbit/shared/utils' -import { apiClient } from '@/lib/api-client' -import { performQueuedApiMutation } from '@/lib/queued-api-mutation' -import { useOffline } from '@/hooks/use-offline' - -export interface UserFact { - id: string - factText: string - category: string | null -} - -export function useUserFacts(hasProAccess: boolean) { - const queryClient = useQueryClient() - const { isOnline } = useOffline() - - const factsQuery = useQuery({ - queryKey: userFactKeys.lists(), - queryFn: () => apiClient(API.userFacts.list), - enabled: hasProAccess, - staleTime: 5 * 60 * 1000, - }) - - const facts = useMemo( - () => (hasProAccess ? (factsQuery.data ?? []) : []), - [factsQuery.data, hasProAccess], - ) - - const [selectMode, setSelectMode] = useState(false) - const [selectedFactIds, setSelectedFactIds] = useState>(new Set()) - - const deleteMutation = useMutation({ - mutationFn: (id: string) => - performQueuedApiMutation({ - type: 'deleteUserFact', - scope: 'userFacts', - endpoint: API.userFacts.delete(id), - method: 'DELETE', - payload: undefined, - targetEntityId: id, - dedupeKey: `user-fact-delete-${id}`, - }), - onMutate: async (id) => { - await queryClient.cancelQueries({ queryKey: userFactKeys.lists() }) - const previous = queryClient.getQueryData( - userFactKeys.lists(), - ) - queryClient.setQueryData(userFactKeys.lists(), (old) => - old ? old.filter((fact) => fact.id !== id) : old, - ) - return { previous } - }, - onError: (_err, _id, context: { previous?: UserFact[] } | undefined) => { - if (context?.previous) { - queryClient.setQueryData(userFactKeys.lists(), context.previous) - } - }, - onSuccess: () => { - if (isOnline) { - void queryClient.invalidateQueries({ queryKey: userFactKeys.all }) - } - }, - }) - - const bulkDeleteMutation = useMutation({ - mutationFn: (ids: string[]) => - performQueuedApiMutation({ - type: 'bulkDeleteUserFacts', - scope: 'userFacts', - endpoint: API.userFacts.bulk, - method: 'DELETE', - payload: { ids }, - dedupeKey: 'bulk-delete-user-facts', - }), - onMutate: async (ids) => { - await queryClient.cancelQueries({ queryKey: userFactKeys.lists() }) - const previous = queryClient.getQueryData( - userFactKeys.lists(), - ) - const idsToDelete = new Set(ids) - queryClient.setQueryData(userFactKeys.lists(), (old) => - old ? old.filter((fact) => !idsToDelete.has(fact.id)) : old, - ) - return { previous } - }, - onError: (_err, _ids, context: { previous?: UserFact[] } | undefined) => { - if (context?.previous) { - queryClient.setQueryData(userFactKeys.lists(), context.previous) - } - }, - onSuccess: () => { - if (isOnline) { - void queryClient.invalidateQueries({ queryKey: userFactKeys.all }) - } - setSelectedFactIds(new Set()) - const remaining = - queryClient.getQueryData(userFactKeys.lists()) ?? [] - if (remaining.length === 0) setSelectMode(false) - }, - }) - - const [factsPage, setFactsPage] = useState(1) - const totalFactsPages = useMemo( - () => Math.max(1, Math.ceil(facts.length / USER_FACTS_PER_PAGE)), - [facts.length], - ) - const pagedFacts = useMemo(() => { - const start = (factsPage - 1) * USER_FACTS_PER_PAGE - return facts.slice(start, start + USER_FACTS_PER_PAGE) - }, [facts, factsPage]) - - if (factsPage > totalFactsPages && totalFactsPages >= 1) { - setFactsPage(totalFactsPages) - } - - function toggleSelectMode() { - setSelectMode(!selectMode) - setSelectedFactIds(new Set()) - } - - function toggleFactSelection(id: string) { - const next = new Set(selectedFactIds) - if (next.has(id)) { - next.delete(id) - } else { - next.add(id) - } - setSelectedFactIds(next) - } - - function toggleSelectAll() { - if (selectedFactIds.size === facts.length) { - setSelectedFactIds(new Set()) - } else { - setSelectedFactIds(new Set(facts.map((fact) => fact.id))) - } - } - - return { - factsQuery, - facts, - pagedFacts, - selectMode, - selectedFactIds, - deleteMutation, - bulkDeleteMutation, - factsPage, - setFactsPage, - totalFactsPages, - toggleSelectMode, - toggleFactSelection, - toggleSelectAll, - } -} diff --git a/apps/mobile/components/onboarding/feature-guide-drawer.tsx b/apps/mobile/components/onboarding/feature-guide-drawer.tsx index b6473c6fed..abde05f8c7 100644 --- a/apps/mobile/components/onboarding/feature-guide-drawer.tsx +++ b/apps/mobile/components/onboarding/feature-guide-drawer.tsx @@ -118,9 +118,7 @@ const sectionItems: Record = { settings: [ { titleKey: 'onboarding.featureGuide.settingsSection.colorSchemeTitle', descKey: 'onboarding.featureGuide.settingsSection.colorSchemeDesc' }, { titleKey: 'onboarding.featureGuide.settingsSection.languageTitle', descKey: 'onboarding.featureGuide.settingsSection.languageDesc' }, - { titleKey: 'onboarding.featureGuide.settingsSection.aiMemoryTitle', descKey: 'onboarding.featureGuide.settingsSection.aiMemoryDesc' }, { titleKey: 'onboarding.featureGuide.settingsSection.aiSummaryTitle', descKey: 'onboarding.featureGuide.settingsSection.aiSummaryDesc' }, - { titleKey: 'onboarding.featureGuide.settingsSection.userFactsTitle', descKey: 'onboarding.featureGuide.settingsSection.userFactsDesc' }, { titleKey: 'onboarding.featureGuide.settingsSection.timezoneTitle', descKey: 'onboarding.featureGuide.settingsSection.timezoneDesc' }, { titleKey: 'onboarding.featureGuide.settingsSection.supportTitle', descKey: 'onboarding.featureGuide.settingsSection.supportDesc' }, { titleKey: 'onboarding.featureGuide.settingsSection.pushNotificationsTitle', descKey: 'onboarding.featureGuide.settingsSection.pushNotificationsDesc' }, diff --git a/apps/mobile/eslint-suppressions.json b/apps/mobile/eslint-suppressions.json index 07510e2a68..e7ddf673c3 100644 --- a/apps/mobile/eslint-suppressions.json +++ b/apps/mobile/eslint-suppressions.json @@ -117,11 +117,6 @@ "count": 1 } }, - "app/ai-settings-styles.ts": { - "local/spacing-scale": { - "count": 12 - } - }, "app/calendar-sync-styles.ts": { "local/spacing-scale": { "count": 15 diff --git a/apps/mobile/lib/offline-mutations.ts b/apps/mobile/lib/offline-mutations.ts index 9c2bca1355..080ca2a954 100644 --- a/apps/mobile/lib/offline-mutations.ts +++ b/apps/mobile/lib/offline-mutations.ts @@ -6,7 +6,6 @@ import { notificationKeys, profileKeys, tagKeys, - userFactKeys, } from '@orbit/shared/query' import type { MutationEntityType, @@ -38,7 +37,6 @@ const SCOPE_QUERY_KEYS: Record = tags: [tagKeys.all, habitKeys.lists()], notifications: [notificationKeys.all], profile: [profileKeys.all], - userFacts: [userFactKeys.all], apiKeys: [apiKeyKeys.all], calendar: [profileKeys.all], } @@ -381,9 +379,6 @@ export function getMutationScope(type: MutationType): MutationScope { case 'deleteNotification': case 'deleteAllNotifications': return 'notifications' - case 'deleteUserFact': - case 'bulkDeleteUserFacts': - return 'userFacts' case 'createApiKey': case 'deleteApiKey': return 'apiKeys' @@ -394,7 +389,6 @@ export function getMutationScope(type: MutationType): MutationScope { case 'setColorScheme': case 'setThemePreference': case 'setTimeZone': - case 'setAiMemory': case 'setAiSummary': case 'setProactiveAstra': case 'setMarketingConsent': diff --git a/apps/mobile/lib/offline-queue.ts b/apps/mobile/lib/offline-queue.ts index 44dc737eb0..e03293f76e 100644 --- a/apps/mobile/lib/offline-queue.ts +++ b/apps/mobile/lib/offline-queue.ts @@ -170,7 +170,6 @@ const LAST_WRITE_WINS_TYPES = new Set([ 'setColorScheme', 'setThemePreference', 'setTimeZone', - 'setAiMemory', 'setAiSummary', 'setProactiveAstra', 'completeOnboarding', @@ -179,7 +178,6 @@ const LAST_WRITE_WINS_TYPES = new Set([ 'reorderGoals', 'markAllNotificationsRead', 'deleteAllNotifications', - 'bulkDeleteUserFacts', ]) function mergePayload(existing: unknown, incoming: unknown): unknown { diff --git a/apps/web/__tests__/actions/profile.test.ts b/apps/web/__tests__/actions/profile.test.ts index 159b6f4bf5..56ff91c963 100644 --- a/apps/web/__tests__/actions/profile.test.ts +++ b/apps/web/__tests__/actions/profile.test.ts @@ -17,7 +17,6 @@ vi.stubGlobal('fetch', mockFetch) const { updateTimezone, updateLanguage, - updateAiMemory, updateAiSummary, updateWeekStartDay, updateThemePreference, @@ -102,28 +101,6 @@ describe('profile server actions', () => { }) - describe('updateAiMemory', () => { - it('sends PUT to /api/profile/ai-memory', async () => { - mock204() - - await updateAiMemory({ enabled: true }) - - const [url, init] = mockFetch.mock.calls[0]! - expect(url).toContain('/api/profile/ai-memory') - expect(init.method).toBe('PUT') - expect(JSON.parse(init.body)).toEqual({ enabled: true }) - }) - - it('sends false value', async () => { - mock204() - - await updateAiMemory({ enabled: false }) - - const [, init] = mockFetch.mock.calls[0]! - expect(JSON.parse(init.body)).toEqual({ enabled: false }) - }) - }) - describe('updateAiSummary', () => { it('sends PUT to /api/profile/ai-summary', async () => { diff --git a/apps/web/__tests__/actions/user-facts.test.ts b/apps/web/__tests__/actions/user-facts.test.ts deleted file mode 100644 index 4c710876a2..0000000000 --- a/apps/web/__tests__/actions/user-facts.test.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest' -import { API } from '@orbit/shared/api' - -const mockServerAuthFetch = vi.fn() -vi.mock('@/lib/server-fetch', () => ({ - serverAuthFetch: mockServerAuthFetch, -})) - -const { deleteUserFact, bulkDeleteUserFacts } = await import('@/app/actions/user-facts') - -describe('user-facts server actions', () => { - beforeEach(() => { - mockServerAuthFetch.mockReset() - mockServerAuthFetch.mockResolvedValue(undefined) - }) - - it('deletes a single fact through the delete endpoint', async () => { - await deleteUserFact('fact-1') - expect(mockServerAuthFetch).toHaveBeenCalledWith(API.userFacts.delete('fact-1'), { - method: 'DELETE', - }) - }) - - it('bulk-deletes facts with the id list in the body', async () => { - await bulkDeleteUserFacts(['a', 'b']) - expect(mockServerAuthFetch).toHaveBeenCalledWith(API.userFacts.bulk, { - method: 'DELETE', - body: JSON.stringify({ ids: ['a', 'b'] }), - }) - }) -}) diff --git a/apps/web/__tests__/components/ai-settings/ai-feature-toggles.test.tsx b/apps/web/__tests__/components/ai-settings/ai-feature-toggles.test.tsx index f8ed7bbb27..dc926cbead 100644 --- a/apps/web/__tests__/components/ai-settings/ai-feature-toggles.test.tsx +++ b/apps/web/__tests__/components/ai-settings/ai-feature-toggles.test.tsx @@ -1,28 +1,12 @@ -import { describe, it, expect, vi } from 'vitest' -import { render, screen, fireEvent } from '@testing-library/react' +import { describe, expect, it, vi } from 'vitest' +import { fireEvent, render, screen } from '@testing-library/react' vi.mock('next-intl', () => ({ useTranslations: () => (key: string) => key, })) -vi.mock('@/hooks/use-profile', () => ({ - useProfile: () => ({ profile: { isTrialActive: false, hasProAccess: true } }), -})) - -vi.mock('next/link', () => ({ - default: ({ - children, - href, - ...props - }: { - children: React.ReactNode - href: string - [key: string]: unknown - }) => ( - - {children} - - ), +vi.mock('@/components/ui/pro-badge', () => ({ + ProBadge: () => null, })) import { AiFeatureToggles } from '@/app/(app)/ai-settings/_components/ai-feature-toggles' @@ -30,13 +14,10 @@ import { AiFeatureToggles } from '@/app/(app)/ai-settings/_components/ai-feature function baseProps() { return { hasProAccess: true, - aiMemoryEnabled: true, aiSummaryEnabled: false, proactiveAstraEnabled: true, - memoryPending: false, summaryPending: false, proactivePending: false, - onToggleMemory: vi.fn(), onToggleSummary: vi.fn(), onToggleProactive: vi.fn(), onUpgrade: vi.fn(), @@ -44,44 +25,39 @@ function baseProps() { } describe('AiFeatureToggles', () => { - it('renders memory, summary, and proactive switches reflecting their on/off state', () => { + it('renders exactly the daily summary and proactive switches for Pro users', () => { render() - expect( - screen.getByRole('switch', { name: 'profile.aiMemory.title' }), - ).toHaveAttribute('aria-checked', 'true') - expect( - screen.getByRole('switch', { name: 'profile.aiSummary.title' }), - ).toHaveAttribute('aria-checked', 'false') + const switches = screen.getAllByRole('switch') + expect(switches).toHaveLength(2) + expect(screen.getByRole('switch', { name: 'profile.aiSummary.title' })).toHaveAttribute( + 'aria-checked', + 'false', + ) expect( screen.getByRole('switch', { name: 'profile.proactiveAstra.title' }), ).toHaveAttribute('aria-checked', 'true') }) - it('fires the memory, summary, and proactive toggle callbacks on click', () => { + it('fires both surviving toggle callbacks on click', () => { const props = baseProps() render() - fireEvent.click(screen.getByRole('switch', { name: 'profile.aiMemory.title' })) - expect(props.onToggleMemory).toHaveBeenCalled() fireEvent.click(screen.getByRole('switch', { name: 'profile.aiSummary.title' })) expect(props.onToggleSummary).toHaveBeenCalled() fireEvent.click(screen.getByRole('switch', { name: 'profile.proactiveAstra.title' })) expect(props.onToggleProactive).toHaveBeenCalled() }) - it('disables a switch while its mutation is pending', () => { - const props = { ...baseProps(), memoryPending: true } - render() - expect( - screen.getByRole('switch', { name: 'profile.aiMemory.title' }), - ).toBeDisabled() + it('disables the summary switch while its mutation is pending', () => { + render() + expect(screen.getByRole('switch', { name: 'profile.aiSummary.title' })).toBeDisabled() }) - it('renders pressable upgrade rows instead of switches for non-pro users', () => { + it('renders two upgrade rows and no switches for free users', () => { const props = { ...baseProps(), hasProAccess: false } render() expect(screen.queryByRole('switch')).not.toBeInTheDocument() const rows = screen.getAllByRole('button') - expect(rows).toHaveLength(3) + expect(rows).toHaveLength(2) fireEvent.click(rows[0]!) expect(props.onUpgrade).toHaveBeenCalled() }) diff --git a/apps/web/__tests__/components/ai-settings/fact-item.test.tsx b/apps/web/__tests__/components/ai-settings/fact-item.test.tsx deleted file mode 100644 index 83e8fa2b0a..0000000000 --- a/apps/web/__tests__/components/ai-settings/fact-item.test.tsx +++ /dev/null @@ -1,118 +0,0 @@ -import { describe, it, expect, vi } from 'vitest' -import { render, screen, fireEvent } from '@testing-library/react' -import type { UserFact } from '@orbit/shared/types/user-fact' - -vi.mock('next-intl', () => ({ - useTranslations: () => (key: string) => key, -})) - -import { FactItem } from '@/app/(app)/ai-settings/_components/fact-item' - -function makeFact(overrides: Partial = {}): UserFact { - return { - id: 'fact-1', - factText: 'Prefers morning workouts', - category: 'preference', - extractedAtUtc: '2026-01-01T00:00:00Z', - updatedAtUtc: null, - ...overrides, - } -} - -describe('FactItem', () => { - it('renders the fact text', () => { - render( - , - ) - expect(screen.getByText('Prefers morning workouts')).toBeInTheDocument() - }) - - it('renders the uppercased category label when a category is present', () => { - render( - , - ) - expect(screen.getByText('PROFILE.FACTS.PREFERENCE')).toBeInTheDocument() - }) - - it('omits the category label when there is no category', () => { - render( - , - ) - expect(screen.queryByText('PROFILE.FACTS.PREFERENCE')).not.toBeInTheDocument() - }) - - it('shows a delete button outside select mode and fires onDelete', () => { - const onDelete = vi.fn() - render( - , - ) - fireEvent.click(screen.getByLabelText('common.delete')) - expect(onDelete).toHaveBeenCalled() - }) - - it('renders a pressable toggle in select mode and fires onToggleSelection', () => { - const onToggleSelection = vi.fn() - render( - , - ) - const toggle = screen.getByRole('button', { pressed: false }) - fireEvent.click(toggle) - expect(onToggleSelection).toHaveBeenCalled() - }) - - it('reflects the selected state via aria-pressed in select mode', () => { - render( - , - ) - expect(screen.getByRole('button', { pressed: true })).toBeInTheDocument() - }) - - it('hides the delete button in select mode', () => { - render( - , - ) - expect(screen.queryByLabelText('common.delete')).not.toBeInTheDocument() - }) -}) diff --git a/apps/web/__tests__/components/ai-settings/facts-pagination.test.tsx b/apps/web/__tests__/components/ai-settings/facts-pagination.test.tsx deleted file mode 100644 index 33c1a42935..0000000000 --- a/apps/web/__tests__/components/ai-settings/facts-pagination.test.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import { describe, it, expect, vi } from 'vitest' -import { render, screen, fireEvent } from '@testing-library/react' - -vi.mock('next-intl', () => ({ - useTranslations: () => (key: string, params?: Record) => { - if (params) return `${key}:${JSON.stringify(params)}` - return key - }, -})) - -import { FactsPagination } from '@/app/(app)/ai-settings/_components/facts-pagination' - -describe('FactsPagination', () => { - it('renders the current page and total via i18n', () => { - render( - , - ) - expect( - screen.getByText('profile.facts.count:{"n":2,"max":4}'), - ).toBeInTheDocument() - }) - - it('navigates to the previous and next page on click', () => { - const onPrevious = vi.fn() - const onNext = vi.fn() - render( - , - ) - fireEvent.click(screen.getByLabelText('common.previousPage')) - expect(onPrevious).toHaveBeenCalled() - fireEvent.click(screen.getByLabelText('common.nextPage')) - expect(onNext).toHaveBeenCalled() - }) - - it('disables previous on the first page', () => { - render( - , - ) - expect(screen.getByLabelText('common.previousPage')).toBeDisabled() - expect(screen.getByLabelText('common.nextPage')).not.toBeDisabled() - }) - - it('disables next on the last page', () => { - render( - , - ) - expect(screen.getByLabelText('common.nextPage')).toBeDisabled() - expect(screen.getByLabelText('common.previousPage')).not.toBeDisabled() - }) -}) diff --git a/apps/web/__tests__/components/ai-settings/facts-select-bar.test.tsx b/apps/web/__tests__/components/ai-settings/facts-select-bar.test.tsx deleted file mode 100644 index e8018e7982..0000000000 --- a/apps/web/__tests__/components/ai-settings/facts-select-bar.test.tsx +++ /dev/null @@ -1,101 +0,0 @@ -import { describe, it, expect, vi } from 'vitest' -import { render, screen, fireEvent } from '@testing-library/react' - -vi.mock('next-intl', () => ({ - useTranslations: () => (key: string, params?: Record) => { - if (params) return `${key}:${JSON.stringify(params)}` - return key - }, -})) - -import { FactsSelectBar } from '@/app/(app)/ai-settings/_components/facts-select-bar' - -function baseProps() { - return { - selectMode: false, - selectedCount: 0, - allSelected: false, - bulkDeletePending: false, - showPagination: false, - page: 1, - totalPages: 1, - onPreviousPage: vi.fn(), - onNextPage: vi.fn(), - onToggleSelectAll: vi.fn(), - onBulkDelete: vi.fn(), - onToggleSelectMode: vi.fn(), - } -} - -describe('FactsSelectBar', () => { - it('shows an icon select toggle when idle', () => { - const props = baseProps() - render() - fireEvent.click(screen.getByLabelText('profile.facts.select')) - expect(props.onToggleSelectMode).toHaveBeenCalled() - }) - - it('renders pagination only when requested', () => { - const idle = baseProps() - const { rerender } = render() - expect( - screen.queryByLabelText('common.previousPage'), - ).not.toBeInTheDocument() - rerender( - , - ) - expect(screen.getByText('profile.facts.count:{"n":2,"max":5}')).toBeInTheDocument() - fireEvent.click(screen.getByLabelText('common.nextPage')) - expect(idle.onNextPage).toHaveBeenCalled() - }) - - it('shows a cancel action in select mode', () => { - const props = { ...baseProps(), selectMode: true, selectedCount: 2 } - render() - fireEvent.click(screen.getByLabelText('profile.facts.cancel')) - expect(props.onToggleSelectMode).toHaveBeenCalled() - }) - - it('toggles select-all and shows the select-all label when none are selected', () => { - const props = { ...baseProps(), selectMode: true, selectedCount: 0 } - render() - fireEvent.click(screen.getByText('profile.facts.selectAll')) - expect(props.onToggleSelectAll).toHaveBeenCalled() - }) - - it('shows the deselect-all label when everything is selected', () => { - const props = { - ...baseProps(), - selectMode: true, - selectedCount: 7, - allSelected: true, - } - render() - expect(screen.getByText('profile.facts.deselectAll')).toBeInTheDocument() - }) - - it('fires bulk delete when there is a selection', () => { - const props = { ...baseProps(), selectMode: true, selectedCount: 3 } - render() - fireEvent.click(screen.getByText('3')) - expect(props.onBulkDelete).toHaveBeenCalled() - }) - - it('disables bulk delete while a delete is pending', () => { - const props = { - ...baseProps(), - selectMode: true, - selectedCount: 3, - bulkDeletePending: true, - } - render() - expect(screen.getByText('3').closest('button')).toBeDisabled() - }) - - it('hides the bulk-delete action when nothing is selected', () => { - const props = { ...baseProps(), selectMode: true, selectedCount: 0 } - render() - expect(props.onBulkDelete).not.toHaveBeenCalled() - expect(screen.getByText('profile.facts.selectAll')).toBeInTheDocument() - }) -}) diff --git a/apps/web/__tests__/components/ai-settings/use-user-facts.test.ts b/apps/web/__tests__/components/ai-settings/use-user-facts.test.ts deleted file mode 100644 index a9365a2e55..0000000000 --- a/apps/web/__tests__/components/ai-settings/use-user-facts.test.ts +++ /dev/null @@ -1,127 +0,0 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest' -import { renderHook, act, waitFor } from '@testing-library/react' -import { QueryClient, QueryClientProvider } from '@tanstack/react-query' -import React from 'react' -import type { UserFact } from '@orbit/shared/types/user-fact' -import { useUserFacts } from '@/app/(app)/ai-settings/_components/use-user-facts' - -const mockFetch = vi.fn() -vi.stubGlobal('fetch', mockFetch) - -vi.mock('@/app/actions/user-facts', () => ({ - deleteUserFact: vi.fn(), - bulkDeleteUserFacts: vi.fn(), -})) - -function makeFact(id: string): UserFact { - return { - id, - factText: `Fact ${id}`, - category: null, - extractedAtUtc: '2026-01-01T00:00:00Z', - updatedAtUtc: null, - } -} - -function makeFacts(count: number): UserFact[] { - return Array.from({ length: count }, (_, index) => makeFact(`f-${index + 1}`)) -} - -function createWrapper() { - const queryClient = new QueryClient({ - defaultOptions: { queries: { retry: false }, mutations: { retry: false } }, - }) - return function Wrapper({ children }: { children: React.ReactNode }) { - return React.createElement(QueryClientProvider, { client: queryClient }, children) - } -} - -describe('useUserFacts', () => { - beforeEach(() => { - mockFetch.mockReset() - }) - - it('does not fetch and reports no facts without pro access', () => { - const { result } = renderHook(() => useUserFacts(false), { wrapper: createWrapper() }) - expect(result.current.facts).toEqual([]) - expect(mockFetch).not.toHaveBeenCalled() - }) - - it('loads facts once pro access is granted', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(3)) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(3)) - expect(result.current.totalFactsPages).toBe(1) - }) - - it('throws when the facts request fails', async () => { - mockFetch.mockResolvedValue({ ok: false, json: () => Promise.resolve({}) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.factsQuery.isError).toBe(true)) - }) - - it('toggles individual selections on and off', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(3)) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(3)) - - act(() => result.current.toggleFactSelection('f-1')) - expect(result.current.selectedFactIds.has('f-1')).toBe(true) - act(() => result.current.toggleFactSelection('f-1')) - expect(result.current.selectedFactIds.has('f-1')).toBe(false) - }) - - it('selects all then clears when toggled again', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(3)) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(3)) - - act(() => result.current.toggleSelectAll()) - expect(result.current.selectedFactIds.size).toBe(3) - act(() => result.current.toggleSelectAll()) - expect(result.current.selectedFactIds.size).toBe(0) - }) - - it('clears the selection when leaving select mode', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(3)) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(3)) - - act(() => result.current.toggleFactSelection('f-2')) - act(() => result.current.toggleSelectMode()) - expect(result.current.selectMode).toBe(true) - expect(result.current.selectedFactIds.size).toBe(0) - }) - - it('paginates in pages of five and clamps an out-of-range page', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(7)) }) - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(7)) - - expect(result.current.totalFactsPages).toBe(2) - expect(result.current.pagedFacts).toHaveLength(5) - - act(() => result.current.setFactsPage(2)) - await waitFor(() => expect(result.current.pagedFacts).toHaveLength(2)) - - act(() => result.current.setFactsPage(9)) - await waitFor(() => expect(result.current.factsPage).toBe(2)) - }) - - it('bulk-deletes and resets the selection', async () => { - mockFetch.mockResolvedValue({ ok: true, json: () => Promise.resolve(makeFacts(3)) }) - const { bulkDeleteUserFacts } = await import('@/app/actions/user-facts') - vi.mocked(bulkDeleteUserFacts).mockResolvedValue(undefined) - - const { result } = renderHook(() => useUserFacts(true), { wrapper: createWrapper() }) - await waitFor(() => expect(result.current.facts).toHaveLength(3)) - - act(() => result.current.toggleSelectAll()) - await act(async () => { - await result.current.bulkDeleteMutation.mutateAsync(['f-1', 'f-2', 'f-3']) - }) - - expect(vi.mocked(bulkDeleteUserFacts).mock.calls[0]![0]).toEqual(['f-1', 'f-2', 'f-3']) - await waitFor(() => expect(result.current.selectedFactIds.size).toBe(0)) - }) -}) diff --git a/apps/web/__tests__/components/ai-settings/user-facts-list.test.tsx b/apps/web/__tests__/components/ai-settings/user-facts-list.test.tsx deleted file mode 100644 index e646dedeae..0000000000 --- a/apps/web/__tests__/components/ai-settings/user-facts-list.test.tsx +++ /dev/null @@ -1,89 +0,0 @@ -import React from 'react' -import { describe, it, expect, vi } from 'vitest' -import { render, screen, fireEvent } from '@testing-library/react' -import type { UserFact } from '@orbit/shared/types/user-fact' - -vi.mock('next-intl', () => ({ - useTranslations: () => (key: string) => key, -})) - -vi.mock('@/components/ui/satellite-glyph', () => ({ SatelliteGlyph: () => })) -vi.mock('@/components/ui/pill-button', () => ({ - PillButton: ({ onClick, children }: { onClick?: () => void; children: React.ReactNode }) => ( - - ), -})) -vi.mock('@/app/(app)/ai-settings/_components/fact-item', () => ({ - FactItem: ({ fact, onDelete, onToggleSelection }: { - fact: UserFact; onDelete: () => void; onToggleSelection: () => void - }) => ( -
- {fact.factText} -
- ), -})) - -import { UserFactsList } from '@/app/(app)/ai-settings/_components/user-facts-list' - -function makeFact(id: string, factText: string): UserFact { - return { id, factText, category: null, extractedAtUtc: '2026-01-01T00:00:00Z', updatedAtUtc: null } -} - -const baseProps = { - isLoading: false, - hasError: false, - facts: [] as UserFact[], - pagedFacts: [] as UserFact[], - selectMode: false, - selectedFactIds: new Set(), - onToggleSelection: vi.fn(), - onDelete: vi.fn(), - onRetry: vi.fn(), - onAskAstra: vi.fn(), -} - -describe('UserFactsList', () => { - it('renders skeletons while loading', () => { - const { container } = render() - expect(container.querySelectorAll('.animate-pulse')).toHaveLength(2) - expect(screen.queryByTestId('fact')).not.toBeInTheDocument() - }) - - it('shows a retryable error state', () => { - const onRetry = vi.fn() - render() - expect(screen.getByRole('alert')).toHaveTextContent('profile.facts.factsError') - fireEvent.click(screen.getByRole('button', { name: 'profile.facts.retry' })) - expect(onRetry).toHaveBeenCalledTimes(1) - }) - - it('offers an Ask Astra CTA when there are no facts', () => { - const onAskAstra = vi.fn() - render() - expect(screen.getByText('profile.facts.empty')).toBeInTheDocument() - fireEvent.click(screen.getByRole('button', { name: 'summary.askAstra' })) - expect(onAskAstra).toHaveBeenCalledTimes(1) - }) - - it('renders the paged facts and forwards delete and selection', () => { - const onDelete = vi.fn() - const onToggleSelection = vi.fn() - const facts = [makeFact('f-1', 'Likes tea'), makeFact('f-2', 'Runs at dawn')] - render( - , - ) - expect(screen.getAllByTestId('fact')).toHaveLength(2) - fireEvent.click(screen.getByRole('button', { name: 'delete-f-1' })) - expect(onDelete).toHaveBeenCalledWith('f-1') - fireEvent.click(screen.getByRole('button', { name: 'toggle-f-2' })) - expect(onToggleSelection).toHaveBeenCalledWith('f-2') - }) -}) diff --git a/apps/web/__tests__/components/onboarding/feature-guide-drawer.test.tsx b/apps/web/__tests__/components/onboarding/feature-guide-drawer.test.tsx index b16f9f30e4..cadb043c73 100644 --- a/apps/web/__tests__/components/onboarding/feature-guide-drawer.test.tsx +++ b/apps/web/__tests__/components/onboarding/feature-guide-drawer.test.tsx @@ -52,6 +52,20 @@ describe('FeatureGuideDrawer', () => { expect(document.body.textContent).toContain('onboarding.featureGuide.astraSection.canDoTitle') }) + it('omits both retired settings entries', () => { + render() + fireEvent.click(screen.getByText('onboarding.featureGuide.settings')) + const removedSuffixes = [ + ['ai', 'MemoryTitle'].join(''), + ['user', 'FactsTitle'].join(''), + ] + for (const suffix of removedSuffixes) { + expect(document.body.textContent).not.toContain( + `onboarding.featureGuide.settingsSection.${suffix}`, + ) + } + }) + it.each([ { tab: 'connect', title: 'onboarding.featureGuide.connectSection.mcpTitle' }, { tab: 'social', title: 'onboarding.featureGuide.socialSection.optInTitle' }, diff --git a/apps/web/__tests__/components/profile/delete-account-modal.test.tsx b/apps/web/__tests__/components/profile/delete-account-modal.test.tsx index 83a1a280ba..7c591860f8 100644 --- a/apps/web/__tests__/components/profile/delete-account-modal.test.tsx +++ b/apps/web/__tests__/components/profile/delete-account-modal.test.tsx @@ -59,7 +59,6 @@ const defaultProfile = { name: 'Thomas', email: 'thomas@example.com', timeZone: 'America/Sao_Paulo', - aiMemoryEnabled: true, aiSummaryEnabled: true, hasCompletedOnboarding: true, hasCompletedTour: false, diff --git a/apps/web/__tests__/components/profile/fresh-start-modal.test.tsx b/apps/web/__tests__/components/profile/fresh-start-modal.test.tsx index a2cae60a01..544e4aa767 100644 --- a/apps/web/__tests__/components/profile/fresh-start-modal.test.tsx +++ b/apps/web/__tests__/components/profile/fresh-start-modal.test.tsx @@ -91,7 +91,6 @@ describe('FreshStartModal', () => { expect(screen.getByText('profile.freshStart.deleteHabits')).toBeInTheDocument() expect(screen.getByText('profile.freshStart.deleteGoals')).toBeInTheDocument() expect(screen.getByText('profile.freshStart.deleteChat')).toBeInTheDocument() - expect(screen.getByText('profile.freshStart.deleteUserFacts')).toBeInTheDocument() expect(screen.getByText('profile.freshStart.deleteAchievements')).toBeInTheDocument() expect(screen.getByText('profile.freshStart.deleteNotifications')).toBeInTheDocument() expect(screen.getByText('profile.freshStart.deleteChecklist')).toBeInTheDocument() diff --git a/apps/web/__tests__/components/profile/subscription-card.test.tsx b/apps/web/__tests__/components/profile/subscription-card.test.tsx index d1d6733cdb..1718085996 100644 --- a/apps/web/__tests__/components/profile/subscription-card.test.tsx +++ b/apps/web/__tests__/components/profile/subscription-card.test.tsx @@ -27,7 +27,6 @@ const baseProfile = { name: 'Thomas', email: 'thomas@example.com', timeZone: 'America/Sao_Paulo', - aiMemoryEnabled: true, aiSummaryEnabled: true, hasCompletedOnboarding: true, hasCompletedTour: false, diff --git a/apps/web/__tests__/components/upgrade/plan-comparison-cards.test.tsx b/apps/web/__tests__/components/upgrade/plan-comparison-cards.test.tsx index f25dddffb1..840c678d8f 100644 --- a/apps/web/__tests__/components/upgrade/plan-comparison-cards.test.tsx +++ b/apps/web/__tests__/components/upgrade/plan-comparison-cards.test.tsx @@ -35,4 +35,10 @@ describe('PlanComparisonCards', () => { expect(icons.length).toBeGreaterThan(0) icons.forEach((icon) => expect(icon).toHaveAttribute('aria-hidden', 'true')) }) + + it('does not render the retired comparison row', () => { + render() + const retiredKey = ['upgrade.features.ai', 'Memory.label'].join('') + expect(screen.queryByText(retiredKey)).not.toBeInTheDocument() + }) }) diff --git a/apps/web/__tests__/pages/ai-settings-page.test.tsx b/apps/web/__tests__/pages/ai-settings-page.test.tsx index e94e40a3dc..3194cc6a3b 100644 --- a/apps/web/__tests__/pages/ai-settings-page.test.tsx +++ b/apps/web/__tests__/pages/ai-settings-page.test.tsx @@ -1,73 +1,56 @@ import React from 'react' -import { describe, it, expect, vi, beforeEach } from 'vitest' -import { render, screen, fireEvent, waitFor } from '@testing-library/react' +import { beforeEach, describe, expect, it, vi } from 'vitest' +import { fireEvent, render, screen, waitFor } from '@testing-library/react' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' const push = vi.fn() const patchProfile = vi.fn() -const updateAiMemory = vi.fn() const updateAiSummary = vi.fn() const updateProactiveAstra = vi.fn() const mocks = vi.hoisted(() => ({ - profile: { hasProAccess: true, aiMemoryEnabled: false, aiSummaryEnabled: false, proactiveAstraEnabled: false } as Record, - userFacts: {} as Record, + profile: { + hasProAccess: true, + aiSummaryEnabled: false, + proactiveAstraEnabled: false, + } as Record, })) -vi.mock('next-intl', () => ({ useTranslations: () => (key: string, params?: Record) => (params ? `${key}(${JSON.stringify(params)})` : key) })) +vi.mock('next-intl', () => ({ useTranslations: () => (key: string) => key })) vi.mock('next/navigation', () => ({ useRouter: () => ({ push }) })) -vi.mock('@/hooks/use-profile', () => ({ useProfile: () => ({ profile: mocks.profile, patchProfile }) })) +vi.mock('@/hooks/use-profile', () => ({ + useProfile: () => ({ profile: mocks.profile, patchProfile }), +})) vi.mock('@/hooks/use-go-back-or-fallback', () => ({ useGoBackOrFallback: () => vi.fn() })) vi.mock('@/app/actions/profile', () => ({ - updateAiMemory: (...args: unknown[]) => updateAiMemory(...args), updateAiSummary: (...args: unknown[]) => updateAiSummary(...args), updateProactiveAstra: (...args: unknown[]) => updateProactiveAstra(...args), })) -vi.mock('@/app/(app)/ai-settings/_components/use-user-facts', () => ({ useUserFacts: () => mocks.userFacts })) vi.mock('@/components/ui/app-bar', () => ({ AppBar: () =>
})) -vi.mock('@/components/ui/section-label', () => ({ SectionLabel: ({ children, trailing }: { children: React.ReactNode; trailing?: React.ReactNode }) =>
{children}{trailing}
})) -vi.mock('@/components/ui/confirm-dialog', () => ({ - ConfirmDialog: ({ open, onConfirm }: { open: boolean; onConfirm: () => void }) => (open ?
), })) -vi.mock('@/app/(app)/ai-settings/_components/pro-upgrade-link', () => ({ ProUpgradeLink: () => })) -vi.mock('@/app/(app)/ai-settings/_components/facts-select-bar', () => ({ FactsSelectBar: () =>
})) -vi.mock('@/app/(app)/ai-settings/_components/user-facts-list', () => ({ UserFactsList: () =>
})) import AiSettingsPage from '@/app/(app)/ai-settings/page' -function defaultUserFacts(overrides: Record = {}) { - return { - factsQuery: { isLoading: false, error: null, refetch: vi.fn() }, - facts: [], - pagedFacts: [], - selectMode: false, - selectedFactIds: new Set(), - deleteMutation: { mutate: vi.fn() }, - bulkDeleteMutation: { mutate: vi.fn(), isPending: false }, - factsPage: 1, - setFactsPage: vi.fn(), - totalFactsPages: 1, - toggleSelectMode: vi.fn(), - toggleFactSelection: vi.fn(), - toggleSelectAll: vi.fn(), - ...overrides, - } -} - function renderPage() { - const client = new QueryClient({ defaultOptions: { mutations: { retry: false }, queries: { retry: false } } }) + const client = new QueryClient({ + defaultOptions: { mutations: { retry: false }, queries: { retry: false } }, + }) return render( @@ -79,45 +62,38 @@ describe('AiSettingsPage', () => { beforeEach(() => { push.mockClear() patchProfile.mockReset() - updateAiMemory.mockReset() updateAiSummary.mockReset() updateProactiveAstra.mockReset() - mocks.profile = { hasProAccess: true, aiMemoryEnabled: false, aiSummaryEnabled: false, proactiveAstraEnabled: false } - mocks.userFacts = defaultUserFacts() + mocks.profile = { + hasProAccess: true, + aiSummaryEnabled: false, + proactiveAstraEnabled: false, + } }) - it('optimistically enables AI memory when toggled', async () => { - updateAiMemory.mockResolvedValue(undefined) + it('renders only the surviving settings controls and no retired list section', () => { renderPage() - fireEvent.click(screen.getByRole('button', { name: 'toggle-memory' })) - expect(patchProfile).toHaveBeenCalledWith({ aiMemoryEnabled: true }) - await waitFor(() => expect(updateAiMemory).toHaveBeenCalledWith({ enabled: true })) + expect(screen.getByRole('button', { name: 'toggle-summary' })).toBeInTheDocument() + expect(screen.getByRole('button', { name: 'toggle-proactive' })).toBeInTheDocument() + expect(screen.getByTestId('feature-toggles').children).toHaveLength(3) }) - it('rolls the memory toggle back to its previous value on failure', async () => { - updateAiMemory.mockRejectedValue(new Error('server down')) + it('optimistically enables the daily summary', async () => { + updateAiSummary.mockResolvedValue(undefined) renderPage() - fireEvent.click(screen.getByRole('button', { name: 'toggle-memory' })) - await waitFor(() => expect(patchProfile).toHaveBeenCalledWith({ aiMemoryEnabled: false })) + fireEvent.click(screen.getByRole('button', { name: 'toggle-summary' })) + expect(patchProfile).toHaveBeenCalledWith({ aiSummaryEnabled: true }) + await waitFor(() => expect(updateAiSummary).toHaveBeenCalledWith({ enabled: true })) }) - it('routes to upgrade from the feature toggles', () => { + it('routes free users to upgrade from a locked surviving row', () => { + mocks.profile = { + hasProAccess: false, + aiSummaryEnabled: false, + proactiveAstraEnabled: false, + } renderPage() fireEvent.click(screen.getByRole('button', { name: 'upgrade' })) expect(push).toHaveBeenCalledWith('/upgrade') }) - - it('shows the locked hint and pro link for free users, hiding the facts list', () => { - mocks.profile = { hasProAccess: false, aiMemoryEnabled: false, aiSummaryEnabled: false, proactiveAstraEnabled: false } - renderPage() - expect(screen.getByTestId('pro-link')).toBeInTheDocument() - expect(screen.queryByTestId('facts-list')).not.toBeInTheDocument() - }) - - it('renders the facts list and select bar for pro users with facts', () => { - mocks.userFacts = defaultUserFacts({ facts: [{ id: 'f-1' }] }) - renderPage() - expect(screen.getByTestId('facts-list')).toBeInTheDocument() - expect(screen.getByTestId('select-bar')).toBeInTheDocument() - }) }) diff --git a/apps/web/app/(app)/ai-settings/_components/ai-feature-toggles.tsx b/apps/web/app/(app)/ai-settings/_components/ai-feature-toggles.tsx index 1978569675..fc77bd1c55 100644 --- a/apps/web/app/(app)/ai-settings/_components/ai-feature-toggles.tsx +++ b/apps/web/app/(app)/ai-settings/_components/ai-feature-toggles.tsx @@ -1,6 +1,6 @@ 'use client' -import { BellRing, Brain, Lock, Satellite } from 'lucide-react' +import { BellRing, Lock, Satellite } from 'lucide-react' import { useTranslations } from 'next-intl' import { SectionLabel } from '@/components/ui/section-label' import { SettingsRow, Switch } from '@/components/ui/settings-row' @@ -8,13 +8,10 @@ import { ProBadge } from '@/components/ui/pro-badge' interface AiFeatureTogglesProps { hasProAccess: boolean - aiMemoryEnabled: boolean aiSummaryEnabled: boolean proactiveAstraEnabled: boolean - memoryPending: boolean summaryPending: boolean proactivePending: boolean - onToggleMemory: () => void onToggleSummary: () => void onToggleProactive: () => void onUpgrade: () => void @@ -22,13 +19,10 @@ interface AiFeatureTogglesProps { export function AiFeatureToggles({ hasProAccess, - aiMemoryEnabled, aiSummaryEnabled, proactiveAstraEnabled, - memoryPending, summaryPending, proactivePending, - onToggleMemory, onToggleSummary, onToggleProactive, onUpgrade, @@ -40,33 +34,6 @@ export function AiFeatureToggles({ }> {t('profile.sections.aiFeatures')} - {hasProAccess ? ( - - - - ) : ( - - - )} {hasProAccess ? ( void - onDelete: () => void -} - -const categoryBadgeStyle: React.CSSProperties = { - fontFamily: 'var(--font-mono)', - // react-doctor-disable-next-line no-tiny-text -- intentional pill badge matching DESIGN.md Badge (10.5/600 UPPERCASE); not body text https://github.com/thomasluizon/orbit-ui-mobile/issues/243 - fontSize: 10, - fontWeight: 500, - color: 'var(--fg-3)', - letterSpacing: '0.06em', - padding: '2px 7px', - borderRadius: 999, - alignSelf: 'flex-start', - boxShadow: 'inset 0 0 0 1px var(--hairline-strong)', -} - -export function FactItem({ - fact, - selectMode, - isSelected, - onToggleSelection, - onDelete, -}: Readonly) { - const t = useTranslations() - const category = fact.category ? normalizeUserFactCategory(fact.category) : null - const categoryLabel = category - ? t(`profile.facts.${category}`).toUpperCase() - : null - - const cardStyle: React.CSSProperties = { - padding: '14px 16px', - gap: 12, - borderRadius: 16, - background: isSelected - ? 'rgba(var(--primary-rgb), 0.08)' - : 'var(--bg-card)', - boxShadow: isSelected - ? 'inset 0 0 0 1px rgba(var(--primary-rgb), 0.28)' - : 'inset 0 0 0 1px var(--hairline)', - } - - const Inner = ( - <> - {selectMode && } -
- {categoryLabel && ( - - {categoryLabel} - - )} - - {fact.factText} - -
- {!selectMode && ( - - )} - - ) - - if (selectMode) { - return ( - - ) - } - - return ( -
- {Inner} -
- ) -} diff --git a/apps/web/app/(app)/ai-settings/_components/facts-pagination.tsx b/apps/web/app/(app)/ai-settings/_components/facts-pagination.tsx deleted file mode 100644 index 37caaeb896..0000000000 --- a/apps/web/app/(app)/ai-settings/_components/facts-pagination.tsx +++ /dev/null @@ -1,56 +0,0 @@ -'use client' - -import { ChevronLeft, ChevronRight } from 'lucide-react' -import { useTranslations } from 'next-intl' - -interface FactsPaginationProps { - page: number - totalPages: number - onPrevious: () => void - onNext: () => void -} - -export function FactsPagination({ - page, - totalPages, - onPrevious, - onNext, -}: Readonly) { - const t = useTranslations() - - return ( - - {t('profile.facts.count', { n: page, max: totalPages })} - - - - ) -} diff --git a/apps/web/app/(app)/ai-settings/_components/facts-select-bar.tsx b/apps/web/app/(app)/ai-settings/_components/facts-select-bar.tsx deleted file mode 100644 index b7a7f84926..0000000000 --- a/apps/web/app/(app)/ai-settings/_components/facts-select-bar.tsx +++ /dev/null @@ -1,118 +0,0 @@ -'use client' - -import { ListChecks, Trash2, X } from 'lucide-react' -import { useTranslations } from 'next-intl' -import { FactsPagination } from './facts-pagination' - -function ChipActionButton({ - onClick, - disabled = false, - destructive = false, - ariaLabel, - children, -}: Readonly<{ - onClick: () => void - disabled?: boolean - destructive?: boolean - ariaLabel?: string - children: React.ReactNode -}>) { - return ( - - ) -} - -interface FactsSelectBarProps { - selectMode: boolean - selectedCount: number - allSelected: boolean - bulkDeletePending: boolean - showPagination: boolean - page: number - totalPages: number - onPreviousPage: () => void - onNextPage: () => void - onToggleSelectAll: () => void - onBulkDelete: () => void - onToggleSelectMode: () => void -} - -export function FactsSelectBar({ - selectMode, - selectedCount, - allSelected, - bulkDeletePending, - showPagination, - page, - totalPages, - onPreviousPage, - onNextPage, - onToggleSelectAll, - onBulkDelete, - onToggleSelectMode, -}: Readonly) { - const t = useTranslations() - - if (!selectMode) { - return ( - - {showPagination && ( - - )} - - - ) - } - - return ( - - - {allSelected - ? t('profile.facts.deselectAll') - : t('profile.facts.selectAll')} - - {selectedCount > 0 && ( - - - )} - - - ) -} diff --git a/apps/web/app/(app)/ai-settings/_components/use-user-facts.ts b/apps/web/app/(app)/ai-settings/_components/use-user-facts.ts deleted file mode 100644 index bcf70a306d..0000000000 --- a/apps/web/app/(app)/ai-settings/_components/use-user-facts.ts +++ /dev/null @@ -1,105 +0,0 @@ -'use client' - -import { useMemo, useState } from 'react' -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' -import { userFactKeys } from '@orbit/shared/query' -import { API } from '@orbit/shared/api' -import { USER_FACTS_PER_PAGE } from '@orbit/shared/utils' -import { bulkDeleteUserFacts, deleteUserFact } from '@/app/actions/user-facts' -import type { UserFact } from '@orbit/shared/types/user-fact' - -async function fetchUserFacts(): Promise { - const res = await fetch(API.userFacts.list) - if (!res.ok) { - throw new Error('Failed to load user facts') - } - return res.json() as Promise -} - -export function useUserFacts(hasProAccess: boolean) { - const queryClient = useQueryClient() - - const factsQuery = useQuery({ - queryKey: userFactKeys.lists(), - queryFn: fetchUserFacts, - enabled: hasProAccess, - staleTime: 5 * 60 * 1000, - }) - - const facts = useMemo( - () => (hasProAccess ? (factsQuery.data ?? []) : []), - [hasProAccess, factsQuery.data], - ) - - const [selectMode, setSelectMode] = useState(false) - const [selectedFactIds, setSelectedFactIds] = useState>(new Set()) - - const deleteMutation = useMutation({ - mutationFn: deleteUserFact, - onSuccess: () => { - void queryClient.invalidateQueries({ queryKey: userFactKeys.all }) - }, - }) - - const bulkDeleteMutation = useMutation({ - mutationFn: bulkDeleteUserFacts, - onSuccess: () => { - void queryClient.invalidateQueries({ queryKey: userFactKeys.all }) - setSelectedFactIds(new Set()) - if (facts.length === 0) setSelectMode(false) - }, - }) - - const [factsPage, setFactsPage] = useState(1) - const totalFactsPages = useMemo( - () => Math.max(1, Math.ceil(facts.length / USER_FACTS_PER_PAGE)), - [facts.length], - ) - const pagedFacts = useMemo(() => { - const start = (factsPage - 1) * USER_FACTS_PER_PAGE - return facts.slice(start, start + USER_FACTS_PER_PAGE) - }, [facts, factsPage]) - - if (factsPage > totalFactsPages) { - setFactsPage(totalFactsPages) - } - - function toggleSelectMode() { - setSelectMode(!selectMode) - setSelectedFactIds(new Set()) - } - - function toggleFactSelection(id: string) { - const next = new Set(selectedFactIds) - if (next.has(id)) { - next.delete(id) - } else { - next.add(id) - } - setSelectedFactIds(next) - } - - function toggleSelectAll() { - if (selectedFactIds.size === facts.length) { - setSelectedFactIds(new Set()) - } else { - setSelectedFactIds(new Set(facts.map((fact) => fact.id))) - } - } - - return { - factsQuery, - facts, - pagedFacts, - selectMode, - selectedFactIds, - deleteMutation, - bulkDeleteMutation, - factsPage, - setFactsPage, - totalFactsPages, - toggleSelectMode, - toggleFactSelection, - toggleSelectAll, - } -} diff --git a/apps/web/app/(app)/ai-settings/_components/user-facts-list.tsx b/apps/web/app/(app)/ai-settings/_components/user-facts-list.tsx deleted file mode 100644 index 3097c9de4b..0000000000 --- a/apps/web/app/(app)/ai-settings/_components/user-facts-list.tsx +++ /dev/null @@ -1,134 +0,0 @@ -'use client' - -import { Sparkles } from 'lucide-react' -import { useTranslations } from 'next-intl' -import { SatelliteGlyph } from '@/components/ui/satellite-glyph' -import { PillButton } from '@/components/ui/pill-button' -import type { UserFact } from '@orbit/shared/types/user-fact' -import { FactItem } from './fact-item' - -function FactsCenteredState({ - message, - messageColor, - alert = false, - button, -}: Readonly<{ - message: string - messageColor: string - alert?: boolean - button: React.ReactNode -}>) { - return ( -
- - - {message} - - {button} -
- ) -} - -interface UserFactsListProps { - isLoading: boolean - hasError: boolean - facts: UserFact[] - pagedFacts: UserFact[] - selectMode: boolean - selectedFactIds: Set - onToggleSelection: (id: string) => void - onDelete: (id: string) => void - onRetry: () => void - onAskAstra: () => void -} - -export function UserFactsList({ - isLoading, - hasError, - facts, - pagedFacts, - selectMode, - selectedFactIds, - onToggleSelection, - onDelete, - onRetry, - onAskAstra, -}: Readonly) { - const t = useTranslations() - - if (isLoading) { - return ( -
-
-
-
- ) - } - - if (hasError) { - return ( - - {t('profile.facts.retry')} - - } - /> - ) - } - - if (facts.length === 0) { - return ( -