diff --git a/frontend/src/i18n/locales/en-US.ts b/frontend/src/i18n/locales/en-US.ts index d7f4e9ef..3c55097d 100755 --- a/frontend/src/i18n/locales/en-US.ts +++ b/frontend/src/i18n/locales/en-US.ts @@ -5386,6 +5386,7 @@ export default { }, comingSoon: 'Coming soon', docHint: 'Get credentials at:', + openDoc: 'Open documentation', copyUrl: 'Copy URL', copied: 'Copied', pleaseTestFirst: 'Please test connection first', diff --git a/frontend/src/i18n/locales/ko-KR.ts b/frontend/src/i18n/locales/ko-KR.ts index a3ad5cd7..4c03c5a6 100755 --- a/frontend/src/i18n/locales/ko-KR.ts +++ b/frontend/src/i18n/locales/ko-KR.ts @@ -5416,6 +5416,7 @@ export default { }, comingSoon: "곧 지원 예정", docHint: "다음에서 인증 정보를 받으세요:", + openDoc: "문서 열기", copyUrl: "URL 복사", copied: "복사됨", pleaseTestFirst: "먼저 연결을 테스트하세요", diff --git a/frontend/src/i18n/locales/ru-RU.ts b/frontend/src/i18n/locales/ru-RU.ts index 2e3670d2..80a57668 100755 --- a/frontend/src/i18n/locales/ru-RU.ts +++ b/frontend/src/i18n/locales/ru-RU.ts @@ -5238,6 +5238,7 @@ export default { }, comingSoon: 'Скоро', docHint: 'Получить учётные данные можно здесь:', + openDoc: 'Открыть документацию', copyUrl: 'Копировать URL', copied: 'Скопировано', pleaseTestFirst: 'Сначала проверьте подключение', diff --git a/frontend/src/i18n/locales/zh-CN.ts b/frontend/src/i18n/locales/zh-CN.ts index 645f38dc..8c7692a7 100755 --- a/frontend/src/i18n/locales/zh-CN.ts +++ b/frontend/src/i18n/locales/zh-CN.ts @@ -5380,6 +5380,7 @@ export default { }, comingSoon: "即将支持", docHint: "在以下地址获取凭证:", + openDoc: "打开文档", copyUrl: "复制 URL", copied: "已复制", pleaseTestFirst: "请先测试连接", diff --git a/frontend/src/views/knowledge/settings/DataSourceEditorDialog.vue b/frontend/src/views/knowledge/settings/DataSourceEditorDialog.vue index 6076c912..bd55c466 100644 --- a/frontend/src/views/knowledge/settings/DataSourceEditorDialog.vue +++ b/frontend/src/views/knowledge/settings/DataSourceEditorDialog.vue @@ -15,6 +15,7 @@ import { type DataSource, type Resource, } from '@/api/datasource' +import SettingDrawer from '@/components/settings/SettingDrawer.vue' import DataSourceTypeIcon from './DataSourceTypeIcon.vue' const props = defineProps<{ @@ -68,19 +69,53 @@ function refreshCredentialsStatus() { // Single-click remove with toast feedback. Mirrors the CredentialResource // component's UX: the secret is irrecoverable client-side either way, so a // modal confirm just adds friction. The danger-themed button is the deterrent. -async function removeCredentials() { +const pendingRemoveCredentials = ref(false) +const removingCredentials = ref(false) + +function requestRemoveCredentials() { + pendingRemoveCredentials.value = true +} + +function cancelPendingRemoveCredentials() { + pendingRemoveCredentials.value = false +} + +async function confirmRemoveCredentials() { if (!props.dataSource?.id) return + removingCredentials.value = true try { await deleteDataSourceCredentials(props.dataSource.id) credentialsConfigured.value = false replaceCredentialsMode.value = false + pendingRemoveCredentials.value = false form.value.config.credentials = {} MessagePlugin.success(t('credential.removedToast')) } catch (e: any) { MessagePlugin.error(e?.message || t('credential.removeFailed')) + } finally { + removingCredentials.value = false } } +function cancelReplaceCredentials() { + replaceCredentialsMode.value = false + pendingRemoveCredentials.value = false + form.value.config.credentials = {} + testResult.value = credentialsConfigured.value ? 'success' : '' + testErrorMsg.value = '' +} + +function needsConnectionTest(): boolean { + return !(isEdit.value && credentialsConfigured.value && !replaceCredentialsMode.value) +} + +function enterReplaceCredentials() { + pendingRemoveCredentials.value = false + replaceCredentialsMode.value = true + testResult.value = '' + testErrorMsg.value = '' +} + // Form data const form = ref({ name: '', @@ -254,14 +289,25 @@ const connectorDefs = computed(() => [ const currentDef = computed(() => connectorDefs.value.find(d => d.type === form.value.type)) -// --- Dialog lifecycle --- -watch(visible, (v) => { - if (!v) return +// --- Drawer lifecycle --- +watch(visible, async (v) => { + if (!v) { + if (!isEdit.value && tempDsId.value) { + try { + await deleteDataSource(tempDsId.value) + } catch { + // Ignore cleanup errors + } + tempDsId.value = '' + } + return + } step.value = isEdit.value ? 1 : 0 testResult.value = '' testErrorMsg.value = '' tempDsId.value = '' prereqExpanded.value = false + pendingRemoveCredentials.value = false resources.value = [] selectedResourceIds.value = [] @@ -272,6 +318,7 @@ watch(visible, (v) => { replaceCredentialsMode.value = false credentialsConfigured.value = false refreshCredentialsStatus() + testResult.value = credentialsConfigured.value ? 'success' : '' form.value = { name: props.dataSource.name, type: props.dataSource.type, @@ -302,6 +349,17 @@ watch(visible, (v) => { } }) +watch( + () => form.value.config.credentials, + () => { + if (needsConnectionTest()) { + testResult.value = '' + testErrorMsg.value = '' + } + }, + { deep: true }, +) + function selectType(def: ConnectorDef) { if (!def.available) return form.value.type = def.type @@ -366,6 +424,9 @@ async function loadResources() { const res = await listResources(tempDsId.value) resources.value = res?.data || res || [] + expandedResourceIds.value = new Set( + resources.value.filter(r => !r.parent_id && r.has_children).map(r => r.external_id), + ) } catch (e: any) { MessagePlugin.error(e?.message || e?.error || t('datasource.resourceLoadFailed')) } @@ -458,12 +519,12 @@ function validateStep1Fields(): boolean { return true } -function nextStep() { +async function nextStep() { if (step.value === 1) { if (!validateStep1Fields()) return - if (testResult.value !== 'success') { - MessagePlugin.warning(t('datasource.pleaseTestFirst')) - return + if (needsConnectionTest() && testResult.value !== 'success') { + await testConnection() + if (testResult.value !== 'success') return } } step.value++ @@ -567,19 +628,52 @@ async function handleSubmit() { submitting.value = false } -// --- Cleanup on dialog close --- -async function handleClose() { - if (!isEdit.value && tempDsId.value) { - try { - await deleteDataSource(tempDsId.value) - } catch { - // Ignore cleanup errors - } - tempDsId.value = '' - } +function handleClose() { visible.value = false } +async function handleDrawerConfirm() { + if (step.value === 1 || step.value === 2) { + await nextStep() + } else if (step.value === 3) { + handleSubmit() + } +} + +const selectedResourceCount = computed(() => { + let count = 0 + for (const state of checkStates.value.values()) { + if (state === 'checked') count++ + } + return count +}) + +const hasExpandableNodes = computed(() => resources.value.some(r => r.has_children)) + +function resourceIconName(r: Resource): string { + if (r.has_children) return 'folder' + switch (r.type) { + case 'wiki_space': + return 'root-list' + case 'book': + return 'book' + case 'doc_category': + return 'folder-open' + default: + return 'file' + } +} + +function expandAllNodes() { + expandedResourceIds.value = new Set( + resources.value.filter(r => r.has_children).map(r => r.external_id), + ) +} + +function collapseAllNodes() { + expandedResourceIds.value = new Set() +} + const resourceTypeLabelMap: Record = { wiki_space: 'datasource.resourceType.wikiSpace', doc_category: 'datasource.resourceType.docCategory', @@ -588,7 +682,16 @@ const resourceTypeLabelMap: Record = { function resourceTypeLabel(type: string): string { const key = resourceTypeLabelMap[type] - return key ? t(key) : type + if (key) return t(key) + return '' +} + +function shouldShowResourceType(type: string): boolean { + return !!resourceTypeLabelMap[type] +} + +function resourceRowState(id: string): CheckState { + return checkStates.value.get(id) || 'unchecked' } const stepTitles = computed(() => [ @@ -597,80 +700,173 @@ const stepTitles = computed(() => [ t('datasource.step.resources'), t('datasource.step.strategy'), ]) + +const drawerTitle = computed(() => + isEdit.value ? t('datasource.editTitle') : t('datasource.createTitle'), +) + +const drawerDescription = computed(() => stepTitles.value[step.value] ?? '') + +const drawerConfirmText = computed(() => { + if (step.value === 3) { + return isEdit.value ? t('datasource.save') : t('datasource.createAndSync') + } + if (step.value >= 1) return t('datasource.next') + return t('common.save') +}) - diff --git a/frontend/src/views/knowledge/settings/DataSourceSettings.vue b/frontend/src/views/knowledge/settings/DataSourceSettings.vue index 9ecc247d..20ad768d 100644 --- a/frontend/src/views/knowledge/settings/DataSourceSettings.vue +++ b/frontend/src/views/knowledge/settings/DataSourceSettings.vue @@ -1,6 +1,6 @@