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
chore(calendar): gate team out of office behind a feature flag (#6253)
gbirman14927b41e64e
diff --git a/apps/web/src/features/block-calendar/components/SidePanelSections.tsx b/apps/web/src/features/block-calendar/components/SidePanelSections.tsxindex c9a6cb0be0..d4f9ac9831 100644--- a/apps/web/src/features/block-calendar/components/SidePanelSections.tsx+++ b/apps/web/src/features/block-calendar/components/SidePanelSections.tsx@@ -7,7 +7,9 @@ import {useHasTeammates,useUpcomingTeamOoo,} from '@app/features/calendar/hooks/use-team-ooo';+import { ShowFeatureFlag } from '@app/lib/analytics/posthog';import { SidePanel, useSidePanel } from '@components/app/side-panel/SidePanel';+import { enableCalendarTeamOoo } from '@core/constant/featureFlags';import { Calendar as MiniCalendar, ToggleSwitch } from '@ui';import { format } from 'date-fns';import {@@ -219,7 +221,9 @@ export function SidePanelSections() {<Show when={!sidePanel?.isNarrow()}><CalendarMiniCalendarSidePanelSection /><CalendarSourcesSidePanelSection />- <CalendarTeamOooSidePanelSection />+ <ShowFeatureFlag flag={enableCalendarTeamOoo}>+ <CalendarTeamOooSidePanelSection />+ </ShowFeatureFlag></Show>);}diff --git a/apps/web/src/features/calendar/hooks/use-calendar-ui-flag.ts b/apps/web/src/features/calendar/hooks/use-calendar-ui-flag.tsindex 02900d2ac2..2ae80be7af 100644--- a/apps/web/src/features/calendar/hooks/use-calendar-ui-flag.ts+++ b/apps/web/src/features/calendar/hooks/use-calendar-ui-flag.ts@@ -3,6 +3,7 @@ import {enableCalendarPromptMobile,enableCalendarPromptWeb,enableCalendarSearchUi,+ enableCalendarTeamOoo,enableCalendarUi,} from '@core/constant/featureFlags';import { isMobile } from '@core/mobile/isMobile';@@ -37,3 +38,12 @@ export function useCalendarPromptAllowed(): Accessor<boolean> {const webFlag = useFeatureFlag(enableCalendarPromptWeb);return () => (isMobile() ? mobileFlag() : webFlag()).enabled;}++/**+ * Whether the team out-of-office surfaces (the side panel section and the+ * teammate absence overlay on the grid) are enabled.+ */+export function useCalendarTeamOooFlag(): Accessor<boolean> {+ const flag = useFeatureFlag(enableCalendarTeamOoo);+ return () => flag().enabled;+}diff --git a/apps/web/src/features/calendar/hooks/use-team-ooo.ts b/apps/web/src/features/calendar/hooks/use-team-ooo.tsindex 46f16414ce..bb7a3d7716 100644--- a/apps/web/src/features/calendar/hooks/use-team-ooo.ts+++ b/apps/web/src/features/calendar/hooks/use-team-ooo.ts@@ -12,6 +12,7 @@ import { parseISO } from 'date-fns';import { type Accessor, createMemo } from 'solid-js';import type { CalendarEvent } from '../types';import { isCalendarRangeSupported } from '../utils/calendar-supported-range';+import { useCalendarTeamOooFlag } from './use-calendar-ui-flag';/** Visibility-source id gating the whole team out-of-office overlay. */export const TEAM_OOO_SOURCE_ID = 'team-ooo';@@ -86,12 +87,13 @@ export function useTeamOooEvents(options: TeamOooEventOptions): TeamOooEventData {const userId = useUserId();+ const teamOooEnabled = useCalendarTeamOooFlag();const isRangeSupported = createMemo(() => {const range = options.range();return range !== undefined && isCalendarRangeSupported(range);});const isOverlayVisible = () =>- options.isSourceVisible?.(TEAM_OOO_SOURCE_ID) !== false;+ teamOooEnabled() && options.isSourceVisible?.(TEAM_OOO_SOURCE_ID) !== false;const query = useTeamOutOfOfficeQuery(() => ({ userId: userId(), range: options.range() }),() => ({@@ -103,7 +105,9 @@ export function useTeamOooEvents(// Read data only on success: a failed overlay fetch degrades to no events// since the grid's own state is driven by the occurrences query, and gating// on success keeps this off the pending/errored resource read that suspends.- if (!isRangeSupported() || !query.isSuccess) return [];+ if (!teamOooEnabled() || !isRangeSupported() || !query.isSuccess) {+ return [];+ }return query.data.map(mapTeamOooItem);});const visibleEvents = createMemo(() => (isOverlayVisible() ? events() : []));diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.tsindex 89a28b59fb..a0dc422f19 100644--- a/apps/web/src/lib/core/constant/featureFlags.ts+++ b/apps/web/src/lib/core/constant/featureFlags.ts@@ -612,6 +612,18 @@ export const enableCalendarPromptWeb = defineFlag({env: 'ENABLE_CALENDAR_PROMPT_WEB',});+// Team out of office: the calendar side panel's "Team out of office" section+// and the read-only teammate absence chips on the grid. Purely additive: when+// off, the section never mounts and no team out-of-office query is issued.+// Lives inside the calendar block, so `enable-calendar-ui` already gates it.+// PostHog-gated with a dev-mode default; override with+// VITE_ENABLE_CALENDAR_TEAM_OOO.+export const enableCalendarTeamOoo = defineFlag({+ key: 'enable-calendar-team-ooo',+ env: 'ENABLE_CALENDAR_TEAM_OOO',+ default: onInDev,+});+// Sharing a personal tag with the team: the "Share with team" action on// personal tags in Settings › Tags, and the prompt that merges into an// existing team label when the names collide. The backend endpoints shipdiff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.mdindex d0190491bc..d870a1b36b 100644--- a/docs/AGENT_GUIDE/surfaces.md+++ b/docs/AGENT_GUIDE/surfaces.md@@ -66,12 +66,13 @@ there. Answering an invitation likewise addresses the primary copy. The detailsthe editor act on the chip's copy, so editing or deleting it targets that calendar's eventat Google.-Teammates' Google Calendar out-of-office events overlay the grid as read-only chips titled-`<name>: <event title>`. The side panel's `Team out of office` section (shown only when the-user belongs to a team with other members) has a checkbox in its header row toggling the-whole overlay on or off — all teammates or none — and lists the next 90 days of teammate-absences; clicking a row navigates the grid to that date. Coverage depends on each teammate-having connected their own calendar and using Google's out-of-office event type.+With the `enable-calendar-team-ooo` flag on, teammates' Google Calendar out-of-office events+overlay the grid as read-only chips titled `<name>: <event title>`. The side panel's+`Team out of office` section (shown only when the user belongs to a team with other members)+has a checkbox in its header row toggling the whole overlay on or off — all teammates or+none — and lists the next 90 days of teammate absences; clicking a row navigates the grid to+that date. Coverage depends on each teammate having connected their own calendar and using+Google's out-of-office event type.## Calls — `/app/component/calls`