Repository navigation
fix(SEL-615): Beta-unavailable UI for Settings/Products/Audit Log/Notifications #3739
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import { beforeEach, describe, expect, it, vi } from 'vitest'; | ||
| import { render, screen, waitFor } from '@testing-library/react'; | ||
| import userEvent from '@testing-library/user-event'; | ||
| import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; | ||
| import SettingsPage from '@/app/dashboard/settings/page'; | ||
| import ProductsPage from '@/app/dashboard/products/page'; | ||
| import AuditLogPage from '@/app/dashboard/audit-log/page'; | ||
| import NotificationsPage from '@/app/dashboard/notifications/page'; | ||
|
|
||
| const fetchMock = vi.hoisted(() => vi.fn()); | ||
| vi.mock('@/lib/fetch-with-csrf', () => ({ fetchWithCsrf: (...args: unknown[]) => fetchMock(...args) })); | ||
| vi.mock('@/lib/api-config', () => ({ getServiceURL: () => '/api/ingestion' })); | ||
| vi.mock('@/lib/auth-context', () => ({ useAuth: () => ({ isAuthenticated: true, user: null }) })); | ||
| vi.mock('@/lib/tenant-context', () => ({ useTenant: () => ({ tenantId: 't', isSystemTenant: false }) })); | ||
| vi.mock('@/hooks/use-billing', () => ({ useCurrentSubscription: () => ({ data: null, isLoading: false, isError: false }) })); | ||
| vi.mock('@/hooks/use-dashboard-refresh', () => ({ useDashboardRefresh: vi.fn() })); | ||
|
|
||
| beforeEach(() => fetchMock.mockReset()); | ||
|
|
||
| for (const [name, Page, primaryPath] of [ | ||
| ['Settings', SettingsPage, '/api/v1/settings/t'], | ||
| ['Products', ProductsPage, '/api/v1/products/t'], | ||
| ['Audit Log', AuditLogPage, '/api/v1/audit-log/t'], | ||
| ['Notifications', NotificationsPage, '/api/v1/notifications/t/preferences'], | ||
| ] as const) { | ||
| describe(name, () => { | ||
| function renderPage() { | ||
| const client = new QueryClient({ defaultOptions: { queries: { retry: false, retryDelay: 0 } } }); | ||
| render(<QueryClientProvider client={client}><Page /></QueryClientProvider>); | ||
| } | ||
|
|
||
| function expectProfileBlocked() { | ||
| if (name === 'Settings') { | ||
| expect(screen.getByRole('button', { name: 'Save Changes' })).toBeDisabled(); | ||
| expect(screen.queryByLabelText('Company Type')).not.toBeInTheDocument(); | ||
| } | ||
| } | ||
|
|
||
| it.each([404, 403])('shows Beta unavailable for HTTP %s', async status => { | ||
| fetchMock.mockResolvedValue(new Response(null, { status })); | ||
| renderPage(); | ||
| expect(await screen.findByText(/not yet available in RegEngine Beta/)).toBeVisible(); | ||
| expect(screen.queryByText(/Couldn't load|We could not load/)).not.toBeInTheDocument(); | ||
| expect(screen.queryByRole('button', { name: 'Retry' })).not.toBeInTheDocument(); | ||
| expectProfileBlocked(); | ||
| expect(fetchMock).toHaveBeenCalledWith(expect.stringContaining(primaryPath), expect.anything()); | ||
| }); | ||
|
|
||
| it.each(['server', 'network'] as const)('keeps ErrorState and working retry for %s failure', async failure => { | ||
| if (failure === 'server') fetchMock.mockResolvedValue(new Response(null, { status: 503 })); | ||
| else fetchMock.mockResolvedValue(Response.error()); | ||
| renderPage(); | ||
| expect(await screen.findByRole('alert')).toHaveTextContent("Couldn't load this"); | ||
| expect(screen.queryByText(/not yet available in RegEngine Beta/)).not.toBeInTheDocument(); | ||
| expect(screen.getByRole('link', { name: 'Contact support' })).toBeVisible(); | ||
| expectProfileBlocked(); | ||
| const callsBeforeRetry = fetchMock.mock.calls.filter(([url]) => url.includes(primaryPath)).length; | ||
| await userEvent.setup().click(screen.getByRole('button', { name: 'Retry' })); | ||
| await waitFor(() => expect(fetchMock.mock.calls.filter(([url]) => url.includes(primaryPath)).length).toBeGreaterThan(callsBeforeRetry)); | ||
| }); | ||
| }); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { Callout } from '@/components/ui/callout'; | ||
| import { BETA_UNAVAILABLE_COPY } from '@/lib/dashboard-load-failure'; | ||
|
|
||
| export interface BetaUnavailableStateProps { | ||
| feature?: string; | ||
| } | ||
|
|
||
| export function BetaUnavailableState({ feature = 'This feature' }: BetaUnavailableStateProps) { | ||
| return ( | ||
| <Callout tone="info" role="status" title={`${feature} is ${BETA_UNAVAILABLE_COPY}`}> | ||
| <a href="/settings/support" className="text-small underline">Contact support</a> | ||
| </Callout> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import { getErrorStatus } from '@/lib/api-error'; | ||
|
|
||
| export const BETA_UNAVAILABLE_COPY = 'not yet available in RegEngine Beta'; | ||
|
|
||
| export function isBetaUnavailableStatus(status: unknown): boolean { | ||
| return status === 404 || status === 403; | ||
| } | ||
|
|
||
| export function isBetaUnavailableError(error: unknown): boolean { | ||
| return isBetaUnavailableStatus(getErrorStatus(error)); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Script executed:
Repository: regengine/RegEngine
Length of output: 4522
Script executed:
Repository: regengine/RegEngine
Length of output: 18558
Script executed:
Repository: regengine/RegEngine
Length of output: 27846
Make the network fixture reject the fetch promise.
Response.error()is a resolvedResponsewithok === false. Each page therefore enters its!res.okresponse-error branch instead of testing a rejectedfetchWithCsrfpromise. The existingdashboard-load-errors.test.tsxcases cover the same pages, but also use resolvedResponse.error(), so they do not cover this rejection path.Proposed change
Committable suggestion