From 284d6c623e5b615c64d5546715b78862e5da3ac9 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 2 Mar 2026 20:58:09 +0800 Subject: [PATCH] feat: add deleteAllSessions functionality and update batch delete logic - Introduced a new API function `deleteAllSessions` to allow deletion of all sessions for a tenant. - Updated the `BatchManageDialog` component to support a confirmation dialog for deleting all sessions. - Enhanced the menu component to reflect the new delete all functionality with appropriate confirmation messages. - Added internationalization support for the new delete all confirmation message in multiple languages. These changes improve session management by providing users with the ability to delete all sessions at once, enhancing the overall user experience. --- frontend/src/api/chat/index.ts | 4 + frontend/src/components/BatchManageDialog.vue | 424 ------------------ frontend/src/components/menu.vue | 64 ++- frontend/src/i18n/locales/en-US.ts | 1 + frontend/src/i18n/locales/ko-KR.ts | 1 + frontend/src/i18n/locales/ru-RU.ts | 1 + frontend/src/i18n/locales/zh-CN.ts | 1 + internal/application/repository/session.go | 5 + internal/application/service/session.go | 30 ++ internal/handler/session/handler.go | 25 +- internal/types/interfaces/session.go | 4 + 11 files changed, 113 insertions(+), 447 deletions(-) delete mode 100644 frontend/src/components/BatchManageDialog.vue diff --git a/frontend/src/api/chat/index.ts b/frontend/src/api/chat/index.ts index b93c3921..634958d7 100644 --- a/frontend/src/api/chat/index.ts +++ b/frontend/src/api/chat/index.ts @@ -48,6 +48,10 @@ export async function batchDelSessions(ids: string[]) { return del(`/api/v1/sessions/batch`, { ids }); } +export async function deleteAllSessions() { + return del(`/api/v1/sessions/batch`, { delete_all: true }); +} + export async function getSession(session_id: string) { return get(`/api/v1/sessions/${session_id}`); } diff --git a/frontend/src/components/BatchManageDialog.vue b/frontend/src/components/BatchManageDialog.vue deleted file mode 100644 index a6f61154..00000000 --- a/frontend/src/components/BatchManageDialog.vue +++ /dev/null @@ -1,424 +0,0 @@ - - - - - diff --git a/frontend/src/components/menu.vue b/frontend/src/components/menu.vue index fedf5d9f..996a4533 100644 --- a/frontend/src/components/menu.vue +++ b/frontend/src/components/menu.vue @@ -71,7 +71,7 @@ :loading="batchDeleting" @click="handleInlineBatchDelete" > - {{ t('batchManage.delete') }}{{ batchSelectedIds.length > 0 ? `(${batchSelectedIds.length})` : '' }} + {{ t('batchManage.delete') }}{{ batchSelectedIds.length > 0 ? `(${batchDisplayCount})` : '' }} @@ -83,12 +83,6 @@ - - - @@ -96,7 +90,7 @@ import { storeToRefs } from 'pinia'; import { onMounted, watch, computed, ref } from 'vue'; import { useRoute, useRouter } from 'vue-router'; -import { getSessionsList, delSession, batchDelSessions } from "@/api/chat/index"; +import { getSessionsList, delSession, batchDelSessions, deleteAllSessions } from "@/api/chat/index"; import { getKnowledgeBaseById } from '@/api/knowledge-base'; import { logout as logoutApi } from '@/api/auth'; import { useMenuStore } from '@/stores/menu'; @@ -133,6 +127,24 @@ const batchMode = ref(false) const batchSelectedIds = ref([]) const batchDeleting = ref(false) +const allSessionIds = computed(() => { + const chatMenu = (menuArr.value as unknown as MenuItem[]).find((item: MenuItem) => item.path === 'creatChat'); + if (!chatMenu?.children) return []; + return (chatMenu.children as any[]).map((s: any) => s.id); +}) + +const isAllBatchSelected = computed(() => + allSessionIds.value.length > 0 && batchSelectedIds.value.length === allSessionIds.value.length +) + +const isBatchIndeterminate = computed(() => + batchSelectedIds.value.length > 0 && batchSelectedIds.value.length < allSessionIds.value.length +) + +const batchDisplayCount = computed(() => + isAllBatchSelected.value ? total.value : batchSelectedIds.value.length +) + // 是否可以访问所有租户 const canAccessAllTenants = computed(() => authStore.canAccessAllTenants); @@ -319,35 +331,47 @@ const toggleBatchSelectAll = (checked: boolean) => { const handleInlineBatchDelete = () => { if (batchSelectedIds.value.length === 0) return + const isDeleteAll = isAllBatchSelected.value + const displayCount = batchDisplayCount.value const confirmDialog = DialogPlugin.confirm({ header: t('batchManage.deleteConfirmTitle'), - body: t('batchManage.deleteConfirmBody', { count: batchSelectedIds.value.length }), + body: isDeleteAll + ? t('batchManage.deleteAllConfirmBody') || t('batchManage.deleteConfirmBody', { count: displayCount }) + : t('batchManage.deleteConfirmBody', { count: displayCount }), confirmBtn: { content: t('batchManage.delete'), theme: 'danger' as const }, cancelBtn: t('batchManage.cancel'), theme: 'warning', onConfirm: async () => { batchDeleting.value = true try { - const ids = [...batchSelectedIds.value] - const res: any = await batchDelSessions(ids) + let res: any + if (isDeleteAll) { + res = await deleteAllSessions() + } else { + res = await batchDelSessions([...batchSelectedIds.value]) + } if (res && res.success === true) { const chatMenuItem = (menuArr.value as any[]).find((m: any) => m.path === 'creatChat'); - if (chatMenuItem && chatMenuItem.children) { - for (const id of ids) { - const idx = chatMenuItem.children.findIndex((s: any) => s.id === id); - if (idx !== -1) chatMenuItem.children.splice(idx, 1); + if (isDeleteAll) { + if (chatMenuItem) chatMenuItem.children = []; + total.value = 0; + } else { + const ids = [...batchSelectedIds.value] + if (chatMenuItem && chatMenuItem.children) { + for (const id of ids) { + const idx = chatMenuItem.children.findIndex((s: any) => s.id === id); + if (idx !== -1) chatMenuItem.children.splice(idx, 1); + } } + total.value = Math.max(0, total.value - ids.length); } - total.value = Math.max(0, total.value - ids.length); const currentChatId = route.params.chatid as string; - if (currentChatId && ids.includes(currentChatId)) { + if (currentChatId && (isDeleteAll || batchSelectedIds.value.includes(currentChatId))) { router.push('/platform/creatChat'); } batchSelectedIds.value = [] MessagePlugin.success(t('batchManage.deleteSuccess')) - if (!chatMenuItem?.children?.length) { - exitBatchMode() - } + exitBatchMode() } else { MessagePlugin.error(t('batchManage.deleteFailed')) } diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index ea59fa72..296c1f0a 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -23,6 +23,7 @@ export default { delete: 'Delete Conversations', deleteConfirmTitle: 'Delete Conversations', deleteConfirmBody: 'Are you sure you want to delete the selected {count} conversation(s)? This action cannot be undone.', + deleteAllConfirmBody: 'Are you sure you want to delete all conversations? This action cannot be undone.', deleteSuccess: 'Deleted successfully', deleteFailed: 'Delete failed, please try again later', noSelection: 'Please select at least one conversation', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index 913070a7..9825e8c5 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -23,6 +23,7 @@ export default { delete: "대화 삭제", deleteConfirmTitle: "대화 삭제", deleteConfirmBody: "선택한 {count}개의 대화를 삭제하시겠습니까? 삭제 후 복구할 수 없습니다.", + deleteAllConfirmBody: "모든 대화를 삭제하시겠습니까? 이 작업은 취소할 수 없습니다.", deleteSuccess: "삭제 성공", deleteFailed: "삭제 실패, 나중에 다시 시도해 주세요", noSelection: "최소 하나의 대화를 선택해 주세요", diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index 5f370a99..bb10d663 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -21,6 +21,7 @@ export default { delete: 'Удалить диалоги', deleteConfirmTitle: 'Удалить диалоги', deleteConfirmBody: 'Вы уверены, что хотите удалить выбранные {count} диалог(ов)? Это действие необратимо.', + deleteAllConfirmBody: 'Вы уверены, что хотите удалить все диалоги? Это действие необратимо.', deleteSuccess: 'Успешно удалено', deleteFailed: 'Ошибка удаления, попробуйте позже', noSelection: 'Выберите хотя бы один диалог', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index e2533d09..806f9adf 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -23,6 +23,7 @@ export default { delete: "删除对话", deleteConfirmTitle: "删除对话", deleteConfirmBody: "确定要删除选中的 {count} 条对话吗?删除后无法恢复。", + deleteAllConfirmBody: "确定要删除所有对话吗?此操作无法恢复。", deleteSuccess: "删除成功", deleteFailed: "删除失败,请稍后再试", noSelection: "请至少选择一条对话", diff --git a/internal/application/repository/session.go b/internal/application/repository/session.go index 666261b1..9187fce3 100644 --- a/internal/application/repository/session.go +++ b/internal/application/repository/session.go @@ -95,3 +95,8 @@ func (r *sessionRepository) BatchDelete(ctx context.Context, tenantID uint64, id } return r.db.WithContext(ctx).Where("tenant_id = ? AND id IN ?", tenantID, ids).Delete(&types.Session{}).Error } + +// DeleteAllByTenantID deletes all sessions for a tenant +func (r *sessionRepository) DeleteAllByTenantID(ctx context.Context, tenantID uint64) error { + return r.db.WithContext(ctx).Where("tenant_id = ?", tenantID).Delete(&types.Session{}).Error +} diff --git a/internal/application/service/session.go b/internal/application/service/session.go index 8a09f0f6..527ae5a6 100644 --- a/internal/application/service/session.go +++ b/internal/application/service/session.go @@ -260,6 +260,36 @@ func (s *sessionService) BatchDeleteSessions(ctx context.Context, ids []string) return nil } +// DeleteAllSessions deletes all sessions for the current tenant +func (s *sessionService) DeleteAllSessions(ctx context.Context) error { + tenantID := types.MustTenantIDFromContext(ctx) + logger.Infof(ctx, "Deleting all sessions for tenant %d", tenantID) + + sessions, err := s.sessionRepo.GetByTenantID(ctx, tenantID) + if err != nil { + logger.Warnf(ctx, "Failed to list sessions for cleanup: %v", err) + } else { + for _, session := range sessions { + if err := s.webSearchStateRepo.DeleteWebSearchTempKBState(ctx, session.ID); err != nil { + logger.Warnf(ctx, "Failed to cleanup temporary KB for session %s: %v", session.ID, err) + } + if err := s.sessionStorage.Delete(ctx, session.ID); err != nil { + logger.Warnf(ctx, "Failed to cleanup conversation context for session %s: %v", session.ID, err) + } + } + } + + if err := s.sessionRepo.DeleteAllByTenantID(ctx, tenantID); err != nil { + logger.ErrorWithFields(ctx, err, map[string]interface{}{ + "tenant_id": tenantID, + }) + return err + } + + logger.Infof(ctx, "All sessions deleted for tenant %d", tenantID) + return nil +} + // GenerateTitle generates a title for the current conversation content // modelID: optional model ID to use for title generation (if empty, uses first available KnowledgeQA model) func (s *sessionService) GenerateTitle(ctx context.Context, diff --git a/internal/handler/session/handler.go b/internal/handler/session/handler.go index ef139c39..d05d73a5 100644 --- a/internal/handler/session/handler.go +++ b/internal/handler/session/handler.go @@ -306,12 +306,13 @@ func (h *Handler) DeleteSession(c *gin.Context) { // batchDeleteRequest represents the request body for batch deleting sessions type batchDeleteRequest struct { - IDs []string `json:"ids" binding:"required,min=1"` + IDs []string `json:"ids"` + DeleteAll bool `json:"delete_all"` } // BatchDeleteSessions godoc // @Summary 批量删除会话 -// @Description 根据ID列表批量删除对话会话 +// @Description 根据ID列表批量删除对话会话,或设置 delete_all=true 删除当前租户的所有会话 // @Tags 会话 // @Accept json // @Produce json @@ -327,7 +328,25 @@ func (h *Handler) BatchDeleteSessions(c *gin.Context) { var req batchDeleteRequest if err := c.ShouldBindJSON(&req); err != nil { logger.Errorf(ctx, "Invalid batch delete request: %v", err) - c.Error(errors.NewBadRequestError("invalid request: ids are required")) + c.Error(errors.NewBadRequestError("invalid request")) + return + } + + if req.DeleteAll { + if err := h.sessionService.DeleteAllSessions(ctx); err != nil { + logger.ErrorWithFields(ctx, err, nil) + c.Error(errors.NewInternalServerError(err.Error())) + return + } + c.JSON(http.StatusOK, gin.H{ + "success": true, + "message": "All sessions deleted successfully", + }) + return + } + + if len(req.IDs) == 0 { + c.Error(errors.NewBadRequestError("ids are required when delete_all is false")) return } diff --git a/internal/types/interfaces/session.go b/internal/types/interfaces/session.go index 1a4b9b22..9b2d53f9 100644 --- a/internal/types/interfaces/session.go +++ b/internal/types/interfaces/session.go @@ -23,6 +23,8 @@ type SessionService interface { DeleteSession(ctx context.Context, id string) error // BatchDeleteSessions deletes multiple sessions by IDs BatchDeleteSessions(ctx context.Context, ids []string) error + // DeleteAllSessions deletes all sessions for the current tenant + DeleteAllSessions(ctx context.Context) error // GenerateTitle generates a title for the current conversation // modelID: optional model ID to use for title generation (if empty, uses first available KnowledgeQA model) GenerateTitle(ctx context.Context, session *types.Session, messages []types.Message, modelID string) (string, error) @@ -84,4 +86,6 @@ type SessionRepository interface { Delete(ctx context.Context, tenantID uint64, id string) error // BatchDelete deletes multiple sessions by IDs BatchDelete(ctx context.Context, tenantID uint64, ids []string) error + // DeleteAllByTenantID deletes all sessions for a tenant + DeleteAllByTenantID(ctx context.Context, tenantID uint64) error }