refine-rails 2.11.3 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da49445eb684d8187ebe0ba05aa919d6293ec55e63e7df2dad3e58051712e901
-  data.tar.gz: d732551892233793e9cf3fbba13143b59698fb27a4029c8635a9202e2ca9b5b2
+  metadata.gz: e921dba424ec4dd695b208763935dbd6f9b5b0425995aa3276c5b08cac46b155
+  data.tar.gz: 10b4c51b19762c45072ee21408241557e870eb09b5f5028f7cc5bf11c9a99745
 SHA512:
-  metadata.gz: b46d8c7809b3c0fa10a1122b2ff16b81e4fdbf36100a426a822c928eccb3d30d6c75b7a073abee80c46a9345b960cf04936cb59d0e77e4373df4484371a17fd4
-  data.tar.gz: cb90e961a890efaa351999f60279380ebc51f7bd7e28bd9856f19856b074c0c8b7a39a06e405f70be95525426af76adb6f0f98d57332b5c72469b65160e9e8b9
+  metadata.gz: 32d2d1e47bd7572142ccd90f6ab23c721bdf0b240646f4b5b1d7140077ed4edac83f2729e33f29fd3c14e91215feea31c4d6006b65edf4828c10862a8cfbc4c3
+  data.tar.gz: 812d9a29cc85ed48f8932f7aab31aee12dd5a793499c5f496b30582f1b95c7a4748f9362c891b8914cd043491b364a0de4d1c039df68d385b11d9a09b4976a3d

data/app/assets/stylesheets/index.css

@@ -1239,12 +1239,24 @@
   flex-wrap: wrap;
   display: flex;
   align-items: center;
+  justify-content: end;
 }
 
-@media (max-width: 960px) {
+@media (max-width: 1525px) {
   .refine--filter-control-group {
-    justify-content: end;
-    width: 25%;
+    width: 24%;
+  }
+}
+
+@media (max-width: 1200px) {
+  .refine--filter-control-group {
+    width: 30%;
+  }
+}
+
+@media (max-width: 1100px) {
+  .refine--filter-control-group {
+    width: 40%;
   }
 }
 
@@ -1265,6 +1277,14 @@
   text-align: left;
 }
 
+.refine--group-join {
+  &:hover {
+    .refine--remove-group {
+      display: block;
+    }
+  }
+}
+
 .refine--group {
   display: flex;
   gap: 10px;
@@ -1383,7 +1403,7 @@
   padding: 4px;
 }
 
-.refine--remove-condition {
+.refine--remove-condition, .refine--remove-group {
   display: none;
   color: #fff;
   padding: 0px 2px 0px 2px;
@@ -1400,12 +1420,11 @@
   .icon.refine--icon-sm {
     padding: 2px 0 ;
   }
-}
-
-&:hover {
-  border-color: #999;
-  .remove-applied-condition {
-    display: block;
+  &:hover {
+    border-color: #999;
+    .remove-applied-condition {
+      display: block;
+    }
   }
 }
 

data/app/assets/stylesheets/index.tailwind.css

@@ -418,12 +418,23 @@
   flex-wrap: wrap;
   display: flex;
   align-items: center;
+  justify-content: end;
 }
 
-@media (max-width: 960px) {
+
+@media (max-width: 1525px) {
+  .refine--filter-control-group {
+    width: 24%;
+  }
+}
+@media (max-width: 1200px) {
+  .refine--filter-control-group {
+    width: 30%; 
+  }
+}
+@media (max-width: 1100px) {
   .refine--filter-control-group {
-    justify-content: end;
-    width: 25%; 
+    width: 40%; 
   }
 }
 
@@ -444,6 +455,14 @@
   text-align: left;
 }
 
+.refine--group-join {
+  &:hover {
+    .refine--remove-group {
+      display: block;
+    }
+  }
+}
+
 .refine--group {
   display: flex;
   gap: 10px;
@@ -563,7 +582,7 @@
   padding: 4px;
 }
 
-.refine--remove-condition {
+.refine--remove-condition, .refine--remove-group {
   display: none;
   color: #fff;
   padding: 0px 2px 0px 2px;
@@ -580,15 +599,15 @@
   .icon.refine--icon-sm {
     padding: 2px 0 ;
   }
-
-}
-&:hover {
-  border-color: #999;
-  .remove-applied-condition {
-    display: block;
+  &:hover {
+    border-color: #999;
+    .remove-applied-condition {
+      display: block;
+    }
   }
 }
 
+
 .refine--condition-value-wrapper {
   position: absolute;
   top: 100%;

data/app/controllers/refine/inline/criteria_controller.rb

@@ -93,12 +93,17 @@ class Refine::Inline::CriteriaController < ApplicationController
     handle_filter_update()
   end
 
-  private
+  def merge_groups
+    @criterion = Refine::Inline::Criterion.new(criterion_params.merge(refine_filter: @refine_filter)) 
+    Refine::Filters::BlueprintEditor
+    .new(@refine_filter.blueprint)
+    .change_conjunction(criterion_params[:position].to_i - 1, "and")
 
-  def set_blank_filter
-    @refine_filter = Refine::Rails.configuration.stabilizer_classes[:url].new
+    handle_filter_update(@refine_filter.to_stable_id)
   end
 
+  private
+
   def set_refine_filter
     @refine_filter ||= Refine::Rails.configuration.stabilizer_classes[:url]
       .new

data/app/models/refine/filters/blueprint_editor.rb

@@ -59,6 +59,14 @@ class Refine::Filters::BlueprintEditor
     blueprint[index][:input] = input
   end
 
+  def change_conjunction(index, conjunction_word)
+    if conjunction_word == "and"
+      blueprint[index][:word] = "and"
+    elsif conjunction_word == "or"
+      blueprint[index][:word] = "or"
+    end
+  end
+
   def delete(index)
    # To support 'groups' there is some complicated logic for deleting criterion.
    #

data/app/views/refine/inline/filters/_criterion.html.erb

@@ -9,10 +9,10 @@
       <%= link_to refine_inline_criterion_path(criterion.position, criterion.to_params), class: "refine--remove-condition", data: {turbo_method: :delete, controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit"} do %>
         <span class="material-icons-outlined refine--icon-sm">clear</span>
       <% end %>
-      <%= link_to edit_refine_inline_criterion_path(criterion.position, criterion.to_params), class:"refine--condition-pill-button", data: {controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit"} do %>
+      <%= link_to edit_refine_inline_criterion_path(criterion.position, criterion.to_params), class:"refine--condition-pill-button", data: {controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit refine--popup#show"} do %>
         <div class="refine--condition-pill-name"><%= criterion.condition_display %></div>
         <div class="refine--condition-value-clause"><%= criterion.clause_display %></div>
-        <div class="refine--condition-value-self" title="<%= criterion.human_readable_value %>">
+        <div class="refine--condition-value-self" title="<%= criterion.human_readable_value %>" data-controller="tooltip" data-tooltip-content-value="<%= criterion.human_readable_value %>">
           <%= criterion.human_readable_value %>
         </div>
       <% end %>

data/app/views/refine/inline/filters/_or_separator.html.erb

@@ -0,0 +1,16 @@
+<% group_position ||= 0 %>
+
+<% unless group_position == 0 %>
+  <% if render_stack %>
+    <div class="refine--group-join-stack">
+  <% end %>
+  <div class="refine--group-join">
+    <%= t("refine.inline.filters.or") %>
+    <%= link_to merge_groups_refine_inline_criteria_path(group.first.to_params), class: "refine--remove-group", data: {turbo_method: :post, controller: "refine--turbo-stream-link", action: "refine--turbo-stream-link#visit"} do %>
+      <span class="material-icons-outlined refine--icon-sm">clear</span>
+    <% end %>
+  </div>
+  <% if render_stack %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/refine/inline/filters/_show.html.erb

@@ -15,15 +15,7 @@
     <% else %>
       <div class="refine--groups-wrapper">
         <% groups.each.with_index do |group, i| %>
-          <% unless i == 0 %>
-            <% if render_stack %>
-              <div class="refine--group-join-stack">
-            <% end %>
-              <div class="refine--group-join"><%= t("refine.inline.filters.or") %></div>
-            <% if render_stack %>
-              </div>
-            <% end %>
-          <% end %>
+          <%= render "refine/inline/filters/or_separator", group: group, group_position: i, render_stack: render_stack %>
           <%= render "refine/inline/filters/group", group: group, group_count: groups.count, condition_count: group.count, render_stack: render_stack %>
           <% if i == groups.length - 1 %>
             <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>

data/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
     end
     namespace :inline do
       resources :criteria, except: [:show] do
+        post "merge_groups", on: :collection
         post "clear", on: :collection
       end
       resources :stored_filters, only: [:index, :new, :create] do

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.11.3"
+    VERSION = "2.11.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.11.5
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,6 +149,7 @@ files:
 - app/views/refine/inline/filters/_criterion.html.erb
 - app/views/refine/inline/filters/_group.html.erb
 - app/views/refine/inline/filters/_or_button.html.erb
+- app/views/refine/inline/filters/_or_separator.html.erb
 - app/views/refine/inline/filters/_popup.html.erb
 - app/views/refine/inline/filters/_save_button.html.erb
 - app/views/refine/inline/filters/_show.html.erb