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
fix(channels): hide unavailable tags and apply rollout updates (#6798)
Eric Hayesdc34fa39cd5b
diff --git a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.test.tsx b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.test.tsxindex 2fdf3ffe99..4c6ea08f86 100644--- a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.test.tsx+++ b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.test.tsx@@ -12,7 +12,7 @@ import { ChannelLabelMenuItems, ChannelsCreateMenu } from './ChannelLabelRows';const rail = vi.hoisted(() => ({channelTagsEnabled: (): boolean => false,- labelsAvailable: () => true,+ labelsAvailable: (): boolean => true,labels: () => [{ id: 'label', name: 'Cached label', channelIds: ['channel'] },],@@ -62,8 +62,10 @@ vi.mock('@kobalte/core/context-menu', () => ({}));let setEnabled: Setter<boolean>;+let setLabelsAvailable: Setter<boolean>;beforeEach(() => {[rail.channelTagsEnabled, setEnabled] = createSignal(false);+ [rail.labelsAvailable, setLabelsAvailable] = createSignal(true);vi.clearAllMocks();vi.stubGlobal('scrollTo', vi.fn());});@@ -73,6 +75,42 @@ afterEach(() => {});describe('channel tag flag in rail menus', () => {+ it('shows direct channel creation until labels load and removes label actions if they become unavailable', async () => {+ setEnabled(true);+ setLabelsAvailable(false);+ render(() => <ChannelsCreateMenu />);++ fireEvent.click(screen.getByRole('button', { name: 'Create channel' }));+ expect(openNewChannelModal).toHaveBeenCalledOnce();+ expect(+ screen.queryByRole('button', { name: 'Create channel or label' })+ ).toBeNull();+ expect(screen.queryByText('New label')).toBeNull();+ expect(screen.queryByText('New smart label')).toBeNull();++ setLabelsAvailable(true);+ fireEvent.keyDown(+ screen.getByRole('button', { name: 'Create channel or label' }),+ { key: 'ArrowDown' }+ );+ const labelAction = await screen.findByRole('menuitem', {+ name: 'New label',+ });+ expect(labelAction.getAttribute('aria-disabled')).not.toBe('true');+ expect(+ screen+ .getByRole('menuitem', { name: 'New smart label' })+ .getAttribute('aria-disabled')+ ).not.toBe('true');++ setLabelsAvailable(false);+ expect(screen.queryByRole('menu')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Create channel' }));+ expect(openNewChannelModal).toHaveBeenCalledTimes(2);+ expect(rail.createLabel).not.toHaveBeenCalled();+ expect(rail.createSmartTag).not.toHaveBeenCalled();+ });+it('keeps direct channel creation available and removes an open label menu when disabled', async () => {render(() => <ChannelsCreateMenu />);diff --git a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsxindex fca1d91dbf..ca215e6508 100644--- a/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx+++ b/apps/web/src/features/channels-view/components/rail/ChannelLabelRows.tsx@@ -191,7 +191,7 @@ export function ChannelsCreateMenu() {return (<Show- when={rail.channelTagsEnabled()}+ when={rail.channelTagsEnabled() && rail.labelsAvailable()}fallback={<ViewSidebar.Controllabel="Create channel"@@ -226,13 +226,11 @@ export function ChannelsCreateMenu() {<MenuRowicon={TagIcon}label="New label"- disabled={!rail.labelsAvailable()}onSelect={() => void rail.createLabel([])}/><MenuRowicon={FilterIcon}label="New smart label"- disabled={!rail.labelsAvailable()}onSelect={() => void rail.createSmartTag()}/></Dropdown.Group>diff --git a/apps/web/src/features/channels-view/components/rail/ChannelsRail.tsx b/apps/web/src/features/channels-view/components/rail/ChannelsRail.tsxindex de4f635004..ae5b02566c 100644--- a/apps/web/src/features/channels-view/components/rail/ChannelsRail.tsx+++ b/apps/web/src/features/channels-view/components/rail/ChannelsRail.tsx@@ -111,7 +111,12 @@ export type ChannelsRailProps = {export function ChannelsRail(props: ChannelsRailProps) {const channelTagsFlag = useFeatureFlag(enableChannelTags);- const channelTagsEnabled = () => channelTagsFlag().enabled;+ const channelTagsEnabled = createMemo(() => channelTagsFlag().enabled);+ // The dialog manager closes entries when their owner is disposed. Give+ // label dialogs an owner that is cleaned up when the rollout turns off.+ const labelDialogOwner = createMemo(() =>+ channelTagsEnabled() ? getOwner() : undefined+ );const {state,setGroupOpen,@@ -123,7 +128,6 @@ export function ChannelsRail(props: ChannelsRailProps) {const panel = useSplitPanelOrThrow();const layout = useSplitLayout();- const owner = getOwner();const notificationSource = useGlobalNotificationSource();const favoritesData = useFavoritesData({ entityType: ['channel'] });@@ -785,7 +789,7 @@ export function ChannelsRail(props: ChannelsRailProps) {setLabelOpen(created.id, true);},},- { owner }+ { owner: labelDialogOwner() });if (!name) return;toast.success(@@ -817,7 +821,7 @@ export function ChannelsRail(props: ChannelsRailProps) {toast.success(`Created “${name}”`);},},- { owner }+ { owner: labelDialogOwner() });};@@ -838,7 +842,7 @@ export function ChannelsRail(props: ChannelsRailProps) {toast.success(`Updated “${name}”`);},},- { owner }+ { owner: labelDialogOwner() });};@@ -856,7 +860,7 @@ export function ChannelsRail(props: ChannelsRailProps) {await renameLabelMutation.mutateAsync({ labelId: label.id, name });},},- { owner }+ { owner: labelDialogOwner() });if (!name || name === label.name) return;toast.success(`Renamed to “${name}”`);@@ -879,7 +883,7 @@ export function ChannelsRail(props: ChannelsRailProps) {cancelLabel: 'Cancel',tone: 'danger',},- { owner }+ { owner: labelDialogOwner() });if (!confirmed || !channelTagsEnabled()) return;try {diff --git a/apps/web/src/lib/analytics/posthog.test.tsx b/apps/web/src/lib/analytics/posthog.test.tsxnew file mode 100644index 0000000000..9263299226--- /dev/null+++ b/apps/web/src/lib/analytics/posthog.test.tsx@@ -0,0 +1,123 @@+import type { RemoteFlag } from '@core/constant/featureFlags';+import { cleanup, render, screen } from '@solidjs/testing-library';+import type { FeatureFlagResult, PostHog } from 'posthog-js';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { PosthogProvider, ShowFeatureFlag, useFeatureFlag } from './posthog';++const posthog = vi.hoisted(() => ({+ onFeatureFlags: vi.fn<PostHog['onFeatureFlags']>(),+ getFeatureFlagResult: vi.fn<PostHog['getFeatureFlagResult']>(),+ unsubscribe: vi.fn(),+}));++vi.mock('./analytics-context', () => ({+ useAnalytics: () => ({ posthog }),+}));++const channelTags: RemoteFlag = {+ key: 'enable-channel-tags',+ override: undefined,+};++function receiveFlags(+ result: FeatureFlagResult | undefined,+ flags = result?.enabled ? [channelTags.key] : []+) {+ posthog.getFeatureFlagResult.mockReturnValue(result);+ const callback = posthog.onFeatureFlags.mock.calls[0]?.[0];+ if (!callback) throw new Error('PostHog provider is not mounted');+ callback(flags, result ? { [result.key]: result.enabled } : {});+}++function flagResult(enabled: boolean, payload?: string): FeatureFlagResult {+ return { key: channelTags.key, enabled, variant: undefined, payload };+}++function renderFlag(flag: RemoteFlag = channelTags) {+ let result!: ReturnType<typeof useFeatureFlag<string>>;+ const mount = vi.fn();+ const Probe = () => {+ mount();+ result = useFeatureFlag<string>(flag, { fallbackPayload: 'fallback' });+ return (+ <ShowFeatureFlag flag={flag}>+ <button>New label</button>+ </ShowFeatureFlag>+ );+ };+ const view = render(() => (+ <PosthogProvider>+ <Probe />+ </PosthogProvider>+ ));+ return { result, mount, ...view };+}++beforeEach(() => {+ vi.clearAllMocks();+ posthog.getFeatureFlagResult.mockReset();+ posthog.onFeatureFlags.mockReturnValue(posthog.unsubscribe);+});+afterEach(cleanup);++describe('reactive PostHog flags', () => {+ it('hides unknown flags and applies rollout changes without remounting', () => {+ const view = renderFlag();++ expect(view.result()).toEqual({+ enabled: false,+ payload: 'fallback',+ loading: true,+ });+ expect(screen.queryByRole('button', { name: 'New label' })).toBeNull();++ receiveFlags(undefined);+ expect(view.result().loading).toBe(false);+ expect(screen.queryByRole('button', { name: 'New label' })).toBeNull();++ receiveFlags(flagResult(true));+ expect(view.result().enabled).toBe(true);+ expect(screen.getByRole('button', { name: 'New label' })).toBeTruthy();++ receiveFlags(flagResult(false));+ expect(view.result().enabled).toBe(false);+ expect(screen.queryByRole('button', { name: 'New label' })).toBeNull();+ expect(view.mount).toHaveBeenCalledOnce();++ view.unmount();+ expect(posthog.unsubscribe).toHaveBeenCalledOnce();+ });++ it('refreshes payloads when the enabled flag list is unchanged', () => {+ const view = renderFlag();+ const flags = [channelTags.key];++ receiveFlags(flagResult(true, 'first'), flags);+ expect(view.result().payload).toBe('first');++ receiveFlags(flagResult(true, 'second'), flags);+ expect(view.result().payload).toBe('second');+ expect(view.mount).toHaveBeenCalledOnce();+ });++ it.each([false, true])(+ 'keeps the explicit %s override authoritative',+ (override) => {+ const view = renderFlag({ ...channelTags, override });++ expect(view.result()).toEqual({+ enabled: override,+ payload: 'fallback',+ loading: false,+ });++ receiveFlags(flagResult(!override, 'remote'));+ expect(view.result()).toEqual({+ enabled: override,+ payload: 'fallback',+ loading: false,+ });+ expect(posthog.getFeatureFlagResult).not.toHaveBeenCalled();+ }+ );+});diff --git a/apps/web/src/lib/analytics/posthog.tsx b/apps/web/src/lib/analytics/posthog.tsxindex f7bc9de27e..8db094a056 100644--- a/apps/web/src/lib/analytics/posthog.tsx+++ b/apps/web/src/lib/analytics/posthog.tsx@@ -16,7 +16,9 @@ export const [PosthogProvider, usePosthog] = createAssertedContextProvider(() => {const analytics = useAnalytics();- const [featureFlags, setFeatureFlags] = createSignal<string[]>([]);+ const [featureFlags, setFeatureFlags] = createSignal<string[]>([], {+ equals: false,+ });// Distinguishes "flags not fetched yet" from "no flags enabled": both// leave featureFlags empty, but destructive flag-off fallbacks (e.g.// RedirectSplit) must not fire before the answer arrives. Set even on@@ -71,6 +73,9 @@ function readFeatureFlag<T extends JsonType>(return { enabled: false, payload: fallbackPayload, loading: true };}+ // The SDK is not reactive. Re-read on each successful refresh, including+ // payload changes that leave the enabled flag list unchanged.+ posthog.featureFlags();const result = posthog.instance.getFeatureFlagResult(key);return {diff --git a/docs/AGENT_GUIDE/channels.md b/docs/AGENT_GUIDE/channels.mdindex a5d5dac20b..9079b1aa38 100644--- a/docs/AGENT_GUIDE/channels.md+++ b/docs/AGENT_GUIDE/channels.md@@ -337,6 +337,12 @@ channel-menu label actions, and label drag targets are absent, and the app makesno channel-label list or smart-label preview requests. Existing saved labelsremain unchanged and reappear when the flag is enabled.+Even with the flag enabled, the heading keeps the direct `Create channel`+action while labels are loading or unavailable. It shows the label creation+menu only after the label list loads successfully; it never advertises disabled+`New label` or `New smart label` actions. Changing the rollout flag to off also+removes open label menus and dismisses label dialogs without reloading Chat.+Verify both states after reloading Chat: with the flag off, inspect the headingaction and a channel's context menu, drag between channel rows, and confirmthere are no `/channel-labels` requests. With the flag enabled, verify the `+`