Merge branch 'develop' into sf/action-confirm-option-issue-257

Author: jonasjabari

Gemfile

@@ -11,10 +11,6 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-# gem 'pry-byebug', group: [:development, :test]
-
 gem "trailblazer"
 gem "trailblazer-rails"
 gem "trailblazer-cells"
@@ -31,6 +27,7 @@ group :development, :test do
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
+  # gem 'pry-byebug'
   gem 'webmock'
   gem 'webdrivers', '~> 4.1'
 end

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.7.2.1)
+    matestack-ui-core (0.7.3)
       cells-haml
       cells-rails
       haml
@@ -84,7 +84,7 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.4)
+    crass (1.0.5)
     declarative (0.0.10)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
@@ -111,7 +111,7 @@ GEM
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -124,16 +124,17 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.5.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     public_suffix (3.0.3)
-    puma (3.12.0)
-    rack (2.0.7)
+    puma (4.3.1)
+      nio4r (~> 2.0)
+    rack (2.0.8)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
@@ -191,7 +192,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubyzip (1.2.2)
+    rubyzip (1.3.0)
     safe_yaml (1.0.5)
     selenium-webdriver (3.14.1)
       childprocess (~> 0.5)
@@ -201,7 +202,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)

README.md

@@ -42,7 +42,7 @@ Click here to see how you can add Matestack UI to your existing Rails applicatio
 class Pages::MyPage < Matestack::Ui::Page
 
   def prepare
-    @technologies = ["Rails", "Vue.js", "Trailblazer", "Rspec", "Capybara"]
+    @technologies = ["Rails", "Vue.js", "Trailblazer", "RSpec", "Capybara"]
   end
 
   def response

app/concepts/matestack/ui/core/action/action.js

@@ -30,9 +30,27 @@ const componentDef = {
           if (self.componentConfig["success"] != undefined && self.componentConfig["success"]["emit"] != undefined) {
             matestackEventHub.$emit(self.componentConfig["success"]["emit"], response.data);
           }
-          if (self.componentConfig["success"] != undefined && self.componentConfig["success"]["transition"] != undefined && self.$store != undefined) {
+          if (self.componentConfig["success"] != undefined
+            && self.componentConfig["success"]["transition"] != undefined
+            && (
+              self.componentConfig["success"]["transition"]["follow_response"] == undefined
+              ||
+              self.componentConfig["success"]["transition"]["follow_response"] === false
+            )
+            && self.$store != undefined
+          ) {
             let path = self.componentConfig["success"]["transition"]["path"]
             self.$store.dispatch('navigateTo', {url: path, backwards: false})
+            return;
+          }
+          if (self.componentConfig["success"] != undefined
+            && self.componentConfig["success"]["transition"] != undefined
+            && self.componentConfig["success"]["transition"]["follow_response"] === true
+            && self.$store != undefined
+          ) {
+            let path = response.data["transition_to"] || response.request.responseURL;
+            self.$store.dispatch('navigateTo', {url: path, backwards: false});
+            return;
           }
         })
         .catch(function(error){

app/concepts/matestack/ui/core/bdi/bdi.haml

@@ -0,0 +1,5 @@
+%bdi{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/bdi/bdi.rb

@@ -0,0 +1,4 @@
+module Matestack::Ui::Core::Bdi
+  class Bdi < Matestack::Ui::Core::Component::Static
+  end
+end

app/concepts/matestack/ui/core/bdo/bdo.haml

@@ -0,0 +1,5 @@
+%bdo{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/bdo/bdo.rb

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Bdo
+  class Bdo < Matestack::Ui::Core::Component::Static
+    REQUIRED_KEYS = [:dir]
+
+    def setup
+      @tag_attributes.merge!({
+        "dir": options[:dir]
+      })
+    end
+  end
+end

app/concepts/matestack/ui/core/data/data.haml

@@ -0,0 +1,5 @@
+%data{@tag_attributes}
+  - if options[:text].blank? && block_given?
+    = yield
+  - else
+    = options[:text]

app/concepts/matestack/ui/core/data/data.rb

@@ -0,0 +1,9 @@
+module Matestack::Ui::Core::Data
+  class Data < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        "value": options[:value] ||= nil
+      })
+    end
+  end
+end