From d2d1d6d59ae7edd11cb27f2a8278d9c08e59f9b1 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 30 Mar 2026 20:10:08 +0800 Subject: [PATCH] feat(datasource): enhance DataSourceSettings and DataSourceSyncLogs functionality - Implemented polling mechanism in DataSourceSettings for real-time updates on data source synchronization status. - Improved loading state management and user feedback during data source operations. - Added load more functionality in DataSourceSyncLogs for better log retrieval experience. - Updated UI elements for consistency, including icon changes and styling adjustments for better visual clarity. --- .../knowledge/settings/DataSourceSettings.vue | 72 +++++++++++++++---- .../knowledge/settings/DataSourceSyncLogs.vue | 59 +++++++++++++-- .../application/service/datasource_service.go | 32 +++++++-- 3 files changed, 135 insertions(+), 28 deletions(-) diff --git a/frontend/src/views/knowledge/settings/DataSourceSettings.vue b/frontend/src/views/knowledge/settings/DataSourceSettings.vue index 47bf362f..592fc922 100644 --- a/frontend/src/views/knowledge/settings/DataSourceSettings.vue +++ b/frontend/src/views/knowledge/settings/DataSourceSettings.vue @@ -1,5 +1,5 @@ @@ -326,6 +361,16 @@ const groupedLogs = computed(() => { margin-bottom: 4px; } +.logs-load-more { + padding: 16px 0 8px; + text-align: center; +} + +.logs-load-more-text { + font-size: 12px; + color: var(--td-text-color-placeholder); +} + /* --- Dot column: continuous line --- */ .tl-dot-col { display: flex; diff --git a/internal/application/service/datasource_service.go b/internal/application/service/datasource_service.go index b2f1b14d..f540bff0 100644 --- a/internal/application/service/datasource_service.go +++ b/internal/application/service/datasource_service.go @@ -272,7 +272,9 @@ func (s *DataSourceService) ManualSync(ctx context.Context, dsID string) (*types return nil, err } - if ds.Status != types.DataSourceStatusActive && ds.Status != types.DataSourceStatusError { + if ds.Status != types.DataSourceStatusActive && + ds.Status != types.DataSourceStatusError && + ds.Status != types.DataSourceStatusPaused { return nil, datasource.ErrDataSourceNotActive } @@ -307,7 +309,9 @@ func (s *DataSourceService) ManualSync(ctx context.Context, dsID string) (*types syncLog.FinishedAt = timePtr(time.Now().UTC()) syncLog.ErrorMessage = err.Error() _ = s.syncLogRepo.Update(ctx, syncLog) - ds.Status = types.DataSourceStatusError + if ds.Status != types.DataSourceStatusPaused { + ds.Status = types.DataSourceStatusError + } ds.ErrorMessage = fmt.Sprintf("Failed to enqueue sync: %v", err) _ = s.dsRepo.Update(ctx, ds) return nil, err @@ -408,6 +412,8 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e return nil } + wasPaused := ds.Status == types.DataSourceStatusPaused + // Get connector connector, err := s.connectorRegistry.Get(ds.Type) if err != nil { @@ -416,7 +422,9 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e syncLog.FinishedAt = timePtr(time.Now().UTC()) syncLog.ErrorMessage = fmt.Sprintf("Connector not found: %s", ds.Type) _ = s.syncLogRepo.Update(ctx, syncLog) - ds.Status = types.DataSourceStatusError + if !wasPaused { + ds.Status = types.DataSourceStatusError + } ds.ErrorMessage = syncLog.ErrorMessage _ = s.dsRepo.Update(ctx, ds) return err @@ -430,7 +438,9 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e syncLog.FinishedAt = timePtr(time.Now().UTC()) syncLog.ErrorMessage = fmt.Sprintf("Invalid configuration: %v", err) _ = s.syncLogRepo.Update(ctx, syncLog) - ds.Status = types.DataSourceStatusError + if !wasPaused { + ds.Status = types.DataSourceStatusError + } ds.ErrorMessage = syncLog.ErrorMessage _ = s.dsRepo.Update(ctx, ds) return err @@ -458,7 +468,9 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e syncLog.FinishedAt = timePtr(time.Now().UTC()) syncLog.ErrorMessage = fmt.Sprintf("Fetch failed: %v", fetchErr) _ = s.syncLogRepo.Update(ctx, syncLog) - ds.Status = types.DataSourceStatusError + if !wasPaused { + ds.Status = types.DataSourceStatusError + } ds.ErrorMessage = syncLog.ErrorMessage _ = s.dsRepo.Update(ctx, ds) return fetchErr @@ -479,7 +491,9 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e syncLog.FinishedAt = timePtr(time.Now().UTC()) syncLog.ErrorMessage = fmt.Sprintf("Failed to get tenant info: %v", err) _ = s.syncLogRepo.Update(ctx, syncLog) - ds.Status = types.DataSourceStatusError + if !wasPaused { + ds.Status = types.DataSourceStatusError + } ds.ErrorMessage = syncLog.ErrorMessage _ = s.dsRepo.Update(ctx, ds) return err @@ -553,7 +567,11 @@ func (s *DataSourceService) ProcessSync(ctx context.Context, task *asynq.Task) e } ds.LastSyncAt = timePtr(time.Now().UTC()) - ds.Status = types.DataSourceStatusActive + if wasPaused { + ds.Status = types.DataSourceStatusPaused + } else { + ds.Status = types.DataSourceStatusActive + } ds.ErrorMessage = "" // Store result