Skip to content

[v13] Allow adding 'locked' features to menu items and routes#25952

Merged
mcbattirola merged 4 commits intobranch/v13from
mcbattirola/v13/allow-locked-features
May 10, 2023
Merged

[v13] Allow adding 'locked' features to menu items and routes#25952
mcbattirola merged 4 commits intobranch/v13from
mcbattirola/v13/allow-locked-features

Conversation

@mcbattirola
Copy link
Copy Markdown
Contributor

Backports #25588 to v13

mcbattirola and others added 4 commits May 9, 2023 16:33
* 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 mcbattirola marked this pull request as ready for review May 9, 2023 19:46
@github-actions github-actions Bot requested review from gzdunek, kimlisa and ryanclark May 9, 2023 19:47
@mcbattirola mcbattirola changed the title Allow adding 'locked' features to menu items and routes [v13] Allow adding 'locked' features to menu items and routes May 9, 2023
@mcbattirola mcbattirola added this pull request to the merge queue May 10, 2023
Merged via the queue into branch/v13 with commit e1f8eaa May 10, 2023
@mcbattirola mcbattirola deleted the mcbattirola/v13/allow-locked-features branch May 10, 2023 12:48
@r0mant r0mant mentioned this pull request Jul 14, 2023
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.

4 participants