rao-service_chain 0.0.35.pre → 0.0.36.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d800775f94e7e872362dc399f00a1fa23b7bd58db861da47bd0b75408713fc
-  data.tar.gz: bcec8c28b254d3facc8ce791d8bb0a3154147eb33a353f7b1f992bd438557241
+  metadata.gz: a484aa3db5835d220e458a08a54de6e6566f022827584726849d886a5af62564
+  data.tar.gz: 3ff63bd8df3c8488d6d66ed7466ab4281911fb466f6701f184a7d3b28827ace3
 SHA512:
-  metadata.gz: 89ec547822e2e0b6428e08b28d0d0ab6a3792f10dfcd677f58718dac964549bc63f3d058060d8023339a26808e83df05c5e23a9d649c83479d72e4506a42b766
-  data.tar.gz: ccad0e54e37a21348e05ad42a131ddbe792cb25a0f2c92fd7f0b6401892f45ad46b873ab146b93ff0751c35da051567e01dfab38e6c38011ffc1eb661b783bba
+  metadata.gz: 3f517402d68b47f6e06ad4638abceec5dfe2e5294b51c9ead78311c103951a6e26b8af0b4a5dc4d8588e667d75f43602d687979be93b9638445979a3f1f5933c
+  data.tar.gz: 499bfbbc30874d793a892005039de3ae0fba012dc467cfb14c036fd3a4d8c65810219b9ac31da8c516d831e20f7bae7ff578fe0c96c5f547f35fd81d6c6daf4f

data/app/service_chains/rao/service_chain/base.rb

@@ -23,7 +23,11 @@ module Rao
   			raise "Child class responsiblity"
   		end
 
-  		def actual_step_index
+  		def step_index(step)
+        self.steps.map(&:service).index(step.try(:service))
+      end
+
+      def actual_step_index
         self.steps.map(&:service).index(self.actual_step.try(:service))
       end
 
@@ -45,12 +49,23 @@ module Rao
       	self.steps[self.actual_step_index - 1]
       end
 
+      def previous_steps
+        return [] if self.actual_step_index.nil?
+        return [] if self.actual_step_index == 0
+        self.steps[0..(self.actual_step_index - 1)]
+      end
+
       def next_step
         return nil if self.actual_step_index.nil?
       	return nil if self.actual_step_index + 1 >= self.step_count
       	self.steps[self.actual_step_index + 1]
       end
 
+      def next_steps
+        return [] if self.actual_step_index.nil?
+        self.steps[(self.actual_step_index + 1)..-1]
+      end
+
       def next_step?
       	!!next_step
       end
@@ -69,10 +84,10 @@ module Rao
       end
 
       def to_hash(context = nil)
-      	{
-      		actual_step: self.actual_step.to_hash(context),
-      		steps: self.steps.map { |s| s.to_hash(context) }
-      	}
+        {
+          actual_step: self.actual_step.to_hash(context),
+          steps: self.steps.map { |s| s.to_hash(context) }
+        }
       end
 
       def completed_steps
@@ -83,6 +98,18 @@ module Rao
         self.steps.collect { |s| s.pending? ? s : nil }.compact
       end
 
+      def before_actual?(step)
+        return false if self.actual_step.nil?
+        return false if (si = step_index(wrap(step))).nil?
+        self.actual_step_index > si
+      end
+
+      def after_actual?(step)
+        return false if self.actual_step.nil?
+        return false if (si = step_index(wrap(step))).nil?
+        self.actual_step_index < si
+      end
+
       private
 
       def wrap(service, options = {})

data/app/view_helpers/rao/service_chain/application_view_helper.rb

@@ -19,9 +19,17 @@ module Rao
       #         = service_chain_helper(self).render_progress(@service_chain)
       #
       def render_progress(service_chain, options = {})
-        options.reverse_merge!(theme: :bootstrap4)
+        return if service_chain.nil?
+
+        options.reverse_merge!(
+          theme: :bootstrap4,
+          link_next_steps: true,
+          link_actual_step: false,
+          link_previous_steps: true
+        )
         theme = options.delete(:theme)
-        c.render partial: "rao/service_chain/application_view_helper/render_progress/#{theme}", locals: { service_chain: service_chain }
+
+        c.render partial: "rao/service_chain/application_view_helper/render_progress/#{theme}", locals: { service_chain: service_chain, options: options }
       end
     end
   end

data/app/views/rao/service_chain/application_view_helper/render_progress/_bootstrap4.html.haml

@@ -7,7 +7,11 @@
           - if step.actual?
             %span.wizard-step-marker.rounded-circle.bg-primary.text-white
               %i.fas.fa-play
-            = step.label
+            %span.wizard-step-label
+              - if options[:link_actual_step]
+                = link_to(step.label, step.url(self))
+              - else
+                = step.label
           - else
             - if step.completed?
               %span.wizard-step-marker.rounded-circle.bg-success.text-white
@@ -15,4 +19,8 @@
             - else
               %span.wizard-step-marker.rounded-circle.bg-secondary.text-white
                 %i.fas.fa-circle
-            = link_to(step.label, step.url(self))
+            %span.wizard-step-label
+              - if (service_chain.before_actual?(step) && options[:link_previous_steps]) || (service_chain.after_actual?(step) && options[:link_next_steps])
+                = link_to(step.label, step.url(self))
+              - else
+                = step.label

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-service_chain
 version: !ruby/object:Gem::Version
-  version: 0.0.35.pre
+  version: 0.0.36.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails