refine-rails 2.11.4 → 2.11.6

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

@@ -12,7 +12,7 @@
       <%= 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/_group.html.erb

@@ -1,4 +1,6 @@
 <% render_stack ||= false %>
+<% use_modal ||= false %>
+<% fill_modal ||= false %>
 
 <% if render_stack %>
   <div class="refine--or-group">
@@ -6,7 +8,7 @@
 <% group.each.with_index do |criterion, i| %>
   <%= render "refine/inline/filters/criterion", criterion: criterion, placement: i, size: group.length %>
 <% end %>
-<%= render "refine/inline/filters/and_button", position: group.last.position + 1, show_label: (group_count < 2 && condition_count < 2) %>
+<%= render "refine/inline/filters/and_button", position: group.last.position + 1, show_label: (group_count < 2 && condition_count < 2), use_modal: use_modal, fill_modal: fill_modal %>
 <% if render_stack %>
   </div> 
 <% end %>

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

@@ -0,0 +1,28 @@
+<%#
+  Generic partial for placing a button that will load popup content in a modal via Shoelace.
+  Required params:
+    - frame_id (the DOM ID of the turbo frame)
+
+  Optional class:
+    - src (the URL to load popup content from)
+    - container_class (class attribute of the wrapper div. Defaults to "refine--inline-popup-container")
+    - frame_class (class attribute of the turbo frame. Defaults to "refine--inline-popup")
+
+  somewhere in your yield be sure to include a `data-action="click->refine--popup#show"` to trigger the the popup
+
+  Popup can be hidden with `data-action="click->refine--popup#hide"`
+%>
+
+<%
+  src ||= ""
+  container_class ||= "sl-dialog refine--inline-modal-container"
+  frame_class ||= "refine--inline-modal"
+  is_open ||= false
+
+%>
+
+<%= tag.div data: {controller: "refine--modal", refine__modal_src_value: src, refine__modal_is_open_value: is_open } do %>
+  <%= yield %>
+
+  <%= turbo_frame_tag frame_id, class: frame_class, data: {refine__modal_target: "frame"} %>
+<% end %>

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

@@ -0,0 +1,35 @@
+<%
+  src ||= ""
+  container_class = container_class 
+  frame_class = frame_class 
+  is_open ||= false
+  use_modal ||= false
+  fill_modal ||= false
+%>
+
+<% if use_modal %>
+  <%= render "refine/inline/filters/modal",
+    frame_id: frame_id,
+    container_class: container_class,
+    frame_class: frame_class,
+    is_open: is_open,
+    fill_modal: fill_modal,
+    src: src do
+  %>
+    <%= capture do %>
+      <%= yield %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= render "refine/inline/filters/popup",
+    frame_id: frame_id,
+    container_class: container_class,
+    frame_class: frame_class,
+    is_open: is_open,
+    src: src do
+  %>
+    <%= capture do %>
+      <%= yield %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -6,6 +6,9 @@
     conjunction: "or",
     position: position
   )
+  use_modal ||= false
+  fill_modal ||= false
+  src = use_modal ? index_advanced_refine_inline_criteria_path(criterion.to_params.merge(fill_modal: fill_modal)) : refine_inline_criteria_path(criterion.to_params)
 %>
 
 <% if @refine_filter.criteria_limit_reached? %>
@@ -15,12 +18,15 @@
     </button>
   </div>
 <% else %>
-  <%= render "refine/inline/filters/popup",
+  
+   <%= render "refine/inline/filters/modal_or_popup",
     frame_id: dom_id(criterion),
-    src: refine_inline_criteria_path(criterion.to_params) do
+    use_modal: use_modal,
+    fill_modal: fill_modal,
+    src: src do
   %>
     <div class="refine--add-group-wrapper">
-      <button class="refine--add-group-button" type="button" data-action="click->refine--popup#show">
+      <button class="refine--add-group-button" type="button" data-action="click->refine--popup#show click->refine--modal#open">
         <span class="refine--add-group-button-label"><%= t(".group") %></span>
       </button>
     </div>

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

@@ -3,6 +3,10 @@
 
   root_data = (defined?(data) && data) || {}
 
+  use_modal = defined?(use_modal) ? use_modal : false
+  fill_modal = defined?(fill_modal) ? fill_modal : false
+
+  hide_save = defined?(hide_save) ? hide_save : true
   render_stack = defined?(render_stack) ? render_stack : false
   main_row_class = class_names "refine--filter-row" => true,
     "refine--has-many-groups" => groups.many?
@@ -11,22 +15,14 @@
 <%= 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", use_modal: use_modal, fill_modal: fill_modal %>
     <% 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/group", group: group, group_count: groups.count, condition_count: group.count, render_stack: render_stack %>
+          <%= 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, use_modal: use_modal, fill_modal: fill_modal %>
           <% if i == groups.length - 1 %>
-            <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
+            <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length, use_modal: use_modal, fill_modal: fill_modal %>
           <% end %>
         <% end %>
 
@@ -35,7 +31,9 @@
    <% if @refine_filter.blueprint&.any? %>
       <div class="refine--filter-control-group">
         <%= render "refine/inline/filters/clear_button" %>
-        <%= render "refine/inline/filters/save_button" %>
+        <% unless hide_save %>
+          <%= render "refine/inline/filters/save_button" %>
+        <% end %>
       </div>
     <% end %> 
   <% end %>

data/config/routes.rb

@@ -9,6 +9,8 @@ Rails.application.routes.draw do
     end
     namespace :inline do
       resources :criteria, except: [:show] do
+        get "index_advanced", on: :collection
+        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.4"
+    VERSION = "2.11.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.6
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,6 +61,7 @@ files:
 - app/javascript/controllers/refine/filter-pills-controller.js
 - app/javascript/controllers/refine/form-controller.js
 - app/javascript/controllers/refine/inline-conditions-controller.js
+- app/javascript/controllers/refine/modal-controller.js
 - app/javascript/controllers/refine/popup-controller.js
 - app/javascript/controllers/refine/search-filter-controller.js
 - app/javascript/controllers/refine/server-refresh-controller.js
@@ -142,13 +143,17 @@ files:
 - app/views/refine/inline/criteria/create.turbo_stream.erb
 - app/views/refine/inline/criteria/edit.turbo_stream.erb
 - app/views/refine/inline/criteria/index.html.erb
+- app/views/refine/inline/criteria/index_advanced.html.erb
 - 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/_modal.html.erb
+- app/views/refine/inline/filters/_modal_or_popup.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