refine-rails 2.9.0 → 2.9.2

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", data: {action: "refine--criterion-form#submit"}, type: "submit", form: form_id %>
-  </div>
+
 
 
 <% end %>

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

@@ -1,19 +1,19 @@
 <% form_id = dom_id(@criterion, :form) %>
 
 <%= turbo_stream.update dom_id(@criterion) do %>
-  <div class="refine--criterion-fields">
-    <%= fields model: @criterion,
-      data: {
-        controller: "refine--criterion-form",
-        refine__criterion_form_url_value: edit_refine_inline_criterion_url(
-          @criterion.position, @criterion.to_params
-        ),
-        refine__criterion_form_turbo_frame_value: dom_id(@criterion)
-      } do |form|
-    %>
+  <%= tag.div class: "refine--criterion-fields",
+    data: {
+      controller: "refine--criterion-form",
+      refine__criterion_form_url_value: edit_refine_inline_criterion_url(
+        @criterion.position, @criterion.to_params
+      ),
+      refine__criterion_form_form_id_value: form_id
+    } do
+  %>
+    <%= fields model: @criterion do |form| %>
       <%= render "form_fields", form: form, form_id: form_id %>
     <% end %>
-  </div>
+  <% end %>
 <% end %>
 
 

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

@@ -10,11 +10,11 @@
 %>
 
 <%= turbo_frame_tag @criterion do %>
-  <div data-controller="refine--inline-conditions">
+  <div data-controller="refine--typeahead-list">
 
     <div class="refine--search-box">
       <span class="material-icons refine--icon-search">search</span>
-      <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--inline-conditions#filterConditions">
+      <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>
@@ -27,13 +27,14 @@
           data: {
             controller: "refine--turbo-stream-link",
             action: "refine--turbo-stream-link#visit",
-            refine__inline_conditions_target: "condition"
+            refine__typeahead_list_target: "listItem",
+            list_item_value: condition.display
           }
         %>
       <% end %>
 
       <%  categorized_conditions.each do |(category, conditions)| %>
-        <b data-refine--inline-conditions-target="category"><%= category %></b>
+        <b data-refine--typeahead-list-target="category"><%= category %></b>
         <% conditions.each do |condition| %>
           <%= link_to condition.display,
             new_refine_inline_criterion_url(@criterion.to_params.deep_merge(refine_inline_criterion: {condition_id: condition.id})),
@@ -41,7 +42,7 @@
             data: {
               controller: "refine--turbo-stream-link",
               action: "refine--turbo-stream-link#visit",
-              refine__inline_conditions_target: "condition",
+              refine__typeahead_list_target: "listItem",
               category: category
             }
           %>

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

@@ -1,19 +1,18 @@
 <% form_id = dom_id(@criterion, :form) %>
 
 <%= turbo_stream.update dom_id(@criterion) do %>
-  <div class="refine--criterion-fields">
-    <%= fields model: @criterion,
-      class: "refine--criterion-form",
-      data: {
-        controller: "refine--criterion-form",
-        refine__criterion_form_url_value: new_refine_inline_criterion_url(
-          @criterion.to_params),
-        refine__criterion_form_turbo_frame_value: dom_id(@criterion),
-      } do |form|
-    %>
+  <%= tag.div class: "refine--criterion-fields",
+    data: {
+      controller: "refine--criterion-form",
+      refine__criterion_form_url_value: new_refine_inline_criterion_url(
+        @criterion.to_params),
+      refine__criterion_form_form_id_value: form_id
+    } do
+  %>
+    <%= fields model: @criterion do |form| %>
       <%= render "form_fields", form: form, conjunction: @conjunction, position: @position, form_id: form_id %>
     <% end %>
-  </div>
+  <% end %>
 <% end %>
 
 <%# 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. %>

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/app/views/refine/inline/inputs/_option_condition.html.erb

@@ -1,13 +1,24 @@
-<div class="refine-option--condition-container">
-  <%= input_fields.collection_select :selected,
-    criterion.options,
-    :id,
-    ->(o) {o.display.truncate(64)},
-    {},
-    class: "refine--select refine--option-select",
-    multiple: criterion.multiple?,
-    form: form_id
-  %>
+<div class="refine--option-condition-container" data-controller="refine--typeahead-list">
+  <div class="refine--search-box">
+    <span class="material-icons refine--icon-search">search</span>
+    <input class="refine--search-trigger" data-search-target="filterProperties" placeholder="<%= t('.type_to_search') %>..." type="text" data-action="refine--typeahead-list#filter" autofocus>
+  </div>
+
+  <% criterion.options.each do |option| %>
+    <%= tag.label class: "refine--option-label",
+      data: {
+        refine__typeahead_list_target: "listItem",
+        list_item_value: option.display
+      } do
+    %>
+      <% if criterion.multiple? %>
+        <%= check_box_tag input_fields.field_name("selected", multiple: true), option.id, criterion.input.selected.to_a.include?(option.id), class: "refine--option-input", form: form_id %>
+      <% else %>
+        <%= radio_button_tag input_fields.field_name("selected"), option.id, (criterion.input.selected == [option.id]), class: "refine--option-input", form: form_id %>
+      <% end %>
+      <span class="refine--option-text"><%= option.display.truncate(64) %></span>
+    <% end %>
+  <% end %>
   <% if criterion.condition.meta[:postfix] %>
     <span class="refine-option--condition-postfix"><%= meta[:postfix] %></span>
   <% end %>

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.9.0"
+    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.0
+  version: 2.9.2
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,6 +70,7 @@ files:
 - app/javascript/controllers/refine/toggle-controller.js
 - app/javascript/controllers/refine/turbo-stream-form-controller.js
 - app/javascript/controllers/refine/turbo-stream-link-controller.js
+- app/javascript/controllers/refine/typeahead-list-controller.js
 - app/javascript/controllers/refine/update-controller.js
 - app/javascript/index.js
 - app/javascript/refine/helpers/index.js
@@ -95,10 +96,12 @@ files:
 - app/models/refine/conditions/text_condition.rb
 - app/models/refine/conditions/uses_attributes.rb
 - app/models/refine/filter.rb
+- app/models/refine/filter/internationalized.rb
 - app/models/refine/filters/blueprint_editor.rb
 - 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