matestack-ui-core 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b357485aaf4b5a49cc255719c7113ffc12b0d65f540130bfa04d64e8fd9afc9
-  data.tar.gz: e2c691da1526db9e715eecb9609b283d49f7d7edaf30b7fe537d430cca0a7c88
+  metadata.gz: af1594c493057f5f1ef5e9548d9485d2fcac014a9c79519554ed53d61de90703
+  data.tar.gz: 1441194ad2d3da09a0d4ebb60def765442042e77d069afe7a75abae9ab565464
 SHA512:
-  metadata.gz: 224bb5440913ee5d88d67a9b118652e278a72d1f42d064f9ff89593f35922310533978f3014a86022bca3ec3b6a7f1220f1e5e303d4a771c5cd011792d6aedf7
-  data.tar.gz: b203163b2a42cdc4aa31849f799fa061826dc42509033cfb2fc9aed61f1f101d163bf0bfcf6d18e2a485448bd1b149b3b4e0fd92b6d8627c0d2e71be600292d2
+  metadata.gz: 70bf6d472b902d96adde03e06ca5ac062fed60f79220ac4de499f996c391198e64fbe8e72fb0a2a7d8c2b08c75de4cb328a9a81b23cf2c2bb92a137de4a92f70
+  data.tar.gz: 141ce7ca2f0857b8c2f4ec3c740d0e89f23c009340b041a4145e8f04000744bacf2fa948c7ac99bb64294f4b5a4321de0713b27bd4feb3f851c8848350f1dc4e

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

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

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

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

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

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

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

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

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

@@ -53,7 +53,6 @@ module Matestack::Ui::Core::App
       return ""
     end
 
-
     def initialize(model=nil, options={})
       super
       @nodes = {}
@@ -87,7 +86,7 @@ module Matestack::Ui::Core::App
       @nodes = Matestack::Ui::Core::AppNode.build(self, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], nil)
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], nil, node["cached_params"])
       end
     end
 

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

@@ -1,7 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
-
 import matestackEventHub from 'js/event-hub'
 
 Vue.use(Vuex)

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

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

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

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

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

@@ -1,2 +1,2 @@
-%div{"v-if": "showing"}
+%div{@tag_attributes}
   = yield

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

@@ -1,7 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
-
 import componentMixin from 'component/component'
 
 const componentDef = {
@@ -60,6 +58,9 @@ const componentDef = {
         }
       }
     }
+    if(this.componentConfig["init_show"] == true){
+      this.showing = true
+    }
   },
   beforeDestroy: function() {
     const self = this

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

@@ -1,10 +1,12 @@
 module Matestack::Ui::Core::Async
-    class Async < Matestack::Ui::Core::Component::Dynamic
-
-      def setup
-        @rerender = true
-      end
-
+  class Async < Matestack::Ui::Core::Component::Dynamic
 
+    def setup
+      @rerender = true
+      @tag_attributes.merge!({
+        "v-if": "showing"
+      })
     end
+
   end
+end

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

@@ -1,9 +1,11 @@
 module Matestack::Ui::Core::Blockquote
   class Blockquote < Matestack::Ui::Core::Component::Static
+
     def setup
       @tag_attributes.merge!({
         "cite": options[:cite]
-      })
+        })
     end
+
   end
 end

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

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

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

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

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

@@ -1,8 +1,6 @@
 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'
 

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

@@ -8,7 +8,7 @@ module Matestack::Ui::Core::Collection::Content
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/filter/filter.js

@@ -1,8 +1,6 @@
 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'
 
 const componentDef = {

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

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Filter
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/filter/input/input.haml

@@ -1,8 +1,2 @@
 - if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{"v-model#{'.number' if options[:type] == :number}": input_key,
-    type: options[:type],
-    class: options[:class],
-    id: component_id,
-    "@keyup.enter": "submitFilter()",
-    ref: "filter.#{attr_key}",
-    placeholder: options[:placeholder]}
+  %input{@tag_attributes}

data/app/concepts/matestack/ui/core/collection/filter/input/input.rb

@@ -1,6 +1,18 @@
 module Matestack::Ui::Core::Collection::Filter::Input
   class Input < Matestack::Ui::Core::Component::Static
 
+    def setup
+      @tag_attributes.merge!({
+        "v-model#{'.number' if options[:type] == :number}": input_key,
+        type: options[:type],
+        class: options[:class],
+        id: component_id,
+        "@keyup.enter": "submitFilter()",
+        ref: "filter.#{attr_key}",
+        placeholder: options[:placeholder]
+      })
+    end
+
     def input_key
       'filter["' + options[:key].to_s + '"]'
     end

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

@@ -59,7 +59,6 @@ module Matestack::Ui::Core::Collection
 
   end
 
-
   module Helper
 
     def get_collection_filter collection_id, key=nil

data/app/concepts/matestack/ui/core/collection/order/order.js

@@ -1,8 +1,6 @@
 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'
 
 const componentDef = {

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

@@ -7,7 +7,7 @@ module Matestack::Ui::Core::Collection::Order
 
     def response
       components {
-        div do
+        div @tag_attributes do
           yield_components
         end
       }

data/app/concepts/matestack/ui/core/collection/order/toggle/indicator/indicator.rb

@@ -3,7 +3,9 @@ module Matestack::Ui::Core::Collection::Order::Toggle::Indicator
 
     def response
       components {
-        plain "{{orderIndicator( '#{@component_config[:key]}', {asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'} ) }}"
+        span @tag_attributes do
+          plain "{{orderIndicator( '#{@component_config[:key]}', {asc: '#{@component_config[:asc]}', desc: '#{@component_config[:desc]}'} ) }}"
+        end
       }
     end
 

data/app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Collection::Order::Toggle
   class Toggle < Matestack::Ui::Core::Component::Static
 
-
   end
 end

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

@@ -1,7 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import axios from 'axios'
 import VRuntimeTemplate from "v-runtime-template"
-
 import matestackEventHub from 'js/event-hub'
 
 const componentMixin = {

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

@@ -1,7 +1,6 @@
 module Matestack::Ui::Core::Component
   class Dynamic < Trailblazer::Cell
 
-
     include ActionView::Helpers::ActiveModelHelper
     include ActionView::Helpers::ActiveModelInstanceTag
     include ActionView::Helpers::AssetTagHelper
@@ -26,8 +25,6 @@ module Matestack::Ui::Core::Component
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::TranslationHelper
     include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::TranslationHelper
     include ::Cell::Haml
     include Matestack::Ui::Core::ApplicationHelper
     include Matestack::Ui::Core::ToCell
@@ -69,13 +66,14 @@ module Matestack::Ui::Core::Component
       @nodes = {}
       @cells = {}
       @included_config = options[:included_config]
+      @cached_params = options[:cached_params]
       @rerender = false
       @options = options
+      set_tag_attributes
+      setup
       generate_component_name
       generate_children_cells
-      set_tag_attributes
       validate_options
-      setup
     end
 
     def validate_options
@@ -160,7 +158,7 @@ module Matestack::Ui::Core::Component
       @nodes = Matestack::Ui::Core::ComponentNode.build(self, nil, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
       end
     end
 
@@ -193,7 +191,6 @@ module Matestack::Ui::Core::Component
       result.join(" ")
     end
 
-
     private
 
       def generate_children_cells
@@ -201,7 +198,7 @@ module Matestack::Ui::Core::Component
           #needs refactoring --> in some cases, :component_key, :children, :origin_url, :url_params, :included_config get passed into options[:children] which causes errors
           #quickfix: except them from iteration
           options[:children].except(:component_key, :children, :origin_url, :url_params, :included_config).each do |key, node|
-            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
+            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"], node["cached_params"])
           end
         end
       end

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

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

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

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

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

@@ -2,10 +2,9 @@
   %label=options[:label]
 
 - if [:text, :number, :email, :date, :password].include?(options[:type])
-  %input{"v-model#{'.number' if options[:type] == :number}": input_key,
+  %input{@tag_attributes,
+    "v-model#{'.number' if options[:type] == :number}": input_key,
     type: options[:type],
-    class: options[:class],
-    id: component_id,
     "@change": "inputChanged(\"#{attr_key}\")",
     ref: "input.#{attr_key}",
     placeholder: options[:placeholder],
@@ -15,9 +14,8 @@
       {{ error }}
 
 - if options[:type] == :textarea
-  %textarea{"v-model": input_key,
-    class: options[:class],
-    id: component_id,
+  %textarea{@tag_attributes,
+    "v-model": input_key,
     "@change": "inputChanged(\"#{attr_key}\")",
     ref: "input.#{attr_key}",
     placeholder: options[:placeholder],

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

@@ -4,8 +4,8 @@
 
 - if options[:type] == :dropdown
 
-  %select{"#{model_binding}" => input_key,
-    id: component_id,
+  %select{@tag_attributes,
+    "#{model_binding}" => input_key,
     ref: "select.#{attr_key}",
     "@change": "inputChanged(\"#{attr_key}\")",
     "init-value": init_value,
@@ -26,7 +26,8 @@
   %div{id: component_id, ref: "select.multiple.#{attr_key}", "init-value": init_value}
     - if options[:options].is_a?(Hash)
       - options[:options].each do |key, value|
-        %input{type: :checkbox,
+        %input{@tag_attributes,
+        type: :checkbox,
         "#{model_binding}": input_key,
         "@change": "inputChanged(\"#{attr_key}\")",
         "value-type": options_type,
@@ -35,7 +36,8 @@
         %label=value
     - if options[:options].is_a?(Array)
       - options[:options].each do |value|
-        %input{type: :checkbox,
+        %input{@tag_attributes,
+        type: :checkbox,
         "#{model_binding}": input_key,
         "@change": "inputChanged(\"#{attr_key}\")",
         "value-type": options_type,
@@ -51,7 +53,8 @@
   %div{id: component_id, ref: "select.#{attr_key}", "init-value": init_value}
     - if options[:options].is_a?(Hash)
       - options[:options].each do |key, value|
-        %input{type: :radio,
+        %input{@tag_attributes,
+        type: :radio,
         "#{model_binding}": input_key,
         "@change": "inputChanged(\"#{attr_key}\")",
         "value-type": options_type,
@@ -60,7 +63,8 @@
         %label=value
     - if options[:options].is_a?(Array)
       - options[:options].each do |value|
-        %input{type: :radio,
+        %input{@tag_attributes,
+        type: :radio,
         "#{model_binding}": input_key,
         "@change": "inputChanged(\"#{attr_key}\")",
         "value-type": options_type,

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

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