refine-rails 2.9.2 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7291e0c87324f5ea5f6d9116e74b4996e873738a1a6f0cb192b5b4f3d6428482
-  data.tar.gz: 10d80a905ddc6ce6d3d0f9e3b1f6c0439bda1e93e0092866b36d184247ec4a6c
+  metadata.gz: 1abfebfeb61dfe1d7807827fdf1d48c8a9b3f163f2d2aced308378ca577234a7
+  data.tar.gz: 59b3a22f8cad671211eb81e2eb8bcb8a68a909b156d19baea265b225a4bfe804
 SHA512:
-  metadata.gz: bd7d4016067808b0d9d32c3d7a564be9c3c35c15b39d1461a7ab01fef04ff44ed9dd65d03162209b339406103620a9b69f591e7d6be7a46d686b69dce74dd283
-  data.tar.gz: 660cd1e5bc02473e92d11d8155ea78591d572a288986c09be87ec355719e59476f6e7085eec63e8450817dbc67c680a97b5c9ba1b353c6cd6054404897e460c9
+  metadata.gz: d4828b6f1e0c4146ec8fa9cb33a0974ed73edec68b820e03337a061b72a8d36c89b80dc8b7bb0ec1bcd24ad24261faf9143616341f1055fc0239122e41b01e23
+  data.tar.gz: 22e89bb4e4f76348ff71a646f55f2ef62b9e350435d3d20ba0a849406a555888ad73c2d4ae1fbff8da5b2118660cbfd7134ffc9dcb50e12735426e7ad671ff98

data/README.md

@@ -42,41 +42,6 @@ This is a helper method you can inspect in `Hammerstone::FilterApplicationContro
     @pagy, @contacts = pagy(@refine_filter.get_query)
 ```
 
-# TODO: Everything below this header was not covered in the installation guide. Not sure if it is deprecated
-
-12. Add the `reveal` controller to your application if using the `filter_builder_dropdown` partial
-
-`yarn add stimulus-reveal`
-
-```javascript
-//index.js
-import RevealController from 'stimulus-reveal'
-
-application.register('reveal', RevealController)
-```
-
-~13. If the gems tailwind styles are being purged with JIT you can add the gem to `tmp/gems` and add this to your tailwing config.~ 
-
-``` tailwind.config.js
-  './tmp/gems/*/app/views/**/*.html.erb',
-  './tmp/gems/*/app/helpers/**/*.rb',
-  './tmp/gems/*/app/assets/stylesheets/**/*.css',
-  './tmp/gems/*/app/javascript/**/*.js',
-```
-
-~Run the following rake task:~ 
-```
-task :add_temp_gems do 
-  target = `bundle show refine-rails`.chomp
-  if target.present?
-    puts "Linking refine-rails to '#{target}'."
-    `ln -s #{target} tmp/gems/refine-rails`
-  end
-end
-```
-
-Don't forget to restart the server! 
-
 14. Add external styles - currently themify icons (can be overriden - the trash can icon is located in `_criterion.html.erb`) and `daterangepicker`
 A quick way to load them is in the `head` section. Also available as an npm package. 
 
@@ -374,25 +339,11 @@ import { controllerDefinitions as refineControllers } from "@hammerstone/refine-
 application.load(refineControllers)
 ```
 
-## Readme Installation Goals (what we're working towards - does not work yet) 
-
-1. Run the generator  
-`rails generate refine:install`
-
-2. Define your filters, subclassing from `Hammerstone::Refine::Filter` 
-
-3. Call `apply_filter` in your controller (or even better, instantiate the filter in your controller `@contacts = ContactFilter.new(blueprint, initial_query` -> might not be possible, how can we do this with validations?)
-
-4. If you want to customize the views you can override our stylesheet with you own. 
-If you need even more customization you can override the views with `rails generate refine:views` will extract the views
-
-5. Add custom datepicker if desired and scope stored filters. 
- 
 ## Releasing New Versions
 
 - Every release should update the gem and NPM package so version numbers stay in sync.
 - Make sure to update the CHANGELOG with a note explaining what the new version does
-- Make sure you have the [bump](https://rubygems.org/gems/bump) and [gemfury](https://rubygems.org/gems/gemfury) gems installed locally
+- Make sure you have the [bump](https://rubygems.org/gems/bump) gems installed locally
 
 ### Releasing the Ruby Gem
 

data/app/assets/stylesheets/index.css

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

data/app/models/refine/filters/blueprint_editor.rb

@@ -15,6 +15,7 @@ class Refine::Filters::BlueprintEditor
     value1
     value2
     count_refinement
+    date_refinement
   ].freeze
 
   def initialize(blueprint)

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

@@ -23,7 +23,6 @@ class Refine::Filters::Criterion
   end
 
   def validate!
-    return if (input&.has_key?(:count_refinement) || input&.has_key?(:date_refinement))
     errors.clear
     return true if type == "conjunction"
     begin
@@ -31,7 +30,7 @@ class Refine::Filters::Criterion
       condition&.apply(input, filter.table, query_for_validate)
     rescue Refine::Conditions::Errors::ConditionClauseError => e
       e.errors.each do |error|
-        errors.add(:base, error.full_message)
+        errors.add(:base, :invalid, message: error.full_message)
       end
     end
   end

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

@@ -29,8 +29,8 @@ class Refine::Inline::Criteria::Input
       value: value,
       value1: value1,
       value2: value2,
-      count_refinement_attributes: count_refinement_attributes.presence,
-      date_refinement_attributes: date_refinement_attributes.presence
+      count_refinement: count_refinement_attributes.presence,
+      date_refinement: date_refinement_attributes.presence
     }.compact
   end
 

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

@@ -93,8 +93,7 @@ class Refine::Inline::Criterion
     result = attributes.slice(:condition_id, :input_attributes)
     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)
+      result[:input] = input_attrs
     end
     result
   end

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

@@ -5,33 +5,38 @@
   refine__update_criterion_id_value: criterion_id,
   position: criterion.position}) do %>
 
+  <div class="refine-criterion-line">
   <!-- Select Condition -->
-  <div class="refine-criterion-condition-container">
-    <%= render partial: 'refine/blueprints/condition_select', locals: {
-      selected_condition_id: criterion.condition_id } %>
-  </div>
+    <div class="refine-criterion-condition-container">
+      <%= render partial: 'refine/blueprints/condition_select', locals: {
+        selected_condition_id: criterion.condition_id } %>
+    </div>
 
-  <!-- Select Clause -->
-  <div class="refine-criterion-clause-container">
-    <%= render partial: 'refine/blueprints/clause_select', locals: {
-        meta: criterion.meta, selected_clause: criterion.input[:clause]} %>
-  </div>
+    <!-- Select Clause -->
+    <div class="refine-criterion-clause-container">
+      <%= render partial: 'refine/blueprints/clause_select', locals: {
+          meta: criterion.meta, selected_clause: criterion.input[:clause]} %>
+    </div>
 
-  <!-- Render correct type of condition -->
-  <%= render partial: "refine/blueprints/clauses/#{criterion.component}", locals: {
-    criterion: criterion,
-    condition: criterion.condition, input: criterion.input, criterion_id: criterion_id, meta: criterion.meta, meta_clause: criterion.selected_clause_meta, input_id: nil } %>
+    <!-- Render correct type of condition -->
+    <%= render partial: "refine/blueprints/clauses/#{criterion.component}", locals: {
+      criterion: criterion,
+      condition: criterion.condition, input: criterion.input, criterion_id: criterion_id, meta: criterion.meta, meta_clause: criterion.selected_clause_meta, input_id: nil } %>
+  </div>
 
   <!-- Refinements -->
   <% criterion.refinements.each do |refinement|%>
 
-    <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(refinement[:id].to_sym, :clause) || {} } %>
-    </div>
+    <div class="refine-criterion-refinement-line">
+      <i class="fa-thin fa-l"></i>
+      <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(refinement[:id].to_sym, :clause) || {} } %>
+      </div>
 
-    <%= render partial: "refine/blueprints/clauses/#{refinement[:component].underscore}", locals: {
-      condition: refinement, input: criterion.input[refinement[:id].to_sym] || {}, criterion_id: criterion_id, meta: refinement[:meta], input_id: "input, #{refinement[:id]}", meta_clause: criterion.meta_for_refinement_clause(refinement), criterion: criterion} %>
+      <%= render partial: "refine/blueprints/clauses/#{refinement[:component].underscore}", locals: {
+        condition: refinement, input: criterion.input[refinement[:id].to_sym] || {}, criterion_id: criterion_id, meta: refinement[:meta], input_id: "input, #{refinement[:id]}", meta_clause: criterion.meta_for_refinement_clause(refinement), criterion: criterion} %>
+    </div>
   <% end %>
   <!-- End Refinements -->
 

data/lib/refine/rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.4
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,7 +178,7 @@ files:
 - lib/tasks/refine/rails_tasks.rake
 homepage: https://rubygems.org/gems/refine-rails
 licenses:
-- Nonstandard
+- MIT
 metadata:
   homepage_uri: https://rubygems.org/gems/refine-rails
   source_code_uri: https://github.com/clickfunnels2/refine-rails