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.

feat(crm): open CRM settings inside the Customers pane (#8447)

gbirman631cce37864a
diff --git a/apps/web/src/features/crm/components/crm-sidebar.tsx b/apps/web/src/features/crm/components/crm-sidebar.tsx
index 62a73c7876..782096c7f5 100644
--- a/apps/web/src/features/crm/components/crm-sidebar.tsx
+++ b/apps/web/src/features/crm/components/crm-sidebar.tsx
@@ -19,7 +19,7 @@ import { CrmCreateMenu } from './crm-create-menu';
const RECORD_ICONS = { active: BuildingsIcon, people: UsersIcon };
export function CrmSidebar(props: {
- /** The highlighted record type, list, or pipeline. */
+ /** The highlighted record type, list, pipeline, or `settings`. */
active: string;
pipelines?: JSX.Element;
lists: { id: string; name: string; count: number }[];
@@ -182,7 +182,10 @@ export function CrmSidebar(props: {
</ViewSidebar.Icon>
Export
</ViewSidebar.Item>
- <ViewSidebar.Item onClick={props.onSettings}>
+ <ViewSidebar.Item
+ active={props.active === 'settings'}
+ onClick={props.onSettings}
+ >
<ViewSidebar.Icon>
<GearIcon class="size-4" />
</ViewSidebar.Icon>
diff --git a/apps/web/src/features/crm/context/workspace-context.tsx b/apps/web/src/features/crm/context/workspace-context.tsx
index a26e196529..32e35c80ee 100644
--- a/apps/web/src/features/crm/context/workspace-context.tsx
+++ b/apps/web/src/features/crm/context/workspace-context.tsx
@@ -43,7 +43,12 @@ export type CrmWorkspace = {
focus(): void;
captureEntryState(): void;
openCompany(entity: EntityData, newSplit: boolean): void;
- openSettings(): void;
+ /** CRM settings, shown in the workspace over its list or record. */
+ settings: {
+ isOpen: Accessor<boolean>;
+ open(): void;
+ close(): void;
+ };
openTeamSettings(): void;
record: CrmRecordNavigation;
};
diff --git a/apps/web/src/features/crm/primitives/settings-page.ts b/apps/web/src/features/crm/primitives/settings-page.ts
new file mode 100644
index 0000000000..c9d91c548d
--- /dev/null
+++ b/apps/web/src/features/crm/primitives/settings-page.ts
@@ -0,0 +1,22 @@
+import {
+ type Accessor,
+ createEffect,
+ createMemo,
+ createSignal,
+ on,
+} from 'solid-js';
+
+/**
+ * CRM settings shown over a workspace location (a list, pipeline, or record).
+ * Any navigation to another location, including browser Back, leaves them.
+ */
+export function createSettingsPage(location: Accessor<string>) {
+ const [isOpen, setOpen] = createSignal(false);
+ const current = createMemo(location);
+ createEffect(on(current, () => setOpen(false), { defer: true }));
+ return {
+ isOpen,
+ open: () => setOpen(true),
+ close: () => setOpen(false),
+ };
+}
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 09bdc7e238..30e01d376f 100644
--- a/apps/web/src/features/crm/views/crm-workspace.test.tsx
+++ b/apps/web/src/features/crm/views/crm-workspace.test.tsx
@@ -7,6 +7,7 @@ import {
} from '@solidjs/testing-library';
import { createSignal, For, type JSX, type ParentProps, Show } from 'solid-js';
import { afterEach, expect, it, vi } from 'vitest';
+import { createSettingsPage } from '../primitives/settings-page';
import { CrmWorkspaceView } from './crm-workspace';
const fixture = vi.hoisted(() => ({
@@ -145,6 +146,7 @@ vi.mock('../components/crm-sidebar', () => ({
CrmSidebar: (props: {
pipelines?: JSX.Element;
onNavigate: (id: string) => void;
+ onSettings: () => void;
onCollapse?: () => void;
}) => (
<nav aria-label="CRM sidebar">
@@ -160,6 +162,9 @@ vi.mock('../components/crm-sidebar', () => ({
People
</button>
{props.pipelines}
+ <button type="button" onClick={props.onSettings}>
+ CRM settings
+ </button>
</nav>
),
}));
@@ -191,6 +196,7 @@ vi.mock('./record-detail', () => ({
</div>
),
}));
+vi.mock('./crm-settings', () => ({ Crm: () => <div>Stage settings</div> }));
vi.mock('./export-companies', () => ({ CrmExport: () => null }));
vi.mock('./import-companies', () => ({ CrmImport: () => null }));
vi.mock('./pipeline', () => ({
@@ -284,6 +290,9 @@ function setup(initialTab = 'active') {
setTab(tab);
};
const captureEntryState = vi.fn();
+ const settings = createSettingsPage(() =>
+ [activeTab(), ...records().map((record) => record.id)].join(' ')
+ );
fixture.workspace = {
activeTab,
setActiveTab,
@@ -291,6 +300,7 @@ function setup(initialTab = 'active') {
scopeId: 'crm',
isActive: () => true,
captureEntryState,
+ settings,
record,
},
source: {},
@@ -419,3 +429,40 @@ it('shows another tab’s list in place of an open record without closing it fir
expect(activeTab()).toBe('people');
expect(screen.getByText('Record list')).toBeTruthy();
});
+
+it('shows CRM settings in place of an open record and returns to it', () => {
+ fixture.touch = false;
+ const { record } = setup('pipeline:sales');
+ fireEvent.click(screen.getByRole('button', { name: 'Open Acme' }));
+ fireEvent.click(screen.getByRole('button', { name: 'CRM settings' }));
+ expect(screen.getByText('Stage settings')).toBeTruthy();
+ expect(screen.queryByText('Sales record company:acme')).toBeNull();
+ fireEvent.click(screen.getByRole('button', { name: 'Close CRM settings' }));
+ expect(screen.queryByText('Stage settings')).toBeNull();
+ expect(screen.getByText('Sales record company:acme')).toBeTruthy();
+ expect(record.close).not.toHaveBeenCalled();
+});
+
+it('leaves CRM settings for the list picked in the sidebar, including the current one', () => {
+ fixture.touch = false;
+ const { activeTab } = setup();
+ fireEvent.click(screen.getByRole('button', { name: 'CRM settings' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Companies' }));
+ expect(screen.queryByText('Stage settings')).toBeNull();
+ expect(screen.getByText('Record list')).toBeTruthy();
+ fireEvent.click(screen.getByRole('button', { name: 'CRM settings' }));
+ fireEvent.click(screen.getByRole('button', { name: 'People' }));
+ expect(activeTab()).toBe('people');
+ expect(screen.queryByText('Stage settings')).toBeNull();
+});
+
+it('leaves CRM settings when the route moves elsewhere, as on Back', () => {
+ fixture.touch = false;
+ const { record } = setup('pipeline:sales');
+ fireEvent.click(screen.getByRole('button', { name: 'CRM settings' }));
+ record.open([{ type: 'company', id: 'acme', name: '' }]);
+ expect(screen.queryByText('Stage settings')).toBeNull();
+ expect(screen.getByText('Sales record company:acme')).toBeTruthy();
+ record.close();
+ expect(screen.getByText('Sales table')).toBeTruthy();
+});
diff --git a/apps/web/src/features/crm/views/crm-workspace.tsx b/apps/web/src/features/crm/views/crm-workspace.tsx
index 94c6fc8f71..03bd4d5ff0 100644
--- a/apps/web/src/features/crm/views/crm-workspace.tsx
+++ b/apps/web/src/features/crm/views/crm-workspace.tsx
@@ -24,6 +24,7 @@ import {
isCrmCompanyEntity,
isCrmContactEntity,
} from '@entity';
+import ArrowLeftIcon from '@phosphor/arrow-left.svg';
import ListIcon from '@phosphor/list.svg';
import PlusIcon from '@phosphor/plus.svg';
import { Button, Dropdown, Tooltip } from '@ui';
@@ -48,6 +49,7 @@ import { CRM_RECORDS, pipelineIdOfTab, pipelineTab } from '../core/navigation';
import type { CrmRecordRef } from '../core/record';
import { createCrmExportLoader } from '../primitives/export-source';
import { useApplyCrmView } from './apply-view';
+import { Crm as CrmSettings } from './crm-settings';
import { CrmExport } from './export-companies';
import { CrmImport } from './import-companies';
import { PipelineView } from './pipeline';
@@ -217,6 +219,7 @@ export function CrmWorkspaceView(props: {
copyPipelineLink,
} = useCrmContext();
const view = useCrmWorkspace();
+ const settings = view.host.settings;
const { openWithSplit } = useCrmContext().createNavigation();
const records = view.host.record.records;
const recordOpen = () => records().length > 0;
@@ -267,6 +270,7 @@ export function CrmWorkspaceView(props: {
pipelines.pipelines().find((pipeline) => pipeline.id === pipelineId());
// Another tab's list replaces an open record; the same tab returns to its list.
const selectPipeline = (id: string) => {
+ settings.close();
if (pipelineTab(id) === view.activeTab()) view.host.record.close();
else view.setActiveTab(pipelineTab(id));
};
@@ -315,6 +319,7 @@ export function CrmWorkspaceView(props: {
CRM_RECORDS.find((record) => record.id === activeRecord())?.label ??
'Companies';
const navigate = (id: string) => {
+ settings.close();
if (!listsEnabled() && id.startsWith('list:')) id = 'active';
if (id !== 'people' && !id.startsWith('list:')) id = 'active';
if (id === active()) view.host.record.close();
@@ -357,7 +362,7 @@ export function CrmWorkspaceView(props: {
<Show when={pipelinesEnabled()}>
<PipelineSidebar
pipelines={pipelines.pipelines()}
- activeId={pipelineId()}
+ activeId={settings.isOpen() ? undefined : pipelineId()}
loading={pipelines.loading()}
error={pipelines.error()}
canCreate={canCreatePipeline()}
@@ -367,7 +372,7 @@ export function CrmWorkspaceView(props: {
/>
</Show>
}
- active={activeRecord()}
+ active={settings.isOpen() ? 'settings' : activeRecord()}
lists={lists.lists().map((list) => ({
id: list.id,
name: list.name,
@@ -391,7 +396,7 @@ export function CrmWorkspaceView(props: {
onNewList={() => setEditing({ name: '', companyIds: [] })}
onImport={() => setImporting(true)}
onExport={() => setExporting(true)}
- onSettings={view.host.openSettings}
+ onSettings={settings.open}
onCollapse={onCollapse}
/>
);
@@ -405,170 +410,205 @@ export function CrmWorkspaceView(props: {
</Suspense>
</ViewShell.Aside>
<ViewShell.Main>
- <Show when={isTouchDevice() && !recordOpen()}>
- <ViewShell.Header>
- <CrmMobileTabs
- active={activeRecord()}
- pipelines={pipelinesEnabled() ? pipelines.pipelines() : []}
- lists={listsEnabled() ? lists.lists() : []}
- onNavigate={(id) => {
- const pipeline = pipelineIdOfTab(id);
- if (pipeline) selectPipeline(pipeline);
- else navigate(id);
- }}
- leading={
- <Show when={!peopleActive() && !pipelineId()}>
- <Suspense>
- <MobileFilterDrawer />
- </Suspense>
- </Show>
- }
- />
- </ViewShell.Header>
- <Show when={!peopleActive() && !pipelineId()}>
- <Suspense>
- <SoupFiltersBar />
- </Suspense>
- </Show>
- </Show>
- <Show when={recordOpen()}>
- <CrmRecordDetail
- records={records()}
- section={view.host.record.section()}
- commentTarget={view.host.record.commentTarget()}
- viewName={activePipeline()?.name ?? title()}
- onOpen={view.host.record.open}
- onSectionChange={view.host.record.setSection}
- onClose={view.host.record.close}
- onOpenPipeline={selectPipeline}
- navigation={
- <NavigationToggle onExpand={() => setCollapsed(false)}>
- <Suspense>{sidebar()}</Suspense>
- </NavigationToggle>
- }
- />
- </Show>
- <Show when={!recordOpen() && pipelineId()} keyed>
- {(id) => (
- <Show when={activePipeline()}>
- {(pipeline) => (
- <PipelineView
- pipeline={pipeline()}
- source={pipelines}
- transfer={{
- source: useCrmContext().createPipelineTransfer(pipeline()),
- downloadCsv: useCrmContext().downloadCsv,
- }}
- Sharing={useCrmContext().PipelineSharing}
- Editor={PipelineEditor}
- onCopyLink={() => copyPipelineLink(id)}
- onTrashed={() => navigate('active')}
- onOpenRecord={openPipelineRecord}
- navigation={
- <Show when={!isTouchDevice()}>
- <NavigationToggle onExpand={() => setCollapsed(false)}>
- <Suspense>{sidebar()}</Suspense>
- </NavigationToggle>
- </Show>
- }
- />
- )}
- </Show>
- )}
- </Show>
- <Show when={pipelineId() && !activePipeline()}>
- <div class="flex flex-col items-start gap-3 p-6 text-sm text-ink-muted">
- <p>
- {pipelines.loading()
- ? 'Loading pipeline…'
- : pipelines.error()
- ? 'Could not load this pipeline.'
- : 'This pipeline is unavailable or you no longer have access.'}
- </p>
- <Button variant="ghost" onClick={() => navigate('active')}>
- Back to companies
- </Button>
- </div>
- </Show>
- <Show when={!recordOpen() && !pipelineId()}>
- <Show when={!isTouchDevice() || peopleActive()}>
- <Show when={!isTouchDevice()}>
- <div class="flex h-12 shrink-0 items-center gap-3 px-4">
+ <Show
+ when={!settings.isOpen()}
+ fallback={
+ <>
+ <div class="flex h-12 min-w-0 shrink-0 items-center gap-3 px-4 touch:h-auto touch:min-h-12 touch:pt-[calc(var(--mobile-content-inset-top,var(--safe-top,0px))+0.5rem)] touch:pb-2">
<NavigationToggle onExpand={() => setCollapsed(false)}>
<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]"
- title={title()}
- >
- <span class="truncate">{title()}</span>
+ <Tooltip label="Back">
+ <Button
+ variant="ghost"
+ size="icon-sm"
+ label="Close CRM settings"
+ onClick={settings.close}
+ >
+ <ArrowLeftIcon class="size-4" />
+ </Button>
+ </Tooltip>
+ <h1 class="flex h-7 min-w-0 flex-1 items-center text-sm font-semibold tracking-[-0.03em]">
+ <span class="truncate">CRM settings</span>
</h1>
</div>
- </Show>
- <Show
- when={!peopleActive()}
- fallback={
- <ViewShell.Header class="touch:pt-0">
- <div class="flex min-w-0 items-center justify-between gap-3">
- <PeopleSearchBar />
- <Button
- variant="outline"
- class="ml-auto shrink-0"
- onClick={() => openCreateContactModal()}
- >
- <PlusIcon class="size-4" />
- New contact
- </Button>
- </div>
- </ViewShell.Header>
- }
- >
- <ViewShell.Header>
- <div class="flex min-w-0 items-center justify-between gap-3">
- <CrmSearchBar />
- <div class="ml-auto flex shrink-0 items-center gap-2 [&_button]:h-8 [&_button]:min-w-8 [&_button>svg]:size-4!">
- <SoupViewContextSort />
- <SoupViewContextGroup hideLabel variant="ghost" />
- <UnifiedFilterDropdown hideLabel variant="ghost" />
- <CompanyDisplayMenu />
+ {/* The header above already clears the status bar on touch. */}
+ <div class="min-h-0 min-w-0 flex-1 [--mobile-content-inset-top:0px]">
+ <CrmSettings />
+ </div>
+ </>
+ }
+ >
+ <Show when={isTouchDevice() && !recordOpen()}>
+ <ViewShell.Header>
+ <CrmMobileTabs
+ active={activeRecord()}
+ pipelines={pipelinesEnabled() ? pipelines.pipelines() : []}
+ lists={listsEnabled() ? lists.lists() : []}
+ onNavigate={(id) => {
+ const pipeline = pipelineIdOfTab(id);
+ if (pipeline) selectPipeline(pipeline);
+ else navigate(id);
+ }}
+ leading={
+ <Show when={!peopleActive() && !pipelineId()}>
<Suspense>
- <CompanyViewsMenu hideLabel />
+ <MobileFilterDrawer />
</Suspense>
- <Show when={listsEnabled() && activeList()}>
- {(list) => (
- <Button
- variant="ghost"
- size="sm"
- onClick={() =>
- setEditing({
- id: list().id,
- name: list().name,
- companyIds: [...list().config.companyIds],
- })
- }
- >
- Edit list
- </Button>
- )}
- </Show>
- <Button variant="outline" onClick={openCreateCompanyModal}>
- <PlusIcon />
- New company
- </Button>
- </div>
- </div>
- </ViewShell.Header>
+ </Show>
+ }
+ />
+ </ViewShell.Header>
+ <Show when={!peopleActive() && !pipelineId()}>
<Suspense>
- <CrmFilterChips onReset={() => navigate(active())} />
+ <SoupFiltersBar />
</Suspense>
</Show>
</Show>
- {/* The header above already clears the status bar on touch. */}
- <div class="flex min-h-0 min-w-0 flex-1 flex-col [--mobile-content-inset-top:0px]">
- {props.children({
- onOpenEntity: isTouchDevice() ? undefined : openRecord,
- })}
- </div>
+ <Show when={recordOpen()}>
+ <CrmRecordDetail
+ records={records()}
+ section={view.host.record.section()}
+ commentTarget={view.host.record.commentTarget()}
+ viewName={activePipeline()?.name ?? title()}
+ onOpen={view.host.record.open}
+ onSectionChange={view.host.record.setSection}
+ onClose={view.host.record.close}
+ onOpenPipeline={selectPipeline}
+ navigation={
+ <NavigationToggle onExpand={() => setCollapsed(false)}>
+ <Suspense>{sidebar()}</Suspense>
+ </NavigationToggle>
+ }
+ />
+ </Show>
+ <Show when={!recordOpen() && pipelineId()} keyed>
+ {(id) => (
+ <Show when={activePipeline()}>
+ {(pipeline) => (
+ <PipelineView
+ pipeline={pipeline()}
+ source={pipelines}
+ transfer={{
+ source: useCrmContext().createPipelineTransfer(
+ pipeline()
+ ),
+ downloadCsv: useCrmContext().downloadCsv,
+ }}
+ Sharing={useCrmContext().PipelineSharing}
+ Editor={PipelineEditor}
+ onCopyLink={() => copyPipelineLink(id)}
+ onTrashed={() => navigate('active')}
+ onOpenRecord={openPipelineRecord}
+ navigation={
+ <Show when={!isTouchDevice()}>
+ <NavigationToggle onExpand={() => setCollapsed(false)}>
+ <Suspense>{sidebar()}</Suspense>
+ </NavigationToggle>
+ </Show>
+ }
+ />
+ )}
+ </Show>
+ )}
+ </Show>
+ <Show when={pipelineId() && !activePipeline()}>
+ <div class="flex flex-col items-start gap-3 p-6 text-sm text-ink-muted">
+ <p>
+ {pipelines.loading()
+ ? 'Loading pipeline…'
+ : pipelines.error()
+ ? 'Could not load this pipeline.'
+ : 'This pipeline is unavailable or you no longer have access.'}
+ </p>
+ <Button variant="ghost" onClick={() => navigate('active')}>
+ Back to companies
+ </Button>
+ </div>
+ </Show>
+ <Show when={!recordOpen() && !pipelineId()}>
+ <Show when={!isTouchDevice() || peopleActive()}>
+ <Show when={!isTouchDevice()}>
+ <div class="flex h-12 shrink-0 items-center gap-3 px-4">
+ <NavigationToggle onExpand={() => setCollapsed(false)}>
+ <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]"
+ title={title()}
+ >
+ <span class="truncate">{title()}</span>
+ </h1>
+ </div>
+ </Show>
+ <Show
+ when={!peopleActive()}
+ fallback={
+ <ViewShell.Header class="touch:pt-0">
+ <div class="flex min-w-0 items-center justify-between gap-3">
+ <PeopleSearchBar />
+ <Button
+ variant="outline"
+ class="ml-auto shrink-0"
+ onClick={() => openCreateContactModal()}
+ >
+ <PlusIcon class="size-4" />
+ New contact
+ </Button>
+ </div>
+ </ViewShell.Header>
+ }
+ >
+ <ViewShell.Header>
+ <div class="flex min-w-0 items-center justify-between gap-3">
+ <CrmSearchBar />
+ <div class="ml-auto flex shrink-0 items-center gap-2 [&_button]:h-8 [&_button]:min-w-8 [&_button>svg]:size-4!">
+ <SoupViewContextSort />
+ <SoupViewContextGroup hideLabel variant="ghost" />
+ <UnifiedFilterDropdown hideLabel variant="ghost" />
+ <CompanyDisplayMenu />
+ <Suspense>
+ <CompanyViewsMenu hideLabel />
+ </Suspense>
+ <Show when={listsEnabled() && activeList()}>
+ {(list) => (
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() =>
+ setEditing({
+ id: list().id,
+ name: list().name,
+ companyIds: [...list().config.companyIds],
+ })
+ }
+ >
+ Edit list
+ </Button>
+ )}
+ </Show>
+ <Button
+ variant="outline"
+ onClick={openCreateCompanyModal}
+ >
+ <PlusIcon />
+ New company
+ </Button>
+ </div>
+ </div>
+ </ViewShell.Header>
+ <Suspense>
+ <CrmFilterChips onReset={() => navigate(active())} />
+ </Suspense>
+ </Show>
+ </Show>
+ {/* The header above already clears the status bar on touch. */}
+ <div class="flex min-h-0 min-w-0 flex-1 flex-col [--mobile-content-inset-top:0px]">
+ {props.children({
+ onOpenEntity: isTouchDevice() ? undefined : openRecord,
+ })}
+ </div>
+ </Show>
</Show>
</ViewShell.Main>
<Show when={creatingPipeline() && canCreatePipeline()}>
diff --git a/apps/web/src/features/crm/views/empty-state.tsx b/apps/web/src/features/crm/views/empty-state.tsx
index e104d0d983..f4ccf0009f 100644
--- a/apps/web/src/features/crm/views/empty-state.tsx
+++ b/apps/web/src/features/crm/views/empty-state.tsx
@@ -43,7 +43,7 @@ export function CrmEmptyState() {
isTeamAdmin()
? {
label: 'Open CRM settings',
- onClick: () => host.openSettings(),
+ onClick: () => host.settings.open(),
}
: undefined
}
diff --git a/apps/web/src/features/crm/workspace-adapter.tsx b/apps/web/src/features/crm/workspace-adapter.tsx
index 947e3a8af3..5d6dcf1166 100644
--- a/apps/web/src/features/crm/workspace-adapter.tsx
+++ b/apps/web/src/features/crm/workspace-adapter.tsx
@@ -23,6 +23,7 @@ import type { CrmRoute, CrmWorkspace } from './context/workspace-context';
import type { CrmViewConfig } from './core/saved-view';
import { createCrmCollectionFilters } from './filter-adapter';
import { COMPANY_GROUP_OPTIONS } from './group-options';
+import { createSettingsPage } from './primitives/settings-page';
// The filter context lands in cached soup query meta, so its stage resolvers
// close over the deal stages only, never this workspace's scope (see "Query
@@ -278,6 +279,14 @@ export function createCrmWorkspace(
state.context.setActiveTab = wrappedSetActiveTab;
const { openSettings } = useSettingsState();
+ const settings = createSettingsPage(() =>
+ [
+ route.tab(),
+ ...route.records().map((record) => `${record.type}:${record.id}`),
+ route.section() ?? '',
+ route.commentTarget()?.seek ?? '',
+ ].join(' ')
+ );
const context: CrmWorkspace = {
...soupView,
setActiveTab: wrappedSetActiveTab,
@@ -296,7 +305,14 @@ export function createCrmWorkspace(
'open-entity-in-split'
);
},
- openSettings: () => openSettings('CRM'),
+ settings: {
+ ...settings,
+ open: () => {
+ // The list unmounts; its entry keeps the scroll position for the return.
+ panel.handle.captureEntryState();
+ settings.open();
+ },
+ },
openTeamSettings: () => openSettings('Team'),
record: route,
},
diff --git a/docs/agent-guide/crm.md b/docs/agent-guide/crm.md
index cb5a719ba6..8caf7fd3e9 100644
--- a/docs/agent-guide/crm.md
+++ b/docs/agent-guide/crm.md
@@ -205,8 +205,8 @@ The sidebar's Records and Lists sections can also collapse independently.
records editor. They have their own identity, ownership and sharing; their
storage does not appear as a separate database in navigation.
**New pipeline** is disabled until the team's CRM is enabled. For a new team,
-use **Open CRM settings** in the empty state to enable CRM, then return to
-Customers to create a pipeline. Verify this with a newly created team as well as
+use **Open CRM settings** in the empty state to enable CRM, then use the back
+arrow to return to Customers and create a pipeline. Verify this with a newly created team as well as
an existing CRM-enabled team.
Choose **New pipeline**, enter a name in the dialog's first row, pick
**Companies** (the default) or **Contacts** from the record-type pill, and tick
@@ -315,8 +315,14 @@ value (missing Stage options are added; owners match by email) and offers **Open
pipeline** after. If that step fails, importing again reuses the same pipeline
and adds only missing rows. A pipeline's own **Import CSV** also takes a
Companies export. Use preview
-and cancel for browser checks against hosted dev data. `CRM settings` opens the existing
-settings panel. Requires a team with CRM enabled.
+and cancel for browser checks against hosted dev data.
+
+`CRM settings` shows the settings in the Customers pane, in place of the open
+list, pipeline, or record, and highlights its sidebar item. The back arrow
+(**Close CRM settings**) returns to that same list, pipeline, or record; picking
+another sidebar destination, or browser Back, also leaves settings. On touch
+the back arrow is the only control in the header. It is the same page as
+Settings > CRM, with the same member and admin permissions; check both roles.
`Export` opens options for companies. Choose Current view
(respects filters/search) or All records across views (each visible record once), then