Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 分享名单暂时为空时保留「配置模型」的跳转目标,名单回来后再选中

fmfsaisai34899bf536bc
diff --git a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
index 17405c7245..66b5c45c23 100644
--- a/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providersSectionDeepLink.test.tsx
@@ -1087,15 +1087,24 @@ describe('ProvidersSection — 分享来的供应商深链', () => {
hostCapable: true,
};
+ /** 返回推送新名单的函数(模拟 main 的 RECEIVED_CHANGED)。 */
function stubReceived(received: ProviderShareReceived[]) {
resetProviderShareStoreForTests();
+ let push: ((list: ProviderShareReceived[]) => void) | null = null;
const command = vi.fn(async (cmd: { action: string }) => {
if (cmd.action === 'received') return received;
throw new Error(`unexpected ${cmd.action}`);
});
Object.assign(window.electronAPI, {
- providerShare: { command, onReceivedChanged: () => () => undefined },
+ providerShare: {
+ command,
+ onReceivedChanged: (listener: (list: ProviderShareReceived[]) => void) => {
+ push = listener;
+ return () => undefined;
+ },
+ },
});
+ return (list: ProviderShareReceived[]) => act(() => push?.(list));
}
afterEach(() => resetProviderShareStoreForTests());
@@ -1109,10 +1118,24 @@ describe('ProvidersSection — 分享来的供应商深链', () => {
});
it('这条分享已不在列表里 → 只停在供应商页,参数同样清除', async () => {
- stubReceived([]);
+ stubReceived([{ ...share, shareId: 'share-other' }]);
renderAt('?tab=providers&receivedShare=share-gone');
await waitFor(() => expect(screen.getByTestId('search').textContent).toBe('?tab=providers'));
expect(screen.queryByTestId('provider-share-received-detail')).toBeNull();
});
+
+ it('名单暂时为空(断线、换账号) → 保留参数,名单回来后再选中', async () => {
+ const push = stubReceived([]);
+ renderAt('?tab=providers&receivedShare=share-1');
+
+ await waitFor(() => expect(window.electronAPI.providerShare.command).toHaveBeenCalledWith({ action: 'received' }));
+ await act(async () => { await new Promise((resolve) => setTimeout(resolve, 0)); });
+ expect(screen.getByTestId('search').textContent).toBe('?tab=providers&receivedShare=share-1');
+ expect(screen.queryByTestId('provider-share-received-detail')).toBeNull();
+
+ push([share]);
+ await screen.findByTestId('provider-share-received-detail');
+ await waitFor(() => expect(screen.getByTestId('search').textContent).toBe('?tab=providers'));
+ });
});
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
index 577e0ee55c..5c69ed3a48 100644
--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx
@@ -2765,10 +2765,11 @@ export function ProvidersSection() {
setSearchParams(next, { replace: true });
}, [searchParams, setSearchParams]);
// 分享来的供应商深链(?receivedShare=<shareId>,来自模型选择器底部「配置模型」):等分享列表到了再消费
- // 并从 URL 摘除;这条分享已不在列表里(刚被撤销或退出)时只停在供应商页。
+ // 并从 URL 摘除;这条分享已不在列表里(刚被撤销或退出)时只停在供应商页。设备互联断开或换账号时 main
+ // 会先推一份空列表表示「暂时读不到」(providerShareStore 同一口径),这时保留参数,等列表回来再选中。
useEffect(() => {
const target = searchParams.get(PROVIDER_SHARE_RECEIVED_PARAM);
- if (!target || !receivedSharesLoaded) return;
+ if (!target || !receivedSharesLoaded || receivedShares.length === 0) return;
if (receivedShares.some((share) => share.shareId === target)) {
setShareManageProviderId(null);
setFocusedModel(null);