Skip to content

[v12] Allow adding 'locked' features to menu items and routes (#25588)#25886

Merged
mcbattirola merged 1 commit intobranch/v12from
mcbattirola/v12/allow-locked-features
May 9, 2023
Merged

[v12] Allow adding 'locked' features to menu items and routes (#25588)#25886
mcbattirola merged 1 commit intobranch/v12from
mcbattirola/v12/allow-locked-features

Conversation

@mcbattirola
Copy link
Copy Markdown
Contributor

Backport #25588 to v12

* 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>
@github-actions github-actions Bot requested review from gzdunek, kimlisa and ryanclark May 9, 2023 13:15
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from kimlisa May 9, 2023 13:32
@mcbattirola mcbattirola added this pull request to the merge queue May 9, 2023
Merged via the queue into branch/v12 with commit a6e81f0 May 9, 2023
@mcbattirola mcbattirola deleted the mcbattirola/v12/allow-locked-features branch May 9, 2023 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants