Team plan CTAs#25073
Merged
mcbattirola merged 51 commits intomasterfrom May 2, 2023
Merged
Conversation
…tirola/team-features-CTAs
Contributor
Author
|
Update: I have synced this with master. Now my changes to the join button component is way smaller :) |
michellescripts
approved these changes
May 1, 2023
avatus
approved these changes
May 1, 2023
Contributor
avatus
left a comment
avatus
left a comment
There was a problem hiding this comment.
Thank you for adding default params on these optional props. LGTM
|
@mcbattirola See the table below for backport results.
|
mcbattirola
added a commit
that referenced
this pull request
May 3, 2023
* (wip) add unlock feature button to support page * Fix typo * (wip) add locked feature join session * Improve session join style * Add session join lock button * Remove hover on locked join menu * Update copy * Only show `join as...` when appropriate * (wip) * Make ButtonLockedFeature theme sensitive * Remove debug stuff * Adjust feature button height * Fix session join button on locked * Remove unused import * typo * Add link to cta button * Remove teams flag * Add cta service * Update snapshots * Lock button style * Add cta to context * Rename cta to ctaService * Stories and tests * Add comments clarifying that ctas are not used currently * add showActiveSessionsCTA to useSessions * Licenses * Lint license * Remove commented out code * Add missing types * Replace cta service for an object with cta on context * Fix menu hack * small refactor in styled stuff * Update SessionJoinBtn to use master code * Snapshot update * Minor stuff
mcbattirola
added a commit
that referenced
this pull request
May 3, 2023
* Team plan CTAs (#25073) * (wip) add unlock feature button to support page * Fix typo * (wip) add locked feature join session * Improve session join style * Add session join lock button * Remove hover on locked join menu * Update copy * Only show `join as...` when appropriate * (wip) * Make ButtonLockedFeature theme sensitive * Remove debug stuff * Adjust feature button height * Fix session join button on locked * Remove unused import * typo * Add link to cta button * Remove teams flag * Add cta service * Update snapshots * Lock button style * Add cta to context * Rename cta to ctaService * Stories and tests * Add comments clarifying that ctas are not used currently * add showActiveSessionsCTA to useSessions * Licenses * Lint license * Remove commented out code * Add missing types * Replace cta service for an object with cta on context * Fix menu hack * small refactor in styled stuff * Update SessionJoinBtn to use master code * Snapshot update * Minor stuff * Fix style messed on cherry-picking
|
@mcbattirola See the table below for backport results.
|
mcbattirola
added a commit
that referenced
this pull request
May 5, 2023
* (wip) add unlock feature button to support page * Fix typo * (wip) add locked feature join session * Improve session join style * Add session join lock button * Remove hover on locked join menu * Update copy * Only show `join as...` when appropriate * (wip) * Make ButtonLockedFeature theme sensitive * Remove debug stuff * Adjust feature button height * Fix session join button on locked * Remove unused import * typo * Add link to cta button * Remove teams flag * Add cta service * Update snapshots * Lock button style * Add cta to context * Rename cta to ctaService * Stories and tests * Add comments clarifying that ctas are not used currently * add showActiveSessionsCTA to useSessions * Licenses * Lint license * Remove commented out code * Add missing types * Replace cta service for an object with cta on context * Fix menu hack * small refactor in styled stuff * Update SessionJoinBtn to use master code * Snapshot update * Minor stuff
mcbattirola
added a commit
that referenced
this pull request
May 9, 2023
* Team plan CTAs (#25073) * (wip) add unlock feature button to support page * Fix typo * (wip) add locked feature join session * Improve session join style * Add session join lock button * Remove hover on locked join menu * Update copy * Only show `join as...` when appropriate * (wip) * Make ButtonLockedFeature theme sensitive * Remove debug stuff * Adjust feature button height * Fix session join button on locked * Remove unused import * typo * Add link to cta button * Remove teams flag * Add cta service * Update snapshots * Lock button style * Add cta to context * Rename cta to ctaService * Stories and tests * Add comments clarifying that ctas are not used currently * add showActiveSessionsCTA to useSessions * Licenses * Lint license * Remove commented out code * Add missing types * Replace cta service for an object with cta on context * Fix menu hack * small refactor in styled stuff * Update SessionJoinBtn to use master code * Snapshot update * Minor stuff * update snapshots * Update snapshots * Remove duplicated prop
Closed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This PR adds CTAs for the usage-based billing plan.
Designs can be found here. Note that some of the designs are implemented in this teleport.e pr: https://github.com/gravitational/teleport.e/pull/1200.
Note that the CTAs are hidden behind a flag set by
ctaService. Currently, this service is never updated, so CTAs shouldn't be visible currently. In the future, this will be updated at the app start time based on the cluster features.I also added a flag to the config
isUsageBasedBilling. This will always be false for now. In a future PR, when I update this code to actually set the CTA flags, this value will be used. This is used for now on https://github.com/gravitational/teleport.e/pull/1200 to show/hide the usage-based specific access requests page.You can update
web/packages/teleport/src/services/cta/cta.tsand set all fields totrueto test this (or see the storybook components).Part of https://github.com/gravitational/cloud/issues/4119
Edit: there was some overlapping between the CTA of active sessions in this PR and the work done on #24961. I'll wait for it to be merged and go back to this.