-
-
Notifications
You must be signed in to change notification settings - Fork 11.8k
Added multiple-active-subscriptions members warning and filter #28232
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.
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
59eb759
Added multiple subscriptions member filter
kevinansfield ddfccfb
Updated styles
peterzimon 98d563c
Updated test change
peterzimon bc433ac
Changed multiple subscriptions filter to a hidden filter predicate
kevinansfield fcd3335
✨ Added a warning for members with multiple active Stripe subscriptions
kevinansfield File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
apps/posts/src/views/members/components/multiple-active-subscriptions-banner.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import {Banner, Button} from '@tryghost/shade/components'; | ||
| import {formatNumber} from '@tryghost/shade/utils'; | ||
| import {useMultipleActiveSubscriptionsBanner} from '../hooks/use-multiple-active-subscriptions-banner'; | ||
|
|
||
| interface MultipleActiveSubscriptionsBannerProps { | ||
| nql?: string; | ||
| search: string; | ||
| } | ||
|
|
||
| const MultipleActiveSubscriptionsBanner = ({ | ||
| nql, | ||
| search | ||
| }: MultipleActiveSubscriptionsBannerProps) => { | ||
| const banner = useMultipleActiveSubscriptionsBanner({ | ||
| nql, | ||
| search | ||
| }); | ||
|
|
||
| if (!banner.shouldShow) { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <Banner | ||
| role="status" | ||
| variant="warning" | ||
| {...(banner.canDismiss ? { | ||
| dismissible: true as const, | ||
| onDismiss: banner.handleDismiss | ||
| } : { | ||
| dismissible: false as const | ||
| })} | ||
| > | ||
| <div className="flex flex-col gap-3 pr-8 sm:flex-row sm:items-center sm:justify-between"> | ||
| <div className="text-sm font-medium"> | ||
| We found {formatNumber(banner.count)} {banner.count === 1 ? 'member' : 'members'} with more than one active paid subscription.{' '} | ||
| <a className="font-semibold underline" href="https://ghost.org/help/duplicate-subscription-warning/" rel="noopener noreferrer" target="_blank">Learn more</a> | ||
| </div> | ||
| {banner.canDismiss && ( | ||
| <Button size="sm" variant="outline" onClick={banner.handleViewMembers}> | ||
| View members | ||
| </Button> | ||
| )} | ||
| </div> | ||
| </Banner> | ||
| ); | ||
| }; | ||
|
|
||
| export default MultipleActiveSubscriptionsBanner; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks a bit fishy to me. I think we should have a general way to preserve additional filter parameters without coupling this to the multiple active subscriptions banner. Ideally, we would just have that banner link to the member list view with the appropriate filter query state, and the rest would be driven by the URL. No preserveMultipleActiveSubscriptionsFilter or preservedRawFilter shenanigans.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean without having the filter in the URL? One of the main use-cases for the URL approach is to allow it to be bookmarked and linked to from our help docs.