basemate-ui-core 0.5.1 → 0.6.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d703c2c29c9c5a23e01ca806b1e878187bfeea98f6322c298178bdc52528c95
-  data.tar.gz: ec7e15c93e97e703f3a61d4a2255909edbbf18d58cbca97facf031aee681d959
+  metadata.gz: 443aa974568221356740ed44ad37a7e91e650f4271e4ab18027e202f381e2bdf
+  data.tar.gz: 8b00a348e1e3203f926a91447b0402a813c49cd2bfe32a1dc58f389d7a0aa5cd
 SHA512:
-  metadata.gz: 879e8616eb7fd1bcbb58e4ca84839b0c6d021e0a5ce07577eb8cf644570f86b5878073e95e41ec37427882c123514c1bc213adecf022e73b9a41fb96b8f577d7
-  data.tar.gz: f7e1ec7734a2d35b2772c77ddb3e8a1651c9dcce80a5e1bf3e13297a2430346140b7bd283bbf2234297a25969dda8750eeb97d51ca7949a42934cc857cf7a6ab
+  metadata.gz: 7bfa85451abd984134064b7046aee02e13dbbb0cf202bfcdad0e2214a2bd647ab51abc43283cd5ddeb2433cadaa5c889e4e97dd7e0100d16215ace169b50bcba
+  data.tar.gz: fa107b2572b1b526c67ce97bf384fee4b274da810dd5d351c2b75483174b1d6b3bc5cf6027469567425a678f5e2852200a550a7a24a2ef34223d8ef2632979bf

data/README.md

@@ -41,7 +41,7 @@ Execute them with:
 
 ```shell
 
-bundle exec rspec
+bundle exec rspec spec/concepts
 
 ```
 

data/app/concepts/app/cell/app.rb

@@ -64,7 +64,7 @@ module App::Cell
       @nodes = ::App::Utils::AppNode.build(self, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"])
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], nil)
       end
     end
 

data/app/concepts/app/js/store.js

@@ -19,6 +19,7 @@ const store = new Vuex.Store({
   },
   actions: {
     navigateTo ({ commit, state }, { url, backwards }) {
+      console.log("navigate")
       if (typeof basemateUiCoreTransitionStart !== 'undefined') {
         basemateUiCoreTransitionStart(url);
       }

data/app/concepts/component/cell/dynamic.rb

@@ -44,12 +44,27 @@ module Component::Cell
       @static = false
       @nodes = {}
       @cells = {}
+      @included_config = options[:included_config]
       generate_component_name
       generate_children_cells
       set_tag_attributes
+      validate_options
       setup
     end
 
+    def validate_options
+      if defined? self.class::REQUIRED_KEYS
+        self.class::REQUIRED_KEYS.each do |key|
+          raise "required key '#{key}' is missing" if options[key].nil?
+        end
+      end
+      custom_options_validation
+    end
+
+    def custom_options_validation
+      true
+    end
+
     def setup
       true
     end
@@ -107,15 +122,15 @@ module Component::Cell
     end
 
     def components(&block)
-      @nodes = ::Component::Utils::ComponentNode.build(self, &block)
+      @nodes = ::Component::Utils::ComponentNode.build(self, nil, &block)
 
       @nodes.each do |key, node|
-        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"])
+        @cells[key] = to_cell(key, node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
       end
     end
 
     def partial(&block)
-      ::Component::Utils::ComponentNode.build(self, &block)
+      ::Component::Utils::ComponentNode.build(self, nil, &block)
     end
 
     private
@@ -123,7 +138,7 @@ module Component::Cell
       def generate_children_cells
         unless options[:children].nil?
           options[:children].each do |key, node|
-            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"])
+            @children_cells[key] = to_cell("#{@component_key}__#{key}", node["component_name"], node["config"], node["argument"], node["components"], node["included_config"])
           end
         end
       end

data/app/concepts/component/utils/component_node.rb

@@ -1,18 +1,19 @@
 module Component::Utils
   class ComponentNode
 
-    def self.build(component_instance, &block)
-      node = ComponentNode.new(component_instance)
+    def self.build(component_instance, included_config, &block)
+      node = ComponentNode.new(component_instance, included_config)
       node.instance_eval(&block)
       node.hash
     end
 
     attr_reader :hash
 
-    def initialize(component_instance)
+    def initialize(component_instance, included_config)
       @hash = {}
       @node_start_id = 0
       @component_instance = component_instance
+      @included_config = included_config
       component_instance.instance_variables.each do |component_instance_var_key|
         self.instance_variable_set(component_instance_var_key, component_instance.instance_variable_get(component_instance_var_key))
       end
@@ -29,6 +30,7 @@ module Component::Utils
         @hash[current_node]["component_name"] = meth.to_s
         @hash[current_node]["config"] = {}
         @hash[current_node]["argument"] = nil
+        @hash[current_node]["included_config"] = @included_config
 
         if meth == :partial
           @hash[current_node]["components"] = @component_instance.send(args.first, *args.drop(1))
@@ -39,8 +41,18 @@ module Component::Utils
             @hash[current_node]["argument"] = args.first
           end
 
+          if args.second == :include
+            included = args.first
+          else
+            unless @included_config .nil?
+              included = @included_config
+            else
+              included = nil
+            end
+          end
+
           if block_given?
-            @hash[current_node]["components"] = ComponentNode.build(@component_instance, &block)
+            @hash[current_node]["components"] = ComponentNode.build(@component_instance, included, &block)
           end
         end
       end

data/app/concepts/footer/cell/footer.rb

@@ -0,0 +1,5 @@
+module Footer::Cell
+  class Footer < Component::Cell::Static
+
+  end
+end

data/app/concepts/footer/view/footer.haml

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

data/app/concepts/form/cell/form.rb

@@ -1,22 +1,66 @@
 module Form::Cell
   class Form < Component::Cell::Dynamic
 
+    REQUIRED_KEYS = [:for, :path, :method]
+
     def setup
-      @component_config[:submit_path] = submit_path
-      @component_config[:method] = options[:method]
-      @component_config[:success] = options[:success]
-      if options[:notify].nil?
-        @component_config[:notify] = true
-      end
+      begin
+        @component_config[:for] = form_wrapper
+        @component_config[:submit_path] = submit_path
+        @component_config[:method] = options[:method]
+        @component_config[:success] = options[:success]
+        unless options[:success].nil?
+          unless options[:success][:transition].nil?
+            @component_config[:success][:transition][:path] = transition_path
+          end
+        end
+        if options[:notify].nil?
+          @component_config[:notify] = true
+        end
 
-      @tag_attributes.merge!({"@submit.prevent": true})
+        @tag_attributes.merge!({"@submit.prevent": true})
+      rescue => e
+        raise "Form component could not be setted up. Reason: #{e}"
+      end
     end
 
     def submit_path
       begin
-        return ::Rails.application.routes.url_helpers.send(options[:path], options[:params])
+        if options[:path].is_a?(Symbol)
+          return ::Rails.application.routes.url_helpers.send(options[:path], options[:params])
+        else
+          return options[:path]
+        end
+      rescue
+        raise "Submit path not found"
+      end
+    end
+
+    def transition_path
+      begin
+        if options[:success][:transition][:path].is_a?(Symbol)
+          return ::Rails.application.routes.url_helpers.send(
+            options[:success][:transition][:path],
+            options[:success][:transition][:params]
+          )
+        else
+          return options[:success][:transition][:path]
+        end
       rescue
-        "path_not_found"
+        raise "Transition path not found"
+      end
+    end
+
+    def form_wrapper
+      case options[:for]
+      when Symbol
+        return options[:for]
+      when String
+        return options[:for]
+      end
+
+      if options[:for].respond_to?(:model_name)
+        return options[:for].model_name.singular
       end
     end
 

data/app/concepts/{input → form}/cell/inline.rb

@@ -1,9 +1,9 @@
-module Input::Cell
+module Form::Cell
   class Inline < Component::Cell::Static
 
-
     def input_key
       'data["' + options[:key].to_s + '"]'
     end
+    
   end
 end

data/app/concepts/form/cell/input.rb

@@ -0,0 +1,42 @@
+module Form::Cell
+  class Input < Component::Cell::Static
+
+    REQUIRED_KEYS = [:key, :type]
+
+    def custom_options_validation
+      raise "included form config is missing, please add ':include' to parent form component" if @included_config.nil?
+    end
+
+    def input_key
+      'data["' + options[:key].to_s + '"]'
+    end
+
+    def error_key
+      'errors["' + options[:key].to_s + '"]'
+    end
+
+    def attr_key
+      options[:key].to_s
+    end
+
+    def init_value
+      unless options[:init].nil?
+        return options[:init]
+      end
+
+      unless @included_config.nil? && @included_config[:for].nil?
+        if @included_config[:for].respond_to?(options[:key])
+          return @included_config[:for].send(options[:key])
+        else
+          if @included_config[:for].is_a?(Symbol) || @included_config[:for].is_a?(String)
+            return nil
+          end
+          if @included_config[:for].is_a?(Hash)
+            return @included_config[:for][options[:key]]
+          end
+        end
+      end
+    end
+
+  end
+end

data/app/concepts/form/cell/select.rb

@@ -0,0 +1,48 @@
+module Form::Cell
+  class Select < Component::Cell::Static
+
+    def input_key
+      'data["' + options[:key].to_s + '"]'
+    end
+
+    def error_key
+      'errors["' + options[:key].to_s + '"]'
+    end
+
+    def attr_key
+      options[:key].to_s
+    end
+
+    def option_values
+      values = options[:options] if options[:options].is_a?(Array)
+      values = options[:options].values if options[:options].is_a?(Hash)
+      return values
+    end
+
+    def options_type
+      return Integer if option_values.first.is_a?(Integer)
+      return String if option_values.first.is_a?(String)
+    end
+
+    def model_binding
+
+      if option_values.first.is_a?(Integer)
+        return "v-model.number"
+      else
+        return "v-model"
+      end
+    end
+
+    def init_value
+      unless options[:init].nil?
+        return options[:init]
+      end
+
+      unless @included_config.nil? && @included_config[:for].nil?
+        return @included_config[:for].send(options[:key])
+      end
+    end
+
+
+  end
+end

data/app/concepts/{submit → form}/cell/submit.rb

@@ -1,4 +1,4 @@
-module Submit::Cell
+module Form::Cell
   class Submit < Component::Cell::Static
 
     def setup

data/app/concepts/form/js/form.js

@@ -11,10 +11,22 @@ const componentDef = {
   data: function(){
     return {
       data: {},
-      showInlineForm: false
+      showInlineForm: false,
+      errors: {}
     }
   },
   methods: {
+    initDataKey: function(key, initValue){
+      this.data[key] = initValue;
+    },
+    inputChanged: function(key){
+      this.resetErrors(key)
+    },
+    resetErrors: function(key){
+      if (this.errors[key]){
+        this.errors[key] = null;
+      }
+    },
     launchInlineForm: function(key, value){
       this.showInlineForm = true;
       this.data[key] = value;
@@ -50,7 +62,14 @@ const componentDef = {
       })
       .then(function(response){
         for (let key in self.componentConfig["success"]) {
-          basemateEventHub.$emit(self.componentConfig["success"][key], key);
+          switch(key){
+            case "transition":
+              let path = self.componentConfig["success"]["transition"]["path"]
+              self.$store.dispatch('navigateTo', {url: path, backwards: false})
+              break;
+            default:
+              basemateEventHub.$emit(self.componentConfig["success"][key], key);
+          }
         }
         if (self.componentConfig["notify"] === true) {
           if (typeof basemateUiCoreActionSuccess !== 'undefined') {
@@ -61,6 +80,9 @@ const componentDef = {
         self.showInlineForm = false;
       })
       .catch(function(error){
+        if(error.response && error.response.data && error.response.data.errors){
+          self.errors = error.response.data.errors;
+        }
         if (self.componentConfig["notify"] === true) {
           if (typeof basemateUiCoreActionError !== 'undefined') {
             basemateUiCoreActionError(error);
@@ -68,6 +90,40 @@ const componentDef = {
         }
       })
     }
+  },
+  mounted: function(){
+    let self = this;
+    let data = {}
+    for (let key in self.$refs) {
+      if (key.startsWith("input.")){
+        if(self.$refs[key]["attributes"]["init-value"]){
+          data[key.replace('input.', '')] = self.$refs[key]["attributes"]["init-value"]["value"]
+        }else{
+          data[key.replace('input.', '')] = null
+        }
+      }
+      if (key.startsWith("select.")){
+        if (key.startsWith("select.multiple.")){
+          if(self.$refs[key]["attributes"]["init-value"]){
+            data[key.replace('select.multiple.', '')] = JSON.parse(self.$refs[key]["attributes"]["init-value"]["value"])
+          }else{
+            data[key.replace('select.multiple.', '')] = []
+          }
+        }else{
+          if(self.$refs[key]["attributes"]["init-value"]){
+            if(self.$refs[key]["attributes"]["value-type"]["value"] == "Integer")
+              data[key.replace('select.', '')] = parseInt(self.$refs[key]["attributes"]["init-value"]["value"])
+            else{
+              data[key.replace('select.', '')] = self.$refs[key]["attributes"]["init-value"]["value"]
+            }
+          }else{
+            data[key.replace('select.', '')] = null
+          }
+        }
+
+      }
+    }
+    self.data = data;
   }
 }
 

data/app/concepts/form/view/input.haml

@@ -0,0 +1,29 @@
+- if options[:label]
+  %label=options[:label]
+
+- if [:text, :number, :date, :password].include?(options[:type])
+  %input{"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],
+    "init-value": init_value}
+  %span{"v-if": error_key }
+    %span{"v-for": "error in  #{error_key}"}
+      {{ error }}
+
+- if options[:type] == :textarea
+  %textarea{"v-model": input_key,
+    class: options[:class],
+    id: component_id,
+    "@change": "inputChanged(\"#{attr_key}\")",
+    ref: "input.#{attr_key}",
+    placeholder: options[:placeholder],
+    "init-value": init_value,
+    rows: options[:rows],
+    cols: options[:cols]}
+  %span{"v-if": error_key }
+    %span{"v-for": "error in  #{error_key}"}
+      {{ error }}