refine-rails 2.9.8 → 2.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039df341fd264ac47f7b96bd75982670ec8de4c8c4ceb8b834531e32b0951719'
-  data.tar.gz: 9e66ddc7e19e999393deaddba297aeda5cbb6ae34f60caa5b3b30cbd12ea87c6
+  metadata.gz: d3852aabcc43de99952aaa6053a9dd9e395c41c53df8c6b63d57607bb8fe764b
+  data.tar.gz: 9bb7fc117742ab678dfc21bb01118293ae86e13ed58678504bf5cc046f7bf377
 SHA512:
-  metadata.gz: 4a61c48ceab2212cf91edbff09763337f33b3202bb0a1c53a385f6aa1884e427e45d8140bcc3f13981c52d1190b532f2969b549090567440292a9183d49b89c9
-  data.tar.gz: b30741654641737ed1d2137f471772a66ff1ee9d1206c5817eeab23a6a99093aee9e9364fb4e016d3e28bea7a253ae57071d381b3a5d2f1cb08e3d3ed9e16228
+  metadata.gz: 6904f56779e8bab97700a3ddc2d5db7b6c549e424ec78cdab26324b37fff26d14e435065ddb30f08f6ef34a8c83e9e8770418716fb16bfc69747f2a0403f6dc0
+  data.tar.gz: b2e1afe3abfbd72ee39677bada39ef642584cb2a4e05d51d15a649a338c1ca83b3162dee6b773f847d67849474319b9bce43ba9dcb348a524bce22b1b0b96666

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

@@ -2,6 +2,7 @@
   condition = @criterion.condition
   date_refinement_condition = condition.has_date_refinement? && condition.get_date_refinement_condition
   count_refinement_condition = condition.has_count_refinement? && condition.get_count_refinement_condition
+  condition_clause = @criterion.input.clause || condition.approved_clauses.first.id
 
   last_clause_select = if count_refinement_condition
     :count
@@ -23,7 +24,7 @@
 
 
   <%# Input Value %>
-  <% unless ['st', 'nst'].include? @criterion.input.clause %>
+  <% unless ['st', 'nst'].include? condition_clause %>
     <%= render @criterion.input_partial, criterion: @criterion, form: form, input_fields: input_fields, form_id: form_id %>
     <% if last_clause_select == :criterion %>
       <div class="refine--separator"></div>
@@ -37,7 +38,7 @@
       @criterion.condition.approved_clauses,
       :id,
       :display,
-      {},
+      {selected: condition_clause},
       class: "refine--select refine--clause-select",
       data: {action: "change->refine--criterion-form#refresh"},
       form: form_id
@@ -50,7 +51,7 @@
   <%# Date Refinement  %>
   <% if @criterion.condition.has_date_refinement? %>
     <div class="refine--separator"></div>
-    <label style="color: black;"><%= date_refinement_condition.display %></label>
+    <label><%= date_refinement_condition.display %></label>
     <%= input_fields.fields :date_refinement_attributes, model: @criterion.input.date_refinement do |date_fields| %>
       <div class="refine--refinement-input-container">
         <% unless ['st', 'nst'].include? @criterion.input.date_refinement.clause %>
@@ -80,7 +81,7 @@
 
   <%# Count Refinement  %>
   <% if count_refinement_condition %>
-    <label style="color: black;"><%= @criterion.condition.get_count_refinement_condition.display %></label>
+    <label><%= @criterion.condition.get_count_refinement_condition.display %></label>
     <%= input_fields.fields :count_refinement_attributes, model: @criterion.input.count_refinement do |count_fields| %>
       <div class="refine--criterion-clause-container">
         <%= count_fields.collection_select :clause,
@@ -112,18 +113,8 @@
           <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
         <% end %>
       </div>
-
-
-
     <% end %>
-
   <% end %>
-
-
-
-
-
-
 <% end %>
 
 <% @error_messages&.each do |msg| %>

data/app/views/refine/inline/criteria/edit.turbo_stream.erb

@@ -21,6 +21,7 @@
   <%= form_with url: refine_inline_criterion_path(@criterion.position),
       method: :put,
       id: form_id,
+      html: { autocomplete: "off" },
       data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"}
    %>
 <% end %>

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

@@ -17,6 +17,17 @@
       <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--typeahead-list#filter" autofocus>
     </div>
 
+    <%= render "refine/inline/filters/popup",
+      frame_id: dom_id(@criterion, :load),
+      src: refine_inline_stored_filters_path(@criterion.to_params),
+      frame_class: "refine--stored-filter-list-popup" do
+    %>
+      <%= link_to "#", class: "refine--stored-filters-link", data: {action: "click->refine--popup#show"} do %>
+        <div class="material-icons-outlined refine--list-icon">save</div>
+        <%= t('.saved_filters') %>
+      <% end %>
+    <% end %>
+
     <div class="refine--separator-m0"></div>
 
     <div class="refine--condition-list">
@@ -52,14 +63,5 @@
 
   </div>
   <div class="refine--separator"></div>
-  <%= render "refine/inline/filters/popup",
-    frame_id: dom_id(@criterion, :load),
-    src: refine_inline_stored_filters_path(@criterion.to_params),
-    frame_class: "refine--stored-filter-list-popup" do
-  %>
-    <%= link_to "#", class: "refine--stored-filters-link", data: {action: "click->refine--popup#show"} do %>
-      <div class="material-icons-outlined refine--list-icon">save</div>
-      <%= t('.saved_filters') %>
-    <% end %>
-  <% end %>
+  
 <% end %>

data/app/views/refine/inline/criteria/new.turbo_stream.erb

@@ -18,6 +18,9 @@
 <%# The actual form tag is appended to the end of the body html.  Inputs are attached using the `form` attribute. This allows the query builder to be placed inside an outer form on the page. %>
 <%= turbo_stream.append_all "body" do %>
   <%= form_with url: refine_inline_criteria_path,
-      method: :post, id: form_id, data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"} %>
+      method: :post,
+      id: form_id,
+      html: { autocomplete: "off" },
+      data: {controller: "refine--turbo-stream-form", action: "submit->refine--turbo-stream-form#submit"} %>
 <% end %>
 

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.9.8"
+    VERSION = "2.9.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.9.8
+  version: 2.9.10
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,7 +145,6 @@ files:
 - app/views/refine/inline/filters/_and_button.html.erb
 - app/views/refine/inline/filters/_criterion.html.erb
 - app/views/refine/inline/filters/_group.html.erb
-- app/views/refine/inline/filters/_load_button.html.erb
 - app/views/refine/inline/filters/_or_button.html.erb
 - app/views/refine/inline/filters/_popup.html.erb
 - app/views/refine/inline/filters/_save_button.html.erb

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

@@ -1,15 +0,0 @@
-<% 
-  criterion = Refine::Inline::Criterion.new(
-    stable_id: @refine_filter.to_stable_id,
-    client_id: @refine_client_id,
-  )
-%>
-
-<%= render "refine/inline/filters/popup",
-  frame_id: dom_id(criterion, :load),
-  src: refine_inline_stored_filters_path(criterion.to_params) do
-%>
-  <button class="refine--inline-btn" type="button" data-action="click->refine--popup#show">
-    <%= t(".load_filter") %>
-  </button>
-<% end %>