refine-rails 2.11.0 → 2.11.2

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

@@ -9,18 +9,20 @@
 %>
 
 <% if @refine_filter.criteria_limit_reached? %>
-  <button disabled class="refine--add-group-button" type="button" title="<%= t(".criteria_limit", criteria_limit: @refine_filter.criteria_limit) %>">
-    <span class="icon material-icons-outlined refine--icon-sm">add</span>
-    <span class="refine--add-group-button-label"><%= t(".group") %></span>
-  </button>
+  <div class="refine--add-group-wrapper">
+    <button disabled class="refine--add-group-button" type="button" title="<%= t(".criteria_limit", criteria_limit: @refine_filter.criteria_limit) %>">
+      <span class="refine--add-group-button-label"><%= t(".group") %></span>
+    </button>
+  </div>
 <% else %>
   <%= render "refine/inline/filters/popup",
     frame_id: dom_id(criterion),
     src: refine_inline_criteria_path(criterion.to_params) do
   %>
-    <button class="refine--add-group-button" type="button" data-action="click->refine--popup#show">
-      <span class="icon material-icons-outlined refine--icon-sm">add</span>
-      <span class="refine--add-group-button-label"><%= t(".group") %></span>
-    </button>
+    <div class="refine--add-group-wrapper">
+      <button class="refine--add-group-button" type="button" data-action="click->refine--popup#show">
+        <span class="refine--add-group-button-label"><%= t(".group") %></span>
+      </button>
+    </div>
   <% end %>
 <% end %>

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

@@ -1,38 +1,38 @@
 <%
   groups = Refine::Inline::Criterion.groups_from_filter(@refine_filter, client_id: @refine_client_id, stable_id: @refine_stable_id)
 
+  root_data = (defined?(data) && data) || {}
+
   main_row_class = class_names "refine--filter-row" => true,
     "refine--has-many-groups" => groups.many?
 %>
 
-<%= tag.div class: "refine--filter-wrapper", id: "refine-inline-filter-#{@refine_client_id}" do %>
+<%= tag.div class: "refine--filter-wrapper", id: "refine-inline-filter-#{@refine_client_id}", data: root_data do %>
   <%= tag.div class: main_row_class do %>
     <% if @refine_filter.blueprint.empty? %>
-      <%= render "refine/inline/filters/add_first_condition_button", position: 0, btn_class: "
-      refine--add-first-condition-btn" %>
+      <%= render "refine/inline/filters/add_first_condition_button", position: 0, btn_class: "refine--add-first-condition-btn" %>
     <% else %>
-      <div class="refine--filter-label">
-        <%= t('refine.inline.filters.filter') %>: 
-      </div>
       <div class="refine--groups-wrapper">
         <% groups.each.with_index do |group, i| %>
           <% unless i == 0 %>
-            <div class="refine--group-join"><%= t("refine.inline.filters.or") %></div>
-          <% end %>
-
-          <%= render "refine/inline/filters/group", group: group %>
+              <div class="refine--group-join"><%= t("refine.inline.filters.or") %></div>
+            <% end %>
+            <%= render "refine/inline/filters/group", group: group, group_count: groups.count, condition_count: group.count %>
+            <% if i == groups.length - 1 %>
+              <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
+            <% end %>
         <% end %>
 
-        <div class="refine--group">
-          <div class="refine--group-conditions-wrapper">
-            <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
-          </div>
-        </div>
-        <%= render "refine/inline/filters/save_button" %>
-        
       </div>
     <% end %>
+   <% if @refine_filter.blueprint&.any? %>
+      <div class="refine--filter-control-group">
+        <%= render "refine/inline/filters/clear_button" %>
+        <%= render "refine/inline/filters/save_button" %>
+      </div>
+    <% end %> 
   <% end %>
+  
 <% end %>
 
 

data/config/locales/en/refine.en.yml

@@ -58,7 +58,8 @@ en:
         or_button: "+ Add OR Group"
         filter: "Filter"
         criteria_limit: "You can only create up to %{criteria_limit} filter conditions"
-        save_filter: "Save Filter"
+        save_filter: "Save"
+        clear_filter: "Clear"
         or: "or"
         clear: "clear"
       inputs:

data/config/routes.rb

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

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.11.0"
+    VERSION = "2.11.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.2
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,6 +145,7 @@ files:
 - app/views/refine/inline/criteria/new.turbo_stream.erb
 - app/views/refine/inline/filters/_add_first_condition_button.html.erb
 - app/views/refine/inline/filters/_and_button.html.erb
+- app/views/refine/inline/filters/_clear_button.html.erb
 - 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