effective_resources 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af933d56ed2a8a49c9b05dfee64b5a8e7a13d84358c54966208507f1703090ec
-  data.tar.gz: dd28e88602d3c2d9f4b908d79260b2849d34cbdd3c8b6c204a18c96c2ad2d217
+  metadata.gz: 146cdb78cb556ab64e1dc464ad8670179f45d20b6aa4c89584d8a96dbd573517
+  data.tar.gz: e00c2763329776a6e06b95aa70fc7da7405baa7c11c4f77889d3f44fae8a3cf7
 SHA512:
-  metadata.gz: a46d1580c41d7597766cea58782d0e7c4092aca90210049b5155d9b0330c3b5ed01cb8f24d8ab299bc12fcdec13a3b9f79fb8e4959e4cb3b38af1a1d407164a2
-  data.tar.gz: a422ebe046792b4f000918c86a0df61e9884f276dbb5d580cce8ac02fb090186552cc25ae3da26682775460ef84a9da7a7296e2260e9e02c1a5ccec7d5960e0f
+  metadata.gz: 1b83b25e3291c35839e59637e4f79f83bd2e3e8cc998ba91f50ec30bccd814a0eb90f713c8de8c1367b17fc5aa0080020e07cf88893afa7ca9528724e1e56320
+  data.tar.gz: '05845a45e1650fef9da050660183138f2e23fa7e255942e8c70a01b3ee413fe19624465dabab515477c9f093d5414fc10c949f6f87c3ee2edd6f5e0b4ef3634f'

data/app/helpers/effective_resources_helper.rb

@@ -280,7 +280,7 @@ module EffectiveResourcesHelper
     end
 
     content_tag(:div, class: 'card') do
-      content_tag(:div, class: 'card-body yo') do
+      content_tag(:div, class: 'card-body') do
         content_tag(:div, class: 'row') do
           content_tag(:div, class: 'col-sm') do
             content_tag(:h5, title, class: 'card-title')

data/app/helpers/effective_resources_wizard_helper.rb

@@ -2,12 +2,17 @@
 
 module EffectiveResourcesWizardHelper
 
-  def render_wizard_sidebar(resource, numbers: true, horizontal: false, &block)
+  def render_wizard_sidebar(resource, numbers: true, path: nil, horizontal: false, &block)
+    if path.present?
+      raise('expected path to be a string with /build/ in it ') unless path.to_s.include?('/build/')
+      path = path.split('/build/').first + '/build/'
+    end
+
     klasses = ['wizard-sidebar', 'list-group', ('list-group-horizontal' if horizontal)].compact.join(' ')
 
     sidebar = content_tag(:div, class: klasses) do
       resource.sidebar_steps.map.with_index do |nav_step, index|
-        render_wizard_sidebar_item(resource, nav_step, (index + 1 if numbers))
+        render_wizard_sidebar_item(resource, nav_step: nav_step, index: (index + 1 if numbers), path: (path + nav_step.to_s if path))
       end.join.html_safe
     end
 
@@ -19,7 +24,7 @@ module EffectiveResourcesWizardHelper
     end
   end
 
-  def render_wizard_sidebar_item(resource, nav_step, index = nil)
+  def render_wizard_sidebar_item(resource, nav_step:, path: nil, index: nil)
     # From Controller
     current = (nav_step == step)
     title = resource_wizard_step_title(resource, nav_step)
@@ -33,7 +38,7 @@ module EffectiveResourcesWizardHelper
     if (current || disabled)
       content_tag(:a, label, class: klass)
     else
-      link_to(label, wizard_path(nav_step), class: klass)
+      link_to(label, path || wizard_path(nav_step), class: klass)
     end
   end
 

data/app/models/effective/resources/relation.rb

@@ -305,12 +305,7 @@ module Effective
                 end
               )
 
-              if joined
-                relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
-              else
-                relation.where(attribute.gteq(term)).where(attribute.lteq(end_at))
-              end
-
+              relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
             end
 
           when :effective_obfuscation
@@ -334,11 +329,11 @@ module Effective
         return searched if searched
 
         # Simple operation search
+        # The Arel operator eq and matches bug out with serialized Array columns. So we avoid for datatables usage.
+
         case operation
-          when :eq then
-            joined ? relation.where("#{sql_column} = ?", term) : relation.where(attribute.eq(term))
-          when :matches then
-            joined ? relation.where("#{sql_column} #{ilike} ?", "%#{term}%") : relation.where(attribute.matches("%#{term}%"))
+          when :eq then relation.where("#{sql_column} = ?", term)
+          when :matches then relation.where("#{sql_column} #{ilike} ?", "%#{term}%")
           when :not_eq then relation.where(attribute.not_eq(term))
           when :does_not_match then relation.where(attribute.does_not_match("%#{term}%"))
           when :starts_with then relation.where(attribute.matches("#{term}%"))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails