From 667b1c37a38531ea63e8cecab67ba00868368592 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 13 Nov 2025 15:28:32 +0800 Subject: [PATCH 1/2] fix: can still invite when api is pending (#28161) --- .../members-page/invite-modal/index.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx index 264665805d..a432b8a4f0 100644 --- a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx +++ b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx @@ -17,8 +17,9 @@ import type { InvitationResult } from '@/models/common' import I18n from '@/context/i18n' import 'react-multi-email/dist/style.css' import { noop } from 'lodash-es' - import { useProviderContextSelector } from '@/context/provider-context' +import { useBoolean } from 'ahooks' + type IInviteModalProps = { isEmailSetup: boolean onCancel: () => void @@ -49,9 +50,15 @@ const InviteModal = ({ const { locale } = useContext(I18n) const [role, setRole] = useState('normal') + const [isSubmitting, { + setTrue: setIsSubmitting, + setFalse: setIsSubmitted, + }] = useBoolean(false) + const handleSend = useCallback(async () => { - if (isLimitExceeded) + if (isLimitExceeded || isSubmitting) return + setIsSubmitting() if (emails.map((email: string) => emailRegex.test(email)).every(Boolean)) { try { const { result, invitation_results } = await inviteMember({ @@ -70,7 +77,8 @@ const InviteModal = ({ else { notify({ type: 'error', message: t('common.members.emailInvalid') }) } - }, [isLimitExceeded, emails, role, locale, onCancel, onSend, notify, t]) + setIsSubmitted() + }, [isLimitExceeded, emails, role, locale, onCancel, onSend, notify, t, isSubmitting]) return (
@@ -133,7 +141,7 @@ const InviteModal = ({ tabIndex={0} className='w-full' onClick={handleSend} - disabled={!emails.length || isLimitExceeded} + disabled={!emails.length || isLimitExceeded || isSubmitting} variant='primary' > {t('common.members.sendInvite')} From 45e816a9f6fa195b508657ec0c1f67936b65d229 Mon Sep 17 00:00:00 2001 From: breath57 <48155693+breath57@users.noreply.github.com> Date: Thu, 13 Nov 2025 15:36:27 +0800 Subject: [PATCH 2/2] fix(knowledge-base): regenerate child chunks not working completely (#27934) --- .../completed/common/regeneration-modal.tsx | 2 +- .../documents/detail/completed/index.tsx | 3 +++ .../detail/completed/segment-detail.tsx | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx b/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx index 95bb339db9..f90fd7ac60 100644 --- a/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx +++ b/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx @@ -121,7 +121,7 @@ const RegenerationModal: FC = ({ }) return ( - + {!loading && !updateSucceeded && } {loading && !updateSucceeded && } {!loading && updateSucceeded && } diff --git a/web/app/components/datasets/documents/detail/completed/index.tsx b/web/app/components/datasets/documents/detail/completed/index.tsx index 8fa167f976..09c63d54a1 100644 --- a/web/app/components/datasets/documents/detail/completed/index.tsx +++ b/web/app/components/datasets/documents/detail/completed/index.tsx @@ -124,6 +124,7 @@ const Completed: FC = ({ const [limit, setLimit] = useState(DEFAULT_LIMIT) const [fullScreen, setFullScreen] = useState(false) const [showNewChildSegmentModal, setShowNewChildSegmentModal] = useState(false) + const [isRegenerationModalOpen, setIsRegenerationModalOpen] = useState(false) const segmentListRef = useRef(null) const childSegmentListRef = useRef(null) @@ -669,6 +670,7 @@ const Completed: FC = ({ onClose={onCloseSegmentDetail} showOverlay={false} needCheckChunks + modal={isRegenerationModalOpen} > = ({ isEditMode={currSegment.isEditMode} onUpdate={handleUpdateSegment} onCancel={onCloseSegmentDetail} + onModalStateChange={setIsRegenerationModalOpen} /> {/* Create New Segment */} diff --git a/web/app/components/datasets/documents/detail/completed/segment-detail.tsx b/web/app/components/datasets/documents/detail/completed/segment-detail.tsx index bbd9df1adc..5e5ae6b485 100644 --- a/web/app/components/datasets/documents/detail/completed/segment-detail.tsx +++ b/web/app/components/datasets/documents/detail/completed/segment-detail.tsx @@ -27,6 +27,7 @@ type ISegmentDetailProps = { onCancel: () => void isEditMode?: boolean docForm: ChunkingMode + onModalStateChange?: (isOpen: boolean) => void } /** @@ -38,6 +39,7 @@ const SegmentDetail: FC = ({ onCancel, isEditMode, docForm, + onModalStateChange, }) => { const { t } = useTranslation() const [question, setQuestion] = useState(isEditMode ? segInfo?.content || '' : segInfo?.sign_content || '') @@ -68,11 +70,19 @@ const SegmentDetail: FC = ({ const handleRegeneration = useCallback(() => { setShowRegenerationModal(true) - }, []) + onModalStateChange?.(true) + }, [onModalStateChange]) const onCancelRegeneration = useCallback(() => { setShowRegenerationModal(false) - }, []) + onModalStateChange?.(false) + }, [onModalStateChange]) + + const onCloseAfterRegeneration = useCallback(() => { + setShowRegenerationModal(false) + onModalStateChange?.(false) + onCancel() // Close the edit drawer + }, [onCancel, onModalStateChange]) const onConfirmRegeneration = useCallback(() => { onUpdate(segInfo?.id || '', question, answer, keywords, true) @@ -161,7 +171,7 @@ const SegmentDetail: FC = ({ isShow={showRegenerationModal} onConfirm={onConfirmRegeneration} onCancel={onCancelRegeneration} - onClose={onCancelRegeneration} + onClose={onCloseAfterRegeneration} /> ) }