Skip to content

⭐️⭐️⭐️ 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.

fix(web): hidden views open from their own menu (#769)

Pasqual Troncone96acad1dcede
diff --git a/apps/web/src/components/layout/HiddenViewsMenu.tsx b/apps/web/src/components/layout/HiddenViewsMenu.tsx
new file mode 100644
index 00000000..23fafd56
--- /dev/null
+++ b/apps/web/src/components/layout/HiddenViewsMenu.tsx
@@ -0,0 +1,68 @@
+import { useState } from 'react';
+import { Check, Eye, EyeOff } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import type { View } from '@/lib/api/endpoints/views';
+import { cn } from '@/lib/utils';
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import ViewTabLabel from '@/components/layout/ViewTabLabel';
+
+// The views the caller hid from their tab row: each one still opens from here, or is shown
+// again. A hidden view that is open has no tab, so this button stands for it.
+export default function HiddenViewsMenu({
+ hidden,
+ activeViewId,
+ onSelect,
+ onShow,
+}: {
+ hidden: View[];
+ activeViewId: number | null;
+ onSelect: (id: number) => void;
+ onShow: (view: View) => void;
+}) {
+ const t = useTranslations('views');
+ const [open, setOpen] = useState(false);
+ const hiddenOpen = hidden.some((view) => view.id === activeViewId);
+
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <button
+ type="button"
+ className={cn(
+ 'flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-sm',
+ hiddenOpen
+ ? 'bg-secondary font-medium text-foreground'
+ : 'text-muted-foreground hover:bg-accent hover:text-foreground',
+ )}
+ >
+ <EyeOff className="size-3.5" />
+ {t('hiddenViews', { count: hidden.length })}
+ </button>
+ </PopoverTrigger>
+ <PopoverContent align="start" className="w-64 p-1">
+ {hidden.map((view) => (
+ <div key={view.id} className="flex items-center gap-1">
+ <button
+ type="button"
+ onClick={() => {
+ setOpen(false);
+ onSelect(view.id);
+ }}
+ className="flex min-w-0 flex-1 items-center gap-1.5 truncate rounded px-2 py-1 text-start text-sm hover:bg-accent"
+ >
+ <ViewTabLabel view={view} />
+ {view.id === activeViewId && <Check className="size-3.5 shrink-0" />}
+ </button>
+ <button
+ type="button"
+ onClick={() => onShow(view)}
+ className="flex shrink-0 items-center gap-1 rounded px-1.5 py-0.5 text-xs hover:bg-accent"
+ >
+ <Eye className="size-3" /> {t('show')}
+ </button>
+ </div>
+ ))}
+ </PopoverContent>
+ </Popover>
+ );
+}
diff --git a/apps/web/src/components/layout/MobileHiddenViews.tsx b/apps/web/src/components/layout/MobileHiddenViews.tsx
new file mode 100644
index 00000000..d786431e
--- /dev/null
+++ b/apps/web/src/components/layout/MobileHiddenViews.tsx
@@ -0,0 +1,53 @@
+import { useState } from 'react';
+import { useCommandState } from 'cmdk';
+import { ChevronDown, ChevronRight, EyeOff } from 'lucide-react';
+import { useTranslations } from 'next-intl';
+import type { View } from '@/lib/api/endpoints/views';
+import { cn } from '@/lib/utils';
+import { CommandGroup, CommandItem } from '@/components/ui/command';
+import MobileViewItem from '@/components/layout/MobileViewItem';
+
+// The views the person hid, folded under their own item of the mobile picker: a phone does not
+// arrange the row, but they still open from here. A search finds them under their heading.
+export default function MobileHiddenViews({
+ hidden,
+ activeViewId,
+ onSelect,
+}: {
+ hidden: View[];
+ activeViewId: number | null;
+ onSelect: (id: number) => void;
+}) {
+ const t = useTranslations('views');
+ const searching = useCommandState((state) => state.search !== '');
+ const [unfolded, setUnfolded] = useState(false);
+ const label = t('hiddenViews', { count: hidden.length });
+ const items = hidden.map((view) => (
+ <MobileViewItem
+ key={view.id}
+ view={view}
+ active={view.id === activeViewId}
+ onSelect={onSelect}
+ />
+ ));
+
+ if (searching) return <CommandGroup heading={label}>{items}</CommandGroup>;
+ return (
+ <CommandGroup>
+ <CommandItem
+ value="__hidden__"
+ onSelect={() => setUnfolded((was) => !was)}
+ className={cn(!unfolded && hidden.some((v) => v.id === activeViewId) && 'bg-accent/50')}
+ >
+ <EyeOff className="size-4" />
+ <span className="min-w-0 flex-1 truncate">{label}</span>
+ {unfolded ? (
+ <ChevronDown className="size-4 shrink-0" />
+ ) : (
+ <ChevronRight className="size-4 shrink-0 rtl:rotate-180" />
+ )}
+ </CommandItem>
+ {unfolded && items}
+ </CommandGroup>
+ );
+}
diff --git a/apps/web/src/components/layout/MobileViewItem.tsx b/apps/web/src/components/layout/MobileViewItem.tsx
new file mode 100644
index 00000000..9f9d0a9d
--- /dev/null
+++ b/apps/web/src/components/layout/MobileViewItem.tsx
@@ -0,0 +1,30 @@
+import { Check } from 'lucide-react';
+import type { View } from '@/lib/api/endpoints/views';
+import { cn } from '@/lib/utils';
+import { ViewIcon } from '@/utils/viewIcons';
+import { CommandItem } from '@/components/ui/command';
+
+// A saved view in the mobile picker. Its value is the id, not the name — two views may share
+// a name — and the name is passed as a search keyword.
+export default function MobileViewItem({
+ view,
+ active,
+ onSelect,
+}: {
+ view: View;
+ active: boolean;
+ onSelect: (id: number) => void;
+}) {
+ return (
+ <CommandItem
+ value={String(view.id)}
+ keywords={[view.name]}
+ onSelect={() => onSelect(view.id)}
+ className={cn(active && 'bg-accent/50')}
+ >
+ <ViewIcon name={view.icon} className="size-4" />
+ <span className="min-w-0 flex-1 truncate">{view.name}</span>
+ {active && <Check className="size-4 shrink-0" />}
+ </CommandItem>
+ );
+}
diff --git a/apps/web/src/components/layout/MobileViewSwitcher.tsx b/apps/web/src/components/layout/MobileViewSwitcher.tsx
index 6d7b5c22..a64b0804 100644
--- a/apps/web/src/components/layout/MobileViewSwitcher.tsx
+++ b/apps/web/src/components/layout/MobileViewSwitcher.tsx
@@ -13,11 +13,12 @@ import {
CommandList,
} from '@/components/ui/command';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
+import MobileHiddenViews from '@/components/layout/MobileHiddenViews';
+import MobileViewItem from '@/components/layout/MobileViewItem';
// Mobile view picker: the tab strip collapses into a dropdown showing the active
-// view, listing All + saved views (searchable) and a New view action. Item values
-// are ids, not names — two views may share a name — and the name is passed as a
-// search keyword.
+// view, listing All + saved views (searchable) and a New view action. It is given the
+// hidden views too, so it names one opened by its link.
export default function MobileViewSwitcher({
views,
activeViewId,
@@ -34,6 +35,13 @@ export default function MobileViewSwitcher({
const t = useTranslations('views');
const [open, setOpen] = useState(false);
const active = activeViewId != null ? (views.find((v) => v.id === activeViewId) ?? null) : null;
+ const hidden = views.filter((v) => v.hidden);
+
+ function selectView(id: number) {
+ onSelect(id);
+ setOpen(false);
+ }
+
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
@@ -70,23 +78,24 @@ export default function MobileViewSwitcher({
<span className="min-w-0 flex-1 truncate">{t('all')}</span>
{activeViewId === null && <Check className="size-4 shrink-0" />}
</CommandItem>
- {views.map((v) => (
- <CommandItem
- key={v.id}
- value={String(v.id)}
- keywords={[v.name]}
- onSelect={() => {
- onSelect(v.id);
- setOpen(false);
- }}
- className={cn(activeViewId === v.id && 'bg-accent/50')}
- >
- <ViewIcon name={v.icon} className="size-4" />
- <span className="min-w-0 flex-1 truncate">{v.name}</span>
- {activeViewId === v.id && <Check className="size-4 shrink-0" />}
- </CommandItem>
- ))}
+ {views
+ .filter((v) => !v.hidden)
+ .map((v) => (
+ <MobileViewItem
+ key={v.id}
+ view={v}
+ active={v.id === activeViewId}
+ onSelect={selectView}
+ />
+ ))}
</CommandGroup>
+ {hidden.length > 0 && (
+ <MobileHiddenViews
+ hidden={hidden}
+ activeViewId={activeViewId}
+ onSelect={selectView}
+ />
+ )}
{canCreate && (
<CommandGroup>
<CommandItem
diff --git a/apps/web/src/components/layout/SidebarWorkNav.tsx b/apps/web/src/components/layout/SidebarWorkNav.tsx
index c905922e..8cf1a339 100644
--- a/apps/web/src/components/layout/SidebarWorkNav.tsx
+++ b/apps/web/src/components/layout/SidebarWorkNav.tsx
@@ -46,8 +46,7 @@ export default function SidebarWorkNav({
const disabled = !projectKey;
const { data: inboxUnread } = useInboxUnread(projectKey, projectId);
const { data: views } = useViewsQuery(projectKey);
- // A view hidden from the tab row would open with no tab to show it.
- const favorites = views?.filter((v) => v.favorite && !v.hidden) ?? [];
+ const favorites = views?.filter((v) => v.favorite) ?? [];
// "Work items" is the default view: active on the project root and any segment
// that is not one of the other top-level destinations.
diff --git a/apps/web/src/components/layout/TabRowMenu.tsx b/apps/web/src/components/layout/TabRowMenu.tsx
index ef5c11f5..f79ef9b6 100644
--- a/apps/web/src/components/layout/TabRowMenu.tsx
+++ b/apps/web/src/components/layout/TabRowMenu.tsx
@@ -1,22 +1,16 @@
import { useState } from 'react';
-import { Eye, EyeOff, ListOrdered, MoreHorizontal, RotateCcw } from 'lucide-react';
+import { ListOrdered, MoreHorizontal, RotateCcw } from 'lucide-react';
import { useTranslations } from 'next-intl';
-import type { View } from '@/lib/api/endpoints/views';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
-import ViewTabLabel from '@/components/layout/ViewTabLabel';
-// The end of the caller's tab row: the views they hid, to show again, and the row as a
-// whole — back to the project's order, or, for whoever edits views, made the project's.
+// The end of the caller's tab row: the row as a whole, back to the project's order or, for
+// whoever edits views, made the project's.
export default function TabRowMenu({
- hidden,
canPinProjectOrder,
- onShow,
onReset,
onPinProjectOrder,
}: {
- hidden: View[];
canPinProjectOrder: boolean;
- onShow: (view: View) => void;
onReset: () => void;
onPinProjectOrder: () => void;
}) {
@@ -31,34 +25,12 @@ export default function TabRowMenu({
<button
type="button"
title={t('tabRow')}
- className="flex shrink-0 items-center gap-1 rounded-md px-2 py-1 text-sm text-muted-foreground hover:bg-accent hover:text-foreground"
+ className="flex shrink-0 items-center rounded-md px-2 py-1 text-sm text-muted-foreground hover:bg-accent hover:text-foreground"
>
- {hidden.length > 0 ? (
- <>
- <EyeOff className="size-3.5" />
- {t('hiddenViews', { count: hidden.length })}
- </>
- ) : (
- <MoreHorizontal className="size-3.5" />
- )}
+ <MoreHorizontal className="size-3.5" />
</button>
</PopoverTrigger>
<PopoverContent align="start" className="w-64 p-1">
- {hidden.map((view) => (
- <div key={view.id} className="flex items-center gap-2 px-2 py-1 text-sm">
- <span className="flex min-w-0 flex-1 items-center gap-1.5 truncate">
- <ViewTabLabel view={view} />
- </span>
- <button
- type="button"
- onClick={() => onShow(view)}
- className="flex shrink-0 items-center gap-1 rounded px-1.5 py-0.5 text-xs hover:bg-accent"
- >
- <Eye className="size-3" /> {t('show')}
- </button>
- </div>
- ))}
- {hidden.length > 0 && <div className="my-1 border-t" />}
<button
type="button"
title={t('resetTabRowHint')}
diff --git a/apps/web/src/components/layout/ViewTabs.test.tsx b/apps/web/src/components/layout/ViewTabs.test.tsx
index 03126dd2..e369879d 100644
--- a/apps/web/src/components/layout/ViewTabs.test.tsx
+++ b/apps/web/src/components/layout/ViewTabs.test.tsx
@@ -62,6 +62,7 @@ let dom: JSDOM;
let root: Root;
let originalGlobalDescriptors: Map<string, PropertyDescriptor | undefined>;
let duplicated: View[];
+let selected: (number | null)[];
let shown: View[];
// A member whose role only reads views.
@@ -88,7 +89,7 @@ async function render(activeViewId: number, shell = reader) {
views={[mine, board, roadmap]}
projectKey="eng.P01"
activeViewId={activeViewId}
- onSelect={() => {}}
+ onSelect={(id) => selected.push(id)}
onNewView={() => {}}
onEdit={() => {}}
onDelete={() => {}}
@@ -108,6 +109,18 @@ async function render(activeViewId: number, shell = reader) {
);
}
+const hiddenLabel = views.hiddenViews.replace('{count}', '1');
+
+function hiddenViewsButton() {
+ return [...document.querySelectorAll<HTMLElement>('button')].find(
+ (b) => b.textContent?.trim() === hiddenLabel,
+ );
+}
+
+function pickerItems() {
+ return [...document.querySelectorAll<HTMLElement>('[cmdk-item]')];
+}
+
async function openMenu(): Promise<string[]> {
const trigger = document.querySelector<HTMLElement>(`[title="${views.options}"]`);
assert.ok(trigger);
@@ -153,7 +166,9 @@ beforeEach(async () => {
Object.defineProperty(window, '__ITSAPLAN_ENV__', {
value: { apiUrl: 'https://api.test', privacyUrl: '', termsUrl: '' },
});
+ window.HTMLElement.prototype.scrollIntoView = () => {};
duplicated = [];
+ selected = [];
shown = [];
const { createRoot } = await import('react-dom/client');
root = createRoot(document.querySelector('#root')!);
@@ -209,7 +224,7 @@ describe('ViewTabs', () => {
await render(board.id, admin);
const buttons = [...document.querySelectorAll('button')].map((b) => b.textContent?.trim());
assert.ok(!buttons.includes(views.newView));
- assert.ok(buttons.includes(views.hiddenViews.replace('{count}', '1')));
+ assert.ok(buttons.includes(hiddenLabel));
assert.deepEqual(await openMenu(), [views.favorite, views.hide]);
});
@@ -243,26 +258,82 @@ describe('ViewTabs', () => {
assert.deepEqual(items, [views.favorite, views.duplicate, common.edit, common.delete]);
});
- it('keeps the hidden views at the end of the row, to show again', async () => {
+ it('lists the hidden views before New view, to open or to show again', async () => {
await render(board.id);
- const label = views.hiddenViews.replace('{count}', '1');
- const trigger = [...document.querySelectorAll<HTMLElement>('button')].find(
- (b) => b.textContent?.trim() === label,
- );
- assert.ok(trigger);
+ const buttons = [...document.querySelectorAll<HTMLElement>('button')];
+ const trigger = hiddenViewsButton();
+ const newView = buttons.find((b) => b.textContent?.trim() === views.newView);
+ const rowMenu = buttons.find((b) => b.title === views.tabRow);
+ assert.ok(trigger && newView && rowMenu);
+ assert.ok(buttons.indexOf(trigger) < buttons.indexOf(newView));
+ assert.ok(buttons.indexOf(newView) < buttons.indexOf(rowMenu));
+ assert.ok(!trigger.className.includes('bg-secondary'));
+
await act(async () => trigger.click());
const items = [
...document.querySelectorAll<HTMLElement>('[data-slot="popover-content"] button'),
];
assert.deepEqual(
items.map((b) => b.textContent?.trim()),
- [views.show, views.resetTabRow],
+ [roadmap.name, views.show],
);
- await act(async () => items[0].click());
+ await act(async () => items[1].click());
assert.deepEqual(
shown.map((v) => v.id),
[roadmap.id],
);
+ await act(async () => items[0].click());
+ assert.deepEqual(selected, [roadmap.id]);
+ });
+
+ it('marks the hidden views button and the view in its menu while a hidden view is open', async () => {
+ await render(roadmap.id);
+ const trigger = hiddenViewsButton();
+ assert.ok(trigger?.className.includes('bg-secondary'));
+ await act(async () => trigger!.click());
+ const content = document.querySelector('[data-slot="popover-content"]');
+ assert.ok(content?.textContent?.includes(roadmap.name));
+ assert.ok(content?.querySelector('svg.lucide-check'));
+ });
+
+ it('folds the hidden views into the mobile picker, which names one opened by its link', async () => {
+ await render(roadmap.id);
+ assert.equal(document.querySelectorAll(`[title="${views.tabRow}"]`).length, 1);
+ const picker = document.querySelector<HTMLElement>(`[title="${views.switchView}"]`);
+ assert.equal(picker?.textContent?.trim(), roadmap.name);
+ await act(async () => picker!.click());
+ assert.deepEqual(
+ pickerItems().map((item) => item.textContent?.trim()),
+ [views.all, mine.name, board.name, hiddenLabel, views.newView],
+ );
+ await act(async () => pickerItems()[3].click());
+ assert.deepEqual(
+ pickerItems().map((item) => item.textContent?.trim()),
+ [views.all, mine.name, board.name, hiddenLabel, roadmap.name, views.newView],
+ );
+ await act(async () => pickerItems()[4].click());
+ assert.deepEqual(selected, [roadmap.id]);
+ });
+
+ it('finds a hidden view in the mobile picker search, under its own heading', async () => {
+ await render(board.id);
+ await act(async () =>
+ document.querySelector<HTMLElement>(`[title="${views.switchView}"]`)!.click(),
+ );
+ const input = document.querySelector<HTMLInputElement>('[cmdk-input]')!;
+ const setter = Object.getOwnPropertyDescriptor(
+ window.HTMLInputElement.prototype,
+ 'value',
+ )!.set!;
+ await act(async () => {
+ setter.call(input, 'road');
+ input.dispatchEvent(new window.Event('input', { bubbles: true }));
+ });
+ assert.deepEqual(
+ pickerItems().map((item) => item.textContent?.trim()),
+ [roadmap.name],
+ );
+ assert.equal(document.querySelector('[cmdk-group-heading]')?.textContent, hiddenLabel);
});
it("offers whoever edits views to make their row the project's order", async () => {
@@ -272,6 +343,9 @@ describe('ViewTabs', () => {
const items = [
...document.querySelectorAll<HTMLElement>('[data-slot="popover-content"] button'),
];
- assert.ok(items.map((b) => b.textContent?.trim()).includes(views.pinProjectOrder));
+ assert.deepEqual(
+ items.map((b) => b.textContent?.trim()),
+ [views.resetTabRow, views.pinProjectOrder],
+ );
});
});
diff --git a/apps/web/src/components/layout/ViewTabs.tsx b/apps/web/src/components/layout/ViewTabs.tsx
index 2d1bbafe..c91173cf 100644
--- a/apps/web/src/components/layout/ViewTabs.tsx
+++ b/apps/web/src/components/layout/ViewTabs.tsx
@@ -15,6 +15,7 @@ import { useDndSensors, useDroppedOrder } from '@/lib/dnd';
import { usePermissions } from '@/hooks/usePermissions';
import { movedInRow } from '@/services/views.service';
import AllViewTab, { ALL_DROP_ID } from '@/components/layout/AllViewTab';
+import HiddenViewsMenu from '@/components/layout/HiddenViewsMenu';
import MobileViewSwitcher from '@/components/layout/MobileViewSwitcher';
import SavedViewTab from '@/components/layout/SavedViewTab';
import TabRowMenu from '@/components/layout/TabRowMenu';
@@ -26,7 +27,7 @@ import ViewTabLabel from '@/components/layout/ViewTabLabel';
// right, the filter and display toggles. The leading "All" tab is implicit and
// has no filters; it cannot be deleted. The saved tabs are the caller's own tab row, a
// horizontal sortable list — dragging one rearranges it and persists via onArrangeRow, and
-// the views the caller hid are listed in the menu at its end. The filter toggle
+// the views the caller hid are listed in their own menu. The filter toggle
// shows the filter row, which filters the current screen only; onEdit opens the
// edit bar for a view (see WorkItemsPage).
export default function ViewTabs({
@@ -79,9 +80,7 @@ export default function ViewTabs({
// The tab row is kept by anyone who reads the views, members or not.
const tabRowMenu = can('views', 'read') && (
<TabRowMenu
- hidden={hidden}
canPinProjectOrder={canEditView && views.some((v) => !v.isPrivate)}
- onShow={onShow}
onReset={onResetRow}
onPinProjectOrder={onPinProjectOrder}
/>
@@ -115,14 +114,12 @@ export default function ViewTabs({
{/* Mobile: views collapse into a dropdown (no drag reorder there). */}
<div className="flex min-w-0 flex-1 items-center sm:hidden">
<MobileViewSwitcher
- views={row}
+ views={shown}
activeViewId={activeViewId}
canCreate={canCreateView}
onSelect={onSelect}
onNewView={onNewView}
/>
- {/* A phone does not drag, but it shows the hidden views and resets the row. */}
- {tabRowMenu}
</div>
{/* Desktop: the scrollable, reorderable tab strip. */}
@@ -175,6 +172,14 @@ export default function ViewTabs({
</DragOverlay>
</DndContext>
+ {hidden.length > 0 && (
+ <HiddenViewsMenu
+ hidden={hidden}
+ activeViewId={activeViewId}
+ onSelect={onSelect}
+ onShow={onShow}
+ />
+ )}
{canCreateView && (
<button
type="button"