Merge branch '20200810_refactor-isolated-component' into next-release

Author: Nils Henning

app/concepts/matestack/ui/core/component/base.rb

@@ -231,23 +231,23 @@ def add_child(child_class, *args, &block)
       # the childs content in order to respond to the subsequent component rendering call with
       # the childs content. In this case: "I should be deferred"
       skip_deferred_child_response = false
-      if child_class <= Matestack::Ui::Core::Async::Async || child_class < Matestack::Ui::Core::Isolate::Isolate
+      if child_class <= Matestack::Ui::Core::Async::Async || child_class < Matestack::Ui::Core::Isolated::Isolated
         if args.any? { |arg| arg[:defer].present? } && @matestack_skip_defer == true
           skip_deferred_child_response = true
         end
       end
 
       # check only allowed keys are passed to isolated components
-      if child_class < Matestack::Ui::Core::Isolate::Isolate
-        unless args.empty? || args[0].keys.all? { |key| [:defer, :public_options, :rerender_on, :init_on, :rerender_delay].include? key }
+      if child_class < Matestack::Ui::Core::Isolated::Isolated
+        unless args.empty? || args[0].keys.all? { |key| [:defer, :public_options, :rerender_on, :init_on, :rerender_delay, :matestack_context].include? key }
           raise "isolated components can only take params in a public_options hash, which will be exposed to the client side in order to perform an async request with these params."
         end
         if args.any? { |arg| arg[:init_on].present? } && @matestack_skip_defer == true
           skip_deferred_child_response = true
         end
       end
 
-      if self.class < Matestack::Ui::Core::Isolate::Isolate
+      if self.class < Matestack::Ui::Core::Isolated::Isolated
         parent_context_included_config = @current_parent_context.get_included_config || {}
         parent_context_included_config.merge!({ isolated_parent_class: self.class.name })
         args_with_context = add_context_to_options(args,parent_context_included_config)

app/concepts/matestack/ui/core/isolated/children_wrapper.haml

@@ -0,0 +1,2 @@
+%div{ class: 'matestack-isolated-component-root'}
+  =yield

app/concepts/matestack/ui/core/isolate/isolate.haml renamed to app/concepts/matestack/ui/core/isolated/isolated.haml

@@ -71,21 +71,15 @@ const componentDef = {
   },
   mounted: function (){
     const self = this
-    console.log('mounted isolated component')
     if(this.componentConfig["init_on"] === undefined || this.componentConfig["init_on"] === null){
-      console.log('Its me')
       if(self.componentConfig["defer"] == true || Number.isInteger(self.componentConfig["defer"])){
-        console.log('I should render deferred')
         if(!isNaN(self.componentConfig["defer"])){
           self.startDefer()
         }
         else{
           self.renderIsolatedContent();
         }
       }
-      else {
-        console.log('I should NOT render deferred')
-      }
     }else{
       if(self.componentConfig["defer"] != undefined){
         if(!isNaN(self.componentConfig["defer"])){

app/concepts/matestack/ui/core/isolate/isolate.js renamed to app/concepts/matestack/ui/core/isolated/isolated.js

@@ -1,5 +1,5 @@
-module Matestack::Ui::Core::Isolate
-  class Isolate < Matestack::Ui::Core::Component::Dynamic
+module Matestack::Ui::Core::Isolated
+  class Isolated < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name "matestack-ui-core-isolate"
 
     def initialize(*args)
@@ -11,9 +11,9 @@ def public_options
       @public_options ||= {}
     end
 
-    def params
-      context[:params] ||= {}
-    end
+    # def params
+    #   context[:params] || matestack_context[:params]
+    # end
 
     def setup
       @component_config[:component_class] = self.class.name
@@ -35,12 +35,14 @@ def render_content
 
     # only render vuejs component wrapper on show
     def show
-      render :isolate
+      render :isolated
     end
 
     # this method gets called when the isolate vuejs component requests isolated content
     def render_isolated_content
-      render :children if authorized?
+      render :children_wrapper do
+        render :children if authorized?
+      end
     end
 
     def authorized?

app/concepts/matestack/ui/core/isolate/isolate.rb renamed to app/concepts/matestack/ui/core/isolated/isolated.rb

@@ -16,7 +16,7 @@ import onclick from '../onclick/onclick'
 import collectionContent from '../collection/content/content'
 import collectionFilter from '../collection/filter/filter'
 import collectionOrder from '../collection/order/order'
-import isolate from '../isolate/isolate'
+import isolate from '../isolated/isolated'
 
 let matestackUiApp = undefined
 

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

@@ -44,13 +44,11 @@ def render(*args)
                   (matestack_arg < Matestack::Ui::Page)
             Rendering::MainRenderer.render(self, matestack_arg, options)
           else
-            # if called from a controller and params contains a component key render without layout
-            # else it was called from within an app/page and should render normally
-            # if self.is_a?(ActionController::Base) && params&.dig(:component_key)
-            #   super layout: false
-            # else
+            if params[:component_class].present? && !((options = args.first).is_a?(Hash) && options[:html].present?)
+              Rendering::MainRenderer.render(self, Matestack::Ui::Page, {})
+            else
               super
-            # end
+            end
           end
         end
 

app/helpers/matestack/ui/core/application_helper.rb

@@ -153,7 +153,7 @@ def resolve_component(name)
 
   def resolve_isolated_component(name)
     constant = const_get(name)
-    if constant < Matestack::Ui::Core::Isolate::Isolate
+    if constant < Matestack::Ui::Core::Isolated::Isolated
       constant
     else
       nil

app/lib/matestack/ui/core/rendering/main_renderer.rb

@@ -1 +1 @@
-Matestack::Ui::IsolatedComponent = Matestack::Ui::Core::Isolate::Isolate
+Matestack::Ui::IsolatedComponent = Matestack::Ui::Core::Isolated::Isolated

app/lib/matestack/ui/isolated_component.rb

@@ -9,6 +9,8 @@ services:
       - "3000:3000"
     environment:
       RAILS_ENV: development
+    links:
+      - postgres_dummy
     volumes:
       - ./:/app
       - gem-volume:/usr/local/bundle
@@ -59,6 +61,17 @@ services:
     volumes:
       - test-data-volume:/var/lib/postgresql/data
 
+  postgres_dummy:
+    image: postgres
+    expose:
+      - 5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: dummy
+    volumes:
+      - test-data-volume:/var/lib/postgresql/data
+
 volumes:
   test-data-volume:
   gem-volume: