Skip to content

Commit 7387452

Browse files
Bill Leoutsakoscursoragent
authored andcommitted
fix(settings): prioritize API key load errors
Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent bef4ac9 commit 7387452

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

  • apps/sim/app/workspace/[workspaceId]/settings/components/api-keys

apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,13 @@ export function ApiKeys({ scope = 'workspace' }: ApiKeysProps) {
104104
const workspaceKeys = apiKeysData?.workspaceKeys ?? EMPTY_KEYS
105105
const personalKeys = apiKeysData?.personalKeys ?? EMPTY_KEYS
106106
const conflicts = apiKeysData?.conflicts ?? EMPTY_KEY_NAMES
107-
const isLoading =
108-
isLoadingKeys ||
109-
isKeysPlaceholderData ||
110-
(showsWorkspaceKeys && (isLoadingSettings || isSettingsPlaceholderData))
111107
const hasLoadError = isKeysError || (showsWorkspaceKeys && isSettingsError)
112-
const dataState = isLoading ? 'loading' : hasLoadError ? 'error' : 'ready'
108+
const isLoading =
109+
!hasLoadError &&
110+
(isLoadingKeys ||
111+
isKeysPlaceholderData ||
112+
(showsWorkspaceKeys && (isLoadingSettings || isSettingsPlaceholderData)))
113+
const dataState = hasLoadError ? 'error' : isLoading ? 'loading' : 'ready'
113114

114115
const allowPersonalApiKeys =
115116
workspaceSettingsData?.settings?.workspace?.allowPersonalApiKeys ?? true

0 commit comments

Comments
 (0)