refine-rails 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a54fd34a98179098e040456276d0109895a9963b23f45d8a4349341f741ec58
-  data.tar.gz: daba33b740e07950606b1935a5726d4650386d38aef645d4de0c7d07eabea546
+  metadata.gz: 7291e0c87324f5ea5f6d9116e74b4996e873738a1a6f0cb192b5b4f3d6428482
+  data.tar.gz: 10d80a905ddc6ce6d3d0f9e3b1f6c0439bda1e93e0092866b36d184247ec4a6c
 SHA512:
-  metadata.gz: 7711ae2669c9b3e9b93b77e1217dd98f44fe55d6f91ebd0b5b2d45006b6b88aa0918825af3c2d5dec4d92467ab27152f4d07c5807595280e8b790db75f70e6ed
-  data.tar.gz: 64b1ae0855a94252aeb1544f9e8ea07571d5a47e5e584c297adc4297c40a88990505072cc68ec76e16900ef65b09a06e3eee894d990d81018ccfa67bc69247cc
+  metadata.gz: bd7d4016067808b0d9d32c3d7a564be9c3c35c15b39d1461a7ab01fef04ff44ed9dd65d03162209b339406103620a9b69f591e7d6be7a46d686b69dce74dd283
+  data.tar.gz: 660cd1e5bc02473e92d11d8155ea78591d572a288986c09be87ec355719e59476f6e7085eec63e8450817dbc67c680a97b5c9ba1b353c6cd6054404897e460c9

data/app/assets/stylesheets/index.css

@@ -822,13 +822,11 @@
 }
 
 .refine-criterion-refinement-container {
-  width: 100%;
-  padding-top: 0.75rem
+  width: 100%
 }
 
 @media (min-width: 640px) {
   .refine-criterion-refinement-container {
-    margin-right: 0.75rem;
     width: auto;
     flex-shrink: 0
   }
@@ -1426,6 +1424,10 @@
   padding: 0.5rem 0;
 }
 
+.refine--refinement-input-container {
+  margin: 0.5rem 0;
+}
+
 /*  _date_condition.html.erb */
 
 .refine--date-condition-days-text {

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

@@ -224,7 +224,7 @@
   }
 
   .refine-criterion-refinement-container {
-    @apply w-full pt-3 sm:w-auto sm:flex-shrink-0 sm:mr-3;
+    @apply w-full sm:w-auto sm:flex-shrink-0;
   }
 
   /* _delete_criterion.html.erb */
@@ -601,6 +601,10 @@
     padding: 0.5rem 0;
 }
 
+.refine--refinement-input-container {
+  margin: 0.5rem 0;
+}
+
 
 /*  _date_condition.html.erb */
 .refine--date-condition-days-text {

data/app/controllers/refine/inline/criteria_controller.rb

@@ -118,6 +118,12 @@ class Refine::Inline::CriteriaController < ApplicationController
           :clause,
           :value1,
           :value2
+        ],
+        date_refinement_attributes: [
+          :clause,
+          :date1,
+          :date2,
+          :days
         ]
       ]
     )

data/app/models/refine/filter.rb

@@ -50,7 +50,6 @@ module Refine
       end
     end
 
-    # DEPRECATED use Refine::Filters::Criterion#human_readable instead
     def human_readable_criterions
       output = []
       if blueprint.present?
@@ -58,7 +57,13 @@ module Refine
           if criterion[:type] == "conjunction"
             output << criterion[:word]
           else
-            output << get_condition_for_criterion(criterion).human_readable(criterion[:input])
+            condition = get_condition_for_criterion(criterion)
+            text = condition.human_readable(criterion[:input])
+            if condition.has_date_refinement?
+              date_refinement_condition = condition.has_date_refinement?.call
+              text += date_refinement_condition.human_readable(criterion[:input][:date_refinement])
+            end
+            output << text
           end
         end
       end

data/app/models/refine/inline/criteria/date_refinement.rb

@@ -0,0 +1,14 @@
+class Refine::Inline::Criteria::DateRefinement
+  include ActiveModel::Model
+
+  attr_accessor :clause, :date1, :date2, :days
+
+  def attributes
+    {
+      clause: clause,
+      date1: date1,
+      date2: date2,
+      days: days
+    }.compact
+  end
+end

data/app/models/refine/inline/criteria/input.rb

@@ -15,7 +15,8 @@ class Refine::Inline::Criteria::Input
   :value,
   :value1,
   :value2,
-  :count_refinement
+  :count_refinement,
+  :date_refinement
 
   def attributes
     {
@@ -28,7 +29,8 @@ class Refine::Inline::Criteria::Input
       value: value,
       value1: value1,
       value2: value2,
-      count_refinement_attributes: count_refinement_attributes.presence
+      count_refinement_attributes: count_refinement_attributes.presence,
+      date_refinement_attributes: date_refinement_attributes.presence
     }.compact
   end
 
@@ -44,6 +46,18 @@ class Refine::Inline::Criteria::Input
     count_refinement.attributes = attrs.to_h
   end
 
+  def date_refinement
+    @date_refinement ||= Refine::Inline::Criteria::DateRefinement.new
+  end
+
+  def date_refinement_attributes
+    date_refinement.attributes
+  end
+
+  def date_refinement_attributes=(attrs = {})
+    date_refinement.attributes = attrs.to_h
+  end
+
   def selected=(value)
     @selected = Array.wrap(value)
   end

data/app/models/refine/inline/criterion.rb

@@ -21,6 +21,7 @@ class Refine::Inline::Criterion
     attrs[:input_attributes] = attrs.delete(:input)
     if input_attrs = attrs[:input_attributes]
       input_attrs[:count_refinement_attributes] = input_attrs.delete(:count_refinement)
+      input_attrs[:date_refinement_attributes] = input_attrs.delete(:date_refinement)
     end
     new(attrs)
   end
@@ -93,6 +94,7 @@ class Refine::Inline::Criterion
     result[:input] = result.delete(:input_attributes)
     if input_attrs = result[:input]
       input_attrs[:count_refinement] = input_attrs.delete(:count_refinement_attributes)
+      input_attrs[:date_refinement] = input_attrs.delete(:date_refinement_attributes)
     end
     result
   end
@@ -121,8 +123,6 @@ class Refine::Inline::Criterion
   end
 
   def validate!
-    # TODO figure out how to validate inputs with count refinements
-    return if input.count_refinement.attributes.present?
     errors.clear
     begin
       query_for_validate = refine_filter.initial_query || refine_filter.model.all

data/app/views/refine/blueprints/_criterion.html.erb

@@ -27,7 +27,7 @@
 
     <div class="refine-criterion-refinement-container">
       <%= render partial: 'refine/blueprints/clause_select', locals: {
-        meta: refinement[:meta], input_id: "input, #{refinement[:id]}", selected_clause: criterion.input.dig(:input, refinement[:id].to_sym, :clause) || {} } %>
+        meta: refinement[:meta], input_id: "input, #{refinement[:id]}", selected_clause: criterion.input.dig(refinement[:id].to_sym, :clause) || {} } %>
     </div>
 
     <%= render partial: "refine/blueprints/clauses/#{refinement[:component].underscore}", locals: {

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

@@ -1,3 +1,18 @@
+<%
+  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
+
+  last_clause_select = if count_refinement_condition
+    :count
+  elsif date_refinement_condition
+    :date
+  else
+    :criterion
+  end
+%>
+
+
 <%= form.hidden_field :stable_id, form: form_id %>
 <%= form.hidden_field :client_id, form: form_id %>
 <%= form.hidden_field :condition_id, form: form_id %>
@@ -10,16 +25,66 @@
   <%# Input Value %>
   <% unless ['st', 'nst'].include? @criterion.input.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') %>
+    <%= input_fields.collection_select :clause,
+      @criterion.condition.approved_clauses,
+      :id,
+      :display,
+      {},
+      class: "refine--select refine--clause-select",
+      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>
+
+  <%# 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">
+        <%= date_fields.label :clause, t('.rule') %>
+        <%= date_fields.collection_select :clause,
+          date_refinement_condition.approved_clauses,
+          :id,
+          :display,
+          {},
+          class: "refine--select refine--clause-select",
+          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 %>
+        <% end %>
+      </div>
+    <% end %>
+
   <% end %>
 
   <%# Count Refinement  %>
-  <% if @criterion.condition.has_count_refinement? %>
+  <% if count_refinement_condition %>
     <label style="color: black;"><%= @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,
-          @criterion.condition.get_count_refinement_condition.clauses,
+          count_refinement_condition.approved_clauses,
           :id,
           :display,
           {},
@@ -29,28 +94,34 @@
       </div>
 
       <% unless ['st', 'nst'].include? @criterion.input.count_refinement.clause %>
-        <%= render "refine/inline/inputs/numeric_condition", input_fields: count_fields, form_id: form_id %>
+        <%= render "refine/inline/inputs/numeric_condition", criterion: @criterion, form: form, input_fields: count_fields, form_id: form_id %>
       <% end %>
+
+      <div class="refine--criterion-clause-container">
+        <%= count.label :clause, t('.rule') %>
+        <%= count.collection_select :clause,
+          @criterion.condition.approved_clauses,
+          :id,
+          :display,
+          {},
+          class: "refine--select refine--clause-select",
+          data: {action: "change->refine--criterion-form#refresh"},
+          form: form_id
+        %>
+        <% if last_clause_select == :count %>
+          <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
+        <% end %>
+      </div>
+
+
+
     <% end %>
 
   <% end %>
 
 
 
-  <%# Clause Select %>
-  <div class="refine--criterion-clause-container">
-    <%= input_fields.label :clause, t('.rule') %>
-    <%= input_fields.collection_select :clause,
-      @criterion.condition.approved_clauses,
-      :id,
-      :display,
-      {},
-      class: "refine--select refine--clause-select",
-      data: {action: "change->refine--criterion-form#refresh"},
-      form: form_id
-    %>
-    <%= form.button t('global.buttons.apply'), class: "refine--apply-button", type: "submit", form: form_id %>
-  </div>
+
 
 
 <% end %>

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

@@ -17,7 +17,6 @@
          </div>
       </div>
     </div>
-
   </div>
 
 <% end %>

data/app/views/refine/inline/inputs/_date_condition.html.erb

@@ -1,6 +1,6 @@
-<% if criterion.input.clause.in? ["exct", "gt", "lt"] %>
+<% if input_fields.object.clause.in? ["exct", "gt", "lt"] %>
   <%= render "refine/inline/inputs/date_condition_days", input_fields: input_fields, criterion: criterion, form_id: form_id %>
-<% elsif criterion.input.clause == "btwn" %>
+<% elsif input_fields.object.clause == "btwn" %>
   <%= render "refine/inline/inputs/date_condition_range", input_fields: input_fields, criterion: criterion, form_id: form_id %>
 <% else %>
   <%= render "refine/inline/inputs/date_condition_single", input_fields: input_fields, criterion: criterion, form_id: form_id %>

data/app/views/refine/inline/inputs/_date_condition_range.html.erb

@@ -2,7 +2,7 @@
   <%= render "refine/inline/inputs/date_picker",
     input_fields: input_fields,
     attribute: :date1,
-    value: criterion.input.date1,
+    value: input_fields.object.date1,
     label: "#{criterion.condition.display.downcase} (#{t('.min')})",
     form_id: form_id
   %>
@@ -13,7 +13,7 @@
     <%= render "refine/inline/inputs/date_picker",
       input_fields: input_fields,
       attribute: :date2,
-      value: criterion.input.date2,
+      value: input_fields.object.date2,
       label: "#{criterion.condition.display.downcase} (#{t('.max')})",
       form_id: form_id
     %>

data/app/views/refine/inline/inputs/_date_condition_single.html.erb

@@ -2,7 +2,7 @@
   <%= render "refine/inline/inputs/date_picker",
     input_fields: input_fields,
     attribute: :date1,
-    value: criterion.input.date1,
+    value: input_fields.object.date1,
     label: criterion.condition.display.downcase,
     form_id: form_id
   %>

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.9.1"
+    VERSION = "2.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,6 +101,7 @@ files:
 - app/models/refine/filters/builder.rb
 - app/models/refine/filters/criterion.rb
 - app/models/refine/filters/query.rb
+- app/models/refine/inline/criteria/date_refinement.rb
 - app/models/refine/inline/criteria/input.rb
 - app/models/refine/inline/criteria/numeric_refinement.rb
 - app/models/refine/inline/criteria/option.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Visual query builder for Rails