effective_resources 2.8.8 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a583a70685ae3faf4811c49e750ae55c05aec5af0ed3f061662c80723575a2c9
-  data.tar.gz: acb81962352988b990db0d8b95ba4430d02bfad1bf04946d5724753bf10454ad
+  metadata.gz: 6a38e2952ba5fef52c6aa082b18ef2d9261c32dcd89f629fa548b22b4c5f70b6
+  data.tar.gz: 0aebae2fb3691c17fcc6cbe84d3a153592cd0fd4c49aafdeadcf77d511bd5c30
 SHA512:
-  metadata.gz: 60bb0ff5c80356b24770eb98d9787a9a975368edf7fa3be6c5cd700c7937e3fce7a6ad1a5d8cf8670184c0b5feeaf0dd98577989948b5292a7f3f4fe09c3ed97
-  data.tar.gz: 1aa740c85b5a07a900e9cc68f97f38dfe0c57b1ca1fbfecf43f34a2b9be2aba8571e84d989a99957c319d33b437da061e56744999d49213d4a9dddf3795f30f4
+  metadata.gz: da673d1b40fbdf5c6ddf6322619c4cf8e1641b3aa28a81395de8080f5220d371a272f9cca5541eae8f8206c5020418d1562f1db3f22117c0513eb9fd2df0bc72
+  data.tar.gz: b0167300f0a180b5f7bb4445aa70750b6a606a38633d9fcb4ba22ea68d5e290602cfc5b659638e4703bed29fb2df8863ce4a94cdc59def680fdeec1acfefdc0f

data/app/helpers/effective_resources_wizard_helper.rb

@@ -42,19 +42,32 @@ module EffectiveResourcesWizardHelper
     end
   end
 
-  def render_wizard_resource(resource, as: nil, path: nil)
+  def render_wizard_resource_step(resource, step, as: nil, path: nil)
+    render_wizard_resource(resource, only: step, as: as, path: path)
+  end
+
+  def render_wizard_resource(resource, only: [], except: [], as: nil, path: nil)
     effective_resource = Effective::Resource.new(resource)
 
+    # Render path
     as ||= effective_resource.name
-    path ||= effective_resource.view_file_path(nil)
+    path ||= effective_resource.wizard_file_path(resource)
     raise('expected a path') unless path.present?
 
     resource.render_path = path.to_s.chomp('/')
 
-    resource.render_steps.map do |partial|
-      resource.render_step = partial
+    # Render steps
+    only = Array(only)
+    except = Array(except)
+
+    steps = resource.render_steps
+    steps = (steps - except) if except.present?
+    steps = (steps & only) if only.present?
+
+    steps.map do |step|
+      resource.render_step = step
 
-      render_if_exists("#{path}/#{partial}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
+      render_if_exists("#{path}/#{step}", as.to_sym => resource) || render('effective/acts_as_wizard/wizard_step', resource: resource, resource_path: path)
     end.join.html_safe
   end
 

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

@@ -35,6 +35,15 @@ module Effective
         File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
       end
 
+      # Wizards are kinda weird, we need some help for effective_memberships
+      def wizard_file_path(resource)
+        if resource.class.try(:effective_memberships_applicant?) || resource.class.try(:effective_memberships_applicant_review?)
+          File.join(*['effective', plural_name].compact)
+        else
+          view_file_path(nil)
+        end
+      end
+
       # Views
       def view_file(action = :index, partial: false)
         File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.8.8'.freeze
+  VERSION = '2.8.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.8.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails