Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:sparkles: Explain incomplete sync configuration before saving https://github.com/siyuan-note/siyuan/issues/20427

Daniel456ba2e7eb17
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index 9563e91cbe..770d47501f 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "لم يتم حفظ التغييرات، يرجى إكمال الحقول المطلوبة",
"previousDatabaseRow": "إدخال قاعدة البيانات السابق",
"nextDatabaseRow": "إدخال قاعدة البيانات التالي",
"dynamicRefTextRefreshRetry": "تم حفظ تعديلاتك، ولكن تعذر تحديث بعض نصوص المراجع. سيعيد SiYuan المحاولة تلقائيًا.",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index b130ee5ee8..61792b2a9c 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Änderungen wurden noch nicht gespeichert; bitte alle Pflichtfelder ausfüllen",
"previousDatabaseRow": "Vorheriger Datenbankeintrag",
"nextDatabaseRow": "Nächster Datenbankeintrag",
"dynamicRefTextRefreshRetry": "Ihre Änderungen wurden gespeichert, aber einige Referenztexte konnten nicht aktualisiert werden. SiYuan versucht es automatisch erneut.",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index 6e7cee0860..ba0802505d 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Changes have not been saved; complete the required fields",
"previousDatabaseRow": "Previous database entry",
"nextDatabaseRow": "Next database entry",
"dynamicRefTextRefreshRetry": "Your edits have been saved, but some reference text could not be refreshed. SiYuan will retry automatically.",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 6c3b089124..b2535fe1fa 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Los cambios no se han guardado; completa los campos obligatorios",
"previousDatabaseRow": "Entrada anterior de la base de datos",
"nextDatabaseRow": "Siguiente entrada de la base de datos",
"dynamicRefTextRefreshRetry": "Tus cambios se han guardado, pero no se ha podido actualizar parte del texto de las referencias. SiYuan lo intentará de nuevo automáticamente.",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index 176b3cee05..910abf887c 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Les modifications n’ont pas été enregistrées ; remplissez les champs obligatoires",
"previousDatabaseRow": "Entrée précédente de la base de données",
"nextDatabaseRow": "Entrée suivante de la base de données",
"dynamicRefTextRefreshRetry": "Vos modifications ont été enregistrées, mais certains textes de référence n’ont pas pu être actualisés. SiYuan réessaiera automatiquement.",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index b982a2f1ce..37bee2c359 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "השינויים טרם נשמרו; יש למלא את כל שדות החובה",
"previousDatabaseRow": "הרשומה הקודמת במסד הנתונים",
"nextDatabaseRow": "הרשומה הבאה במסד הנתונים",
"dynamicRefTextRefreshRetry": "העריכות נשמרו, אך לא ניתן היה לרענן חלק מטקסט ההפניות. SiYuan ינסה שוב אוטומטית.",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index 0fd69da625..28e1c3b9c1 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "बदलाव अभी सहेजे नहीं गए हैं; कृपया आवश्यक फ़ील्ड भरें",
"previousDatabaseRow": "पिछली डेटाबेस प्रविष्टि",
"nextDatabaseRow": "अगली डेटाबेस प्रविष्टि",
"dynamicRefTextRefreshRetry": "आपके संपादन सहेज लिए गए हैं, लेकिन कुछ संदर्भ पाठ अपडेट नहीं हो सके। SiYuan अपने आप फिर से प्रयास करेगा।",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index 0cad5d28eb..e2cb6b3007 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Perubahan belum disimpan; lengkapi kolom wajib",
"previousDatabaseRow": "Entri basis data sebelumnya",
"nextDatabaseRow": "Entri basis data berikutnya",
"dynamicRefTextRefreshRetry": "Perubahan Anda telah disimpan, tetapi sebagian teks referensi gagal diperbarui. SiYuan akan mencoba lagi secara otomatis.",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index a8374e8260..c3ea2319c1 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Le modifiche non sono state salvate; compila i campi obbligatori",
"previousDatabaseRow": "Voce precedente del database",
"nextDatabaseRow": "Voce successiva del database",
"dynamicRefTextRefreshRetry": "Le modifiche sono state salvate, ma alcuni testi dei riferimenti non sono stati aggiornati. SiYuan riproverà automaticamente.",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index 2fdcfbf71f..60c427a679 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "変更はまだ保存されていません。必須項目をすべて入力してください",
"previousDatabaseRow": "前のデータベース項目",
"nextDatabaseRow": "次のデータベース項目",
"dynamicRefTextRefreshRetry": "編集内容は保存されましたが、一部の参照テキストを更新できませんでした。自動的に再試行します。",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index cf36535224..7f9d0e8a42 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "변경 사항이 아직 저장되지 않았습니다. 필수 항목을 모두 입력해 주세요",
"previousDatabaseRow": "이전 데이터베이스 항목",
"nextDatabaseRow": "다음 데이터베이스 항목",
"dynamicRefTextRefreshRetry": "편집 내용은 저장되었지만 일부 참조 텍스트를 갱신하지 못했습니다. 자동으로 다시 시도합니다.",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index 8e947dfb22..43970bbae0 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "De wijzigingen zijn nog niet opgeslagen; vul de verplichte velden in",
"previousDatabaseRow": "Vorige databasevermelding",
"nextDatabaseRow": "Volgende databasevermelding",
"dynamicRefTextRefreshRetry": "Uw wijzigingen zijn opgeslagen, maar sommige verwijzingsteksten konden niet worden bijgewerkt. SiYuan probeert het automatisch opnieuw.",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index 2858fbad33..85df887a64 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Zmiany nie zostały zapisane; uzupełnij wymagane pola",
"previousDatabaseRow": "Poprzedni wpis w bazie danych",
"nextDatabaseRow": "Następny wpis w bazie danych",
"dynamicRefTextRefreshRetry": "Zmiany zostały zapisane, ale nie udało się odświeżyć części tekstów odwołań. SiYuan automatycznie spróbuje ponownie.",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index 3e866ae737..4f3760f677 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "As alterações ainda não foram salvas; preencha os campos obrigatórios",
"previousDatabaseRow": "Entrada anterior do banco de dados",
"nextDatabaseRow": "Próxima entrada do banco de dados",
"dynamicRefTextRefreshRetry": "Suas alterações foram salvas, mas alguns textos de referência não puderam ser atualizados. O SiYuan tentará novamente automaticamente.",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index 1e9beaf765..23a13eabe8 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Изменения не сохранены; заполните обязательные поля",
"previousDatabaseRow": "Предыдущая запись базы данных",
"nextDatabaseRow": "Следующая запись базы данных",
"dynamicRefTextRefreshRetry": "Изменения сохранены, но часть текста ссылок не удалось обновить. SiYuan автоматически повторит попытку.",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index a4762da3c4..28ec23b18c 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Zmeny neboli uložené; vyplňte povinné polia",
"previousDatabaseRow": "Predchádzajúca položka databázy",
"nextDatabaseRow": "Nasledujúca položka databázy",
"dynamicRefTextRefreshRetry": "Vaše zmeny boli uložené, ale niektoré texty odkazov sa nepodarilo aktualizovať. SiYuan to automaticky skúsi znova.",
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index bb455b9032..69b091a082 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Промене нису сачуване; попуните обавезна поља",
"previousDatabaseRow": "Претходни унос базе података",
"nextDatabaseRow": "Следећи унос базе података",
"dynamicRefTextRefreshRetry": "Измене су сачуване, али део текста референци није ажуриран. SiYuan ће аутоматски покушати поново.",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index f48b06c4ae..8868dfcff7 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "ยังไม่ได้บันทึกการเปลี่ยนแปลง โปรดกรอกข้อมูลในช่องที่จำเป็นให้ครบ",
"previousDatabaseRow": "รายการฐานข้อมูลก่อนหน้า",
"nextDatabaseRow": "รายการฐานข้อมูลถัดไป",
"dynamicRefTextRefreshRetry": "บันทึกการแก้ไขแล้ว แต่ไม่สามารถอัปเดตข้อความอ้างอิงบางส่วนได้ SiYuan จะลองใหม่โดยอัตโนมัติ",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index b0caaf2dfa..7a856bb925 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Değişiklikler henüz kaydedilmedi; zorunlu alanları doldurun",
"previousDatabaseRow": "Önceki veritabanı kaydı",
"nextDatabaseRow": "Sonraki veritabanı kaydı",
"dynamicRefTextRefreshRetry": "Düzenlemeleriniz kaydedildi ancak bazı başvuru metinleri yenilenemedi. SiYuan otomatik olarak yeniden deneyecek.",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index fce1845f38..bedb03cc66 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "Зміни не збережено; заповніть обов’язкові поля",
"previousDatabaseRow": "Попередній запис бази даних",
"nextDatabaseRow": "Наступний запис бази даних",
"dynamicRefTextRefreshRetry": "Зміни збережено, але частину тексту посилань не вдалося оновити. SiYuan автоматично повторить спробу.",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 417bd474ef..f13039c92f 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "更改尚未保存,请填写完整的必填项",
"previousDatabaseRow": "上一条数据库条目",
"nextDatabaseRow": "下一条数据库条目",
"dynamicRefTextRefreshRetry": "编辑已保存,但部分引用文本刷新失败,思源将自动重试。",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index ba76c1eabd..cc890ec373 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,5 @@
{
+ "syncConfigNotSaved": "變更尚未儲存,請填寫完整的必填項目",
"previousDatabaseRow": "上一筆資料庫項目",
"nextDatabaseRow": "下一筆資料庫項目",
"dynamicRefTextRefreshRetry": "編輯已儲存,但部分引用文字更新失敗,思源將自動重試。",
diff --git a/app/src/assets/scss/business/_config.scss b/app/src/assets/scss/business/_config.scss
index 994ce95bf3..80e5270602 100644
--- a/app/src/assets/scss/business/_config.scss
+++ b/app/src/assets/scss/business/_config.scss
@@ -165,6 +165,14 @@
}
}
+@media screen and (max-width: 750px) {
+ .config-sync-field > .fn__flex-1 {
+ flex: none;
+ width: 100%;
+ margin-top: 8px;
+ }
+}
+
.config {
&__tab-wrap {
overflow: hidden;
diff --git a/app/src/config/tabs/syncUi.test.ts b/app/src/config/tabs/syncUi.test.ts
index e89f2005b7..c378ab3ddd 100644
--- a/app/src/config/tabs/syncUi.test.ts
+++ b/app/src/config/tabs/syncUi.test.ts
@@ -17,13 +17,21 @@ const setup = (initial: {endpoint?: string, bucket?: string} = {}) => {
const inputs = Object.fromEntries(Object.keys(s3).map((key) => [key, {
value: "",
focus: () => {},
+ attributes: {} as Record<string, string>,
+ setAttribute(name: string, value: string) {this.attributes[name] = value;},
}]));
+ const errors = Object.fromEntries(Object.keys(s3).map(key => [`sync-${key}-error`, {
+ textContent: "", classList: {toggle() {}},
+ }]));
+ let unsaved = false;
+ const status = {classList: {toggle: (_name: string, hidden: boolean) => { unsaved = !hidden; }}};
const messages: string[] = [];
const events: Record<string, (event: unknown) => void> = {};
let warningHidden = true;
const warning = {classList: {toggle: (_name: string, hidden: boolean) => { warningHidden = hidden; }}};
const element = {
- querySelector: (selector: string) => selector === '[data-type="s3-endpoint-warning"]' ? warning : inputs[selector.slice(1)] || null,
+ querySelector: (selector: string) => selector === '[data-type="s3-endpoint-warning"]' ? warning :
+ selector === '[data-type="sync-config-unsaved"]' ? status : inputs[selector.slice(1)] || errors[selector.slice(1)] || null,
addEventListener: (name: string, callback: (event: unknown) => void) => { events[name] = callback; },
};
const requests: {data: {s3: typeof s3}, resolve: (response: unknown) => void, reject: (error: Error) => void}[] = [];
@@ -54,7 +62,7 @@ const setup = (initial: {endpoint?: string, bucket?: string} = {}) => {
events.change({target: {matches: () => true}});
}
};
- return {sync, inputs, requests, messages, fill, warningHidden: () => warningHidden,
+ return {sync, inputs, requests, messages, fill, errors, unsaved: () => unsaved, warningHidden: () => warningHidden,
input: () => events.input({}), change: () => events.change({target: {matches: () => true}})};
};
@@ -113,10 +121,18 @@ test("S3 configuration saves automatically once required fields are complete", a
await settle();
assert.equal(ui.messages.length, 0);
assert.equal(ui.requests.length, 0);
+ assert.equal(ui.unsaved(), true);
+ assert.equal(ui.inputs.endpoint.attributes["aria-invalid"], "true");
+ assert.equal(ui.errors["sync-endpoint-error"].textContent, "Input can not be empty");
ui.fill();
await settle();
assert.equal(ui.requests.length, 1);
assert.equal(ui.requests[0].data.s3.region, "region");
+ assert.equal(ui.unsaved(), false);
+ ui.inputs.endpoint.value = "";
+ ui.input();
+ assert.equal(ui.unsaved(), true);
+ assert.equal(ui.inputs.endpoint.attributes["aria-invalid"], "true");
});
test("failed S3 saves retain all inputs and allow retry", async () => {
diff --git a/app/src/config/tabs/syncUi.ts b/app/src/config/tabs/syncUi.ts
index c84ade144e..51817a1576 100644
--- a/app/src/config/tabs/syncUi.ts
+++ b/app/src/config/tabs/syncUi.ts
@@ -89,6 +89,7 @@ type SyncProviderIntroDef = {
type SyncThirdPartyProviderDef = SyncProviderIntroDef & {
configKey: SyncProviderConfigKey;
+ requiredFields: string[];
api: string;
getConfig: () => Config.ISync[SyncProviderConfigKey];
fields: SyncProviderFieldDef[];
@@ -144,6 +145,7 @@ const SYNC_PROVIDER_DEFS: Record<Config.ISync["provider"], SyncProviderDef> = {
2: {
isProviderConfigAllowed: isPaidUser,
configKey: "s3",
+ requiredFields: ["endpoint", "accessKey", "secretKey", "bucket", "region"],
api: "/api/sync/setSyncProviderS3",
getConfig: () => window.siyuan.config.sync.s3,
genIntro: () => `<div class="b3-label b3-label--inner">
@@ -175,6 +177,7 @@ const SYNC_PROVIDER_DEFS: Record<Config.ISync["provider"], SyncProviderDef> = {
3: {
isProviderConfigAllowed: isPaidUser,
configKey: "webdav",
+ requiredFields: ["endpoint"],
api: "/api/sync/setSyncProviderWebDAV",
getConfig: () => window.siyuan.config.sync.webdav,
genIntro: () => `<div class="b3-label b3-label--inner">
@@ -200,6 +203,7 @@ const SYNC_PROVIDER_DEFS: Record<Config.ISync["provider"], SyncProviderDef> = {
4: {
isProviderConfigAllowed: isPaidUser,
configKey: "local",
+ requiredFields: ["endpoint"],
api: "/api/sync/setSyncProviderLocal",
getConfig: () => window.siyuan.config.sync.local,
genIntro: () => `<div class="b3-label b3-label--inner">
@@ -286,7 +290,7 @@ const renderProviderConfig = (root: Element) => {
html = def.genUnpaidIntro();
} else if (isThirdPartySyncProviderDef(def)) {
const warning = def.configKey === "s3" ? `<div data-type="s3-endpoint-warning" class="b3-label b3-label--inner ft__error fn__none" role="status">${window.siyuan.languages.s3EndpointBucketWarning}</div>` : "";
- html = `${def.genIntro()}${def.fields.map(genProviderField).join("")}${warning}${genProviderActionButtons(def.configKey)}`;
+ html = `${def.genIntro()}${def.fields.map(genProviderField).join("")}${warning}<div data-type="sync-config-unsaved" class="b3-label b3-label--inner ft__error fn__none" role="status">${window.siyuan.languages.syncConfigNotSaved}</div>${genProviderActionButtons(def.configKey)}`;
} else {
html = def.genIntro();
}
@@ -308,19 +312,20 @@ const genProviderField = (field: SyncProviderFieldDef): string => {
}
};
-const genProviderFlexInput = (label: string, id: string, attrs = "") => `<div class="b3-label b3-label--inner fn__flex">
- <div class="fn__flex-center fn__size200">${label}</div>
+const genProviderFlexInput = (label: string, id: string, attrs = "") => `<div class="b3-label b3-label--inner fn__flex config-sync-field">
+ <label for="${id}" class="fn__flex-center fn__size200">${label}</label>
<div class="fn__space"></div>
- <input spellcheck="false" id="${id}" class="b3-text-field fn__block"${attrs ? ` ${attrs}` : ""}>
+ <div class="fn__flex-1"><input spellcheck="false" id="${id}" class="b3-text-field fn__block" aria-describedby="sync-${id}-error"${attrs ? ` ${attrs}` : ""}>
+ <div id="sync-${id}-error" class="ft__error fn__none" role="status"></div></div>
</div>`;
-const genProviderFlexPassword = (label: string, id: string) => `<div class="b3-label b3-label--inner fn__flex">
- <div class="fn__flex-center fn__size200">${label}</div>
+const genProviderFlexPassword = (label: string, id: string) => `<div class="b3-label b3-label--inner fn__flex config-sync-field">
+ <label for="${id}" class="fn__flex-center fn__size200">${label}</label>
<div class="fn__space"></div>
- <div class="b3-form__icona fn__block">
- <input spellcheck="false" id="${id}" type="password" class="b3-text-field b3-form__icona-input">
+ <div class="fn__flex-1"><div class="b3-form__icona fn__block">
+ <input spellcheck="false" id="${id}" type="password" class="b3-text-field b3-form__icona-input" aria-describedby="sync-${id}-error">
<svg class="b3-form__icona-icon" data-action="togglePassword"><use xlink:href="#iconEye"></use></svg>
- </div>
+ </div><div id="sync-${id}-error" class="ft__error fn__none" role="status"></div></div>
</div>`;
const genProviderFlexSelect = (label: string, id: string, optionsHtml: string) => `<div class="b3-label b3-label--inner fn__flex">
@@ -403,7 +408,12 @@ const bindProviderConfigEvent = (configElement: Element, root: Element) => {
return;
}
syncProviderConfigBoundElements.add(configElement);
- configElement.addEventListener("input", () => updateS3EndpointWarning(configElement));
+ configElement.addEventListener("input", () => {
+ updateS3EndpointWarning(configElement);
+ if (syncProviderValidationShown.has(configElement)) {
+ validateSyncProviderRequiredFields(configElement, def);
+ }
+ });
configElement.addEventListener("change", (event: Event) => {
const target = event.target as HTMLElement;
if (!target.matches(".b3-text-field, .b3-select")) {
@@ -414,12 +424,33 @@ const bindProviderConfigEvent = (configElement: Element, root: Element) => {
});
};
+const syncProviderValidationShown = new WeakSet<Element>();
+
+const validateSyncProviderRequiredFields = (configElement: Element, def: SyncThirdPartyProviderDef) => {
+ let valid = true;
+ def.requiredFields.forEach(key => {
+ const input = configElement.querySelector<HTMLInputElement>(`#${key}`);
+ const missing = !input.value.trim();
+ input.setAttribute("aria-invalid", String(missing));
+ const error = configElement.querySelector<HTMLElement>(`#sync-${key}-error`);
+ error.textContent = missing ? window.siyuan.languages._kernel[142] : "";
+ error.classList.toggle("fn__none", !missing);
+ valid &&= !missing;
+ });
+ configElement.querySelector('[data-type="sync-config-unsaved"]').classList.toggle("fn__none", valid);
+ return valid;
+};
+
const saveSyncProviderConfigValues = (configElement: Element) => {
const provider = window.siyuan.config.sync.provider;
const def = SYNC_PROVIDER_DEFS[provider];
if (!isThirdPartySyncProviderDef(def)) {
return;
}
+ syncProviderValidationShown.add(configElement);
+ if (!validateSyncProviderRequiredFields(configElement, def)) {
+ return;
+ }
const template = def.getConfig();
for (const key of ["timeout", "concurrentReqs"] as const) {
if (typeof template[key] !== "number") {
@@ -434,14 +465,6 @@ const saveSyncProviderConfigValues = (configElement: Element) => {
}
const data = readProviderConfigFields(configElement, template);
const configKey = def.configKey;
- if (configKey === "s3") {
- for (const key of ["endpoint", "accessKey", "secretKey", "bucket", "region"]) {
- const input = configElement.querySelector<HTMLInputElement>(`#${key}`);
- if (!input.value.trim()) {
- return;
- }
- }
- }
// 记录提交时的控件和值,仅回填未被继续编辑的控件,失败时保留输入。
const fields = def.fields.map((field) => {
const element = configElement.querySelector<HTMLInputElement | HTMLSelectElement>(`#${field.id}`);