⭐️⭐️⭐️ Open-source, self-hosted alternative to Linear and Plane. Project management and issue tracking where teams and AI agents work side by side to plan and ship products.
TypeScript agenticagileai-agentsbug-reportingbug-trackerganttissue-trackerjirajira-alternativekanbanlinearlinear-alternativeopen-sourceproduct-managementproject-managementroadmapself-hostedsprint-planningteam-collaborationtrello-alternative
improvement(web): redesign the project switcher dropdown (#439)
Croff8080f6a5b3dd
diff --git a/apps/web/messages/ar/nav.json b/apps/web/messages/ar/nav.jsonindex 8cb4ec76..fe74bd7f 100644--- a/apps/web/messages/ar/nav.json+++ b/apps/web/messages/ar/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "اسحب لتغيير العرض، وانقر نقرًا مزدوجًا للاستعادة","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "تنقل",+ "hintOpen": "فتح"}}diff --git a/apps/web/messages/en/nav.json b/apps/web/messages/en/nav.jsonindex 34afca44..fa52bac3 100644--- a/apps/web/messages/en/nav.json+++ b/apps/web/messages/en/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Drag to resize the project picker, double-click to reset","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "move",+ "hintOpen": "open"}}diff --git a/apps/web/messages/es-ES/nav.json b/apps/web/messages/es-ES/nav.jsonindex 59234431..2e58520c 100644--- a/apps/web/messages/es-ES/nav.json+++ b/apps/web/messages/es-ES/nav.json@@ -46,8 +46,7 @@"noResults": "No hay proyectos que coincidan","sortCreated": "Creados recientemente","hideHidden": "Ocultar proyectos ocultos",- "resize": "Arrastra para cambiar el ancho del selector de proyectos",- "resetWidth": "Restablecer el ancho del selector de proyectos",+ "resize": "Arrastra para cambiar el ancho del selector de proyectos; doble clic para restablecerlo","activityHint": "Último cambio o comentario en un elemento de trabajo","search": "Buscar proyectos por nombre, clave o equipo…","sortActivity": "Actividad reciente",@@ -63,11 +62,7 @@"hiddenProjects": "Proyectos ocultos ({count})","noHiddenResults": "Ningún proyecto oculto coincide con tu búsqueda","noVisibleProjects": "No hay proyectos en tu vista",- "projectActions": "Acciones para {name}",- "starAction": "Destacar proyecto",- "unstarAction": "Quitar de destacados",- "hideAction": "Ocultar de mi vista",- "restoreAction": "Restaurar a mi vista",- "starred": "Destacados"+ "hintMove": "mover",+ "hintOpen": "abrir"}}diff --git a/apps/web/messages/fr/nav.json b/apps/web/messages/fr/nav.jsonindex 24732325..2558c62d 100644--- a/apps/web/messages/fr/nav.json+++ b/apps/web/messages/fr/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Faites glisser pour redimensionner, double-cliquez pour réinitialiser","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "naviguer",+ "hintOpen": "ouvrir"}}diff --git a/apps/web/messages/id/nav.json b/apps/web/messages/id/nav.jsonindex 5c241265..4e0ca356 100644--- a/apps/web/messages/id/nav.json+++ b/apps/web/messages/id/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Seret untuk mengubah lebar, klik dua kali untuk mengatur ulang","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "pindah",+ "hintOpen": "buka"}}diff --git a/apps/web/messages/pt-BR/nav.json b/apps/web/messages/pt-BR/nav.jsonindex 54d1367f..773b7fae 100644--- a/apps/web/messages/pt-BR/nav.json+++ b/apps/web/messages/pt-BR/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Arraste para redimensionar, clique duas vezes para redefinir","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "mover",+ "hintOpen": "abrir"}}diff --git a/apps/web/messages/ru/nav.json b/apps/web/messages/ru/nav.jsonindex 5f01212f..de706301 100644--- a/apps/web/messages/ru/nav.json+++ b/apps/web/messages/ru/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Потяните, чтобы изменить ширину, двойной щелчок сбрасывает","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "перейти",+ "hintOpen": "открыть"}}diff --git a/apps/web/messages/uk/nav.json b/apps/web/messages/uk/nav.jsonindex 286f5cbf..2ea70abe 100644--- a/apps/web/messages/uk/nav.json+++ b/apps/web/messages/uk/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "Потягніть, щоб змінити ширину, подвійне клацання скидає","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "перейти",+ "hintOpen": "відкрити"}}diff --git a/apps/web/messages/zh-CN/nav.json b/apps/web/messages/zh-CN/nav.jsonindex b21d7dc5..012f4a05 100644--- a/apps/web/messages/zh-CN/nav.json+++ b/apps/web/messages/zh-CN/nav.json@@ -46,8 +46,7 @@"noResults": "No matching projects","sortCreated": "Newest created","hideHidden": "Hide hidden projects",- "resize": "Drag to resize the project picker",- "resetWidth": "Reset project picker width",+ "resize": "拖动以调整宽度,双击恢复默认","activityHint": "Latest work-item change or comment","search": "Search projects by name, key, or team…","sortActivity": "Recent activity",@@ -63,11 +62,7 @@"hiddenProjects": "Hidden projects ({count})","noHiddenResults": "No hidden projects match your search","noVisibleProjects": "No projects in your view",- "projectActions": "Actions for {name}",- "starAction": "Star project",- "unstarAction": "Unstar project",- "hideAction": "Hide from my view",- "restoreAction": "Restore to my view",- "starred": "Starred"+ "hintMove": "移动",+ "hintOpen": "打开"}}diff --git a/apps/web/src/app/globals.css b/apps/web/src/app/globals.cssindex bcc94a43..1eed1a07 100644--- a/apps/web/src/app/globals.css+++ b/apps/web/src/app/globals.css@@ -188,7 +188,8 @@--chat-composer-shadow: 0 -2px 22px 4px rgb(0 0 0 / 0.7);}-/* Every floating surface lifts off the page with the same shadow. It is set here+/* Every floating surface lifts off the page with the same shadow, and a border+ fainter than the page's so it does not read as a bright outline. It is set hererather than per component: the shadcn components are kept as generated, and`shadow-md` on a popover reads as nothing against a background of nearly thesame lightness. These rules sit outside @layer, so they win over the utility. */@@ -201,6 +202,7 @@[data-slot='combobox-content'],[data-slot='tooltip-content'] {box-shadow: var(--overlay-shadow);+ border-color: color-mix(in oklab, var(--border) 55%, transparent);}/* A tooltip is never pointed at, so it must not take the pointer from what itdiff --git a/apps/web/src/components/common/ResizeGrip.tsx b/apps/web/src/components/common/ResizeGrip.tsxindex a282c97c..88100aaa 100644--- a/apps/web/src/components/common/ResizeGrip.tsx+++ b/apps/web/src/components/common/ResizeGrip.tsx@@ -11,10 +11,12 @@ export default function ResizeGrip({label,className,onDrag,+ onReset,}: {label: string;className?: string;onDrag: (deltaX: number) => void;+ onReset?: () => void;}) {// The drag listens on the window, since the pointer leaves the 6px grip as soon// as it moves. The host can unmount mid-drag (switching layout or project), and@@ -39,7 +41,9 @@ export default function ResizeGrip({return (<divonPointerDown={beginResize}+ onDoubleClick={onReset}aria-label={label}+ title={label}className={cn('w-1.5 cursor-col-resize hover:bg-primary/40', className)}/>);diff --git a/apps/web/src/components/layout/ProjectSwitcher.test.tsx b/apps/web/src/components/layout/ProjectSwitcher.test.tsxindex ca1ffd1b..1ae377b9 100644--- a/apps/web/src/components/layout/ProjectSwitcher.test.tsx+++ b/apps/web/src/components/layout/ProjectSwitcher.test.tsx@@ -119,14 +119,6 @@ function touch(target: HTMLElement, type: 'touchstart' | 'touchmove', y: number)return event;}-async function pointer(target: HTMLElement, type: string, pointerType: string) {- await act(async () => {- const event = new window.MouseEvent(type, { bubbles: true, cancelable: true, button: 0 });- Object.defineProperty(event, 'pointerType', { value: pointerType });- target.dispatchEvent(event);- });-}-function scrollableList() {const list = element('[data-slot="command-list"]');// jsdom has no layout engine, so supply the dimensions of an overflowing list.@@ -258,34 +250,6 @@ describe('ProjectSwitcher', () => {assert.deepEqual(selections, ['eng.P02']);});- it('restores picker focus and scrolling after closing nested project actions', async () => {- await render();- const trigger = element('[aria-label="Actions for Project 2"]');- await key(trigger, 'Enter');- const menu = element('[role="menu"]');- await key(menu, 'Escape');- assert.equal(document.querySelector('[role="menu"]'), null);- assert.equal(document.activeElement, trigger);- scrollableList();- const row = element('[data-value="project-2"]');- touch(row, 'touchstart', 200);- assert.equal(touch(row, 'touchmove', 140).defaultPrevented, false);- assert.deepEqual(selections, []);- });-- it('allows a swipe starting on project actions without opening the menu', async () => {- await render();- scrollableList();- const trigger = element('[aria-label="Actions for Project 2"]');- await pointer(trigger, 'pointerdown', 'touch');- assert.equal(document.querySelector('[role="menu"]'), null);- touch(trigger, 'touchstart', 200);- assert.equal(touch(trigger, 'touchmove', 140).defaultPrevented, false);- await pointer(trigger, 'pointercancel', 'touch');- assert.equal(document.querySelector('[role="menu"]'), null);- assert.deepEqual(selections, []);- });-it('keeps the picker scrollable after closing the sort selector', async () => {await render();const trigger = element('[data-slot="select-trigger"]');@@ -300,18 +264,6 @@ describe('ProjectSwitcher', () => {assert.deepEqual(selections, []);});- it('opens project actions on a completed tap and preserves mouse activation', async () => {- await render();- const trigger = element('[aria-label="Actions for Project 2"]');- await pointer(trigger, 'pointerdown', 'touch');- await pointer(trigger, 'pointerup', 'touch');- await act(async () => trigger.click());- await key(element('[role="menu"]'), 'Escape');- await pointer(trigger, 'pointerdown', 'mouse');- assert.ok(element('[role="menu"]'));- assert.deepEqual(selections, []);- });-it('closes the picker before its sidebar and releases the scroll lock', async () => {await render();await key(element('[data-slot="popover-content"]'), 'Escape');diff --git a/apps/web/src/components/layout/ProjectSwitcherFooter.tsx b/apps/web/src/components/layout/ProjectSwitcherFooter.tsxindex 52636d76..71bbabf3 100644--- a/apps/web/src/components/layout/ProjectSwitcherFooter.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherFooter.tsx@@ -4,17 +4,37 @@ import { useTranslations } from 'next-intl';import { manageTeamsPath } from '@/utils/paths';import { Button } from '@/components/ui/button';-export default function ProjectSwitcherFooter({ onClose }: { onClose: () => void }) {+const KBD = 'rounded border bg-muted px-1 font-sans text-[10px] font-medium text-muted-foreground';++export default function ProjectSwitcherFooter({+ isMobile,+ onClose,+}: {+ isMobile: boolean;+ onClose: () => void;+}) {const t = useTranslations('nav');return (- <div className="flex shrink-0 flex-wrap gap-1 border-t p-1">+ <div className="flex shrink-0 items-center gap-1 border-t p-1"><Button asChild variant="ghost" size="sm" className="flex-1 justify-start"><Link href={manageTeamsPath()} onClick={onClose}><Users />{t('manageTeams')}</Link></Button>+ {!isMobile && (+ <span+ aria-hidden+ className="flex shrink-0 items-center gap-1 pe-2 text-xs text-muted-foreground"+ >+ <kbd className={KBD}>↑</kbd>+ <kbd className={KBD}>↓</kbd>+ {t('projectPicker.hintMove')}+ <kbd className={`${KBD} ms-1.5`}>↵</kbd>+ {t('projectPicker.hintOpen')}+ </span>+ )}</div>);}diff --git a/apps/web/src/components/layout/ProjectSwitcherHideButton.tsx b/apps/web/src/components/layout/ProjectSwitcherHideButton.tsxnew file mode 100644index 00000000..d625a80c--- /dev/null+++ b/apps/web/src/components/layout/ProjectSwitcherHideButton.tsx@@ -0,0 +1,34 @@+import { Eye, EyeOff } from 'lucide-react';+import { useTranslations } from 'next-intl';+import type { Project } from '@/lib/api/endpoints/projects';+import { cn } from '@/lib/utils';+import { useUpdateProjectPreferences } from '@/services/projects.service';+import { Button } from '@/components/ui/button';++export default function ProjectSwitcherHideButton({ project }: { project: Project }) {+ const t = useTranslations('nav.projectPicker');+ const update = useUpdateProjectPreferences();+ const label = t(project.isHidden ? 'showProject' : 'hideProject', { name: project.name });++ return (+ <Button+ variant="ghost"+ size="icon-xs"+ className={cn(+ 'size-10 shrink-0 text-muted-foreground md:size-7',+ !project.isHidden &&+ 'md:opacity-0 md:group-focus-within/row:opacity-100 md:group-hover/row:opacity-100 md:group-has-[[data-selected=true]]/row:opacity-100',+ )}+ aria-label={label}+ title={label}+ disabled={update.isPending}+ onKeyDown={(event) => event.stopPropagation()}+ onClick={(event) => {+ event.stopPropagation();+ update.mutate({ projectKey: project.ref, patch: { isHidden: !project.isHidden } });+ }}+ >+ {project.isHidden ? <Eye /> : <EyeOff />}+ </Button>+ );+}diff --git a/apps/web/src/components/layout/ProjectSwitcherList.tsx b/apps/web/src/components/layout/ProjectSwitcherList.tsxindex 973135b3..ecb31172 100644--- a/apps/web/src/components/layout/ProjectSwitcherList.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherList.tsx@@ -5,6 +5,7 @@ import type { Team } from '@/lib/api/endpoints/teams';import { Command, CommandInput, CommandList } from '@/components/ui/command';import ProjectSwitcherTeamGroup from './ProjectSwitcherTeamGroup';import ProjectSwitcherHiddenProjects from './ProjectSwitcherHiddenProjects';+import ProjectSwitcherSort from './ProjectSwitcherSort';import { projectSwitcherSections, type ProjectSort } from './utils/projectSwitcher';export default function ProjectSwitcherList({@@ -12,6 +13,7 @@ export default function ProjectSwitcherList({teams,current,sort,+ onSortChange,showHidden,onShowHiddenChange,openTeams,@@ -23,6 +25,7 @@ export default function ProjectSwitcherList({teams: Team[];current?: Project;sort: ProjectSort;+ onSortChange: (sort: ProjectSort) => void;showHidden: boolean;onShowHiddenChange: (show: boolean) => void;openTeams: Record<number, boolean>;@@ -42,6 +45,16 @@ export default function ProjectSwitcherList({);const searching = query.trim().length > 0;const hiddenCount = projects.filter((project) => project.isHidden).length;+ const hiddenMatches = searching && hiddenProjects.length > 0;++ function search(next: string) {+ setQuery(next);+ if (+ next.trim() &&+ projectSwitcherSections(projects, teams, next, sort, locale).hiddenProjects.length > 0+ )+ onShowHiddenChange(true);+ }return (<Command@@ -50,15 +63,19 @@ export default function ProjectSwitcherList({className="min-h-0 flex-1 rounded-none"label={t('projects')}>- <CommandInput- ref={inputRef}- value={query}- onValueChange={setQuery}- placeholder={t('projectPicker.search')}- aria-label={t('projectPicker.search')}- />+ <div className="flex shrink-0 items-center gap-1 border-b pe-2 [&>[data-slot=command-input-wrapper]]:h-11 [&>[data-slot=command-input-wrapper]]:min-w-0 [&>[data-slot=command-input-wrapper]]:flex-1 [&>[data-slot=command-input-wrapper]]:border-0">+ <CommandInput+ ref={inputRef}+ value={query}+ onValueChange={search}+ className="text-[13px]"+ placeholder={t('projectPicker.search')}+ aria-label={t('projectPicker.search')}+ />+ <ProjectSwitcherSort sort={sort} onSortChange={onSortChange} />+ </div><CommandList className="max-h-none min-h-0 flex-1 p-1">- {groups.every((group) => group.projects.length === 0) && (+ {groups.every((group) => group.projects.length === 0) && !hiddenMatches && (<p role="status" className="px-3 py-6 text-center text-sm text-muted-foreground">{searching ? t('projectPicker.noResults') : t('projectPicker.noVisibleProjects')}</p>@@ -79,7 +96,7 @@ export default function ProjectSwitcherList({onSelectProject={onSelectProject}/>))}- {(hiddenCount > 0 || showHidden) && (+ {hiddenCount > 0 && (<ProjectSwitcherHiddenProjectsprojects={hiddenProjects}hiddenCount={hiddenCount}diff --git a/apps/web/src/components/layout/ProjectSwitcherMenu.tsx b/apps/web/src/components/layout/ProjectSwitcherMenu.tsxindex 8936bf2e..232996e9 100644--- a/apps/web/src/components/layout/ProjectSwitcherMenu.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherMenu.tsx@@ -7,9 +7,11 @@ import ResizeGrip from '@/components/common/ResizeGrip';import { PopoverContent } from '@/components/ui/popover';import { useSidebar } from '@/components/ui/sidebar';import ProjectSwitcherList from './ProjectSwitcherList';-import ProjectSwitcherToolbar from './ProjectSwitcherToolbar';import ProjectSwitcherFooter from './ProjectSwitcherFooter';-import type { useProjectSwitcherPreferences } from './hooks/useProjectSwitcherPreferences';+import {+ PROJECT_PICKER_WIDTH,+ type useProjectSwitcherPreferences,+} from './hooks/useProjectSwitcherPreferences';export default function ProjectSwitcherMenu({projects,@@ -61,12 +63,12 @@ export default function ProjectSwitcherMenu({else inputRef.current?.focus();}}>- <ProjectSwitcherToolbar preferences={preferences} isMobile={isMobile} /><ProjectSwitcherListprojects={projects}teams={teams}current={current}sort={preferences.sort}+ onSortChange={preferences.setSort}showHidden={showHidden}onShowHiddenChange={setShowHidden}openTeams={openTeams}@@ -74,7 +76,7 @@ export default function ProjectSwitcherMenu({onSelectProject={onSelectProject}inputRef={inputRef}/>- <ProjectSwitcherFooter onClose={onClose} />+ <ProjectSwitcherFooter isMobile={isMobile} onClose={onClose} />{!isMobile && (<ResizeGriplabel={t('projectPicker.resize')}@@ -83,6 +85,7 @@ export default function ProjectSwitcherMenu({const direction = contentRef.current?.dataset.side === 'left' ? -1 : 1;preferences.setWidth(resizeStart.current + delta * direction);}}+ onReset={() => preferences.setWidth(PROJECT_PICKER_WIDTH.initial)}/>)}</PopoverContent>diff --git a/apps/web/src/components/layout/ProjectSwitcherProjectActions.tsx b/apps/web/src/components/layout/ProjectSwitcherProjectActions.tsxdeleted file mode 100644index 29549da5..00000000--- a/apps/web/src/components/layout/ProjectSwitcherProjectActions.tsx+++ /dev/null@@ -1,77 +0,0 @@-import { useRef, useState } from 'react';-import { Archive, ArchiveRestore, MoreHorizontal, Star } from 'lucide-react';-import { useTranslations } from 'next-intl';-import type { Project } from '@/lib/api/endpoints/projects';-import { useUpdateProjectPreferences } from '@/services/projects.service';-import { Button } from '@/components/ui/button';-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuTrigger,-} from '@/components/ui/dropdown-menu';--export default function ProjectSwitcherProjectActions({ project }: { project: Project }) {- const t = useTranslations('nav.projectPicker');- const update = useUpdateProjectPreferences();- const [open, setOpen] = useState(false);- const touchPress = useRef(false);-- return (- <DropdownMenu open={open} onOpenChange={setOpen}>- <DropdownMenuTrigger asChild>- <Button- variant="ghost"- size="icon-xs"- className="size-10 shrink-0 text-muted-foreground md:size-7"- aria-label={t('projectActions', { name: project.name })}- title={t('projectActions', { name: project.name })}- disabled={update.isPending}- onPointerDown={(event) => {- // Radix opens on pointerdown, before a touch can become a scroll.- touchPress.current = event.pointerType === 'touch';- if (touchPress.current) event.preventDefault();- }}- onPointerCancel={() => {- touchPress.current = false;- }}- onKeyDown={(event) => {- touchPress.current = false;- event.stopPropagation();- }}- onClick={(event) => {- event.stopPropagation();- if (touchPress.current) setOpen((value) => !value);- touchPress.current = false;- }}- >- <MoreHorizontal />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent- align="end"- onKeyDown={(event) => event.stopPropagation()}- onClick={(event) => event.stopPropagation()}- >- {!project.isHidden && (- <DropdownMenuItem- onSelect={() =>- update.mutate({ projectKey: project.ref, patch: { isFavorite: !project.isFavorite } })- }- >- <Star className={project.isFavorite ? 'fill-current' : undefined} />- {t(project.isFavorite ? 'unstarAction' : 'starAction')}- </DropdownMenuItem>- )}- <DropdownMenuItem- onSelect={() =>- update.mutate({ projectKey: project.ref, patch: { isHidden: !project.isHidden } })- }- >- {project.isHidden ? <ArchiveRestore /> : <Archive />}- {t(project.isHidden ? 'restoreAction' : 'hideAction')}- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- );-}diff --git a/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx b/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsxindex de108d91..82cb1701 100644--- a/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherProjectRow.tsx@@ -1,10 +1,11 @@-import { Check, Clock3, Star } from 'lucide-react';import { useTranslations } from 'next-intl';import type { Project } from '@/lib/api/endpoints/projects';+import { cn } from '@/lib/utils';+import { avatarColor } from '@/utils/avatar';import { formatDateTime } from '@/utils/dates';-import { Badge } from '@/components/ui/badge';import { CommandItem } from '@/components/ui/command';-import ProjectSwitcherProjectActions from './ProjectSwitcherProjectActions';+import ProjectSwitcherHideButton from './ProjectSwitcherHideButton';+import ProjectSwitcherStarButton from './ProjectSwitcherStarButton';export default function ProjectSwitcherProjectRow({project,@@ -16,41 +17,52 @@ export default function ProjectSwitcherProjectRow({onSelectProject: (key: string) => void;}) {const t = useTranslations('nav.projectPicker');+ const current = project.ref === currentProjectKey;return (- <div className="flex items-center gap-0.5">+ <div className="group/row relative flex items-center gap-0.5 rounded-sm has-[[data-selected=true]]:bg-accent">+ {current && (+ <span aria-hidden className="absolute inset-y-2 start-0 w-0.5 rounded-full bg-foreground" />+ )}<CommandItemvalue={`project-${project.id}`}onSelect={() => onSelectProject(project.ref)}- className="min-w-0 flex-1 gap-2 p-2"+ aria-current={current || undefined}+ className="min-w-0 flex-1 gap-2.5 p-2 data-[selected=true]:bg-transparent">- <div className="min-w-0 flex-1 space-y-1">- <span className="block text-sm wrap-anywhere whitespace-normal" dir="auto">+ <span+ dir="ltr"+ className={cn(+ 'w-14 shrink-0 rounded-sm px-1 py-1 text-center font-mono font-semibold text-white',+ project.key.length > 7 ? 'text-[8px]' : 'text-[10px]',+ )}+ style={{ backgroundColor: avatarColor(project.key) }}+ >+ {project.key}+ </span>+ <div className="min-w-0 flex-1">+ <span+ className={cn(+ 'block text-sm wrap-anywhere whitespace-normal',+ current ? 'font-semibold' : 'font-medium',+ )}+ dir="auto"+ >{project.name}</span>- <span className="flex flex-wrap items-center gap-x-2 gap-y-1 text-xs text-muted-foreground">- <Badge- variant="outline"- className="max-w-full rounded px-1 py-0 font-mono text-[10px] wrap-anywhere whitespace-normal"+ {project.lastActivityAt && (+ <time+ dateTime={project.lastActivityAt}+ title={t('activityHint')}+ className="block text-xs text-muted-foreground">- {project.key}- </Badge>- {project.isFavorite && (- <Star className="size-3! fill-current" aria-label={t('starred')} />- )}- {project.lastActivityAt && (- <span className="inline-flex items-center gap-1" title={t('activityHint')}>- <Clock3 className="size-3!" />- <time dateTime={project.lastActivityAt}>- {formatDateTime(project.lastActivityAt)}- </time>- </span>- )}- </span>+ {formatDateTime(project.lastActivityAt)}+ </time>+ )}</div>- {project.ref === currentProjectKey && <Check className="size-4 shrink-0" />}</CommandItem>- <ProjectSwitcherProjectActions project={project} />+ <ProjectSwitcherHideButton project={project} />+ {!project.isHidden && <ProjectSwitcherStarButton project={project} />}</div>);}diff --git a/apps/web/src/components/layout/ProjectSwitcherSort.tsx b/apps/web/src/components/layout/ProjectSwitcherSort.tsxnew file mode 100644index 00000000..5bca1423--- /dev/null+++ b/apps/web/src/components/layout/ProjectSwitcherSort.tsx@@ -0,0 +1,43 @@+import { ArrowUpDown } from 'lucide-react';+import { useTranslations } from 'next-intl';+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from '@/components/ui/select';+import type { ProjectSort } from './utils/projectSwitcher';++export default function ProjectSwitcherSort({+ sort,+ onSortChange,+}: {+ sort: ProjectSort;+ onSortChange: (sort: ProjectSort) => void;+}) {+ const t = useTranslations('nav.projectPicker');++ return (+ <Select value={sort} onValueChange={(value) => onSortChange(value as ProjectSort)}>+ <SelectTrigger+ size="sm"+ className="shrink-0 gap-1.5 border-transparent bg-transparent px-2 text-xs shadow-none hover:bg-accent hover:text-accent-foreground data-[state=open]:bg-accent dark:bg-transparent dark:hover:bg-accent"+ aria-label={t('sort')}+ title={t('sort')}+ onKeyDown={(event) => event.stopPropagation()}+ >+ <ArrowUpDown className="size-3.5" />+ <SelectValue />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="key">{t('sortKey')}</SelectItem>+ <SelectItem value="name">{t('sortName')}</SelectItem>+ <SelectItem value="created">{t('sortCreated')}</SelectItem>+ <SelectItem value="activity" title={t('activityHint')}>+ {t('sortActivity')}+ </SelectItem>+ </SelectContent>+ </Select>+ );+}diff --git a/apps/web/src/components/layout/ProjectSwitcherStarButton.tsx b/apps/web/src/components/layout/ProjectSwitcherStarButton.tsxnew file mode 100644index 00000000..687b8442--- /dev/null+++ b/apps/web/src/components/layout/ProjectSwitcherStarButton.tsx@@ -0,0 +1,35 @@+import { Star } from 'lucide-react';+import { useTranslations } from 'next-intl';+import type { Project } from '@/lib/api/endpoints/projects';+import { cn } from '@/lib/utils';+import { useUpdateProjectPreferences } from '@/services/projects.service';+import { Button } from '@/components/ui/button';++export default function ProjectSwitcherStarButton({ project }: { project: Project }) {+ const t = useTranslations('nav.projectPicker');+ const update = useUpdateProjectPreferences();+ const label = t(project.isFavorite ? 'unstarProject' : 'starProject', { name: project.name });++ return (+ <Button+ variant="ghost"+ size="icon-xs"+ className={cn(+ 'size-10 shrink-0 text-muted-foreground md:size-7',+ !project.isFavorite &&+ 'md:opacity-0 md:group-focus-within/row:opacity-100 md:group-hover/row:opacity-100 md:group-has-[[data-selected=true]]/row:opacity-100',+ )}+ aria-label={label}+ aria-pressed={project.isFavorite}+ title={label}+ disabled={update.isPending}+ onKeyDown={(event) => event.stopPropagation()}+ onClick={(event) => {+ event.stopPropagation();+ update.mutate({ projectKey: project.ref, patch: { isFavorite: !project.isFavorite } });+ }}+ >+ <Star className={cn(project.isFavorite && 'fill-current text-amber-500')} />+ </Button>+ );+}diff --git a/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx b/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsxindex cbc0eda4..35b6b324 100644--- a/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx+++ b/apps/web/src/components/layout/ProjectSwitcherTeamGroup.tsx@@ -1,4 +1,4 @@-import { ChevronRight, SquareKanban, Users } from 'lucide-react';+import { ChevronRight } from 'lucide-react';import { useTranslations } from 'next-intl';import { cn } from '@/lib/utils';import { Button } from '@/components/ui/button';@@ -38,22 +38,18 @@ export default function ProjectSwitcherTeamGroup({open && 'rotate-90 rtl:rotate-90',)}/>- <Users className="size-3.5 shrink-0" /><spandir="auto"className="min-w-0 text-start font-medium wrap-anywhere whitespace-normal">{group.teamName}</span>- <span className="ms-auto flex shrink-0 items-center gap-1">- <SquareKanban className="size-3.5" />- <span className="tabular-nums">{group.projects.length}</span>- </span>+ <span className="shrink-0 tabular-nums opacity-70">{group.projects.length}</span></Button></CollapsibleTrigger><CollapsibleContent>{group.projects.length === 0 && (- <p className="py-2 ps-9 pe-2 text-xs text-muted-foreground">{t('noProjects')}</p>+ <p className="py-2 ps-6.5 pe-2 text-xs text-muted-foreground">{t('noProjects')}</p>)}{group.projects.map((project) => (<ProjectSwitcherProjectRowdiff --git a/apps/web/src/components/layout/ProjectSwitcherToolbar.tsx b/apps/web/src/components/layout/ProjectSwitcherToolbar.tsxdeleted file mode 100644index d19f7b3a..00000000--- a/apps/web/src/components/layout/ProjectSwitcherToolbar.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { RotateCcw } from 'lucide-react';-import { useTranslations } from 'next-intl';-import { Button } from '@/components/ui/button';-import {- Select,- SelectContent,- SelectItem,- SelectTrigger,- SelectValue,-} from '@/components/ui/select';-import {- PROJECT_PICKER_WIDTH,- type useProjectSwitcherPreferences,-} from './hooks/useProjectSwitcherPreferences';-import type { ProjectSort } from './utils/projectSwitcher';--export default function ProjectSwitcherToolbar({- preferences,- isMobile,-}: {- preferences: ReturnType<typeof useProjectSwitcherPreferences>;- isMobile: boolean;-}) {- const t = useTranslations('nav');-- return (- <div className="flex shrink-0 flex-wrap items-center gap-1 border-b p-2">- <span className="me-auto px-1 text-xs font-medium text-muted-foreground">- {t('projects')}- </span>- <Select- value={preferences.sort}- onValueChange={(value) => preferences.setSort(value as ProjectSort)}- >- <SelectTrigger- size="sm"- className="max-w-full gap-2 text-xs"- aria-label={t('projectPicker.sort')}- >- <SelectValue />- </SelectTrigger>- <SelectContent>- <SelectItem value="key">{t('projectPicker.sortKey')}</SelectItem>- <SelectItem value="name">{t('projectPicker.sortName')}</SelectItem>- <SelectItem value="created">{t('projectPicker.sortCreated')}</SelectItem>- <SelectItem value="activity" title={t('projectPicker.activityHint')}>- {t('projectPicker.sortActivity')}- </SelectItem>- </SelectContent>- </Select>- {!isMobile && (- <Button- variant="ghost"- size="icon-xs"- title={t('projectPicker.resetWidth')}- aria-label={t('projectPicker.resetWidth')}- onClick={() => preferences.setWidth(PROJECT_PICKER_WIDTH.initial)}- >- <RotateCcw />- </Button>- )}- </div>- );-}diff --git a/apps/web/src/components/layout/hooks/useProjectSwitcherPreferences.ts b/apps/web/src/components/layout/hooks/useProjectSwitcherPreferences.tsindex 51ff1fcd..80c2c32e 100644--- a/apps/web/src/components/layout/hooks/useProjectSwitcherPreferences.ts+++ b/apps/web/src/components/layout/hooks/useProjectSwitcherPreferences.ts@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';import { usePersistedWidth } from '@/hooks/usePersistedWidth';import type { ProjectSort } from '../utils/projectSwitcher';-export const PROJECT_PICKER_WIDTH = { initial: 420, min: 300, max: 720 };+export const PROJECT_PICKER_WIDTH = { initial: 420, min: 420, max: 720 };export function useProjectSwitcherPreferences(userId?: string) {const storageKey = `project-switcher:${userId ?? 'anonymous'}`;diff --git a/apps/web/src/components/layout/utils/projectSwitcher.test.ts b/apps/web/src/components/layout/utils/projectSwitcher.test.tsindex 59812e66..9f064308 100644--- a/apps/web/src/components/layout/utils/projectSwitcher.test.ts+++ b/apps/web/src/components/layout/utils/projectSwitcher.test.ts@@ -346,4 +346,23 @@ describe('projectSwitcherSections', () => {['NEWER', 'OLDER'],);});++ it('sorts hidden projects as one list across teams, ignoring favorites', () => {+ const projects = [+ project({ id: 1, key: 'CCC', isHidden: true, isFavorite: true }),+ project({ id: 2, teamId: 2, key: 'AAA', isHidden: true }),+ project({ id: 3, key: 'BBB', isHidden: true }),+ ];+ const sections = projectSwitcherSections(+ projects,+ [team(), team({ id: 2, name: 'Design' })],+ '',+ 'key',+ 'en',+ );+ assert.deepEqual(+ sections.hiddenProjects.map((item) => item.key),+ ['AAA', 'BBB', 'CCC'],+ );+ });});diff --git a/apps/web/src/components/layout/utils/projectSwitcher.ts b/apps/web/src/components/layout/utils/projectSwitcher.tsindex ee85e04b..e699e881 100644--- a/apps/web/src/components/layout/utils/projectSwitcher.ts+++ b/apps/web/src/components/layout/utils/projectSwitcher.ts@@ -20,6 +20,30 @@ function projectTimestamp(project: Project, sort: ProjectSort): number {return Number.isFinite(timestamp) ? timestamp : -Infinity;}+function searchMatcher(query: string) {+ const tokens = normalizeSearch(query).split(/\s+/).filter(Boolean);+ return (value: string) => {+ const normalized = normalizeSearch(value);+ return tokens.every((token) => normalized.includes(token));+ };+}++function projectComparator(sort: ProjectSort, locale: string) {+ const collator = new Intl.Collator(locale, { sensitivity: 'base' });+ return (a: Project, b: Project) => {+ let order = 0;+ if (sort === 'name') order = collator.compare(a.name, b.name);+ if (sort === 'created' || sort === 'activity') {+ order = projectTimestamp(b, sort) - projectTimestamp(a, sort);+ }+ if (order) return order;+ order = collator.compare(a.key, b.key);+ if (order) return order;+ if (a.key !== b.key) return a.key < b.key ? -1 : 1;+ return a.id - b.id;+ };+}+export function groupProjects(projects: Project[],teams: Team[],@@ -30,11 +54,7 @@ export function groupProjects(const groups = new Map<number, TeamGroup>(teams.map((team) => [team.id, { teamId: team.id, teamName: team.name, projects: [] }]),);- const tokens = normalizeSearch(query).split(/\s+/).filter(Boolean);- const matches = (value: string) => {- const normalized = normalizeSearch(value);- return tokens.every((token) => normalized.includes(token));- };+ const matches = searchMatcher(query);for (const project of projects) {let group = groups.get(project.teamId);@@ -47,28 +67,15 @@ export function groupProjects(}}- const collator = new Intl.Collator(locale, { sensitivity: 'base' });- const compareKeys = (a: Project, b: Project) => {- const order = collator.compare(a.key, b.key);- if (order) return order;- if (a.key !== b.key) return a.key < b.key ? -1 : 1;- return a.id - b.id;- };+ const compare = projectComparator(sort, locale);const result = [...groups.values()].filter((group) => group.projects.length > 0 || matches(group.teamName),);for (const group of result) {- group.projects.sort((a, b) => {- const favoriteOrder = Number(Boolean(b.isFavorite)) - Number(Boolean(a.isFavorite));- if (favoriteOrder) return favoriteOrder;- let order = 0;- if (sort === 'name') order = collator.compare(a.name, b.name);- if (sort === 'created' || sort === 'activity') {- order = projectTimestamp(b, sort) - projectTimestamp(a, sort);- }- return order || compareKeys(a, b);- });+ group.projects.sort(+ (a, b) => Number(Boolean(b.isFavorite)) - Number(Boolean(a.isFavorite)) || compare(a, b),+ );}const newest = (group: TeamGroup) =>@@ -87,6 +94,26 @@ export function groupProjects(return result;}+// Hidden rows show no team and no star, so they are sorted as one list and a+// favorite does not go first.+function hiddenProjects(+ projects: Project[],+ teams: Team[],+ query: string,+ sort: ProjectSort,+ locale: string,+): Project[] {+ const teamNames = new Map(teams.map((team) => [team.id, team.name]));+ const matches = searchMatcher(query);+ return projects+ .filter((project) =>+ matches(+ `${project.name} ${project.key} ${teamNames.get(project.teamId) ?? project.teamName}`,+ ),+ )+ .sort(projectComparator(sort, locale));+}+export function projectSwitcherSections(projects: Project[],teams: Team[],@@ -98,8 +125,6 @@ export function projectSwitcherSections(const hidden = projects.filter((project) => project.isHidden);return {visibleGroups: groupProjects(visible, teams, query, sort, locale),- hiddenProjects: groupProjects(hidden, teams, query, sort, locale).flatMap(- (group) => group.projects,- ),+ hiddenProjects: hiddenProjects(hidden, teams, query, sort, locale),};}