Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(crm): keep split controls out of the narrow CRM navigation menu (#8314)

gbirmand8ad203988df
diff --git a/apps/web/src/features/crm/components/crm-sidebar.test.tsx b/apps/web/src/features/crm/components/crm-sidebar.test.tsx
new file mode 100644
index 0000000000..356e93e0d2
--- /dev/null
+++ b/apps/web/src/features/crm/components/crm-sidebar.test.tsx
@@ -0,0 +1,66 @@
+import { SplitPanelControllerProvider } from '@components/app/split-panel';
+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
+import { afterEach, expect, it, vi } from 'vitest';
+import { CrmSidebar } from './crm-sidebar';
+
+vi.mock('@core/mobile/isTouchDevice', () => ({ isTouchDevice: () => false }));
+vi.mock('@solid-primitives/resize-observer', () => ({
+ createResizeObserver: () => {},
+}));
+
+const close = vi.fn();
+
+afterEach(() => {
+ cleanup();
+ close.mockReset();
+});
+
+function renderSidebar(onCollapse?: () => void) {
+ render(() => (
+ <SplitPanelControllerProvider
+ controller={{
+ canGoBack: () => false,
+ goBack: () => {},
+ canGoForward: () => false,
+ goForward: () => {},
+ canClose: () => true,
+ close,
+ }}
+ >
+ <CrmSidebar
+ active="active"
+ lists={[]}
+ listsEnabled={false}
+ listsLoading={false}
+ listsError={false}
+ canCreateList
+ onNavigate={() => {}}
+ onCreateCompany={() => {}}
+ onCreateContact={() => {}}
+ onNewList={() => {}}
+ onImport={() => {}}
+ onExport={() => {}}
+ onSettings={() => {}}
+ onCollapse={onCollapse}
+ />
+ </SplitPanelControllerProvider>
+ ));
+}
+
+it('closes the split and collapses from the docked sidebar header', () => {
+ const collapse = vi.fn();
+ renderSidebar(collapse);
+ fireEvent.click(screen.getByRole('button', { name: 'Collapse CRM sidebar' }));
+ expect(collapse).toHaveBeenCalledOnce();
+ fireEvent.click(screen.getByRole('button', { name: 'Close' }));
+ expect(close).toHaveBeenCalledOnce();
+});
+
+it('leaves split controls to the split header inside the navigation menu', () => {
+ renderSidebar();
+ expect(screen.getByText('Customers')).toBeTruthy();
+ expect(
+ screen.queryByRole('button', { name: 'Collapse CRM sidebar' })
+ ).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Close' })).toBeNull();
+});
diff --git a/apps/web/src/features/crm/components/crm-sidebar.tsx b/apps/web/src/features/crm/components/crm-sidebar.tsx
index 00a3918a5d..62a73c7876 100644
--- a/apps/web/src/features/crm/components/crm-sidebar.tsx
+++ b/apps/web/src/features/crm/components/crm-sidebar.tsx
@@ -36,7 +36,11 @@ export function CrmSidebar(props: {
onImport: () => void;
onExport: () => void;
onSettings: () => void;
- onCollapse: () => void;
+ /**
+ * Collapses the docked sidebar. The narrow navigation menu omits it, along
+ * with the split close, which stays in the split header beside the menu.
+ */
+ onCollapse?: () => void;
}) {
const [recordsOpen, setRecordsOpen] = createSignal(true);
const [listsOpen, setListsOpen] = createSignal(true);
@@ -46,19 +50,23 @@ export function CrmSidebar(props: {
<Show when={!isTouchDevice()}>
<ViewSidebar.Header>
<div class="flex min-w-0 items-center gap-1">
- <ViewSidebar.CloseButton class="shrink-0" />
+ <Show when={props.onCollapse}>
+ <ViewSidebar.CloseButton class="shrink-0" />
+ </Show>
<ViewSidebar.Title>Customers</ViewSidebar.Title>
</div>
- <Tooltip label="Collapse CRM sidebar">
- <Button
- variant="ghost"
- size="icon-sm"
- label="Collapse CRM sidebar"
- onClick={props.onCollapse}
- >
- <SidebarIcon class="size-4" />
- </Button>
- </Tooltip>
+ <Show when={props.onCollapse}>
+ <Tooltip label="Collapse CRM sidebar">
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ label="Collapse CRM sidebar"
+ onClick={props.onCollapse}
+ >
+ <SidebarIcon class="size-4" />
+ </Button>
+ </Tooltip>
+ </Show>
</ViewSidebar.Header>
</Show>
<ViewSidebar.Primary ref={tourTarget(COMPANIES_TOUR.create)}>
diff --git a/apps/web/src/features/crm/views/crm-workspace.test.tsx b/apps/web/src/features/crm/views/crm-workspace.test.tsx
index 7c2450c21f..d5468dd8b1 100644
--- a/apps/web/src/features/crm/views/crm-workspace.test.tsx
+++ b/apps/web/src/features/crm/views/crm-workspace.test.tsx
@@ -145,12 +145,14 @@ vi.mock('../components/crm-sidebar', () => ({
CrmSidebar: (props: {
pipelines?: JSX.Element;
onNavigate: (id: string) => void;
- onCollapse: () => void;
+ onCollapse?: () => void;
}) => (
<nav aria-label="CRM sidebar">
- <button type="button" onClick={props.onCollapse}>
- Collapse CRM sidebar
- </button>
+ <Show when={props.onCollapse}>
+ <button type="button" onClick={props.onCollapse}>
+ Collapse CRM sidebar
+ </button>
+ </Show>
<button type="button" onClick={() => props.onNavigate('active')}>
Companies
</button>
@@ -345,16 +347,21 @@ it('shows a pipeline another view asks for, in place of an open record', () => {
expect(screen.queryByText('Sales record company:acme')).toBeNull();
});
-it('closes the narrow navigation menu on collapse without saving the preference', () => {
+it('keeps the split close in the header and offers no collapse in the narrow navigation menu', () => {
fixture.touch = false;
fixture.narrow = true;
setup('pipeline:sales');
- const collapses = () =>
- screen.getAllByRole('button', { name: 'Collapse CRM sidebar' });
- fireEvent.click(screen.getByRole('button', { name: 'Show CRM navigation' }));
- expect(collapses()).toHaveLength(2);
- fireEvent.click(collapses()[1]!);
- expect(collapses()).toHaveLength(1);
+ const trigger = screen.getByRole('button', { name: 'Show CRM navigation' });
+ expect(
+ screen.getByRole('button', { name: 'Close split' }).nextElementSibling
+ ).toBe(trigger.parentElement);
+ fireEvent.click(trigger);
+ expect(
+ screen.getAllByRole('navigation', { name: 'CRM sidebar' })
+ ).toHaveLength(2);
+ expect(
+ screen.getAllByRole('button', { name: 'Collapse CRM sidebar' })
+ ).toHaveLength(1);
expect(fixture.setCollapsed).not.toHaveBeenCalled();
});
diff --git a/apps/web/src/features/crm/views/crm-workspace.tsx b/apps/web/src/features/crm/views/crm-workspace.tsx
index e31b4a7d4d..5ecf3fe68e 100644
--- a/apps/web/src/features/crm/views/crm-workspace.tsx
+++ b/apps/web/src/features/crm/views/crm-workspace.tsx
@@ -61,7 +61,7 @@ import {
function NavigationToggle(props: {
onExpand: () => void;
- children: (close: () => void) => JSX.Element;
+ children: JSX.Element;
}) {
const shell = useViewShell();
const [open, setOpen] = createSignal(false);
@@ -109,7 +109,7 @@ function NavigationToggle(props: {
setOpen(false);
}}
>
- {props.children(() => setOpen(false))}
+ {props.children}
</div>
</Dropdown.Content>
</Dropdown>
@@ -369,7 +369,7 @@ export function CrmWorkspaceView(props: {
onMount(() => {
if (!listsEnabled() && active().startsWith('list:')) navigate('active');
});
- const sidebar = (onCollapse: () => void = () => setCollapsed(true)) => (
+ const sidebar = (onCollapse?: () => void) => (
<CrmSidebar
pipelines={
<Show when={pipelinesEnabled()}>
@@ -419,7 +419,7 @@ export function CrmWorkspaceView(props: {
<Suspense
fallback={<div class="p-4 text-sm text-ink-muted">Loading CRM…</div>}
>
- {sidebar()}
+ {sidebar(() => setCollapsed(true))}
</Suspense>
</ViewShell.Aside>
<ViewShell.Main>
@@ -458,7 +458,7 @@ export function CrmWorkspaceView(props: {
onOpenPipeline={selectPipeline}
navigation={
<NavigationToggle onExpand={() => setCollapsed(false)}>
- {(close) => <Suspense>{sidebar(close)}</Suspense>}
+ <Suspense>{sidebar()}</Suspense>
</NavigationToggle>
}
/>
@@ -488,7 +488,7 @@ export function CrmWorkspaceView(props: {
navigation={
<Show when={!isTouchDevice()}>
<NavigationToggle onExpand={() => setCollapsed(false)}>
- {(close) => <Suspense>{sidebar(close)}</Suspense>}
+ <Suspense>{sidebar()}</Suspense>
</NavigationToggle>
</Show>
}
@@ -516,7 +516,7 @@ export function CrmWorkspaceView(props: {
<Show when={!isTouchDevice()}>
<div class="flex h-12 shrink-0 items-center gap-3 px-4">
<NavigationToggle onExpand={() => setCollapsed(false)}>
- {(close) => <Suspense>{sidebar(close)}</Suspense>}
+ <Suspense>{sidebar()}</Suspense>
</NavigationToggle>
<h1
class="flex h-7 min-w-0 flex-1 items-center px-1 text-sm font-semibold tracking-[-0.03em]"
diff --git a/docs/agent-guide/crm.md b/docs/agent-guide/crm.md
index 8289aac393..9fe9399396 100644
--- a/docs/agent-guide/crm.md
+++ b/docs/agent-guide/crm.md
@@ -161,10 +161,12 @@ the entity actions menu and command menu with stage requests delayed; cancel the
editors without changing hosted data.
`Collapse CRM sidebar` persists across visits; `Expand CRM sidebar` restores it.
-At narrow widths, `Show CRM navigation` opens the same navigation in a menu;
-`Collapse CRM sidebar` there closes the menu and leaves the saved preference alone.
-While the sidebar is collapsed, the split's **Close** sits before either toggle,
-including on a pipeline, and stays hidden when the split cannot close.
+At narrow widths, `Show CRM navigation` opens the same navigation in a menu
+without **Close** or `Collapse CRM sidebar`; picking a destination or clicking
+outside closes it.
+While the sidebar is collapsed or shown as a menu, the split's **Close** sits
+before either toggle, including on a pipeline, and stays hidden when the split
+cannot close.
The sidebar's Records and Lists sections can also collapse independently.
**Pipelines** in the CRM sidebar hold company or contact entries in the shared