Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

Fix: Add a loading state to the button that creates a memory. (#20098)

balibabu50aaa1d1852b
diff --git a/web/src/pages/home/memory-list.tsx b/web/src/pages/home/memory-list.tsx
index 1bc1fb059d..a5b52adfbf 100644
--- a/web/src/pages/home/memory-list.tsx
+++ b/web/src/pages/home/memory-list.tsx
@@ -28,7 +28,7 @@ export function MemoryList({
openCreateModal,
showMemoryRenameModal,
hideMemoryModal,
- searchRenameLoading,
+ memoryRenameLoading,
onMemoryRenameOk,
initialMemory,
} = useRenameMemory();
@@ -69,7 +69,7 @@ export function MemoryList({
initialMemory={initialMemory}
isCreate={false}
open={openCreateModal}
- loading={searchRenameLoading}
+ loading={memoryRenameLoading}
onClose={hideMemoryModal}
onSubmit={onMemoryConfirm}
/>
diff --git a/web/src/pages/memories/add-or-edit-modal.tsx b/web/src/pages/memories/add-or-edit-modal.tsx
index 859a8518e8..4203f125ee 100644
--- a/web/src/pages/memories/add-or-edit-modal.tsx
+++ b/web/src/pages/memories/add-or-edit-modal.tsx
@@ -66,7 +66,7 @@ export const AddOrEditModal = memo(function AddOrEditModal(props: IProps) {
<div className="flex justify-end gap-2 pb-5">
<DynamicForm.CancelButton handleCancel={onClose} />
<DynamicForm.SavingButton
- submitLoading={false}
+ submitLoading={props.loading}
submitFunc={(data) => {
onSubmit?.(data);
}}
diff --git a/web/src/pages/memories/hooks.ts b/web/src/pages/memories/hooks.ts
index 4a9c8e1d80..6db05059f8 100644
--- a/web/src/pages/memories/hooks.ts
+++ b/web/src/pages/memories/hooks.ts
@@ -37,22 +37,34 @@ export const useCreateMemory = () => {
const { t } = useTranslation();
const queryClient = useQueryClient();
- const createMemory = useCallback(
- async (props: ICreateMemoryProps): Promise<CreateMemoryResponse> => {
+ const {
+ data,
+ isError,
+ isPending,
+ mutateAsync: createMemoryMutation,
+ } = useMutation<CreateMemoryResponse, Error, ICreateMemoryProps>({
+ mutationKey: ['createMemory'],
+ mutationFn: async (props) => {
const { data: response } = await memoryService.createMemory(props);
if (response.code !== 0) {
throw new Error(response.message || 'Failed to create memory');
}
- if (response.code === 0) {
- message.success(t('message.created'));
- queryClient.invalidateQueries({ queryKey: MemoryKeys.filters() });
- }
+ queryClient.invalidateQueries({ queryKey: MemoryKeys.filters() });
return response.data;
},
- [queryClient, t],
+ onSuccess: () => {
+ message.success(t('message.created'));
+ },
+ });
+
+ const createMemory = useCallback(
+ (props: ICreateMemoryProps) => {
+ return createMemoryMutation(props);
+ },
+ [createMemoryMutation],
);
- return { createMemory };
+ return { data, isError, isPending, createMemory };
};
export const useFetchMemoryList = () => {
@@ -241,6 +253,7 @@ export const useUpdateMemory = () => {
const {
data,
isError,
+ isPending,
mutateAsync: updateMemoryMutation,
} = useMutation<any, Error, IMemoryAppDetailProps>({
mutationKey: ['updateMemory'],
@@ -272,7 +285,7 @@ export const useUpdateMemory = () => {
[updateMemoryMutation],
);
- return { data, isError, updateMemory };
+ return { data, isError, isPending, updateMemory };
};
export const useRenameMemory = () => {
@@ -282,9 +295,9 @@ export const useRenameMemory = () => {
hideModal: hideChatRenameModal,
showModal: showChatRenameModal,
} = useSetModalState();
- const { updateMemory } = useUpdateMemory();
- const { createMemory } = useCreateMemory();
- const [loading, setLoading] = useState(false);
+ const { isPending: createPending, createMemory } = useCreateMemory();
+ const { isPending: updatePending, updateMemory } = useUpdateMemory();
+ const memoryRenameLoading = createPending || updatePending;
const defaultModelDictionary = useFetchDefaultModelDictionary();
const handleShowChatRenameModal = useCallback(
@@ -310,8 +323,6 @@ export const useRenameMemory = () => {
const onMemoryRenameOk = useCallback(
async (data: ICreateMemoryProps, callBack?: () => void) => {
- // let res;
- setLoading(true);
if (memory?.id) {
try {
await updateMemory({
@@ -329,13 +340,12 @@ export const useRenameMemory = () => {
// navigateToMemory(res?.id)();
// }
callBack?.();
- setLoading(false);
handleHideModal();
},
[memory, createMemory, handleHideModal, updateMemory],
);
return {
- memoryRenameLoading: loading,
+ memoryRenameLoading,
initialMemory: memory,
onMemoryRenameOk,
openCreateModal,
diff --git a/web/src/pages/memories/index.tsx b/web/src/pages/memories/index.tsx
index f7cf2220a0..4b59a5496a 100644
--- a/web/src/pages/memories/index.tsx
+++ b/web/src/pages/memories/index.tsx
@@ -46,7 +46,7 @@ export default function MemoryList() {
openCreateModal,
showMemoryRenameModal,
hideMemoryModal,
- searchRenameLoading,
+ memoryRenameLoading,
onMemoryRenameOk,
initialMemory,
} = useRenameMemory();
@@ -172,7 +172,7 @@ export default function MemoryList() {
initialMemory={initialMemory}
isCreate={addOrEditType === 'add'}
open={openCreateModal}
- loading={searchRenameLoading}
+ loading={memoryRenameLoading}
onClose={hideMemoryModal}
onSubmit={onMemoryConfirm}
/>