Skip to content

fix(frontend): cap sidebar banner queue #4724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmabrouk wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

fix(frontend): cap sidebar banner queue #4724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion web/oss/src/components/SidebarBanners/state/atoms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ export const PRIORITY_ORDER: Record<BannerType, number> = {
trial: 3, // Lowest priority - show after other banners are dismissed
}

/**
* Maximum number of dismissible sidebar banners a user should have to clear.
* Apply this before dismissal filtering so older changelog entries do not
* backfill the sidebar after each close.
*/
export const MAX_DISMISSIBLE_SIDEBAR_BANNERS = 2

/**
* Persisted atom for dismissed banner IDs.
* Uses localStorage to remember which banners the user has dismissed.
Expand Down Expand Up @@ -107,8 +114,17 @@ export const activeBannersAtom = atom((get) => {
export const visibleBannersAtom = atom((get) => {
const allBanners = get(activeBannersAtom)
const dismissedIds = get(dismissedBannerIdsAtom)
const sortedBanners = [...allBanners].sort(
(a, b) => PRIORITY_ORDER[a.type] - PRIORITY_ORDER[b.type],
)

const cappedDismissibleBanners = sortedBanners
.filter((banner) => banner.dismissible)
.slice(0, MAX_DISMISSIBLE_SIDEBAR_BANNERS)

const nonDismissibleBanners = sortedBanners.filter((banner) => !banner.dismissible)

return allBanners
return [...cappedDismissibleBanners, ...nonDismissibleBanners]
.filter((banner) => !dismissedIds.includes(banner.id))
.sort((a, b) => PRIORITY_ORDER[a.type] - PRIORITY_ORDER[b.type])
})
Expand Down
Loading