Skip to content
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

Enterprise version detection fix #4547

Merged
merged 5 commits into from
May 10, 2018
Merged

Enterprise version detection fix #4547

merged 5 commits into from
May 10, 2018

Conversation

meirish
Copy link
Contributor

@meirish meirish commented May 10, 2018

There was a bug if you were running the HSM build of Enterprise where the UI would parse the version wrong and lock you out of all Enterprise features.

In addition there was a race condition with the replication menu so you'd only see the type of replication you had enabled in the menu and Performance would be an upsell link. Now we fetch features at the cluster route to ensure they're loaded before the application nav renders.

We also fixed a small layout bug in the replication menu.

@meirish meirish requested review from a team May 10, 2018 20:13
alisdair
alisdair previously approved these changes May 10, 2018
Copy link

@alisdair alisdair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Just one minor suggestion.

@@ -29,7 +30,10 @@ export default Ember.Route.extend(ModelBoundaryRoute, ClusterRoute, {

model(params) {
const id = this.getClusterId(params);
return this.get('store').findRecord('cluster', id);

return this.get('version').fetchFeatures().then(() => {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could move this to a beforeModel hook, to prevent the explicit promise chaining and keep the model hook simple.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yep, good call - updated in e9721df. Thanks!

@meirish meirish added this to the 0.10.2 milestone May 10, 2018
@meirish meirish merged commit dee9f11 into master May 10, 2018
@meirish meirish deleted the enterprise-version-fix branch May 10, 2018 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants