Feature - inline ui can now merge OR groupings #193
Conversation
…dition thereby merging condition groups
|
|
||
| def set_blank_filter |
There was a problem hiding this comment.
This wasn't being used anywhere and was leftover from my work on the clear button. So removed
| @@ -93,12 +93,17 @@ def clear | |||
| handle_filter_update() | |||
| end | |||
|
|
|||
| private | |||
| def merge_groups | |||
| @criterion = Refine::Inline::Criterion.new(criterion_params.merge(refine_filter: @refine_filter)) | |||
There was a problem hiding this comment.
Technically we don't need a criterion object to perform the operation required here, but the controller expects a criterion so the action just passes in the first element of the group being acted on. Its not ideal and arguably we should have a conjunction controller or a rethink of how criteria are managed. Today criterion are also acting on their surrounding conjunctions and it can be confusing but I didn't want to mess with this paradigm in this work
| def change_conjunction(index, conjunction_word) | ||
| if conjunction_word == "and" | ||
| blueprint[index][:word] = "and" | ||
| elsif conjunction_word == "or" |
There was a problem hiding this comment.
No real use case for this behavior but I went ahead and added it since it was easy
| @@ -15,15 +15,7 @@ | |||
| <% else %> | |||
| <div class="refine--groups-wrapper"> | |||
| <% groups.each.with_index do |group, i| %> | |||
| <% unless i == 0 %> | |||
There was a problem hiding this comment.
most of this got moved into the or_separator partial
In the inline UI, the OR groups are separated by the text "OR". This PR updates this pill to have a remove button. Upon activation, the Or conjunction is flipped to an And conjunction, thereby merging the two groups.
This PR also: