Skip to content

chore(release): staging to production - 2026.02.19 #970

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxtechera merged 2 commits into from
Feb 19, 2026
Merged

chore(release): staging to production - 2026.02.19 #970

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
80342f6
fix: enable drive picker in docstores
maxtechera Feb 19, 2026
0a885e2
Merge pull request #969 from the-answerai/fix/support-19-drive-picker
maxtechera Feb 19, 2026
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
59 changes: 48 additions & 11 deletions packages/ui/src/ui-component/drive/GoogleDrivePicker.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const useGooglePicker = (accessToken, onFilesSelected) => {
const createPicker = useCallback(async () => {
if (!accessToken || !window.google?.picker) {
console.error('Google Picker not available or no access token')
return
return false
}

try {
Expand All @@ -149,8 +149,10 @@ const useGooglePicker = (accessToken, onFilesSelected) => {

picker.setVisible(true)
setPickerInstance(picker)
return true
} catch (error) {
console.error('Error creating picker:', error)
return false
}
}, [accessToken, createPickerView, pickerCallback])

Expand Down Expand Up @@ -185,6 +187,17 @@ export const GoogleDrivePicker = ({ onChange, value, disabled, credentialId, cre
const getCredentialDataApi = useApi(credentialsApi.getSpecificCredential)
const scriptsLoaded = useGoogleAPILoader(accessToken)

const getTokenStateFromCredential = useCallback((plainDataObj = {}) => {
const token = plainDataObj.access_token || plainDataObj.googleAccessToken || ''
const expiresAt = plainDataObj.expires_at || plainDataObj.expiresAt
const isExpired = expiresAt ? new Date(expiresAt) < new Date() : false

return {
token,
isExpired
}
}, [])

// Handle new files selection from picker
const handleFilesSelected = useCallback(
(newFiles) => {
Expand Down Expand Up @@ -219,23 +232,21 @@ export const GoogleDrivePicker = ({ onChange, value, disabled, credentialId, cre
// Handle credential data from prop
useEffect(() => {
if (credentialData?.plainDataObj) {
const { access_token, expires_at } = credentialData.plainDataObj
const isExpired = expires_at ? new Date(expires_at) < new Date() : false
const { token, isExpired } = getTokenStateFromCredential(credentialData.plainDataObj)
setIsTokenExpired(isExpired)
setAccessToken(access_token ?? '')
setAccessToken(token)
}
}, [credentialData])
}, [credentialData, getTokenStateFromCredential])

// Handle credential data from API
useEffect(() => {
if (getCredentialDataApi.data) {
const { access_token, expires_at } = getCredentialDataApi.data?.plainDataObj
const isExpired = expires_at ? new Date(expires_at) < new Date() : false
const { token, isExpired } = getTokenStateFromCredential(getCredentialDataApi.data?.plainDataObj)
setIsTokenExpired(isExpired)
setAccessToken(access_token ?? '')
setAccessToken(token)
handleCredentialDataChange?.(getCredentialDataApi.data)
}
}, [getCredentialDataApi.data, handleCredentialDataChange])
}, [getCredentialDataApi.data, getTokenStateFromCredential, handleCredentialDataChange])

// Handle outside clicks and keyboard events for picker
useEffect(() => {
Expand Down Expand Up @@ -320,6 +331,32 @@ export const GoogleDrivePicker = ({ onChange, value, disabled, credentialId, cre
}
}, [credentialId, getCredentialDataApi, showSnackbar])

const handleOpenPicker = useCallback(async () => {
const opened = await createPicker()
if (opened) return

if (!credentialId) {
showSnackbar('Select a credential before opening Google Drive.', 'warning')
return
}

if (!accessToken) {
showSnackbar('No access token available. Refresh or re-authenticate to load files.', 'error')
return
}

if (!scriptsLoaded) {
showSnackbar('Google picker is still loading. Try again in a moment.', 'info')
return
}

if (isTokenExpired) {
showSnackbar('Access token expired. Refresh or re-authenticate before selecting files.', 'warning')
} else {
showSnackbar('Unable to open Google Drive picker. Please try again.', 'error')
}
}, [accessToken, createPicker, credentialId, isTokenExpired, scriptsLoaded, showSnackbar])

const handleReauthenticate = useCallback(async () => {
if (!credentialId) return

Expand Down Expand Up @@ -358,15 +395,15 @@ export const GoogleDrivePicker = ({ onChange, value, disabled, credentialId, cre
}
}, [credentialId, getCredentialDataApi, showSnackbar])

const isPickerReady = scriptsLoaded && !disabled && !isTokenExpired
const isPickerReady = !disabled
const hasSelectedFiles = selectedFiles.length > 0

return (
<div style={{ margin: '10px 0px 0 0' }}>
<Stack direction='column' spacing={2} sx={{ mb: 2 }}>
<Button
variant='outlined'
onClick={createPicker}
onClick={handleOpenPicker}
disabled={!isPickerReady}
sx={{
'&.Mui-disabled': {
Expand Down
72 changes: 40 additions & 32 deletions packages/ui/src/views/docstore/DocStoreInputHandler.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types'
import { useState, useContext, useCallback } from 'react'
import { useState, useContext, useCallback, useEffect } from 'react'
import { useSelector } from 'react-redux'

// material-ui
Expand Down Expand Up @@ -42,9 +42,16 @@ const DocStoreInputHandler = ({ inputParam, data, disabled = false, onNodeDataCh
const [showManageScrapedLinksDialog, setShowManageScrapedLinksDialog] = useState(false)
const [manageScrapedLinksDialogProps, setManageScrapedLinksDialogProps] = useState({})
const [reloadTimestamp, setReloadTimestamp] = useState(Date.now().toString())
const [selectedCredential, setSelectedCredential] = useState(data.credential || null)
const [selectedCredential, setSelectedCredential] = useState(
data.credential || data.inputs?.credential || data.inputs?.[FLOWISE_CREDENTIAL_ID] || null
)
const [selectedCredentialData, setSelectedCredentialData] = useState(null)

useEffect(() => {
const credentialFromData = data.credential || data.inputs?.credential || data.inputs?.[FLOWISE_CREDENTIAL_ID] || null
setSelectedCredential((prevCredential) => (prevCredential === credentialFromData ? prevCredential : credentialFromData))
}, [data.credential, data.inputs?.credential, data.inputs?.[FLOWISE_CREDENTIAL_ID]])

const handleCredentialDataChange = useCallback((credData) => {
setSelectedCredentialData(credData)
}, [])
Expand Down Expand Up @@ -275,37 +282,38 @@ const DocStoreInputHandler = ({ inputParam, data, disabled = false, onNodeDataCh
value={data.inputs[inputParam.name] ?? inputParam.default ?? 'choose an option'}
/>
)}
{(inputParam.type === 'asyncOptions' || inputParam.type === 'asyncMultiOptions') && (
<>
{data.inputParams?.length === 1 && <div style={{ marginTop: 10 }} />}
<div style={{ display: 'flex', flexDirection: 'row' }}>
<div key={reloadTimestamp} style={{ flex: 1 }}>
<AsyncDropdown
key={JSON.stringify(inputParam)}
disabled={disabled}
name={inputParam.name}
nodeData={data}
freeSolo={inputParam.freeSolo}
multiple={inputParam.type === 'asyncMultiOptions'}
value={data.inputs[inputParam.name] ?? inputParam.default ?? 'choose an option'}
onSelect={(newValue) => handleDataChange({ inputParam, newValue })}
onCreateNew={() => addAsyncOption(inputParam.name)}
fullWidth={true}
/>
{(inputParam.type === 'asyncOptions' || inputParam.type === 'asyncMultiOptions') &&
!(data.name === 'googleDrive' && inputParam.name === 'selectedFiles') && (
<>
{data.inputParams?.length === 1 && <div style={{ marginTop: 10 }} />}
<div style={{ display: 'flex', flexDirection: 'row' }}>
<div key={reloadTimestamp} style={{ flex: 1 }}>
<AsyncDropdown
key={JSON.stringify(inputParam)}
disabled={disabled}
name={inputParam.name}
nodeData={data}
freeSolo={inputParam.freeSolo}
multiple={inputParam.type === 'asyncMultiOptions'}
value={data.inputs[inputParam.name] ?? inputParam.default ?? 'choose an option'}
onSelect={(newValue) => handleDataChange({ inputParam, newValue })}
onCreateNew={() => addAsyncOption(inputParam.name)}
fullWidth={true}
/>
</div>
{inputParam.refresh && (
<IconButton
title='Refresh'
color='primary'
size='small'
onClick={() => setReloadTimestamp(Date.now().toString())}
>
<IconRefresh />
</IconButton>
)}
</div>
{inputParam.refresh && (
<IconButton
title='Refresh'
color='primary'
size='small'
onClick={() => setReloadTimestamp(Date.now().toString())}
>
<IconRefresh />
</IconButton>
)}
</div>
</>
)}
</>
)}
{inputParam.type === 'array' && (
<ArrayRenderer inputParam={inputParam} data={data} disabled={disabled} isDocStore={true} />
)}
Expand Down
Loading