refine-rails 2.9.9 → 2.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446a8130188530cee2fb75c67578c600275c0a828fb2231196d3517f5f95a837
-  data.tar.gz: a5a22667df259ae68c2ce26c5e18dae49a02708342580e9569d26237d2632281
+  metadata.gz: 64fe80e7dcd7ca840c20101b7085466d63482d9dbd69f70edd521319530bab54
+  data.tar.gz: 7799610f7a21b824fe718fcbbfacbd4361effb636c14fbe817d3da986af6549e
 SHA512:
-  metadata.gz: abb49f9681a6fbd5079b1fe745bab2e993a59855092023d9b2ae7fd312f38d143701e9666400de69b4ef71b81f797e3e3fff616082029589971d0e2659b5b4f0
-  data.tar.gz: 78b5b26f113149a4ed8e1aff5063be84afa462a9aaf5091514ef96f8f81ed01c3a93e68c33f409179d026e7bf79fb8bc9173ca9fd6e4ca0790f88ea90fc3731e
+  metadata.gz: 69c1c06d278965e2781730c5f4e1eb7f178eae986da41b3b4fdb09fc8cd2ae5d98a84ab1d6e4af7b71b0c7dcb6ce0de9715dcdce130cca22423c52529e2e7f24
+  data.tar.gz: 96fe4a9b0e501b6542a7a02ac541aedd338554ade49ad1cad6ee8578b3ac53dd3a2426e173f84bff0bbee9d51f216a737ff3bff14d11ba5bacefeaddbd5483bc

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

@@ -607,6 +607,9 @@
   margin: 0.5rem 0;
 }
 
+.refine--date-refinement-clause-container > .refine--block {
+  display: block;
+}
 
 /*  _date_condition.html.erb */
 .refine--date-condition-days-text {

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

@@ -22,15 +22,6 @@
 
 <%= form.fields :input_attributes, model: @criterion.input do |input_fields| %>
 
-
-  <%# Input Value %>
-  <% 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>
-    <% end %>
-  <% end %>
-
   <%# Clause Select %>
   <div class="refine--criterion-clause-container">
     <%= input_fields.label :clause, t('.rule') %>
@@ -43,24 +34,26 @@
       data: {action: "change->refine--criterion-form#refresh"},
       form: form_id
     %>
-    <% if last_clause_select == :criterion %>
-      <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
-    <% end %>
   </div>
 
+
+  <%# Input Value %>
+  <% unless ['st', 'nst'].include? condition_clause %>
+    <div class="refine--separator"></div>
+    <%= render @criterion.input_partial, criterion: @criterion, form: form, input_fields: input_fields, form_id: form_id %>
+  <% end %>
+
+  <% if last_clause_select == :criterion %>
+    <div class="refine--separator"></div>
+    <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
+  <% end %>
+  
   <%# Date Refinement  %>
   <% if @criterion.condition.has_date_refinement? %>
     <div class="refine--separator"></div>
-    <label style="color: black;"><%= 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 %>
-          <%= render "refine/inline/inputs/date_condition", criterion: @criterion, form: form, input_fields: date_fields, form_id: form_id %>
-        <% end %>
-
-      </div>
-
-      <div class="refine--criterion-clause-container">
+    <div class="refine--criterion-clause-container refine--date-refinement-clause-container">
+      <%= input_fields.label :clause, date_refinement_condition.display, class: "refine--block" %>
+      <%= input_fields.fields :date_refinement_attributes, model: @criterion.input.date_refinement do |date_fields| %>
         <%= date_fields.label :clause, t('.rule') %>
         <%= date_fields.collection_select :clause,
           date_refinement_condition.approved_clauses,
@@ -71,17 +64,21 @@
           data: {action: "change->refine--criterion-form#refresh"},
           form: form_id
         %>
-        <% if last_clause_select == :date %>
-          <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
+      </div>
+      <div class="refine--refinement-input-container">
+        <% unless ['st', 'nst'].include? @criterion.input.date_refinement.clause %>
+          <%= render "refine/inline/inputs/date_condition", criterion: @criterion, form: form, input_fields: date_fields, form_id: form_id %>
         <% end %>
       </div>
     <% end %>
-
+    <% if last_clause_select == :date %>
+      <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
+    <% end %>
   <% end %>
 
   <%# 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,
@@ -113,18 +110,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/app/views/refine/inline/inputs/_option_condition.html.erb

@@ -4,8 +4,6 @@
     <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--typeahead-list#filter" autofocus>
   </div>
 
-  <div class="refine--separator-m0"></div>
-
   <div class="refine--option-list">
     <% criterion.options.each do |option| %>
       <%= tag.label class: "refine--option-label",

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.9.9"
+    VERSION = "2.9.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.9.9
+  version: 2.9.11
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-04-03 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 %>