effective_resources 2.2.5 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e5bf3fd1991d755505ba17c9ec917279bed6ed92e8b336005ccbcf4568ac01
-  data.tar.gz: 84a1301995e457d5ac7250528ca7dafb6ac3d043d41c8dec65a200f452217c11
+  metadata.gz: 6819b26bada9a724fa3389143b46e3d39988040cc58430440679672d8a437114
+  data.tar.gz: 604f9712d29693fd48ea06d357ac7f84a0ff07b717316f6378b3822db5fbdc87
 SHA512:
-  metadata.gz: 481fd4b475b39f2c048288831ae0929b86062dbb63edb49ada6b4652a7c33953a172bb9f3ec5f2c4d9cf2d1653bf3a6625b692d8d776ae6b11281ca30bc57b73
-  data.tar.gz: eab64d1fa9fb21caa68e028943ea22bd4ced563a7ca9fb08d35e23dd5ae325c00918a1485273297ef46311c047eef4790631d60022a9eea5eed1bc4504d74bdd
+  metadata.gz: 756414efa78b9f5517699e5cb61de0ea62de0f0180efadb24ee7ffb065985441e17f389de7b2452346946024da12f1131cd3fee3766d633a6b2956ba705f9bb1
+  data.tar.gz: a5d1dd0200866bfd0b7b1970d599203a72b5c9f3d08f57931e7679d8b0eb61f3f769921d3c7c634a9d250c73210f544468a9845aba368e60e0ad00f0be03cbce

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -47,8 +47,9 @@ module Effective
         return if resource.try(:done?)
         return unless resource_scope.respond_to?(:in_progress)
 
-        existing = resource_scope.in_progress.where.not(id: resource).first
+        existing = resource_scope.in_progress.order(:id).where.not(id: resource).first
         return unless existing.present?
+        return if (existing.id > resource.id) # Otherwise we get an infinite loop
 
         flash[:success] = "You have been redirected to your in-progress wizard"
         redirect_to resource_wizard_path(existing, existing.next_step)

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/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.5'.freeze
+  VERSION = '2.2.7'.freeze
 end

metadata

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