Consolidated View life cycle + billing integration #5866

aerosol · 2025-11-04T13:00:41Z

Changes

This PR integrates consolidated view life cycle with billing properties.
It relies on two migrations (~~included here still~~), extracted to separate PRs:

Main changes:

new feature flag: :consolidated_view - we no longer display anything based on super_admin role; flag is not setup on production yet, meaning existing consolidated views will disappear (and no CTAs will be shown).
new billing feature: ConsolidatedView
all existing plans are updated, so that business tier includes the newly added features - either through static definitions or database migration
whenever /sites is visited an attempt is made to create consolidated view. If the team is eligible, and the feature flag is raised, the consolidated view card is shown. Otherwise a CTA card is displayed (courtesy of @sanne-san)
- CTA card has several variants, depending on the context, but eventually leads to upgrade. Once the upgrade is performed, /sites will include the consolidated view card.
- CTA card can be permanently dismissed per user and team; because local storage and cookies turned out to be very difficult to work with in this setup, the decision was made to introduce a new postgres table capable of storing user preferences in a team context (it's almost a 1:1 copy of the existing site user preferences table)
- When CTA is dismissed, the "New Site" button becomes a prima drop-down (courtesy of @ukutaht) from which the user may restore it (by selecting "+ New consolidated view" dropdown item)
- CRM now presents a more elaborate alert on deleting consolidated view, as well as the availability status (whether upgrade is required)
- some minor improvements BTW:
  - shared links enforce regular sites,
  - accessing a consolidated view via pre-existing URL, while ineligible, redirects to /sites
  - at least 2 sites are now required to create (or even suggest) a consolidated view
  - ConsolidatedView.enabled?/1 has been removed, since enabling doesn't mean availability

TODO:

staging preview is currently unavailable due to pending migrations
~~there are visual issues with card plots and overlapping dropdowns~~

record-2025-11-10-10-29-34-year.node.norm.mp4

~~the dropdown doesn't respect dark mode~~

Tests

Automated tests have been added
This PR does not require tests

Changelog

Entry has been added to changelog
This PR does not make a user-facing change

Documentation

Docs have been updated
This change does not need a documentation update

Dark mode

The UI has been tested both in dark and light mode
This PR does not change the UI

- add functions to manipulate user/team options (for CTA) - require at least two sites in order to create a consolidated view - require billing/plan compliance when computing eligibility

Co-authored-by: Sanne de Vries <[email protected]> Co-authored-by: Uku Taht <[email protected]>

- require team-wise feature flag instead of super admin role - redirect to /sites if the team isn't eligible any more - enforce regular site in shared links controller

RobertJoonas

Good stuff, looks great overall! A few comments inline.

extra/lib/plausible/consolidated_view.ex

extra/lib/plausible_web/live/customer_support/team/components/consolidated_views.ex

lib/plausible_web/controllers/stats_controller.ex

lib/plausible_web/live/sites.ex

RobertJoonas · 2025-11-10T15:44:00Z

lib/plausible_web/live/sites.ex

  end

-  def upgrade_card(assigns) do
+  def consolidated_view_card_cta(assigns) do


There's a slight UI annoyance I'm seeing locally. Try to hide the CTA card, then navigate to another page, e.g. click on one of the site cards to see a dashboard. Now, hit back in the browser history. The card flickers for a second and then disappears. Same happens when you've hidden it before and then restore it.

We should make sure that hiding/restoring the card also updates the entry in browser history stack.

phoenixframework/phoenix_live_view#3508 looks like a similar issue and from what I see it was tricky to address and I'm not event sure it got fully resolved?

test/plausible_web/live/sites_test.exs

aerosol · 2025-11-11T08:04:19Z

lib/plausible_web/live/sites.ex

      <div :if={@has_sites?}>
        <ul class="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
-          <!-- Insert upgrade_card here -->
+          <.consolidated_view_card_cta


I'll see if I can extract this to a separate component and maybe even extract the state management out of here. It's getting really noisy.

Moving conditional expressions to the start of render and assigning them to something like show_consolidated_view_cta? and show_consolidated_view? might help clean it up as well.

@sanne-san

cc @sanne-san

zoldar

God's work 🙏 Left some feedback, most of it just nice-to-haves. Keeping preferences on membership instead of team/user combo makes more sense to me.

EDIT: Oh, and one more thing I've noted and then forgot about. Perhaps ConslidatedView.reset_if_enabled could be turned into an upsert? That would pair well with disable which is resilient to the view struct getting stale already.

extra/lib/plausible/consolidated_view.ex

lib/plausible/teams/user_preference.ex

lib/plausible/teams/users.ex

zoldar · 2025-11-12T09:55:41Z

lib/plausible_web/live/sites.ex

-            <Heroicons.cog_6_tooth class="hidden group-hover:inline size-5 dark:text-gray-100 text-gray-900" />
-          </.unstyled_link>
        </h2>
+        <.unstyled_link


Maybe a good opportunity to use icon_button component, which was recently introduced? 😄 Though it might require introducing one more theme.

hrm @sanne-san do you think it's something we should do in this context?

zoldar · 2025-11-12T10:01:59Z

lib/plausible_web/live/sites.ex

      <div :if={@has_sites?}>
        <ul class="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
-          <!-- Insert upgrade_card here -->
+          <.consolidated_view_card_cta


Moving conditional expressions to the start of render and assigning them to something like show_consolidated_view_cta? and show_consolidated_view? might help clean it up as well.

zoldar · 2025-11-12T10:10:15Z

lib/plausible_web/live/sites.ex

  end

-  def upgrade_card(assigns) do
+  def consolidated_view_card_cta(assigns) do


phoenixframework/phoenix_live_view#3508 looks like a similar issue and from what I see it was tricky to address and I'm not event sure it got fully resolved?

Will be included via main branch sync This reverts commit 05bec55.

github-actions · 2025-11-12T11:42:25Z

Preview environment👷🏼‍♀️🏗️
PR-5866

…illing

aerosol force-pushed the consolidated-view-billing branch 2 times, most recently from ea6644d to b1e1b17 Compare November 10, 2025 10:10

aerosol added 5 commits November 10, 2025 13:40

Migration: add consolidated views feature to enterprise plans

05bec55

Migration: Add user preferences per team table

92ef4a0

Update static plan definitions

0ce1fe3

Add feature module definition

7ae18f5

Display consolidated view availability in crm

b6b4edf

aerosol force-pushed the consolidated-view-billing branch from 2fa36cd to 1b9decd Compare November 10, 2025 12:40

aerosol and others added 5 commits November 10, 2025 13:46

Extend ConsolidatedView interface:

b11e3f5

- add functions to manipulate user/team options (for CTA) - require at least two sites in order to create a consolidated view - require billing/plan compliance when computing eligibility

Team/User preferences schema

5fa19b7

Implement consolidated view life cycle on /sites

11e031c

Co-authored-by: Sanne de Vries <[email protected]> Co-authored-by: Uku Taht <[email protected]>

Enroll consolidated_view feature flag

80c13dd

Consolidated view access hardening (+feature flag)

87e593f

- require team-wise feature flag instead of super admin role - redirect to /sites if the team isn't eligible any more - enforce regular site in shared links controller

aerosol force-pushed the consolidated-view-billing branch from 1b9decd to 87e593f Compare November 10, 2025 12:46

Remove no longer needed ConsolidatedView.enabled?/1

2ae4797

aerosol force-pushed the consolidated-view-billing branch from 64760be to 2ae4797 Compare November 10, 2025 12:53

Alias PrimaDropdown

9b2bfe3

aerosol changed the title ~~[wip] Consolidated View: billing integration~~ Consolidated View life cycle + billing integration Nov 10, 2025

aerosol added preview and removed preview labels Nov 10, 2025

plausible deleted a comment from github-actions bot Nov 10, 2025

aerosol requested review from RobertJoonas, sanne-san and zoldar November 10, 2025 13:19

aerosol marked this pull request as ready for review November 10, 2025 13:37

RobertJoonas reviewed Nov 10, 2025

View reviewed changes

aerosol added 3 commits November 11, 2025 08:42

No consolidates views for shared links

00556c8

Remove user argument from ok_to_display?

93412ec

Adjust a temporary test

c116447

aerosol commented Nov 11, 2025

View reviewed changes

sanne-san approved these changes Nov 11, 2025

View reviewed changes

aerosol and others added 3 commits November 11, 2025 12:24

Use the plus icon for standalone "Add website" too

111294d

cc @sanne-san

Format

d5d4ba7

Fix z-index issue with dropdowns on sites page

f2b5a2d

sanne-san force-pushed the consolidated-view-billing branch from 557d2e8 to f2b5a2d Compare November 11, 2025 11:46

sanne-san approved these changes Nov 11, 2025

View reviewed changes

aerosol added 4 commits November 12, 2025 07:35

Remove TODOs

0d7b949

Make consolidated view cards disappear when searching

6e4409d

Clean up test

876ae2a

Use per-team membership user preferences

5108d40

zoldar approved these changes Nov 12, 2025

View reviewed changes

aerosol added 4 commits November 12, 2025 11:27

Use conditional instead of with statement

ba695c4

Inline ensure_eligible

9a1dff7

Use Map.fetch! getting preference from default struct

47e30e3

fixup

ad8712e

aerosol mentioned this pull request Nov 12, 2025

Migration: team membership user preferences table #5881

Merged

aerosol added 2 commits November 12, 2025 11:48

Revert "Migration: add consolidated views feature to enterprise plans"

c92e06f

Will be included via main branch sync This reverts commit 05bec55.

Merge branch 'master' into consolidated-view-billing

3ff5d0c

aerosol added the preview label Nov 12, 2025

aerosol added 2 commits November 12, 2025 14:31

Fix and test feature-flag effect on both view and CTA cards

9e70222

Merge remote-tracking branch 'origin/master' into consolidated-view-b…

9cab9b2

…illing

aerosol added this pull request to the merge queue Nov 12, 2025

Merged via the queue into master with commit 08c7d2e Nov 12, 2025
17 of 28 checks passed

This was referenced Nov 24, 2025

[CLEAN] Synthetic Benchmark PR #5866 - Consolidated View life cycle + billing integration qodo-benchmark/analytics#21

Open

[CORRUPTED] Synthetic Benchmark PR #5866 - Consolidated View life cycle + billing integration qodo-benchmark/analytics#22

Open

aerosol deleted the consolidated-view-billing branch November 24, 2025 12:08

This was referenced Dec 4, 2025

[CLEAN] Synthetic Benchmark PR #5866 - Consolidated View life cycle + billing integration qodo-benchmark/analytics#91

Open

[CORRUPTED] Synthetic Benchmark PR #5866 - Consolidated View life cycle + billing integration qodo-benchmark/analytics#92

Open

Uh oh!

Consolidated View life cycle + billing integration #5866

Consolidated View life cycle + billing integration #5866

Uh oh!

Conversation

aerosol commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Tests

Changelog

Documentation

Dark mode

Uh oh!

RobertJoonas left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zoldar left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

aerosol commented Nov 4, 2025 •

edited

Loading

zoldar left a comment •

edited

Loading