Skip to content

fix(selectors): gdrive and slack selectors inf loops #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2025
Merged

fix(selectors): gdrive and slack selectors inf loops #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb3c0d
fix(selectors): gdrive and slack selectors inf loops
icecrasher321 Sep 18, 2025
14da69e
remove comment
icecrasher321 Sep 18, 2025
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
12 changes: 11 additions & 1 deletion ...ck/components/sub-block/components/channel-selector/components/slack-channel-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,21 @@ export function SlackChannelSelector({
body: JSON.stringify({ credential, workflowId }),
})

if (!res.ok) throw new Error(`HTTP error! status: ${res.status}`)
if (!res.ok) {
const errorData = await res
.json()
.catch(() => ({ error: `HTTP error! status: ${res.status}` }))
setError(errorData.error || `HTTP error! status: ${res.status}`)
setChannels([])
setInitialFetchDone(true)
return
}

const data = await res.json()
if (data.error) {
setError(data.error)
setChannels([])
setInitialFetchDone(true)
} else {
setChannels(data.channels)
setInitialFetchDone(true)
Expand All @@ -72,6 +81,7 @@ export function SlackChannelSelector({
if ((err as Error).name === 'AbortError') return
setError((err as Error).message)
setChannels([])
setInitialFetchDone(true)
} finally {
setLoading(false)
}
Expand Down
12 changes: 11 additions & 1 deletion ...ow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ export function GoogleDrivePicker({
if (response.ok) {
const data = await response.json()
setCredentials(data.credentials)
// Do not auto-select. Respect persisted credential via prop when provided.
if (credentialId && !data.credentials.some((c: any) => c.id === credentialId)) {
setSelectedCredentialId('')
}
Comment on lines +103 to +105
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Type assertion to any should be avoided. Consider defining a proper type for the credential object.

Suggested change
if (credentialId && !data.credentials.some((c: any) => c.id === credentialId)) {
setSelectedCredentialId('')
}
if (credentialId && !data.credentials.some((c: Credential) => c.id === credentialId)) {
setSelectedCredentialId('')
}

Context Used: Context - Avoid using type assertions to 'any' in TypeScript. Instead, ensure proper type definitions are used to maintain type safety. (link)

}
} catch (error) {
logger.error('Error fetching credentials:', { error })
Expand Down Expand Up @@ -151,6 +153,14 @@ export function GoogleDrivePicker({
onChange('')
onFileInfoChange?.(null)
}

if (response.status === 401) {
logger.info('Credential unauthorized (401), clearing selection and prompting re-auth')
setSelectedFileId('')
onChange('')
onFileInfoChange?.(null)
setShowOAuthModal(true)
}
}
return null
} catch (error) {
Expand Down