Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions frontend/src/components/Initializers/Initializers.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,16 @@ describe('Initializers', () => {
expect(within(baselineRow).queryByRole('button', { name: 'Apply now' })).not.toBeInTheDocument()
})

it('should keep saved settings visible when catalog loading fails', async () => {
mockedInitializersApi.listRegistered.mockRejectedValue(new Error('Service Unavailable'))

renderInitializers()

expect(await screen.findByTestId('baseline-initializer-row-target')).toBeInTheDocument()
expect(screen.getByTestId('initializer-row-additional-1')).toBeInTheDocument()
expect(screen.getByText('Service Unavailable')).toBeInTheDocument()
})

it('should remove an additional initializer and show success feedback', async () => {
const user = userEvent.setup()
renderInitializers()
Expand Down
44 changes: 25 additions & 19 deletions frontend/src/components/Initializers/Initializers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,32 @@ export default function Initializers() {
let cancelled = false

const loadInitializersAsync = async (): Promise<void> => {
try {
const [settingsResponse, registeredResponse] = await Promise.all([
initializersApi.getSettings(),
initializersApi.listRegistered(),
])
if (cancelled) {
return
}
setSettings(settingsResponse)
setRegisteredInitializers(registeredResponse.items)
} catch (error) {
if (cancelled) {
return
}
setStatusMessage({ intent: 'error', text: toApiError(error).detail })
} finally {
if (!cancelled) {
setLoading(false)
}
const [settingsResult, registeredResult] = await Promise.allSettled([
initializersApi.getSettings(),
initializersApi.listRegistered(),
])
if (cancelled) {
return
}

if (settingsResult.status === 'fulfilled') {
setSettings(settingsResult.value)
} else {
setStatusMessage({ intent: 'error', text: toApiError(settingsResult.reason).detail })
}

if (registeredResult.status === 'fulfilled') {
setRegisteredInitializers(registeredResult.value.items)
} else {
const catalogError = toApiError(registeredResult.reason).detail
setStatusMessage((current: StatusMessage | null) =>
current
? { intent: 'error', text: `${current.text} ${catalogError}` }
: { intent: 'error', text: catalogError },
)
}

setLoading(false)
}

void loadInitializersAsync()
Expand Down
Loading