diff --git a/packages/webui/components/file-browser/file-browser.tsx b/packages/webui/components/file-browser/file-browser.tsx
index 788612f1..69af56ea 100644
--- a/packages/webui/components/file-browser/file-browser.tsx
+++ b/packages/webui/components/file-browser/file-browser.tsx
@@ -994,6 +994,9 @@ export function FileBrowser({
collection={collection}
onUpdateCollection={onUpdateCollection}
rootFolderId={rootFolderId}
+ onNewFolder={() => handleNewFolder(m.new_folder())}
+ onUploadFile={handleUploadFilesClick}
+ onUploadFolder={handleUploadFolderClick}
/>
)}
{isRecentlyDeleted && (
diff --git a/packages/webui/components/file-browser/toolbar.test.tsx b/packages/webui/components/file-browser/toolbar.test.tsx
new file mode 100644
index 00000000..69cbfbec
--- /dev/null
+++ b/packages/webui/components/file-browser/toolbar.test.tsx
@@ -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(
+
+
+ ,
+ )
+
+ 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(
+
+
+ ,
+ )
+
+ expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
+ })
+
+ it('does not render plus button in recently deleted view', () => {
+ render(
+
+
+ ,
+ )
+
+ expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
+ })
+
+ it('does not render plus button in recents view', () => {
+ render(
+
+
+ ,
+ )
+
+ expect(screen.queryByRole('button', { name: /Add/i })).toBeNull()
+ })
+})
diff --git a/packages/webui/components/file-browser/toolbar.tsx b/packages/webui/components/file-browser/toolbar.tsx
index e61adb10..04f5e79b 100644
--- a/packages/webui/components/file-browser/toolbar.tsx
+++ b/packages/webui/components/file-browser/toolbar.tsx
@@ -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({
>
)}
+
+ {canEdit && !isRecentlyDeleted && !isRecents && (
+ <>
+
+
+
+
+
+
+
+
+ {m.upload_file()}
+
+
+
+ {m.upload_folder()}
+
+
+
+ {m.new_folder()}
+
+
+
+ >
+ )}
>
)}
diff --git a/packages/webui/components/search/filter-panel.test.tsx b/packages/webui/components/search/filter-panel.test.tsx
new file mode 100644
index 00000000..fe052469
--- /dev/null
+++ b/packages/webui/components/search/filter-panel.test.tsx
@@ -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(
+ ,
+ )
+
+ const selectTrigger = document.querySelector('[data-slot="select-trigger"]')
+ expect(selectTrigger).not.toBeNull()
+ expect(selectTrigger?.textContent).toBe('Name')
+ })
+})
diff --git a/packages/webui/components/search/filter-panel.tsx b/packages/webui/components/search/filter-panel.tsx
index d111539b..8cccfee3 100644
--- a/packages/webui/components/search/filter-panel.tsx
+++ b/packages/webui/components/search/filter-panel.tsx
@@ -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()
+ 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 = () => {
diff --git a/packages/webui/components/search/sort-control.test.tsx b/packages/webui/components/search/sort-control.test.tsx
new file mode 100644
index 00000000..13010c70
--- /dev/null
+++ b/packages/webui/components/search/sort-control.test.tsx
@@ -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(
+ ,
+ )
+
+ // 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(
+ ,
+ )
+
+ 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',
+ })
+ })
+})
diff --git a/packages/webui/components/search/sort-control.tsx b/packages/webui/components/search/sort-control.tsx
index 90a2bc99..2fff3ada 100644
--- a/packages/webui/components/search/sort-control.tsx
+++ b/packages/webui/components/search/sort-control.tsx
@@ -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()
+ 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