refine-rails 2.9.10 → 2.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3852aabcc43de99952aaa6053a9dd9e395c41c53df8c6b63d57607bb8fe764b
-  data.tar.gz: 9bb7fc117742ab678dfc21bb01118293ae86e13ed58678504bf5cc046f7bf377
+  metadata.gz: 64fe80e7dcd7ca840c20101b7085466d63482d9dbd69f70edd521319530bab54
+  data.tar.gz: 7799610f7a21b824fe718fcbbfacbd4361effb636c14fbe817d3da986af6549e
 SHA512:
-  metadata.gz: 6904f56779e8bab97700a3ddc2d5db7b6c549e424ec78cdab26324b37fff26d14e435065ddb30f08f6ef34a8c83e9e8770418716fb16bfc69747f2a0403f6dc0
-  data.tar.gz: b2e1afe3abfbd72ee39677bada39ef642584cb2a4e05d51d15a649a338c1ca83b3162dee6b773f847d67849474319b9bce43ba9dcb348a524bce22b1b0b96666
+  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><%= 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,12 +64,16 @@
           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  %>

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.10"
+    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.10
+  version: 2.9.11
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-20 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails