refine-rails 2.11.8 → 2.11.10

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

@@ -6,9 +6,6 @@
     conjunction: "and",
     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? %>
@@ -19,13 +16,11 @@
     <span class="icon material-icons-outlined refine--icon-sm">add</span>
   </button>
 <% else %>
-  <%= render "refine/inline/filters/modal_or_popup",
+  <%= render "refine/inline/filters/popup",
     frame_id: dom_id(criterion),
-    use_modal: use_modal,
-    fill_modal: fill_modal,
-    src: src do
+    src: refine_inline_criteria_path(criterion.to_params) do
   %>
-    <button class="refine--add-condition-button refine--group-last-item refine--condition-pill-end" type="button" data-action="click->refine--popup#show click->refine--modal#open">
+    <button class="refine--add-condition-button refine--group-last-item refine--condition-pill-end" type="button" data-action="click->refine--popup#show">
       <% if show_label %>
         <span class="refine--add-button-label"><%= t("refine.inline.filters.and_button.condition") %></span>
       <% end %>

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

@@ -1,6 +1,4 @@
 <% render_stack ||= false %>
-<% use_modal ||= false %>
-<% fill_modal ||= false %>
 
 <% if render_stack %>
   <div class="refine--or-group">
@@ -8,7 +6,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), use_modal: use_modal, fill_modal: fill_modal %>
+<%= render "refine/inline/filters/and_button", position: group.last.position + 1, show_label: (group_count < 2 && condition_count < 2) %>
 <% if render_stack %>
   </div> 
 <% end %>

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

@@ -6,9 +6,6 @@
     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? %>
@@ -19,14 +16,12 @@
   </div>
 <% else %>
   
-   <%= render "refine/inline/filters/modal_or_popup",
+   <%= render "refine/inline/filters/popup",
     frame_id: dom_id(criterion),
-    use_modal: use_modal,
-    fill_modal: fill_modal,
-    src: src do
+    src: refine_inline_criteria_path(criterion.to_params) do
   %>
     <div class="refine--add-group-wrapper">
-      <button class="refine--add-group-button" type="button" data-action="click->refine--popup#show click->refine--modal#open">
+      <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>

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

@@ -3,10 +3,6 @@
 
   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?
@@ -15,14 +11,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", use_modal: use_modal, fill_modal: fill_modal %>
+      <%= render "refine/inline/filters/add_first_condition_button", position: 0, btn_class: "refine--add-first-condition-btn" %>
     <% else %>
       <div class="refine--groups-wrapper">
         <% groups.each.with_index do |group, i| %>
           <%= 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 %>
+          <%= 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, use_modal: use_modal, fill_modal: fill_modal %>
+            <%= render "refine/inline/filters/or_button", position: @refine_filter.blueprint.length %>
           <% end %>
         <% end %>
 
@@ -31,9 +27,7 @@
    <% if @refine_filter.blueprint&.any? %>
       <div class="refine--filter-control-group">
         <%= render "refine/inline/filters/clear_button" %>
-        <% unless hide_save %>
-          <%= render "refine/inline/filters/save_button" %>
-        <% end %>
+        <%= render "refine/inline/filters/save_button" %>
       </div>
     <% end %> 
   <% end %>

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

@@ -194,3 +194,21 @@ en:
               recommended: "Recommended"
           load_button:
             load_filter: "Load Filter"
+
+      advanced_inline:
+        filters:
+          add_first_condition_button:
+            filter: "Filter"
+          criteria:
+            index:
+              recommended: "Recommended"
+            index_advanced:
+              title: "Select Filter"
+              saved_filters: "Saved Filters"
+              type_to_search: "Type to search"
+              recommended: "Recommended"
+              search_attributes: "Search Attributes"
+              filter_attributes_tab_name: "FILTER ATTRIBUTES"
+              filter_saved_filters_tab_name: "SAVED FILTERS"
+          load_button:
+            load_filter: "Load Filter"

data/config/routes.rb

@@ -9,7 +9,15 @@ 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
+        post "find", on: :collection
+      end
+    end
+    namespace :advanced_inline do
+      resources :criteria, except: [:show] do
         post "merge_groups", on: :collection
         post "clear", on: :collection
       end

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.11.8"
+    VERSION = "2.11.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.8
+  version: 2.11.10
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -47,11 +47,14 @@ files:
 - app/assets/javascripts/refine-stimulus.umd.js.map
 - app/assets/stylesheets/index.css
 - app/assets/stylesheets/index.tailwind.css
+- app/controllers/refine/advanced_inline/criteria_controller.rb
+- app/controllers/refine/advanced_inline/stored_filters_controller.rb
 - app/controllers/refine/blueprints_controller.rb
 - app/controllers/refine/filter_application_controller.rb
 - app/controllers/refine/inline/criteria_controller.rb
 - app/controllers/refine/inline/stored_filters_controller.rb
 - app/controllers/refine/stored_filters_controller.rb
+- app/javascript/controllers/fields/shoelace/tab-group-controller.js
 - app/javascript/controllers/index.js
 - app/javascript/controllers/refine/add-controller.js
 - app/javascript/controllers/refine/criterion-form-controller.js
@@ -118,6 +121,34 @@ files:
 - app/views/_filter_builder_dropdown.html.erb
 - app/views/_filter_pills.html.erb
 - app/views/_loading.html.erb
+- app/views/refine/advanced_inline/criteria/_condition_list_item_card.html.erb
+- app/views/refine/advanced_inline/criteria/_form_fields.html.erb
+- app/views/refine/advanced_inline/criteria/create.turbo_stream.erb
+- app/views/refine/advanced_inline/criteria/edit.turbo_stream.erb
+- app/views/refine/advanced_inline/criteria/index.html.erb
+- app/views/refine/advanced_inline/criteria/new.turbo_stream.erb
+- app/views/refine/advanced_inline/filters/_add_first_condition_button.html.erb
+- app/views/refine/advanced_inline/filters/_and_button.html.erb
+- app/views/refine/advanced_inline/filters/_clear_button.html.erb
+- app/views/refine/advanced_inline/filters/_criterion.html.erb
+- app/views/refine/advanced_inline/filters/_group.html.erb
+- app/views/refine/advanced_inline/filters/_modal.html.erb
+- app/views/refine/advanced_inline/filters/_or_button.html.erb
+- app/views/refine/advanced_inline/filters/_or_separator.html.erb
+- app/views/refine/advanced_inline/filters/_popup.html.erb
+- app/views/refine/advanced_inline/filters/_save_button.html.erb
+- app/views/refine/advanced_inline/filters/_show.html.erb
+- app/views/refine/advanced_inline/inputs/_date_condition.html.erb
+- app/views/refine/advanced_inline/inputs/_date_condition_days.html.erb
+- app/views/refine/advanced_inline/inputs/_date_condition_range.html.erb
+- app/views/refine/advanced_inline/inputs/_date_condition_single.html.erb
+- app/views/refine/advanced_inline/inputs/_date_picker.html.erb
+- app/views/refine/advanced_inline/inputs/_numeric_condition.html.erb
+- app/views/refine/advanced_inline/inputs/_option_condition.html.erb
+- app/views/refine/advanced_inline/inputs/_text_condition.html.erb
+- app/views/refine/advanced_inline/stored_filters/find.turbo_stream.erb
+- app/views/refine/advanced_inline/stored_filters/index.html.erb
+- app/views/refine/advanced_inline/stored_filters/new.turbo_stream.erb
 - app/views/refine/blueprints/_add_and.html.erb
 - app/views/refine/blueprints/_add_group.html.erb
 - app/views/refine/blueprints/_clause_select.html.erb
@@ -143,15 +174,12 @@ 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

data/app/views/refine/inline/criteria/index_advanced.html.erb

@@ -1,29 +0,0 @@
-<%
-  # a hash mapping Category => [array, of, conditions], sorted by category
-  categorized_conditions = @conditions
-    .group_by {|c| c.meta[:category].presence}
-    .sort_by do |(category, _conditions)|
-      if @refine_filter.has_category_ordering?
-        @refine_filter.category_order.index(category) || Float::INFINITY
-      else
-        category.to_s.downcase
-      end
-    end
-    .to_h
-
-  recommended_conditions = @conditions
-    .select { |c| c.meta[:recommended] }
-    .sort_by {|recommended| recommended.to_s.downcase }
-
-  # an array of uncategorized conditions
-  uncategorized_conditions = categorized_conditions.delete(nil)
-  fill_modal = @fill_modal || false
-  dialog_class = "sl-dialog refine--inline-modal-container"
-  dialog_class += " dialog-full" if fill_modal
-%>
-
-<%= turbo_frame_tag @criterion do %>
-  <sl-dialog open class="<%= dialog_class %>" no-header>
-    This is where the main content will render... 
-  </sl-dialog>
-<% end %>

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

@@ -1,35 +0,0 @@
-<%
-  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 %>