Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(crm): show no-team and CRM-disabled empty states on the board view (#4858)
Evan Hutnik1bced10c9c7e
diff --git a/apps/web/src/features/companies/crm/team-crm-config.ts b/apps/web/src/features/companies/crm/team-crm-config.tsindex a6b8b99330..74f66d56ea 100644--- a/apps/web/src/features/companies/crm/team-crm-config.ts+++ b/apps/web/src/features/companies/crm/team-crm-config.ts@@ -256,6 +256,18 @@ export function useCrmPermissions() {};}+/**+ * True once the current-team query resolves to no team (null) or a team+ * with CRM disabled — the companies views swap in an explanatory empty+ * state and keep bottom chrome like the AI bar. Stays false while the+ * query loads so enabled teams don't flash the empty state.+ */+export function useCrmUnavailable(): Accessor<boolean> {+ const teamQuery = useCurrentTeamQuery();+ return () =>+ teamQuery.data === null || teamQuery.data?.team.crm_enabled === false;+}+/*** The set of stage option ids considered "closed" — explicit config when* present, else a label heuristic over the active stages.diff --git a/apps/web/src/features/next-soup/soup-view/empty-states.tsx b/apps/web/src/features/next-soup/soup-view/empty-states.tsxindex 40d3fd5897..f2443afc74 100644--- a/apps/web/src/features/next-soup/soup-view/empty-states.tsx+++ b/apps/web/src/features/next-soup/soup-view/empty-states.tsx@@ -21,7 +21,7 @@ import EmptyStateTasksGraphic from '@design/empty-state-tasks.svg';import PlusIcon from '@phosphor/plus.svg';import { useCurrentTeamQuery, useIsTeamAdmin } from '@queries/team/teams';import { EmptyStatePanel, FilteredHiddenBanner } from '@ui';-import { type Component, type JSXElement, Match, Show, Switch } from 'solid-js';+import { type Component, type JSXElement, Match, Switch } from 'solid-js';import { FolderDropZone } from './FolderDropZone';import { useSoupView } from './soup-view-context';@@ -79,8 +79,13 @@ export function EmptyState(props: {const { openSettings } = useSettingsState();// CRM is disabled by default per team; the companies list has a dedicated- // empty state that points admins to the toggle in Settings › CRM.+ // empty state that points admins to the toggle in Settings › CRM. A user+ // with no team at all (data resolves to null) is pointed to team settings+ // instead, since CRM can only be enabled on a team. Branches wait for the+ // query to resolve so enabled teams don't flash the disabled copy.+ const teamResolved = () => teamQuery.data !== undefined;const crmEnabled = () => teamQuery.data?.team.crm_enabled ?? false;+ const hasNoTeam = () => teamQuery.data === null;const onConnectEmail = () => {void startAddInbox();@@ -239,9 +244,22 @@ export function EmptyState(props: {</Match><Match when={props.listView === 'companies'}>- <Show- when={crmEnabled()}- fallback={+ <Switch>+ {/* Render nothing until the team query resolves — showing a wrong+ panel for a moment is worse than a brief blank. */}+ <Match when={!teamResolved()}>{null}</Match>+ <Match when={hasNoTeam()}>+ <EmptyStatePanel+ graphic={EmptyStateCompaniesGraphic}+ title="Join a team to enable CRM"+ description="Create or join a team in Settings > Team."+ primaryAction={{+ label: 'Open team settings',+ onClick: () => openSettings('Team'),+ }}+ />+ </Match>+ <Match when={!crmEnabled()}><EmptyStatePanelgraphic={EmptyStateCompaniesGraphic}title="CRM is disabled"@@ -259,14 +277,15 @@ export function EmptyState(props: {: undefined}/>- }- >- <EmptyStatePanel- graphic={EmptyStateCompaniesGraphic}- title="No customers yet"- description="Customers your team emails will appear here."- />- </Show>+ </Match>+ <Match when={true}>+ <EmptyStatePanel+ graphic={EmptyStateCompaniesGraphic}+ title="No customers yet"+ description="Customers your team emails will appear here."+ />+ </Match>+ </Switch></Match><Matchdiff --git a/apps/web/src/features/next-soup/soup-view/soup-view.tsx b/apps/web/src/features/next-soup/soup-view/soup-view.tsxindex a6d561877c..2f85e1ea9f 100644--- a/apps/web/src/features/next-soup/soup-view/soup-view.tsx+++ b/apps/web/src/features/next-soup/soup-view/soup-view.tsx@@ -60,6 +60,7 @@ import { usePreference } from '@app/preferences/use-preference';import { useDealStages } from '@companies/crm/deal-stages';import { CrmStageIcon } from '@companies/crm/StageIcon';import type { CrmViewConfig } from '@companies/crm/saved-views';+import { useCrmUnavailable } from '@companies/crm/team-crm-config';import {useGlobalBlockOrchestrator,useGlobalNotificationSource,@@ -578,6 +579,12 @@ export const SoupView = (props: SoupViewProps) => {() => activeListView() === 'companies' && soupView.viewMode() === 'board');+ // When CRM is unavailable (no team / disabled) the board renders the+ // empty state instead of columns, so board-only chrome tweaks (like+ // hiding the AI bar) shouldn't apply.+ const crmUnavailable = useCrmUnavailable();+ const isBoardRendered = createMemo(() => isBoardMode() && !crmUnavailable());+const [narrowSearchExpanded, setNarrowSearchExpanded] = createSignal(false);const [mobileSearchOpen, setMobileSearchOpen] = createSignal(false);const [searchIsCollapsed, setSearchIsCollapsed] = createSignal(false);@@ -778,7 +785,7 @@ export const SoupView = (props: SoupViewProps) => {ENABLE_UNIFIED_LIST_AI_INPUT &&!isMobile() &&!isNewInboxEnabled() &&- !isBoardMode()+ !isBoardRendered()}><SoupChatInput />diff --git a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyKanban.tsx b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyKanban.tsxindex d7b147a7cb..9412aea7be 100644--- a/apps/web/src/features/next-soup/soup-view/views/companies/CompanyKanban.tsx+++ b/apps/web/src/features/next-soup/soup-view/views/companies/CompanyKanban.tsx@@ -1,4 +1,5 @@import { NO_STAGE } from '@app/features/next-soup/filters/configs/';+import { EmptyState } from '@app/features/next-soup/soup-view/empty-states';import { SoupEntityContextMenu } from '@app/features/next-soup/soup-view/soup-entity-context-menu';import { useSoupView } from '@app/features/next-soup/soup-view/soup-view-context';import { usePreviewPaneVisiblity } from '@app/features/next-soup/soup-view/use-preview-pane-visibility';@@ -8,6 +9,7 @@ import { CrmStageIcon } from '@companies/crm/StageIcon';import {useClosedStageIds,useCrmPermissions,+ useCrmUnavailable,} from '@companies/crm/team-crm-config';import { useGlobalBlockOrchestrator } from '@components/app/GlobalAppState';import { PreviewPanel } from '@components/app/PreviewPanel';@@ -67,6 +69,9 @@ export function CompanyKanban() {const { canEditCrm, canMoveClosedDeals } = useCrmPermissions();const closedStageIds = useClosedStageIds(stages);+ // Mirror the list view's no-team / CRM-disabled empty states.+ const crmUnavailable = useCrmUnavailable();+const stageColumns = createMemo((): StageColumn[] => {// Candidates in canonical pipeline order: the filterable set (active// stages plus retired legacy stages on the system default), then@@ -180,152 +185,158 @@ export function CompanyKanban() {};return (- <Resize.Zone direction="horizontal" gutter={0}>- <Resize.Panel id="company-kanban" minSize={200}>- {/* Relative wrapper anchors the horizontal scrollbar to the board's+ <Show+ when={!crmUnavailable()}+ fallback={<EmptyState listView="companies" />}+ >+ <Resize.Zone direction="horizontal" gutter={0}>+ <Resize.Panel id="company-kanban" minSize={200}>+ {/* Relative wrapper anchors the horizontal scrollbar to the board'sbottom edge when the split is too narrow for all columns. */}- <div- class={cn(- 'relative size-full min-w-0',- paneVisible() && 'border-r border-edge-muted'- )}- ><div- ref={setScrollRef}- class="size-full overflow-x-auto overflow-y-hidden scrollbar-hidden"+ class={cn(+ 'relative size-full min-w-0',+ paneVisible() && 'border-r border-edge-muted'+ )}>- <div class="flex h-full gap-3 p-3">- <For each={columns()}>- {(column, columnIndex) => (- <div- class={cn(- // Fallback sizing until the board is measured; after- // that the snapping columnWidth() takes over.- 'flex h-full min-w-56 flex-1 flex-col rounded-lg border border-edge-muted bg-surface',- dropTarget() === column.key &&- draggedId() &&- 'border-accent/50 bg-accent/5'- )}- style={- columnWidth() !== undefined- ? { width: `${columnWidth()}px`, flex: 'none' }- : undefined- }- onDragOver={(e) => {- if (!draggedId()) return;- e.preventDefault();- setDropTarget(column.key);- }}- onDragLeave={(e) => {- if (- e.relatedTarget instanceof Node &&- e.currentTarget.contains(e.relatedTarget)- ) {- return;+ <div+ ref={setScrollRef}+ class="size-full overflow-x-auto overflow-y-hidden scrollbar-hidden"+ >+ <div class="flex h-full gap-3 p-3">+ <For each={columns()}>+ {(column, columnIndex) => (+ <div+ class={cn(+ // Fallback sizing until the board is measured; after+ // that the snapping columnWidth() takes over.+ 'flex h-full min-w-56 flex-1 flex-col rounded-lg border border-edge-muted bg-surface',+ dropTarget() === column.key &&+ draggedId() &&+ 'border-accent/50 bg-accent/5'+ )}+ style={+ columnWidth() !== undefined+ ? { width: `${columnWidth()}px`, flex: 'none' }+ : undefined}- if (dropTarget() === column.key) setDropTarget(undefined);- }}- onDrop={(e) => {- e.preventDefault();- const id =- draggedId() ?? e.dataTransfer?.getData('text/plain');- setDropTarget(undefined);- setDraggedId(undefined);- if (id) moveToStage(id, column.key);- }}- >- <div class="flex items-center gap-2 px-3 py-2.5 text-xs font-semibold text-ink-muted">- <Show- when={column.key !== NO_STAGE_KEY}- fallback={- <CircleDashed class="size-3.5 text-ink-extra-muted" />+ onDragOver={(e) => {+ if (!draggedId()) return;+ e.preventDefault();+ setDropTarget(column.key);+ }}+ onDragLeave={(e) => {+ if (+ e.relatedTarget instanceof Node &&+ e.currentTarget.contains(e.relatedTarget)+ ) {+ return;}- >- <CrmStageIcon- optionId={column.key}- index={columnIndex()}- class="size-3.5"- />- </Show>- <span class="truncate">{column.label}</span>- </div>- <div class="min-h-0 flex-1 overflow-y-auto scrollbar-hidden flex flex-col gap-2 px-2 pb-2">- <For each={column.entities}>- {(entity) => (- // The context-menu trigger is h-full (sized for list- // rows); an auto-height wrapper resolves that to the- // card's content height instead of the column's.- <div class="shrink-0">- <SoupEntityContextMenu entity={entity}>- <CompanyKanbanCard- entity={entity}- draggable={canDragFrom(column.key)}- dragging={draggedId() === entity.id}- onDragStart={(e) => {- e.dataTransfer?.setData(- 'text/plain',- entity.id- );- if (e.dataTransfer) {- e.dataTransfer.effectAllowed = 'move';- }- setDraggedId(entity.id);- }}- onDragEnd={() => {- setDraggedId(undefined);- setDropTarget(undefined);- }}- onClick={(e) => openCompany(entity, e)}- />- </SoupEntityContextMenu>- </div>- )}- </For>+ if (dropTarget() === column.key)+ setDropTarget(undefined);+ }}+ onDrop={(e) => {+ e.preventDefault();+ const id =+ draggedId() ?? e.dataTransfer?.getData('text/plain');+ setDropTarget(undefined);+ setDraggedId(undefined);+ if (id) moveToStage(id, column.key);+ }}+ >+ <div class="flex items-center gap-2 px-3 py-2.5 text-xs font-semibold text-ink-muted">+ <Show+ when={column.key !== NO_STAGE_KEY}+ fallback={+ <CircleDashed class="size-3.5 text-ink-extra-muted" />+ }+ >+ <CrmStageIcon+ optionId={column.key}+ index={columnIndex()}+ class="size-3.5"+ />+ </Show>+ <span class="truncate">{column.label}</span>+ </div>+ <div class="min-h-0 flex-1 overflow-y-auto scrollbar-hidden flex flex-col gap-2 px-2 pb-2">+ <For each={column.entities}>+ {(entity) => (+ // The context-menu trigger is h-full (sized for list+ // rows); an auto-height wrapper resolves that to the+ // card's content height instead of the column's.+ <div class="shrink-0">+ <SoupEntityContextMenu entity={entity}>+ <CompanyKanbanCard+ entity={entity}+ draggable={canDragFrom(column.key)}+ dragging={draggedId() === entity.id}+ onDragStart={(e) => {+ e.dataTransfer?.setData(+ 'text/plain',+ entity.id+ );+ if (e.dataTransfer) {+ e.dataTransfer.effectAllowed = 'move';+ }+ setDraggedId(entity.id);+ }}+ onDragEnd={() => {+ setDraggedId(undefined);+ setDropTarget(undefined);+ }}+ onClick={(e) => openCompany(entity, e)}+ />+ </SoupEntityContextMenu>+ </div>+ )}+ </For>+ </div></div>- </div>- )}- </For>+ )}+ </For>+ </div></div>- </div>- {/* watchContent: columns mount after the initial measurement, so+ {/* watchContent: columns mount after the initial measurement, sooverflow must be re-detected as they load in. */}- <CustomScrollbar- scrollContainer={scrollRef}- horizontal- revealZone={48}- gutterSize={20}- watchContent- />- </div>- </Resize.Panel>- <Show when={paneVisible()}>- <Resize.Panel- id="soup-preview"- minSize={500}- target={{ kind: 'percent', percent: 70 }}- >- <Show- when={selectedEntity()}- fallback={- <EmptyStatePanel- graphic={EmptyStatePreviewIcon}- title="Nothing selected"- description="Select a card from the board to preview it here"- centered- />- }- >- {(entity) => (- <PreviewPanel- selectedEntity={entity()}- orchestrator={orchestrator}- splitPanelContext={panel}- />- )}- </Show>+ <CustomScrollbar+ scrollContainer={scrollRef}+ horizontal+ revealZone={48}+ gutterSize={20}+ watchContent+ />+ </div></Resize.Panel>- </Show>- </Resize.Zone>+ <Show when={paneVisible()}>+ <Resize.Panel+ id="soup-preview"+ minSize={500}+ target={{ kind: 'percent', percent: 70 }}+ >+ <Show+ when={selectedEntity()}+ fallback={+ <EmptyStatePanel+ graphic={EmptyStatePreviewIcon}+ title="Nothing selected"+ description="Select a card from the board to preview it here"+ centered+ />+ }+ >+ {(entity) => (+ <PreviewPanel+ selectedEntity={entity()}+ orchestrator={orchestrator}+ splitPanelContext={panel}+ />+ )}+ </Show>+ </Resize.Panel>+ </Show>+ </Resize.Zone>+ </Show>);}