mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-19 14:16:29 +00:00
fix(webui): prevent duplicate name in sort/filter selectors and add toolbar quick actions (#523)
This commit is contained in:
@@ -994,6 +994,9 @@ export function FileBrowser({
|
||||
collection={collection}
|
||||
onUpdateCollection={onUpdateCollection}
|
||||
rootFolderId={rootFolderId}
|
||||
onNewFolder={() => handleNewFolder(m.new_folder())}
|
||||
onUploadFile={handleUploadFilesClick}
|
||||
onUploadFolder={handleUploadFolderClick}
|
||||
/>
|
||||
)}
|
||||
{isRecentlyDeleted && (
|
||||
|
||||
@@ -0,0 +1,198 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||
import { FileBrowserToolbar } from './toolbar'
|
||||
|
||||
const mockCanEdit = vi.fn().mockReturnValue(true)
|
||||
|
||||
vi.mock('@/ui/hooks/use-permissions', () => ({
|
||||
usePermissions: () => ({
|
||||
canEdit: mockCanEdit(),
|
||||
canAdmin: true,
|
||||
role: 'owner',
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/ui/api/client', () => ({
|
||||
client: {
|
||||
api: {
|
||||
folders: {
|
||||
':folderId': {
|
||||
$get: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ id: 'f-1', name: 'Folder 1', hasAgentsMd: false }),
|
||||
}),
|
||||
},
|
||||
},
|
||||
fields: {
|
||||
':fieldId': {
|
||||
$put: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
$delete: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
},
|
||||
},
|
||||
teams: {
|
||||
':teamId': {
|
||||
members: {
|
||||
$get: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => [],
|
||||
}),
|
||||
},
|
||||
},
|
||||
},
|
||||
projects: {
|
||||
':projectId': {
|
||||
fields: {
|
||||
$post: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
order: {
|
||||
$patch: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
},
|
||||
},
|
||||
members: {
|
||||
$get: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => [],
|
||||
}),
|
||||
$post: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({}),
|
||||
}),
|
||||
':userId': {
|
||||
$patch: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
$delete: vi.fn().mockResolvedValue({ ok: true, json: async () => ({}) }),
|
||||
},
|
||||
},
|
||||
team: {
|
||||
$get: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ id: 't-1' }),
|
||||
}),
|
||||
},
|
||||
me: {
|
||||
$get: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ role: 'owner' }),
|
||||
}),
|
||||
},
|
||||
invite: {
|
||||
$post: vi.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
json: async () => ({ inviteLink: '' }),
|
||||
}),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}))
|
||||
|
||||
vi.mock('@tanstack/react-router', () => ({
|
||||
useNavigate: () => vi.fn(),
|
||||
}))
|
||||
|
||||
describe('FileBrowserToolbar - Plus Button', () => {
|
||||
let queryClient: QueryClient
|
||||
|
||||
beforeEach(() => {
|
||||
queryClient = new QueryClient({
|
||||
defaultOptions: { queries: { retry: false } },
|
||||
})
|
||||
mockCanEdit.mockReturnValue(true)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
const defaultProps = {
|
||||
teamId: 'team-1',
|
||||
projectId: 'proj-1',
|
||||
assetId: 'folder-root',
|
||||
fields: [],
|
||||
filterConditions: [],
|
||||
onFilterChange: vi.fn(),
|
||||
onSortChange: vi.fn(),
|
||||
}
|
||||
|
||||
it('renders plus button with hidden md:inline-flex and triggers actions from dropdown', async () => {
|
||||
const onNewFolder = vi.fn()
|
||||
const onUploadFile = vi.fn()
|
||||
const onUploadFolder = vi.fn()
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<FileBrowserToolbar
|
||||
{...defaultProps}
|
||||
onNewFolder={onNewFolder}
|
||||
onUploadFile={onUploadFile}
|
||||
onUploadFolder={onUploadFolder}
|
||||
/>
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
const addButton = screen.getByRole('button', { name: /Add/i })
|
||||
expect(addButton).toBeDefined()
|
||||
expect(addButton.className).toContain('hidden')
|
||||
expect(addButton.className).toContain('md:inline-flex')
|
||||
|
||||
// Click plus button to open dropdown menu
|
||||
fireEvent.pointerDown(addButton, { button: 0, ctrlKey: false })
|
||||
|
||||
// Verify menu items appear
|
||||
const uploadFileItem = screen.getByText('Upload File')
|
||||
const uploadFolderItem = screen.getByText('Upload Folder')
|
||||
const newFolderItem = screen.getByText('New Folder')
|
||||
expect(uploadFileItem).toBeDefined()
|
||||
expect(uploadFolderItem).toBeDefined()
|
||||
expect(newFolderItem).toBeDefined()
|
||||
|
||||
// Trigger actions
|
||||
fireEvent.click(uploadFileItem)
|
||||
expect(onUploadFile).toHaveBeenCalledTimes(1)
|
||||
|
||||
// Re-open menu for upload folder
|
||||
fireEvent.pointerDown(addButton, { button: 0, ctrlKey: false })
|
||||
fireEvent.click(screen.getByText('Upload Folder'))
|
||||
expect(onUploadFolder).toHaveBeenCalledTimes(1)
|
||||
|
||||
// Re-open menu for new folder
|
||||
fireEvent.pointerDown(addButton, { button: 0, ctrlKey: false })
|
||||
fireEvent.click(screen.getByText('New Folder'))
|
||||
expect(onNewFolder).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('does not render plus button for reviewers (canEdit is false)', () => {
|
||||
mockCanEdit.mockReturnValue(false)
|
||||
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<FileBrowserToolbar {...defaultProps} />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
|
||||
})
|
||||
|
||||
it('does not render plus button in recently deleted view', () => {
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<FileBrowserToolbar {...defaultProps} isRecentlyDeleted />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
|
||||
})
|
||||
|
||||
it('does not render plus button in recents view', () => {
|
||||
render(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<FileBrowserToolbar {...defaultProps} isRecents />
|
||||
</QueryClientProvider>,
|
||||
)
|
||||
|
||||
expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -14,6 +14,13 @@ import { MembersDialog } from '../members-dialog'
|
||||
import { FilterPanel } from '../search/filter-panel'
|
||||
import { SearchFilterDialog } from '../search/search-filter-dialog'
|
||||
import { SortControl } from '../search/sort-control'
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuItem,
|
||||
DropdownMenuTrigger,
|
||||
} from '../ui/dropdown-menu'
|
||||
import { FolderPlus, Plus, UploadCloud } from 'lucide-react'
|
||||
import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar'
|
||||
import { Button } from '../ui/button'
|
||||
import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover'
|
||||
@@ -36,6 +43,9 @@ type FileBrowserToolbarProps = {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
onUpdateCollection?: (updates: { name?: string; filter?: any }) => void
|
||||
rootFolderId?: string
|
||||
onNewFolder?: () => void
|
||||
onUploadFile?: () => void
|
||||
onUploadFolder?: () => void
|
||||
}
|
||||
|
||||
export function FileBrowserToolbar({
|
||||
@@ -52,6 +62,9 @@ export function FileBrowserToolbar({
|
||||
collection,
|
||||
onUpdateCollection,
|
||||
rootFolderId,
|
||||
onNewFolder,
|
||||
onUploadFile,
|
||||
onUploadFolder,
|
||||
}: FileBrowserToolbarProps) {
|
||||
const { canEdit } = usePermissions(projectId)
|
||||
const [popoverOpen, setPopoverOpen] = useState(false)
|
||||
@@ -394,6 +407,48 @@ export function FileBrowserToolbar({
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
|
||||
{canEdit && !isRecentlyDeleted && !isRecents && (
|
||||
<>
|
||||
<Separator orientation="vertical" className="hidden md:block" />
|
||||
<DropdownMenu modal={false}>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="hidden md:inline-flex items-center justify-center size-8 p-0"
|
||||
title={m.add()}
|
||||
aria-label={m.add()}
|
||||
>
|
||||
<Plus className="size-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="start" className="w-48">
|
||||
<DropdownMenuItem
|
||||
onClick={onUploadFile}
|
||||
className="flex items-center gap-2 cursor-pointer"
|
||||
>
|
||||
<UploadCloud className="size-4" />
|
||||
<span>{m.upload_file()}</span>
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
onClick={onUploadFolder}
|
||||
className="flex items-center gap-2 cursor-pointer"
|
||||
>
|
||||
<UploadCloud className="size-4" />
|
||||
<span>{m.upload_folder()}</span>
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem
|
||||
onClick={onNewFolder}
|
||||
className="flex items-center gap-2 cursor-pointer"
|
||||
>
|
||||
<FolderPlus className="size-4" />
|
||||
<span>{m.new_folder()}</span>
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, render } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { FieldInfo } from '@shumai/dtos'
|
||||
import { FilterPanel } from './filter-panel'
|
||||
|
||||
vi.mock('@/ui/hooks/use-team-id', () => ({
|
||||
useTeamId: () => 'team-1',
|
||||
}))
|
||||
|
||||
vi.mock('@/ui/stores/members', () => ({
|
||||
useMemberStore: () => ({
|
||||
members: [],
|
||||
fetchMembers: vi.fn(),
|
||||
}),
|
||||
}))
|
||||
|
||||
vi.mock('@/ui/hooks/use-archive-config', () => ({
|
||||
useArchiveConfig: () => ({
|
||||
archiveStorageEnabled: false,
|
||||
}),
|
||||
}))
|
||||
|
||||
describe('FilterPanel', () => {
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('renders "Name" once without duplicating when fields contains system name field', () => {
|
||||
const mockFields: FieldInfo[] = [
|
||||
{
|
||||
id: 'name',
|
||||
scope: 'SYSTEM',
|
||||
readOnly: true,
|
||||
visible: true,
|
||||
description: '',
|
||||
config: {
|
||||
name: 'Name',
|
||||
type: 'text',
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
render(
|
||||
<FilterPanel
|
||||
fields={mockFields}
|
||||
conditions={[{ field: 'name', operator: 'eq', value: 'sample' }]}
|
||||
onChange={vi.fn()}
|
||||
/>,
|
||||
)
|
||||
|
||||
const selectTrigger = document.querySelector('[data-slot="select-trigger"]')
|
||||
expect(selectTrigger).not.toBeNull()
|
||||
expect(selectTrigger?.textContent).toBe('Name')
|
||||
})
|
||||
})
|
||||
@@ -76,7 +76,14 @@ export function FilterPanel({
|
||||
: f.config?.select?.options || f.config?.selectMulti?.options,
|
||||
config: f.config,
|
||||
}))
|
||||
return [...sys, ...custom].filter((f) => !excludeFields?.includes(f.id))
|
||||
const seen = new Set<string>()
|
||||
return [...sys, ...custom]
|
||||
.filter((f) => !excludeFields?.includes(f.id))
|
||||
.filter((f) => {
|
||||
if (!f.id || seen.has(f.id)) return false
|
||||
seen.add(f.id)
|
||||
return true
|
||||
})
|
||||
}, [fields, memberOptions, excludeFields, archiveStorageEnabled])
|
||||
|
||||
const handleAddCondition = () => {
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
// @vitest-environment happy-dom
|
||||
import { cleanup, fireEvent, render, screen } from '@testing-library/react'
|
||||
import React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { FieldInfo } from '@shumai/dtos'
|
||||
import { SortControl } from './sort-control'
|
||||
|
||||
describe('SortControl', () => {
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
vi.clearAllMocks()
|
||||
})
|
||||
|
||||
it('renders "Name" once in the selector when fields contains system name field', () => {
|
||||
const mockFields: FieldInfo[] = [
|
||||
{
|
||||
id: 'name',
|
||||
scope: 'SYSTEM',
|
||||
readOnly: true,
|
||||
visible: true,
|
||||
description: '',
|
||||
config: {
|
||||
name: 'Name',
|
||||
type: 'text',
|
||||
},
|
||||
},
|
||||
{
|
||||
id: 'custom_rating',
|
||||
scope: 'PROJECT',
|
||||
readOnly: false,
|
||||
visible: true,
|
||||
description: '',
|
||||
config: {
|
||||
name: 'Rating',
|
||||
type: 'rating',
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
render(
|
||||
<SortControl
|
||||
fields={mockFields}
|
||||
sort={{ field: 'name', order: 'asc' }}
|
||||
onSortChange={vi.fn()}
|
||||
/>,
|
||||
)
|
||||
|
||||
// Open the sort popover
|
||||
const popoverButton = screen.getByRole('button')
|
||||
fireEvent.click(popoverButton)
|
||||
|
||||
// The select trigger inside the popover must display "Name", not "NameName"
|
||||
const selectTrigger = document.querySelector('[data-slot="select-trigger"]')
|
||||
expect(selectTrigger).not.toBeNull()
|
||||
expect(selectTrigger?.textContent).toBe('Name')
|
||||
})
|
||||
|
||||
it('calls onSortChange when changing sort field', () => {
|
||||
const onSortChange = vi.fn()
|
||||
const mockFields: FieldInfo[] = [
|
||||
{
|
||||
id: 'custom_status',
|
||||
scope: 'PROJECT',
|
||||
readOnly: false,
|
||||
visible: true,
|
||||
description: '',
|
||||
config: {
|
||||
name: 'Status',
|
||||
type: 'select',
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
render(
|
||||
<SortControl
|
||||
fields={mockFields}
|
||||
sort={{ field: 'name', order: 'asc' }}
|
||||
onSortChange={onSortChange}
|
||||
/>,
|
||||
)
|
||||
|
||||
const popoverButton = screen.getByRole('button')
|
||||
fireEvent.click(popoverButton)
|
||||
|
||||
// Order toggle button should show "A → Z" when sorted by name asc
|
||||
const orderButton = screen.getByRole('button', { name: /A\s*→\s*Z/i })
|
||||
expect(orderButton).toBeDefined()
|
||||
|
||||
// Toggle direction
|
||||
fireEvent.click(orderButton)
|
||||
expect(onSortChange).toHaveBeenCalledWith({
|
||||
field: 'name',
|
||||
order: 'desc',
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -33,7 +33,12 @@ export function SortControl({ fields, sort, onSortChange, disabled }: SortContro
|
||||
id: f.id!,
|
||||
label: f.config?.name || f.description || m.unknown(),
|
||||
}))
|
||||
return [...sys, ...custom]
|
||||
const seen = new Set<string>()
|
||||
return [...sys, ...custom].filter((f) => {
|
||||
if (!f.id || seen.has(f.id)) return false
|
||||
seen.add(f.id)
|
||||
return true
|
||||
})
|
||||
}, [fields])
|
||||
|
||||
// Default to Custom if no sort selected
|
||||
|
||||
Reference in New Issue
Block a user