fix(analytics): repair dashboard timezone crash and click-to-message ad attribution (#1114)

Author: viethung0o0

apps/builder/__tests__/ads-analytics-context-memoization.test.ts

@@ -36,6 +36,12 @@ vi.mock("@chatbotx.io/business", () => ({
     listForChannel: mocks.listForChannel,
   },
   listCachedMessagingAdAccounts: vi.fn(),
+  // The union's workspace-wide leg checks for the integration up front
+  // (absence is a normal state, not a logged failure) — these suites
+  // exercise the messaging leg, so report it as present.
+  integrationFacebookAdsService: {
+    findByWorkspaceId: vi.fn(async () => ({ id: "ifa-1" })),
+  },
   buildMessagingAdsContext: vi.fn(),
   isAdsEligibleChannel: (channel: unknown) =>
     channel === "whatsapp" ||

apps/builder/__tests__/ads-analytics-timeseries.test.ts

@@ -19,6 +19,12 @@ vi.mock("@chatbotx.io/business", () => ({
     listForChannel: mocks.listForChannel,
   },
   listCachedMessagingAdAccounts: vi.fn(),
+  // The union's workspace-wide leg checks for the integration up front
+  // (absence is a normal state, not a logged failure) — these suites
+  // exercise the messaging leg, so report it as present.
+  integrationFacebookAdsService: {
+    findByWorkspaceId: vi.fn(async () => ({ id: "ifa-1" })),
+  },
   buildMessagingAdsContext: vi.fn(),
   isAdsEligibleChannel: (channel: unknown) =>
     channel === "whatsapp" ||

apps/builder/__tests__/ads-analytics-view-retarget.test.tsx

@@ -279,12 +279,17 @@ describe("AdsAnalyticsView — single-channel retarget row actions", () => {
     const buttons = Array.from(
       container.querySelectorAll<HTMLButtonElement>("button[data-menu-item]"),
     )
-    const purchasesButton = buttons.find(
-      (button) => button.textContent === "ads.analytics.thoseWhoPurchased",
+    // Was "ads.analytics.thoseWhoPurchased" — that entry is
+    // TEMPORARILY HIDDEN (conversion tracking unfinished), so this drives the same
+    // regression through the one segment still rendered. Switch it back when
+    // the purchases/leads entries are restored.
+    const conversationsButton = buttons.find(
+      (button) =>
+        button.textContent === "ads.analytics.thoseWhoStartedConversation",
     )
 
     await act(async () => {
-      purchasesButton?.click()
+      conversationsButton?.click()
       await flush()
     })
 

apps/builder/__tests__/ads-analytics-view-revenue-delivery.test.tsx

@@ -187,7 +187,21 @@ describe("AdsAnalyticsView revenue and delivery", () => {
     container.remove()
   })
 
-  test("renders revenue, ROAS, and delivery status details", async () => {
+  // Renamed and narrowed: revenue/ROAS/delivery are
+  // TEMPORARILY HIDDEN (conversion tracking unfinished). When they come back,
+  // restore the name and these assertions:
+  //   expect(container.textContent).toContain("ads.analytics.revenue")
+  //   expect(container.textContent).toContain("ads.analytics.roas")
+  //   expect(container.textContent).toContain("2.50x")
+  //   expect(container.textContent).toContain("ads.analytics.delivery.title")
+  //   expect(container.textContent).toContain("ads.analytics.delivery.sent")
+  //   expect(container.textContent).toContain("ads.analytics.delivery.skippedNoScope")
+  //   expect(container.textContent).toContain("ads.analytics.delivery.noScopeWarning")
+  //   expect(container.textContent).toContain("ads.analytics.delivery.reconnectCta")
+  //   expect(Array.from(container.querySelectorAll("a")).some((anchor) =>
+  //     anchor.href.includes("/whatsapps/iw-1/ads"))).toBe(true)
+  //   expect(container.textContent).not.toContain("ads.analytics.delivery.skippedRegion")
+  test("renders the Insights-sourced spend metrics", async () => {
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -209,9 +223,6 @@ describe("AdsAnalyticsView revenue and delivery", () => {
       await Promise.resolve()
     })
 
-    expect(container.textContent).toContain("ads.analytics.revenue")
-    expect(container.textContent).toContain("ads.analytics.roas")
-    expect(container.textContent).toContain("2.50x")
     expect(container.textContent).toContain("ads.analytics.impressions")
     expect(container.textContent).toContain("5,000")
     expect(container.textContent).toContain("ads.analytics.clicks")
@@ -221,28 +232,14 @@ describe("AdsAnalyticsView revenue and delivery", () => {
     expect(container.textContent).toContain("4.00%")
     expect(container.textContent).toContain("ads.analytics.cpm")
     expect(container.textContent).toContain("ads.analytics.costPerConversation")
-    expect(container.textContent).toContain("ads.analytics.delivery.title")
-    expect(container.textContent).toContain("ads.analytics.delivery.sent")
-    expect(container.textContent).toContain(
-      "ads.analytics.delivery.skippedNoScope",
-    )
-    expect(container.textContent).toContain(
-      "ads.analytics.delivery.noScopeWarning",
-    )
-    expect(container.textContent).toContain(
-      "ads.analytics.delivery.reconnectCta",
-    )
-    expect(
-      Array.from(container.querySelectorAll("a")).some((anchor) =>
-        anchor.href.includes("/whatsapps/iw-1/ads"),
-      ),
-    ).toBe(true)
-    expect(container.textContent).not.toContain(
-      "ads.analytics.delivery.skippedRegion",
-    )
+    // Guards the hidden state itself: the delivery card must not render while
+    // the conversion-rule engine is unfinished. Delete this when restoring.
+    expect(container.textContent).not.toContain("ads.analytics.delivery.title")
   })
 
-  test("omits the reconnect CTA link in the aggregate (no account) view", async () => {
+  // TEMPORARILY HIDDEN (conversion tracking unfinished): the delivery card this
+  // exercises is commented out in AdsAnalyticsView. Un-skip when it returns.
+  test.skip("omits the reconnect CTA link in the aggregate (no account) view", async () => {
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>
@@ -272,7 +269,9 @@ describe("AdsAnalyticsView revenue and delivery", () => {
     )
   })
 
-  test("shows a messenger-channel reconnect CTA linked to the messenger ads settings page", async () => {
+  // TEMPORARILY HIDDEN (conversion tracking unfinished): the delivery card this
+  // exercises is commented out in AdsAnalyticsView. Un-skip when it returns.
+  test.skip("shows a messenger-channel reconnect CTA linked to the messenger ads settings page", async () => {
     await act(async () => {
       root.render(
         <QueryClientProvider client={queryClient}>

apps/builder/__tests__/channel-ad-accounts.test.ts

@@ -7,6 +7,7 @@ const mocks = vi.hoisted(() => ({
   listCachedMessagingAdAccounts: vi.fn(),
   listForChannel: vi.fn(),
   getCachedAdAccounts: vi.fn(),
+  findByWorkspaceId: vi.fn(),
   warn: vi.fn(),
 }))
 
@@ -15,6 +16,9 @@ vi.mock("@chatbotx.io/business", () => ({
   messagingAdsConnectionService: {
     listForChannel: mocks.listForChannel,
   },
+  integrationFacebookAdsService: {
+    findByWorkspaceId: mocks.findByWorkspaceId,
+  },
 }))
 
 vi.mock("@/features/integration-facebook-ads/queries", () => ({
@@ -28,6 +32,9 @@ vi.mock("@/lib/log", () => ({
 describe("resolveChannelAdAccountSources", () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    // Default: the workspace HAS a workspace-wide Facebook Ads integration, so
+    // existing cases keep exercising the `getCachedAdAccounts` leg unchanged.
+    mocks.findByWorkspaceId.mockResolvedValue({ id: "ifa-1" })
   })
 
   test("integrationId given -> narrows to that integration's own connection, tagged with a messaging source", async () => {
@@ -236,4 +243,55 @@ describe("resolveChannelAdAccountSources", () => {
     ])
     expect(mocks.listCachedMessagingAdAccounts).not.toHaveBeenCalled()
   })
+
+  // A workspace with no workspace-wide Facebook Ads integration is the normal
+  // case now that each box connects its own token. Absence is a STATE, not a
+  // failure: the union must simply skip that leg, without reaching for a
+  // throwing lookup and without writing a stack trace to the log. The previous
+  // implementation called `findByWorkspaceIdOrFail` through
+  // `getCachedAdAccounts`, so every ordinary dashboard load logged
+  // `WARN "Facebook Ads integration not found"` with a full stack — noise that
+  // reads like a real fault while nothing is actually wrong.
+  test("no workspace-wide integration -> skips that leg silently, no log", async () => {
+    mocks.findByWorkspaceId.mockResolvedValue(undefined)
+    mocks.listForChannel.mockResolvedValue([])
+
+    const result = await resolveChannelAdAccountSources({
+      workspaceId: "ws-1",
+      channel: "messenger",
+    })
+
+    expect(result).toEqual([])
+    expect(mocks.getCachedAdAccounts).not.toHaveBeenCalled()
+    expect(mocks.warn).not.toHaveBeenCalled()
+  })
+
+  test("a genuine failure loading the workspace-wide list is still warned about", async () => {
+    mocks.listForChannel.mockResolvedValue([])
+    mocks.getCachedAdAccounts.mockRejectedValue(new Error("graph exploded"))
+
+    const result = await resolveChannelAdAccountSources({
+      workspaceId: "ws-1",
+      channel: "messenger",
+    })
+
+    expect(result).toEqual([])
+    expect(mocks.warn).toHaveBeenCalledTimes(1)
+  })
+  // The integration lookup sits inside the same guard as the Graph call: a
+  // database blip on that preliminary read must degrade the union to "no
+  // workspace-wide accounts", exactly as a Graph failure does — never fail the
+  // whole Ads page.
+  test("a failing integration lookup degrades instead of failing the union", async () => {
+    mocks.findByWorkspaceId.mockRejectedValue(new Error("connection reset"))
+    mocks.listForChannel.mockResolvedValue([])
+
+    const result = await resolveChannelAdAccountSources({
+      workspaceId: "ws-1",
+      channel: "messenger",
+    })
+
+    expect(result).toEqual([])
+    expect(mocks.warn).toHaveBeenCalledTimes(1)
+  })
 })

apps/builder/src/app/space/[workspaceId]/dashboard/ads/[channel]/page.tsx

@@ -1,4 +1,7 @@
-import { perChannelIntegrationIds } from "@chatbotx.io/business"
+import {
+  type CapiDeliverySummary,
+  perChannelIntegrationIds,
+} from "@chatbotx.io/business"
 import {
   type AdsEligibleChannelType,
   adsEligibleChannelTypes,
@@ -11,7 +14,6 @@ import { resolveChannelIntegrations } from "@/features/ads/lib/resolve-channel-i
 import {
   getAdsAnalyticsData,
   getAdsAnalyticsTimeseries,
-  getCapiDeliveryData,
 } from "@/features/ads/queries/analytics"
 import { getAdsSwitcherData } from "@/features/ads/queries/switcher"
 import { adsAnalyticsSearchParamsCache } from "@/features/ads/schema/analytics"
@@ -74,7 +76,20 @@ export default async function AdsChannelAnalyticsPage(props: {
 
   const promises = Promise.all([
     getAdsAnalyticsData(workspaceId, analyticsRange),
-    getCapiDeliveryData(workspaceId, analyticsRange),
+    // TEMPORARILY HIDDEN (conversion tracking unfinished): the delivery card
+    // that consumes this is commented out in `AdsAnalyticsView`, so running
+    // the query would cost every dashboard load a round trip nothing renders.
+    // A resolved zero summary keeps the tuple shape — and therefore the
+    // component's `promises` prop type — unchanged, so restoring the card is
+    // swapping this one line back for:
+    //   getCapiDeliveryData(workspaceId, analyticsRange),
+    Promise.resolve<CapiDeliverySummary>({
+      sent: 0,
+      pending: 0,
+      failed: 0,
+      skippedNoScope: 0,
+      skippedRegion: 0,
+    }),
     getAdsAnalyticsTimeseries(workspaceId, analyticsRange),
   ])
 

apps/builder/src/app/space/[workspaceId]/dashboard/layout.tsx

@@ -38,7 +38,15 @@ export default async function DashboardLayout({
   const cloud = isCloud()
   const { targetWorkspace } = userAndWorkspace
   const [inboxesResult, { blocked, blockReason }] = await Promise.all([
-    listInboxes({ workspaceId, includes: ["integration"] }),
+    // Disconnected inboxes stay listed: Settings -> Channels shows an
+    // integration whether or not its inbox is still connected, so hiding them
+    // here made a channel silently disappear from one surface while remaining
+    // on the other, with nothing on screen explaining the difference.
+    listInboxes({
+      workspaceId,
+      includes: ["integration"],
+      statuses: ["connected", "disconnected"],
+    }),
     resolveWorkspaceBlockState(targetWorkspace.ownerId),
   ])
   const inboxes = inboxesResult.data.filter((inbox) => inbox.channel !== "smtp")