Skip to content

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

:bug: Preserve AI detail views during settings refresh https://github.com/siyuan-note/siyuan/issues/20422

Danielb0bb31829473
diff --git a/app/src/config/setting/mount.test.ts b/app/src/config/setting/mount.test.ts
index 506352a1c8..1251a16587 100644
--- a/app/src/config/setting/mount.test.ts
+++ b/app/src/config/setting/mount.test.ts
@@ -120,6 +120,38 @@ test("settings refresh preserves an unfocused profile draft and resumes after th
assert.equal(mounted, 1);
});
+for (const detail of ["provider", "capability", "skill"]) {
+ test(`AI ${detail} details preserve drafts when unfocused and refresh after closing`, async () => {
+ const code = transpileModule(readFileSync("src/config/setting/mount.ts", "utf8"), {
+ compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},
+ }).outputText;
+ let visible = true;
+ let mounted = 0;
+ const listeners = new Map<string, () => void>();
+ const timers: Array<() => void> = [];
+ const root = {innerHTML: "unsaved draft", scrollTop: 12, scrollLeft: 0, contains: () => false,
+ querySelector: (selector: string) => visible && selector.includes(".config__view--show:not(.fn__none)") ? {} : null};
+ const exports = {} as {remountOpenSettingTab: (tab: string) => Promise<void>};
+ runInNewContext(code, {exports,
+ require: () => ({Constants: {DIALOG_SETTING: "settings"}, getSearchKeywordsLower: () => "",
+ getSettingsOwnerApp: () => ({}), getSettingTab: () => ({mount: async () => { mounted++; }})}),
+ document: {activeElement: {}, addEventListener: (name: string, callback: () => void) => listeners.set(name, callback)},
+ setTimeout: (callback: () => void) => timers.push(callback),
+ window: {siyuan: {dialogs: [{element: {getAttribute: () => "settings", querySelector: () => root}}]}}});
+ await exports.remountOpenSettingTab("ai");
+ listeners.get("focusout")();
+ timers.splice(0).forEach(callback => callback());
+ await Promise.resolve();
+ assert.equal(mounted, 0);
+ assert.equal(root.innerHTML, "unsaved draft");
+ visible = false;
+ listeners.get("siyuan-setting-detail-closed")();
+ timers.splice(0).forEach(callback => callback());
+ await Promise.resolve();
+ assert.equal(mounted, 1);
+ });
+}
+
test("deferred refresh preserves a pressed label until its click completes or is canceled", async () => {
const code = transpileModule(readFileSync("src/config/setting/mount.ts", "utf8"), {
compilerOptions: {module: ModuleKind.CommonJS, target: ScriptTarget.ES2021},
diff --git a/app/src/config/setting/mount.ts b/app/src/config/setting/mount.ts
index 616503d324..b4e3dde540 100644
--- a/app/src/config/setting/mount.ts
+++ b/app/src/config/setting/mount.ts
@@ -53,7 +53,7 @@ export const remountOpenSettingTab = async (tabId: TSettingTab) => {
return;
}
if (root.contains(document.activeElement) || pressedTarget && root.contains(pressedTarget as Node) ||
- root.querySelector(".config-entry-visibility__view, [data-decision-profile-view]")) {
+ root.querySelector(".config__view--show:not(.fn__none), .config-entry-visibility__view, [data-decision-profile-view]")) {
deferredTabs.add(tabId);
if (!watchingFocus) {
watchingFocus = true;
@@ -61,6 +61,7 @@ export const remountOpenSettingTab = async (tabId: TSettingTab) => {
document.addEventListener("focusout", refreshDeferredTabs);
document.addEventListener("siyuan-entry-profile-closed", refreshDeferredTabs);
document.addEventListener("siyuan-decision-profile-closed", refreshDeferredTabs);
+ document.addEventListener("siyuan-setting-detail-closed", refreshDeferredTabs);
}
return;
}
diff --git a/app/src/config/tabs/ai/aiCapabilityUi.ts b/app/src/config/tabs/ai/aiCapabilityUi.ts
index 80c87f9f30..f464962bee 100644
--- a/app/src/config/tabs/ai/aiCapabilityUi.ts
+++ b/app/src/config/tabs/ai/aiCapabilityUi.ts
@@ -192,6 +192,7 @@ const ensureAgentCapabilityView = (root: HTMLElement) => {
const closeAgentCapabilityView = (view: HTMLElement) => {
view.classList.remove("config__view--show");
+ view.dispatchEvent(new CustomEvent("siyuan-setting-detail-closed", {bubbles: true}));
};
const showAgentCapabilityLoading = (root: HTMLElement) => {
diff --git a/app/src/config/tabs/ai/aiDecisionUi.test.ts b/app/src/config/tabs/ai/aiDecisionUi.test.ts
index fb55c617af..99c2b5d300 100644
--- a/app/src/config/tabs/ai/aiDecisionUi.test.ts
+++ b/app/src/config/tabs/ai/aiDecisionUi.test.ts
@@ -543,8 +543,16 @@ test("provider view removal invokes its completion once after animation or timeo
const view = {classList: {remove() {}}, remove: () => connected = false,
addEventListener: (_name: string, callback: typeof transition) => transition = callback};
const exports: {removeProviderView?: (root: unknown, view: unknown, callback: () => void) => void} = {};
- runInNewContext(code, {exports, require: () => ({}), window: {setTimeout: (callback: () => void) => timers.push(callback)}});
- exports.removeProviderView({}, view, () => {
+ let notified = 0;
+ const root = {dispatchEvent: (event: {type: string, bubbles: boolean}) => {
+ assert.equal(connected, false);
+ assert.equal(event.type, "siyuan-setting-detail-closed");
+ assert.equal(event.bubbles, true);
+ notified++;
+ }};
+ runInNewContext(code, {exports, require: () => ({}), window: {setTimeout: (callback: () => void) => timers.push(callback)},
+ CustomEvent: class {constructor(public type: string, public options: {bubbles: boolean}) {} get bubbles() { return this.options.bubbles; }}});
+ exports.removeProviderView(root, view, () => {
assert.equal(connected, false);
completed++;
});
@@ -556,10 +564,11 @@ test("provider view removal invokes its completion once after animation or timeo
timers.splice(0).forEach(callback => callback());
assert.equal(completed, 1);
connected = true;
- exports.removeProviderView({}, view, () => { assert.equal(connected, false); completed++; });
+ exports.removeProviderView(root, view, () => { assert.equal(connected, false); completed++; });
timers.splice(0).forEach(callback => callback());
transition({propertyName: "opacity"});
assert.equal(completed, 2);
+ assert.equal(notified, 2);
});
test("current test results clear on edits and failures restore the test button", async () => {
diff --git a/app/src/config/tabs/ai/aiProviderUi.ts b/app/src/config/tabs/ai/aiProviderUi.ts
index 708e634d5d..4f7e052729 100644
--- a/app/src/config/tabs/ai/aiProviderUi.ts
+++ b/app/src/config/tabs/ai/aiProviderUi.ts
@@ -110,6 +110,7 @@ export const removeProviderView = (root: HTMLElement, view?: HTMLElement, onRemo
removed = true;
item.remove();
onRemoved?.();
+ root.dispatchEvent(new CustomEvent("siyuan-setting-detail-closed", {bubbles: true}));
};
item.classList.remove("config__view--show");
item.addEventListener("transitionend", (event) => {
diff --git a/app/src/config/tabs/ai/aiSkillUi.ts b/app/src/config/tabs/ai/aiSkillUi.ts
index e339bb6128..b11ff1bc07 100644
--- a/app/src/config/tabs/ai/aiSkillUi.ts
+++ b/app/src/config/tabs/ai/aiSkillUi.ts
@@ -45,6 +45,7 @@ const ensureUserSkillsView = (root: HTMLElement) => {
const closeUserSkillsView = (view: HTMLElement) => {
view.classList.remove("config__view--show");
delete view.dataset.skillViewRequest;
+ view.dispatchEvent(new CustomEvent("siyuan-setting-detail-closed", {bubbles: true}));
};
const showUserSkillsLoading = (root: HTMLElement, builtin: boolean) => {