Merge branch 'develop' into 232

Author: jonasjabari

Gemfile

@@ -26,7 +26,6 @@ group :development, :test do
   gem 'puma'
   gem 'simplecov', require: false, group: :test
   gem 'byebug'
-  gem 'pry-byebug'
   gem 'webmock'
   gem 'pry-rails'
   gem 'pry-byebug'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    matestack-ui-core (0.7.3)
+    matestack-ui-core (0.7.4)
       cells-haml
       cells-rails
       haml
@@ -121,7 +121,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     pipetree (0.1.1)
     pry (0.12.2)
@@ -133,7 +133,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (4.3.1)
+    puma (4.3.3)
       nio4r (~> 2.0)
     rack (2.2.1)
     rack-proxy (0.6.5)

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

@@ -10,12 +10,20 @@ const componentDef = {
   },
   computed: Vuex.mapState({
     asyncTemplate: state => state.pageTemplate,
+    currentPathName: state => state.currentPathName,
+    currentSearch: state => state.currentSearch,
+    currentOrigin: state => state.currentOrigin,
   }),
   mounted: function(){
+    const self = this;
     window.onpopstate = (event) => {
-      if (isNavigatingToAnotherPage(document.location, event)) {
-        this.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
-      };
+      if (isNavigatingToAnotherPage({
+          origin: self.currentOrigin,
+          pathName: self.currentPathName,
+          search: self.currentSearch
+        }, document.location)){
+        self.$store.dispatch("navigateTo", {url: document.location.pathname, backwards: true} );
+      }
     }
   },
   components: {

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

@@ -1,8 +1,7 @@
-const isNavigatingToAnotherPage = function(currentLocation, popstateEvent) {
-  const targetLocation = popstateEvent.target.location;
+const isNavigatingToAnotherPage = function(currentLocation, targetLocation) {
 
   // omits hash by design
-  return currentLocation.pathname !== targetLocation.pathname ||
+  return currentLocation.pathName !== targetLocation.pathname ||
     currentLocation.origin !== targetLocation.origin ||
     currentLocation.search !== targetLocation.search
 }

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

@@ -8,14 +8,18 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
   state: {
     pageTemplate: null,
-    currentPath: document.location.pathname
+    currentPathName: document.location.pathname,
+    currentSearch: document.location.search,
+    currentOrigin: document.location.origin
   },
   mutations: {
     setPageTemplate (state, serverResponse){
       state.pageTemplate = serverResponse
     },
-    setCurrentPath (state, path){
-      state.currentPath = path
+    setCurrentLocation (state, current){
+      state.currentPathName = current.path
+      state.currentSearch = current.search
+      state.currentOrigin = current.origin
     }
   },
   actions: {
@@ -46,7 +50,7 @@ const store = new Vuex.Store({
           setTimeout(function () {
             resolve(response["data"])
             commit('setPageTemplate', response["data"])
-            commit('setCurrentPath', url)
+            commit('setCurrentLocation', { path: url, search: document.location.search, origin: document.location.origin })
             matestackEventHub.$emit("page_loaded", url);
             if (typeof matestackUiCoreTransitionSuccess !== 'undefined') {
               matestackUiCoreTransitionSuccess(url);

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

@@ -137,7 +137,7 @@ const componentDef = {
           && self.componentConfig["success"]["transition"]["follow_response"] === true
           && self.$store != undefined
         ) {
-          let path = response.data["transition_to"]
+          let path = response.data["transition_to"] || response.request.responseURL
           self.$store.dispatch('navigateTo', {url: path, backwards: false})
           return;
         }

app/lib/matestack/ui/core/has_view_context.rb

@@ -5,6 +5,10 @@ def initialize(model = nil, options = {})
   end
 
   def method_missing(*args, &block)
-    @view_context.send(*args, &block)
+    if @view_context.respond_to? args.first
+      @view_context.send(*args, &block)
+    else
+      super
+    end
   end
 end

builder/Gemfile

@@ -6,7 +6,7 @@ ruby '2.6.5'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.0'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets

builder/Gemfile.lock

@@ -84,9 +84,9 @@ GEM
     minitest (5.14.0)
     msgpack (1.3.1)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    puma (3.12.2)
+    puma (3.12.4)
     rack (2.1.2)
     rack-proxy (0.6.5)
       rack
@@ -168,7 +168,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)
-  puma (~> 3.11)
+  puma (~> 3.12)
   rails (~> 5.2.0)
   sass-rails (~> 5.0)
   tzinfo-data

package.json

@@ -9,7 +9,7 @@
     "v-runtime-template": "^1.5.2",
     "vue": "^2.5.17",
     "vuex": "^3.0.1",
-    "yarn": "^1.17.3"
+    "yarn": "^1.22.0"
   },
   "exports": {
     "./concepts/": "./app/concepts/matestack/ui/core/"