Skip to content

Fix issues with superadmin org filtering logic #2638

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

Jump to bottom
Merged
merged 7 commits into from
Jun 4, 2025
Merged

Fix issues with superadmin org filtering logic #2638

merged 7 commits into from
Jun 4, 2025

Conversation

emma-sg
Copy link
Member

@emma-sg emma-sg commented May 29, 2025 •
edited
Loading

Fixes #2636

Changes

  • Displays trials scheduled for cancellation alongside non-trials scheduled for cancellation
  • Adds filter for "bad states" — active orgs that have a cancelled subscription, orgs with a cancellation date in the past, and empty subscription ids currently, but could be extended as necessary
  • Displays scheduled-for-cancellation trials in the "trialing" filter as well
  • Improves display of future cancellation durations for both active subscriptions and trials
  • Surfaces issues where a trial cancellation was scheduled for the past but the org is still active
  • Swaps out sl-tooltips for btrix-popovers in popovers with longer details
  • Adds correct heading levels, tabindex, and orientation for popovers in use here

Follow-ups

Once #2637 is merged we can swap out the sl-tooltips for btrix-popovers here done! & in the superadmin stats card

@emma-sg emma-sg requested a review from ikreymer May 29, 2025 22:23
@emma-sg emma-sg force-pushed the frontend-fix-superadmin-org-filter-issue branch from 2c43410 to 65d394a Compare June 2, 2025 17:53
emma-sg added 2 commits June 2, 2025 14:33
@emma-sg
use btrix-popover for larger info tooltips instead of sl-tooltip
f41004f 
- add tabindex to these larger info tooltip targets
- use correct heading level for their contents' headings
- update warning text color to work with popover color scheme
@emma-sg
include scheduled-for-cancellation trials in "trialing" filter
d123327
@emma-sg emma-sg requested a review from SuaYoo June 2, 2025 18:42
@emma-sg emma-sg merged commit 7f44f43 into main Jun 4, 2025
27 checks passed
@emma-sg emma-sg deleted the frontend-fix-superadmin-org-filter-issue branch June 4, 2025 07:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ikreymer ikreymer ikreymer approved these changes

@SuaYoo SuaYoo Awaiting requested review from SuaYoo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: In superadmin view, all trials should be listed under "trials"
2 participants
@emma-sg @ikreymer