[WIP][FEATURE] cable component

Author: Nils Henning

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

@@ -2,10 +2,10 @@ import Vue from 'vue/dist/vue.esm'
 import matestackEventHub from '../../js/event-hub'
 import queryParamsHelper from '../../js/helpers/query-params-helper'
 import componentMixin from '../../component/component'
-import asyncMixin from '../../async/async'
+// import asyncMixin from '../../async/async'
 
 const componentDef = {
-  mixins: [componentMixin, asyncMixin],
+  mixins: [componentMixin],
   data: function(){
     return {
       currentLimit: null,

app/concepts/matestack/ui/core/collection/content/content.rb

@@ -1,5 +1,5 @@
 module Matestack::Ui::Core::Collection::Content
-  class Content < Matestack::Ui::Core::Component::Rerender
+  class Content < Matestack::Ui::Core::Component::Dynamic
     vue_js_component_name 'matestack-ui-core-collection-content'
 
     def setup

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

@@ -4,12 +4,11 @@ class Base < Trailblazer::Cell
     include Matestack::Ui::Core::HasViewContext
     include Matestack::Ui::Core::HtmlAttributes
     include Matestack::Ui::Core::Properties
+    include Matestack::Ui::Core::DSL
 
     # define html global attributes
     html_attributes *HTML_GLOBAL_ATTRIBUTES, *HTML_EVENT_ATTRIBUTES
 
-    # probably need to remove for other tests to be green again
-    include Matestack::Ui::Core::DSL
 
     view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
     view_paths << "#{::Rails.root}#{'/' unless ::Rails.root.nil?}app/matestack"

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

@@ -100,7 +100,9 @@ def responder_for(*args)
 
         def matestack_component(component, options = {}, &block)
           context = (options[:matestack_context] ||= {}).merge(controller: @_controller || self)
-          Matestack::Ui::Core::Component::Base.new(options.merge(matestack_context: context)).send(component, options.merge(matestack_context: context), &block)
+          Matestack::Ui::Core::Component::Base
+            .new(options.merge(matestack_context: context))
+            .send(component, options.merge(matestack_context: context), &block).to_s
         end
       end
     end

docker-compose.yml

@@ -71,18 +71,7 @@ services:
       POSTGRES_DB: test
     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:
   dummy-data-volume:

spec/dummy/.byebug_history

@@ -1,7 +1,6 @@
 class MyAppController < ApplicationController
 
   include Matestack::Ui::Core::ApplicationHelper
-
   include Components::Registry
   include Demo::Components::Registry
 
@@ -49,16 +48,16 @@ def some_action
   end
 
   def form_action
-    @dummy_model = DummyModel.create(dummy_model_params)
-    if @dummy_model.errors.any?
+    dummy_model = DummyModel.create(dummy_model_params)
+    if dummy_model.errors.any?
       render json: {
-        errors: @dummy_model.errors,
+        errors: dummy_model.errors,
         message: "Test Model could not be saved!"
       }, status: :unprocessable_entity
     else
       ActionCable.server.broadcast("matestack_ui_core", {
         message: "test_model_created",
-        new_element: matestack_component(:my_list_item, item: @dummy_model).to_s
+        new_element: matestack_component(:my_list_item, item: dummy_model)
       })
       render json: { transition_to: my_second_page_path }, status: :created
     end

spec/dummy/app/controllers/my_app_controller.rb

@@ -1,11 +1,9 @@
 class Demo::Components::Card < Matestack::Ui::StaticComponent
 
   def response
-    components {
-      div class: "my-component" do
-        plain "demo card!"
-      end
-    }
+    div class: "my-component" do
+      plain "demo card!"
+    end
   end
 
 end

spec/dummy/app/matestack/demo/components/card.rb

@@ -27,12 +27,10 @@ def prepare
 
   def response
     heading size: 2, text: "Collection"
-
-    partial :filter
-    partial :ordering
-
+    filter
+    ordering
     async rerender_on: "my-first-collection-update", id: "my-collection" do
-      partial :content
+      content
     end
   end
 
@@ -66,8 +64,8 @@ def ordering
 
   def content
     collection_content @my_collection.config do
-      partial :list
-      partial :paginator
+      list
+      paginator
     end
   end