Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-share): 折叠转分享名单并优化成员头像 (#6246)
Lizi34c9bda1998d
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex ea1ea1c693..840795e231 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -5,13 +5,21 @@* 打开期间每次 OWNED_CHANGED 都按当前时间段重读(main 因此保持快速拉取,申请能尽快出现);* 关闭、恢复、删除、同意、拒绝都立即生效,结果以 toast 说明。*/-import { ArrowLeft } from 'lucide-react';-import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';+import { ArrowLeft, ChevronRight, CircleMinus, MoreHorizontal } from 'lucide-react';+import { useCallback, useEffect, useId, useMemo, useRef, useState, type ReactNode } from 'react';import { useTranslation } from 'react-i18next';import type { ProviderView } from '@cindy/model-providers';import { Button } from '@/components/ui/button';+import { Collapse } from '@/components/ui/collapse';import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from '@/components/ui/dropdown-menu';+import { Tip } from '@/components/ui/tooltip';import { useDeviceLinkDeviceList } from '@/features/device-link/useDeviceLinkDeviceList';import { useDeviceProviders } from '@/hooks/useDeviceProviders';import { useProviders } from '@/hooks/useProviders';@@ -522,22 +530,32 @@ function MemberRow({const paused = member.status === 'paused';// 转分享里已处理过的人(待处理的在上方「待处理」一栏):可以撤回已同意的,或改为同意。const decided = (member.reshares ?? []).filter((reshare) => reshare.state !== 'pending');+ const approvedCount = decided.filter((reshare) => reshare.state === 'approved').length;+ const declinedCount = decided.length - approvedCount;+ // 这些人默认收起成一行摘要,点开才逐人列出(2026-10-16 用户要求可折叠)。+ const [reshareOpen, setReshareOpen] = useState(false);+ const reshareListId = useId();const statusText = paused? t('providerShare.manage.members.statusPaused'): member.runningTasks > 0? t('providerShare.manage.members.statusRunning', { count: member.runningTasks }): t('providerShare.manage.members.statusActive');+ const moreLabel = t('providerGroup.member.moreAria', { name: member.displayName });// 用量在上方「用量」块里按人列出(供应商组 §10),这里只管分享本身。return (<div className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}>- <div data-testid="provider-share-member-row" className="flex flex-wrap items-center gap-3 px-4 py-3">+ {/* 有转分享摘要时信息列多一行,头像和操作贴着第一行;没有时保持居中。 */}+ <div+ data-testid="provider-share-member-row"+ className={cn('flex flex-wrap gap-3 px-4 py-3', decided.length > 0 ? 'items-start' : 'items-center')}+ ><ShareAvatardisplayName={member.displayName}avatarUrl={member.avatarUrl}className={cn(paused && 'opacity-70')}/>- <div className={cn('flex min-w-[180px] flex-1 flex-col gap-0.5', paused && 'opacity-70')}>- <div className="flex flex-wrap items-center gap-2 text-13">+ <div className="flex min-w-[180px] flex-1 flex-col gap-0.5">+ <div className={cn('flex flex-wrap items-center gap-2 text-13', paused && 'opacity-70')}><span className="font-medium text-[var(--text-primary)]">{member.displayName}</span><span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]"><span@@ -550,7 +568,7 @@ function MemberRow({{statusText}</span></div>- <div className="flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]">+ <div className={cn('flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]', paused && 'opacity-70')}><span>{t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })}</span><span aria-hidden="true">·</span><span>@@ -559,68 +577,130 @@ function MemberRow({: t('providerShare.manage.members.neverUsed')}</span></div>+ {decided.length > 0 && (+ // 经这个成员的供应商组转给别人用的人(provider-sharing.md §4.3):收起时只是一行摘要,挂在这个成员名下。+ <button+ type="button"+ data-testid="provider-share-reshare-toggle"+ aria-expanded={reshareOpen}+ aria-controls={reshareOpen ? reshareListId : undefined}+ onClick={() => setReshareOpen((open) => !open)}+ className="group -ml-1 mt-1.5 flex w-fit max-w-full items-center gap-2 rounded-full py-0.5 pl-1 pr-2 text-left text-12 text-[var(--text-secondary)] transition-colors motion-reduce:transition-none hover:bg-[var(--surface-hover)] hover:text-[var(--text-primary)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"+ >+ <ChevronRight+ size={14}+ aria-hidden="true"+ className={cn(+ 'shrink-0 text-[var(--text-tertiary)] transition-transform duration-150 motion-reduce:transition-none group-hover:text-[var(--text-secondary)]',+ reshareOpen && 'rotate-90',+ )}+ />+ <span aria-hidden="true" className="flex shrink-0">+ {decided.slice(0, 3).map((reshare, index) => (+ <ShareAvatar+ key={reshare.id}+ displayName={reshare.name}+ avatarUrl={reshare.avatarUrl}+ size="xs"+ className={cn('ring-2 ring-[var(--settings-theme-card-bg)]', index > 0 && '-ml-1.5')}+ />+ ))}+ </span>+ <span className="min-w-0 truncate">+ {approvedCount > 0+ ? t('providerShare.manage.reshare.summaryUsing', { count: approvedCount, owner: member.displayName })+ : t('providerShare.manage.reshare.summaryOwner', { owner: member.displayName })}+ {declinedCount > 0 && ` · ${t('providerShare.manage.reshare.summaryDeclined', { count: declinedCount })}`}+ </span>+ </button>+ )}</div><div className="flex shrink-0 items-center gap-1.5"><Button variant="secondary" size="sm" compact disabled={busy} onClick={onPause}>{t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}</Button>- <Button- variant="secondary"- tone="danger"- size="sm"- compact- disabled={busy}- aria-label={t('providerShare.manage.members.removeAria', { name: member.displayName })}- onClick={onRemove}- >- {t('providerShare.manage.members.remove')}- </Button>+ {/* 删除不可撤销且要二次确认:收进「⋯」,与供应商组里移除电脑同一写法,行内不再挂红字。 */}+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Tip text={moreLabel}>+ <button+ type="button"+ aria-label={moreLabel}+ disabled={busy}+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)] disabled:opacity-50"+ >+ <MoreHorizontal size={18} />+ </button>+ </Tip>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ variant="danger"+ disabled={busy}+ aria-label={t('providerShare.manage.members.removeAria', { name: member.displayName })}+ onClick={onRemove}+ >+ <CircleMinus size={18} className="mr-2.5" />+ {t('providerShare.manage.members.remove')}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu></div></div>{decided.length > 0 && (- // 经这个成员的供应商组转给别人用的人(provider-sharing.md §4.3):缩进到昵称一列,与这一行同属一人。- <div className="-mt-1 flex flex-col gap-1.5 px-4 pb-3" data-testid="provider-share-reshare-list">- <span className="ml-11 text-12 text-[var(--text-tertiary)]">- {t('providerShare.manage.reshare.listTitle', { owner: member.displayName })}- </span>- {decided.map((reshare) => {- const approved = reshare.state === 'approved';- return (- <div- key={reshare.id}- data-testid="provider-share-reshare-item"- className="ml-11 flex flex-wrap items-center gap-2"- >- <ShareAvatar- displayName={reshare.name}- avatarUrl={reshare.avatarUrl}- size="sm"- className={cn(!approved && 'opacity-70')}- />- <span className={cn('min-w-0 flex-1 truncate text-13 text-[var(--text-primary)]', !approved && 'opacity-70')}>- {reshare.name}- <span className="ml-2 text-12 text-[var(--text-secondary)]">- {t(approved ? 'providerShare.manage.reshare.stateApproved' : 'providerShare.manage.reshare.stateRejected')}- </span>- </span>- <Button- variant="secondary"- size="sm"- compact- tone={approved ? 'danger' : undefined}- disabled={reshareBusy(reshare.id) || (!approved && !canApproveReshare)}- aria-label={t(- approved ? 'providerShare.manage.reshare.revokeAria' : 'providerShare.manage.reshare.approveAria',- { name: reshare.name },- )}- onClick={() => onReshare(reshare, approved ? 'reject' : 'approve')}- >- {t(approved ? 'providerShare.manage.reshare.revoke' : 'providerShare.manage.reshare.approve')}- </Button>- </div>- );- })}- </div>+ <Collapse open={reshareOpen} id={reshareListId}>+ {/* 与昵称一列左对齐(px-4 + 头像 32 + gap-3 = ml-11 之后),浅底小框把这几个人圈成一组。 */}+ <div className="px-4 pb-3">+ <div+ data-testid="provider-share-reshare-list"+ className="ml-11 overflow-hidden rounded-lg border border-[var(--border-default)] bg-[var(--surface)]"+ >+ {decided.map((reshare, index) => {+ const approved = reshare.state === 'approved';+ return (+ <div+ key={reshare.id}+ data-testid="provider-share-reshare-item"+ className={cn(+ 'flex items-center gap-2.5 py-2 pl-3 pr-2',+ index > 0 && 'border-t border-[var(--border-default)]',+ )}+ >+ <ShareAvatar+ displayName={reshare.name}+ avatarUrl={reshare.avatarUrl}+ size="sm"+ className={cn(!approved && 'opacity-70')}+ />+ <span className="flex min-w-0 flex-1 items-baseline gap-2 text-13">+ <span className={cn('truncate text-[var(--text-primary)]', !approved && 'opacity-70')}>+ {reshare.name}+ </span>+ <span className="shrink-0 text-12 text-[var(--text-secondary)]">+ {t(approved ? 'providerShare.manage.reshare.stateApproved' : 'providerShare.manage.reshare.stateRejected')}+ </span>+ </span>+ {/* 撤回后还能改回同意,不是破坏性操作:用安静按钮,红色只留给删除分享。 */}+ <Button+ variant="secondary"+ tone="quiet"+ size="sm"+ compact+ disabled={reshareBusy(reshare.id) || (!approved && !canApproveReshare)}+ aria-label={t(+ approved ? 'providerShare.manage.reshare.revokeAria' : 'providerShare.manage.reshare.approveAria',+ { name: reshare.name },+ )}+ onClick={() => onReshare(reshare, approved ? 'reject' : 'approve')}+ >+ {t(approved ? 'providerShare.manage.reshare.revoke' : 'providerShare.manage.reshare.approve')}+ </Button>+ </div>+ );+ })}+ </div>+ </div>+ </Collapse>)}</div>);diff --git a/apps/desktop/src/renderer/features/provider-share/ShareAvatar.tsx b/apps/desktop/src/renderer/features/provider-share/ShareAvatar.tsxindex 0805e96ab6..1e9338c810 100644--- a/apps/desktop/src/renderer/features/provider-share/ShareAvatar.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ShareAvatar.tsx@@ -15,13 +15,14 @@ export function ShareAvatar({}: {displayName: string;avatarUrl: string | null | undefined;- size?: 'sm' | 'md' | 'lg';+ size?: 'xs' | 'sm' | 'md' | 'lg';className?: string;}) {const [failed, setFailed] = useState(false);useEffect(() => setFailed(false), [avatarUrl]);const frame = cn('inline-flex shrink-0 items-center justify-center overflow-hidden rounded-full',+ size === 'xs' && 'h-5 w-5 text-10',size === 'sm' && 'h-7 w-7 text-12',size === 'md' && 'h-8 w-8 text-13',size === 'lg' && 'h-10 w-10 text-15',@@ -40,10 +41,14 @@ export function ShareAvatar({/>);}+ // 有的主题里 chip 色与卡片底几乎一样(cindy-dark 甚至更暗),细边保证首字头像在任何底色上都是一个圆。return (<spanaria-hidden="true"- className={cn(frame, 'select-none bg-[var(--surface-chip)] font-medium text-[var(--text-primary)]')}+ className={cn(+ frame,+ 'select-none border border-[var(--border-default)] bg-[var(--surface-chip)] font-medium text-[var(--text-primary)]',+ )}>{shareAvatarInitial(displayName)}</span>diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsxindex 6c3762a6be..8e0fa930fb 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx@@ -370,7 +370,10 @@ describe('ProviderShareManagePage', () => {await waitFor(() =>expect(command).toHaveBeenCalledWith({ action: 'set-member', memberId: 'mem-1', status: 'pause' }),);- fireEvent.click(screen.getByRole('button', { name: /providerShare\.manage\.members\.removeAria/ }));+ // 删除收在「⋯」里,行内没有直接的删除按钮。+ expect(screen.queryByRole('button', { name: /providerShare\.manage\.members\.removeAria/ })).toBeNull();+ fireEvent.keyDown(screen.getByRole('button', { name: /providerGroup\.member\.moreAria/ }), { key: 'Enter' });+ fireEvent.click(await screen.findByRole('menuitem', { name: /providerShare\.manage\.members\.removeAria/ }));await waitFor(() =>expect(command).toHaveBeenCalledWith({ action: 'set-member', memberId: 'mem-1', status: 'remove' }),);@@ -424,18 +427,49 @@ describe('ProviderShareManagePage', () => {fireEvent.click(within(pending).getByRole('button', { name: 'providerShare.manage.reshare.approve' }));await expectDecision('rs-pending', 'approve');- // 处理过的人列在这个成员下方:已同意的可撤回,拒绝的可改为同意。- const decided = screen.getAllByTestId('provider-share-reshare-item');+ // 处理过的人挂在这个成员下方,默认收起成一行摘要:几个人在用、几个人没同意。+ const toggle = screen.getByTestId('provider-share-reshare-toggle');+ expect(toggle.getAttribute('aria-expanded')).toBe('false');+ expect(toggle.textContent).toContain(+ 'providerShare.manage.reshare.summaryUsing:{"count":1,"owner":"Lizi"} · providerShare.manage.reshare.summaryDeclined:{"count":1}',+ );+ expect(screen.queryAllByTestId('provider-share-reshare-item')).toHaveLength(0);++ // 点开后逐人列出:已同意的可撤回,拒绝的可改为同意。+ fireEvent.click(toggle);+ expect(toggle.getAttribute('aria-expanded')).toBe('true');+ const decided = await screen.findAllByTestId('provider-share-reshare-item');+ expect(document.getElementById(toggle.getAttribute('aria-controls')!)).not.toBeNull();expect(decided.map((item) => item.textContent)).toEqual([expect.stringContaining('Dave'),expect.stringContaining('Erin'),]);- fireEvent.click(within(decided[0]!).getByRole('button', { name: /providerShare\.manage\.reshare\.revokeAria/ }));+ fireEvent.click(await within(decided[0]!).findByRole('button', { name: /providerShare\.manage\.reshare\.revokeAria/ }));await expectDecision('rs-approved', 'reject');fireEvent.click(within(decided[1]!).getByRole('button', { name: /providerShare\.manage\.reshare\.approveAria/ }));await expectDecision('rs-rejected', 'approve');});+ it('summarizes reshares that were all declined without saying anyone uses it', async () => {+ command.mockImplementation(async (cmd: { action: string }) => {+ if (cmd.action === 'owned') {+ const state = owned();+ state.shares[0]!.members[0]!.reshares = [+ { id: 'rs-rejected', name: 'Erin', avatarUrl: null, state: 'rejected', requestedAt: Date.now() - 9_000, decidedAt: Date.now() - 5_000 },+ ];+ return state;+ }+ if (cmd.action === 'own-usage') return ownUsage();+ if (cmd.action === 'received') return [];+ throw new Error(`unexpected ${cmd.action}`);+ });+ renderPage();+ const toggle = await screen.findByTestId('provider-share-reshare-toggle');+ expect(toggle.textContent).toContain(+ 'providerShare.manage.reshare.summaryOwner:{"owner":"Lizi"} · providerShare.manage.reshare.summaryDeclined:{"count":1}',+ );+ });+it('disables link creation and explains why when sharing is gated', async () => {renderPage('invocation-off');await screen.findAllByTestId('provider-share-member-row');diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 13b6de700b..c900fc3391 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -267,7 +267,11 @@"usageHint": "If you agree, {{name}}’s sessions can run on this computer, and usage counts under {{owner}}","approve": "Agree","reject": "Decline",- "listTitle": "Using it through {{owner}}’s provider group",+ "summaryUsing_one": "{{count}} person uses it through {{owner}}’s provider group",+ "summaryUsing_other": "{{count}} people use it through {{owner}}’s provider group",+ "summaryOwner": "Through {{owner}}’s provider group",+ "summaryDeclined_one": "{{count}} declined",+ "summaryDeclined_other": "{{count}} declined","stateApproved": "Agreed","stateRejected": "Declined","revoke": "Withdraw",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 24e05db305..12e036d0e9 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -265,7 +265,9 @@"usageHint": "同意すると、{{name}} のセッションをこのパソコンで実行でき、使用量は {{owner}} の分として記録されます","approve": "同意","reject": "拒否",- "listTitle": "{{owner}} のプロバイダーグループ経由で利用",+ "summaryUsing_other": "{{count}} 人が {{owner}} のプロバイダーグループ経由で利用",+ "summaryOwner": "{{owner}} のプロバイダーグループ経由",+ "summaryDeclined_other": "{{count}} 人は未同意","stateApproved": "同意済み","stateRejected": "未同意","revoke": "同意を取り消す",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex a0ad9aa4a5..7cd84f6c89 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -265,7 +265,9 @@"usageHint": "동의하면 {{name}}님의 세션이 이 컴퓨터에서 실행될 수 있고, 사용량은 {{owner}}님 몫으로 기록됩니다","approve": "동의","reject": "거절",- "listTitle": "{{owner}}님의 제공자 그룹을 통해 사용",+ "summaryUsing_other": "{{count}}명이 {{owner}}님의 제공자 그룹을 통해 사용",+ "summaryOwner": "{{owner}}님의 제공자 그룹을 통해",+ "summaryDeclined_other": "{{count}}명 동의하지 않음","stateApproved": "동의함","stateRejected": "동의하지 않음","revoke": "동의 철회",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 77fc8e2824..75db35e636 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -265,7 +265,9 @@"usageHint": "同意后,{{name}} 的任务可以在这台电脑上运行,用量算在 {{owner}} 名下","approve": "同意","reject": "拒绝",- "listTitle": "经 {{owner}} 的供应商组使用",+ "summaryUsing_other": "{{count}} 人经 {{owner}} 的供应商组使用",+ "summaryOwner": "经 {{owner}} 的供应商组",+ "summaryDeclined_other": "{{count}} 人未同意","stateApproved": "已同意","stateRejected": "未同意","revoke": "撤回同意",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex e563afdafc..82802b641b 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -265,7 +265,9 @@"usageHint": "同意後,{{name}} 的任務可以在這臺電腦上執行,用量算在 {{owner}} 名下","approve": "同意","reject": "拒絕",- "listTitle": "經 {{owner}} 的供應商組使用",+ "summaryUsing_other": "{{count}} 人經 {{owner}} 的供應商組使用",+ "summaryOwner": "經 {{owner}} 的供應商組",+ "summaryDeclined_other": "{{count}} 人未同意","stateApproved": "已同意","stateRejected": "未同意","revoke": "撤回同意",