Allow adding 'locked' features to menu items and routes#25588
Merged
mcbattirola merged 28 commits intomasterfrom May 9, 2023
Merged
Allow adding 'locked' features to menu items and routes#25588mcbattirola merged 28 commits intomasterfrom
mcbattirola merged 28 commits intomasterfrom
Conversation
…tirola/allow-locked-features
kimlisa
reviewed
May 4, 2023
…tirola/allow-locked-features
mcbattirola
changed the title
kimlisa
approved these changes
May 5, 2023
kimlisa
reviewed
May 5, 2023
…ational/teleport into mcbattirola/allow-locked-features
…tirola/allow-locked-features
…ational/teleport into mcbattirola/allow-locked-features
gzdunek
reviewed
May 8, 2023
Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
gzdunek
reviewed
May 8, 2023
gzdunek
approved these changes
May 8, 2023
ryanclark
approved these changes
May 9, 2023
mcbattirola
added a commit
that referenced
this pull request
May 9, 2023
* Add locked feature options * Remove routes from items with locked parents * Refactor to simplify features * Add type for LockedFeatures * Improve comment * Fix call to isLockedAndUpdatedRouteAndNavigationItem wrong param * Set locked features based on usage based billing * Add back lockedRoute and list items * Use simpler sintax Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com> * Simplify isParentLocked * Improve navigation item rendering * Remove unucessary condition from if * Prevent adding a route if the feature is locked * Throw error instead of logging * Improve if condition --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
|
@mcbattirola See the table below for backport results.
|
hugoShaka
pushed a commit
that referenced
this pull request
May 9, 2023
* Add locked feature options * Remove routes from items with locked parents * Refactor to simplify features * Add type for LockedFeatures * Improve comment * Fix call to isLockedAndUpdatedRouteAndNavigationItem wrong param * Set locked features based on usage based billing * Add back lockedRoute and list items * Use simpler sintax Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com> * Simplify isParentLocked * Improve navigation item rendering * Remove unucessary condition from if * Prevent adding a route if the feature is locked * Throw error instead of logging * Improve if condition --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
mcbattirola
added a commit
that referenced
this pull request
May 9, 2023
) * Add locked feature options * Remove routes from items with locked parents * Refactor to simplify features * Add type for LockedFeatures * Improve comment * Fix call to isLockedAndUpdatedRouteAndNavigationItem wrong param * Set locked features based on usage based billing * Add back lockedRoute and list items * Use simpler sintax * Simplify isParentLocked * Improve navigation item rendering * Remove unucessary condition from if * Prevent adding a route if the feature is locked * Throw error instead of logging * Improve if condition --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
mcbattirola
added a commit
that referenced
this pull request
May 9, 2023
* Add locked feature options * Remove routes from items with locked parents * Refactor to simplify features * Add type for LockedFeatures * Improve comment * Fix call to isLockedAndUpdatedRouteAndNavigationItem wrong param * Set locked features based on usage based billing * Add back lockedRoute and list items * Use simpler sintax Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com> * Simplify isParentLocked * Improve navigation item rendering * Remove unucessary condition from if * Prevent adding a route if the feature is locked * Throw error instead of logging * Improve if condition --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
mcbattirola
added a commit
that referenced
this pull request
May 10, 2023
* Allow adding 'locked' features to menu items and routes (#25588) * Add locked feature options * Remove routes from items with locked parents * Refactor to simplify features * Add type for LockedFeatures * Improve comment * Fix call to isLockedAndUpdatedRouteAndNavigationItem wrong param * Set locked features based on usage based billing * Add back lockedRoute and list items * Use simpler sintax Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com> * Simplify isParentLocked * Improve navigation item rendering * Remove unucessary condition from if * Prevent adding a route if the feature is locked * Throw error instead of logging * Improve if condition --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com> * Allow adding locked features to menu items and routes * Fix duplicated imports * Remove blank line --------- Co-authored-by: Grzegorz Zdunek <gzdunek@users.noreply.github.com>
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 a way to add "locked" features in the menu items.
This is used in https://github.com/gravitational/teleport.e/pull/1200, where we add a different version of a feature (a "preview") for customers without that feature enabled