matestack-ui-core 0.7.2.1 → 1.0.0.rc.1

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

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

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

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

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

@@ -1,15 +1,16 @@
 module Matestack::Ui::Core::Link
   class Link < Matestack::Ui::Core::Component::Static
 
-    REQUIRED_KEYS = [:path]
+    requires :path
 
     def setup
       @tag_attributes.merge!({
-        "class": options[:class],
-        "id": component_id,
-        "method": options[:method],
-        "target": options[:target] ||= nil,
-        "href": link_path
+        class: options[:class],
+        id: component_id,
+        method: options[:method],
+        target: options[:target] ||= nil,
+        href: link_path,
+        title: options[:title]
       })
     end
 

data/app/concepts/matestack/ui/core/{absolute/absolute.haml → map/map.haml}

@@ -1,3 +1,3 @@
-%div{@tag_attributes}
+%map{@tag_attributes}
   - if block_given?
     = yield

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

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Map
+  class Map < Matestack::Ui::Core::Component::Static
+    requires :name
+
+    def setup
+      @tag_attributes.merge!({
+        name: options[:name]
+      })
+    end
+  end
+end

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

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

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

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

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

@@ -0,0 +1,4 @@
+%meter{@tag_attributes}
+  - if block_given?
+    = yield
+    

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

@@ -0,0 +1,14 @@
+module Matestack::Ui::Core::Meter
+  class Meter < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        value: options[:value],
+        min: options[:min],
+        max: options[:max],
+        low: options[:low],
+        high: options[:high],
+        optimum: options[:optimum]
+      })
+    end
+  end
+end

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

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

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

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

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

@@ -0,0 +1 @@
+%object{@tag_attributes}

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

@@ -0,0 +1,15 @@
+module Matestack::Ui::Core::Object
+  class Object < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!({
+        width: options[:width],
+        height: options[:height],
+        data: options[:data],
+        form: options[:form],
+        name: options[:name],
+        type: options[:type],
+        usemap: options[:usemap]
+      })
+    end
+  end
+end

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

@@ -1,8 +1,7 @@
 import Vue from 'vue/dist/vue.esm'
 
-import matestackEventHub from 'js/event-hub'
-
-import componentMixin from 'component/component'
+import matestackEventHub from '../js/event-hub'
+import componentMixin from '../component/component'
 
 const componentDef = {
   mixins: [componentMixin],

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

@@ -1,5 +1,6 @@
 module Matestack::Ui::Core::Onclick
     class Onclick < Matestack::Ui::Core::Component::Dynamic
+      vue_js_component_name "matestack-ui-core-onclick"
 
   end
 end

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

@@ -0,0 +1,3 @@
+%optgroup{@tag_attributes}
+  - if block_given?
+    = yield

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

@@ -0,0 +1,10 @@
+module Matestack::Ui::Core::Optgroup
+  class Optgroup < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        label: options[:label]
+      )
+    end
+  end
+end

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

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

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

@@ -0,0 +1,12 @@
+module Matestack::Ui::Core::Option
+  class Option < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        disabled: options[:disabled] ||= nil,
+        selected: options[:selected] ||= nil,
+        label: options[:label],
+        value: options[:value]
+      )
+    end
+  end
+end

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

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

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

@@ -0,0 +1,11 @@
+module Matestack::Ui::Core::Output
+  class Output < Matestack::Ui::Core::Component::Static
+    def setup
+      @tag_attributes.merge!(
+        name: options[:name],
+        for: options[:for],
+        form: options[:form]
+      )
+    end
+  end
+end

data/app/concepts/matestack/ui/core/page/{content.js → content/content.js}

@@ -1,6 +1,8 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
-import componentMixin from 'component/component'
+import componentMixin from '../../component/component'
+
+import VRuntimeTemplate from "v-runtime-template"
 
 const componentDef = {
   mixins: [componentMixin],
@@ -9,7 +11,11 @@ const componentDef = {
   },
   computed: Vuex.mapState({
     asyncPageTemplate: state => state.pageTemplate,
-  })
+    loading: state => state.pageLoading
+  }),
+  components: {
+    VRuntimeTemplate: VRuntimeTemplate
+  }
 }
 
 let component = Vue.component('matestack-ui-core-page-content', componentDef)

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

@@ -0,0 +1,29 @@
+module Matestack::Ui::Core::Page::Content
+  class Content < Matestack::Ui::Core::Component::Dynamic
+
+    vue_js_component_name "matestack-ui-core-page-content"
+
+    def response
+      div class: "matestack-page-container", attributes: loading_classes do
+        if options[:slots] && options[:slots][:loading_state]
+          div class: "loading-state-element-wrapper", attributes: loading_classes do
+            slot options[:slots][:loading_state]
+          end
+        end
+        div class: "matestack-page-wrapper", attributes: loading_classes  do
+          div attributes: { "v-if": "asyncPageTemplate == null" } do
+            yield_components
+          end
+          div attributes: { "v-if": "asyncPageTemplate != null" } do
+            plain content_tag("v-runtime-template", nil, ":template": "asyncPageTemplate")
+          end
+        end
+      end
+    end
+
+    def loading_classes
+      { "v-bind:class": "{ 'loading': loading === true }" }
+    end
+
+  end
+end

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

@@ -1,9 +1,3 @@
-- if context[:params][:only_page] == "true"
-  %div{class: "matestack_page_content"}
-    - @cells.each do |key, cell|
-      = cell.call(:show)
-- else
-  %div{class: "matestack_page"}
-    %div{class: "matestack_page_content"}
-      - @cells.each do |key, cell|
-        = cell.call(:show)
+%div{class: "matestack-page-root"}
+  - @children.each do |child|
+    = child.show

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

@@ -1,175 +1,30 @@
 module Matestack::Ui::Core::Page
-  class Page < Trailblazer::Cell
 
+  # TODO: Most of the functionality is shared but some initialize stuff a page probably doesn't need
+  class Page < Matestack::Ui::Core::Component::Static
     include ActionView::Helpers::TranslationHelper
-    include ::Cell::Haml
-    include Matestack::Ui::Core::ApplicationHelper
-    include Matestack::Ui::Core::ToCell
 
-    view_paths << "#{Matestack::Ui::Core::Engine.root}/app/concepts"
-
-    extend ViewName::Flat
-
-    def self.prefixes
-      _prefixes = super
-      modified_prefixes = _prefixes.map do |prefix|
-        prefix_parts = prefix.split("/")
-
-        if prefix_parts.last.include?(self.name.split("::")[-1].downcase)
-          prefix_parts[0..-2].join("/")
-        else
-          prefix
-        end
-
-      end
-
-      return modified_prefixes + _prefixes
-    end
-
-    def self.views_dir
-      return ""
-    end
-
-    def initialize(model=nil, options={})
-      super
-      generate_page_name
-      set_app_class
-      @nodes = {}
-      @cells = {}
-      options[:controller_instance].instance_variables.each do |controller_instance_var_key|
-        unless controller_instance_var_key.to_s.start_with?("@_")
-          self.instance_variable_set(controller_instance_var_key, options[:controller_instance].instance_variable_get(controller_instance_var_key))
-        end
-      end
-    end
-
-    def prepare
-      true
-    end
-
-    def components(&block)
-      @nodes = Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
-    end
-
-    def nodes_to_cell
-      @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-      end
-    end
-
-    def partial(&block)
-      return block
+    def initialize(options = {})
+      super(nil, options)
+      copy_controller_instance_variables(options.fetch(:controller_instance))
     end
 
-    def slot(&block)
-      Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
-    end
-
-    def isolate(&block)
-      return block
-    end
-
-
-    def show(component_key=nil, only_page=false)
-      prepare
-      return resolve_isolated_component(component_key) if !component_key.nil? && component_key.include?("isolate")
-
-      response
-
-      render_mode = nil
-      render_mode = :only_page if only_page == true
-      render_mode = :render_page_with_app if !@app_class.nil? && only_page == false
-      render_mode = :only_page if @app_class.nil? && only_page == false
-      render_mode = :render_component if !component_key.nil?
-
-      case render_mode
-
-      when :only_page
-        nodes_to_cell
-        render :page
-      when :render_page_with_app
-        concept(@app_class).call(:show, @page_id, @nodes)
-      when :render_component
-        begin
-          if component_key.include?("__")
-            keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-            page_content_keys = keys_array.select{|key| key.match(/^page_content_/)}
-            if page_content_keys.any?
-              keys_array = keys_array.drop(keys_array.find_index(page_content_keys[0])+2)
-            end
-            node = @nodes.dig(*keys_array)
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-            return cell.render_content
-          else
-            node = @nodes[component_key]
-            cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-            return cell.render_content
-          end
-        rescue
-          raise "Component '#{component_key}' could not be resolved. Notice: Rerendering currently works only on page-level. \
-          You are therefore currently not able to use 'async' within a component for example!"
-        end
-      end
-    end
-
-    def page_id
-      @custom_page_id ||= @page_id
+    def show
+      render :page
     end
 
     private
 
-      def resolve_isolated_component component_key
-        keys_array = component_key.gsub("__", "__components__").split("__").map {|k| k.to_s}
-        isolate_keys = keys_array.select{|key| key.match(/^isolate_/)}
-        keys_array = keys_array.drop(keys_array.find_index(isolate_keys[0])+2)
-        isolated_scope_method = keys_array[0]
-        if isolated_scope_method.include?("(")
-          isolated_scope_method_name = isolated_scope_method.split("(").first
-          isolated_scope_method_argument = isolated_scope_method.split("(").last.split(")").first
-          isolated_scope_method_argument = JSON.parse(isolated_scope_method_argument)
-          isolated_block = self.send(isolated_scope_method_name, isolated_scope_method_argument.with_indifferent_access)
-        else
-          isolated_block = self.send(isolated_scope_method)
-        end
-        nodes = Matestack::Ui::Core::PageNode.build(
-          self, nil, context[:params], &isolated_block
-        )
-        node = nodes.dig(*keys_array.drop(2))
-        cell = to_cell(component_key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
-        return cell.render_content
-      end
-
-      def generate_page_name
-        name_parts = self.class.name.split("::").map { |name| name.underscore }
-        @page_id = name_parts.join("_")
-      end
-
-      def set_app_class
-        class_name = self.class.name
-        name_parts = class_name.split("::")
-        if name_parts.count <= 2
-          @app_class = nil
-          return
-        end
-
-        app_name = "#{name_parts[1]}"
-        begin
-          app_class = Apps.const_get(app_name)
-          if app_class.is_a?(Class)
-            @app_class = app_class
-          else
-            require_dependency "apps/#{app_name.underscore}"
-            app_class = Apps.const_get(app_name)
-            if app_class.is_a?(Class)
-              @app_class = app_class
-            else
-              @app_class = nil
-            end
+      def copy_controller_instance_variables(controller)
+        controller.instance_variables.each do |controller_instance_var_key|
+          unless controller_instance_var_key.to_s.start_with?("@_")
+            # TODO BUG: We might override our own instance variables here.
+            # Solution 1: Check against own instance variables and don't do
+            # Solution 2: Create own context object and don't pollute instance variables
+            # Solution 3: Prefix own instance varibale @_mate or so to circumvent conflicts
+            self.instance_variable_set(controller_instance_var_key, controller.instance_variable_get(controller_instance_var_key))
           end
-        rescue
-          @app_class = nil
         end
       end
-
   end
 end