diff --git a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx index cf0a7ae44..2ace89a8d 100644 --- a/web/src/pages/user-setting/data-source/add-datasource-modal.tsx +++ b/web/src/pages/user-setting/data-source/add-datasource-modal.tsx @@ -47,6 +47,7 @@ const AddDataSourceModal = ({ } open={visible || false} onOpenChange={(open) => !open && hideModal?.()} + maskClosable={false} // onOk={() => handleOk()} okText={t('common.confirm')} cancelText={t('common.cancel')} diff --git a/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx b/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx index 651625bd4..3777ebb31 100644 --- a/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx +++ b/web/src/pages/user-setting/data-source/component/gmail-token-field.tsx @@ -315,12 +315,16 @@ const GmailTokenField = ({ { - if (!open) { + if (!open && dialogOpen) { handleCancel(); } }} > - + e.preventDefault()} + onInteractOutside={(e) => e.preventDefault()} + onEscapeKeyDown={(e) => e.preventDefault()} + > Complete Gmail verification diff --git a/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx b/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx index 50a055f52..bb0565bae 100644 --- a/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx +++ b/web/src/pages/user-setting/data-source/component/google-drive-token-field.tsx @@ -1,5 +1,3 @@ -import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; - import { FileUploader } from '@/components/file-uploader'; import { Button } from '@/components/ui/button'; import { @@ -17,6 +15,7 @@ import { startGoogleDriveWebAuth, } from '@/services/data-source-service'; import { Loader2 } from 'lucide-react'; +import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; type GoogleDriveTokenFieldProps = { value?: string; @@ -313,12 +312,16 @@ const GoogleDriveTokenField = ({ { - if (!open) { + if (!open && dialogOpen) { handleCancel(); } }} > - + e.preventDefault()} + onInteractOutside={(e) => e.preventDefault()} + onEscapeKeyDown={(e) => e.preventDefault()} + > Complete Google verification @@ -326,7 +329,6 @@ const GoogleDriveTokenField = ({ Run the verification flow once to mint reusable tokens. -
@@ -370,7 +372,6 @@ const GoogleDriveTokenField = ({
-