Refactor toolbar builder #12025
Merged
Refactor toolbar builder #12025
Conversation
This file contains 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
romanblanco
force-pushed
the
toolbar_builder_refactoring
branch
5 times, most recently
from
a0b8a9f
to
f70406b
Compare
romanblanco
force-pushed
the
toolbar_builder_refactoring
branch
4 times, most recently
from
eeffc44
to
5bed11a
Compare
This was referenced Oct 25, 2016
romanblanco
force-pushed
the
toolbar_builder_refactoring
branch
3 times, most recently
from
fb15c81
to
3b919e6
Compare
romanblanco
force-pushed
the
toolbar_builder_refactoring
branch
from
3b919e6
to
648fc60
Compare
A lot of methods still has prefix from time, when these methods were in application controller. In this commit I'm changing method names to be more specific and also trying to provide at least basic description of what does the methods do
Don't call methods for setting buttons properties in '#skipped?' method, where we check if the button should be rendered.
Call '#skipped?' method that determines if the buttons should be rendered earlier in the code
| @@ -58,8 +58,7 @@ def all_instance_variables_set | |||
| def skipped? | |||
| return true unless role_allows_feature? | |||
| return true unless all_instance_variables_set | |||
| calculate_properties | |||
| !visible? | |||
| return !visible? | |||
| nil | ||
| else | ||
| apply_common_props(button, inputs) | ||
| end |
There was a problem hiding this comment.
button.skipped? ? nil : apply_common_props(button, inputs)
or early return:
return nil if button.skipped?
apply_common_props(button, inputs)
any of the 2 is more readable than the above imho
There was a problem hiding this comment.
@martinpovolny updated, thanks!
|
Looks good. My only concern: are you sure that none of the |
|
@PanSpagetka @jzigmund @vecerek: can you check the |
|
@martinpovolny I've checked all current |
romanblanco
force-pushed
the
toolbar_builder_refactoring
branch
from
648fc60
to
410399c
Compare
|
Checked commits romanblanco/manageiq@db53fee~...410399c with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 app/helpers/application_helper/button/basic.rb
app/helpers/application_helper/toolbar_builder.rb
|
vecerek
approved these changes
Nov 2, 2016
There was a problem hiding this comment.
@martinpovolny we checked the visible methods with @romanblanco and the changes seem to be fine. No problem encountered.
vecerek
reviewed
Nov 2, 2016
| end | ||
| end | ||
|
|
||
| context "build_toolbar" do | ||
| context "loolbar_class" do |
There was a problem hiding this comment.
@vecerek lool 😄 nice catch! 👍 I'll fix it in another PR, thanks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We need to chane control flow, so we don't need to evaluate procs of toolbars for buttons that are going to be skipped, and avoid situations like this
/cc @PanSpagetka @martinpovolny @jzigmund @vecerek