glib-web 0.4.28 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a3cfc5aa497d164cd2a9d3fa9cbf84139efc72
-  data.tar.gz: 47bb3347a4badb510e3ae751aa67e10aef774144
+  metadata.gz: b077889e4be620efc4f9f9dd4ff92bbdb5f1755c
+  data.tar.gz: e05cceb6de9a7310141f60d46894571a7d0901c3
 SHA512:
-  metadata.gz: 98f020bd692f63eee47654671e5f8a764ef50eba9a7be389acce7f3a4cf15528b0161c4898ca3a049f741ba0c0a27c3b330ad91abc301fbb56af24213c597cc9
-  data.tar.gz: dd3c1bc65805647228d853345450be6cf6dad94018601831ca851ca7f3ee5a8e54c5be1a767338531925514063a4f811c55d5bbd027852de18cb148836927a94
+  metadata.gz: 86651872a1648412cce138ebe10ee1152bf99e3f996af3ff506bc7db0b1e955f08fa2adea1be6e93b6e2830ae05e70701f54a8ef64c0e953038ab7c74eac7c91
+  data.tar.gz: 11c2d3d86873d06958a70a72afae3ab8694768a264ae1755edfd5997183b082dfe970169dec916b8f0288192832d053bcc56adaf9fd37130e834c69991c88147

data/app/helpers/glib/forms_helper.rb

@@ -0,0 +1,15 @@
+module Glib
+  module FormsHelper
+    def glib_form_field_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.label", args.merge(default: nil)) || I18n.t("activerecord.attributes.#{model_name}.#{prop}", args)
+    end
+
+    def glib_form_hint_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.hint", args.merge(default: nil))
+    end
+
+    def glib_form_placeholder_label(model_name, prop, args = {})
+      I18n.t("dt_models.#{model_name}.#{prop}.placeholder", args.merge(default: nil))
+    end
+  end
+end

data/app/helpers/glib/json_ui/abstract_builder.rb

@@ -167,30 +167,51 @@ module Glib
         define_method(propName) do |value|
 
           if value.is_a?(Hash)
-            name = value[:name]
+            data = value
+            name = data[:name]
+          else
+            data = {}
+            name = value
+            # data = { material: { name: value } }
+
+            # name = value
+
+            # TODO: deprecated
+            # json.set!(propName) do
+            #   json.name name
+            # end
+          end
+
+          json.set!(propName) do
+            data[:material] ||= {}
+            data[:material][:name] = name if name
+
+            material = data[:material]
+            json.material do
+              json.name material[:name]
+              json.size material[:size] if material[:size]
+            end
 
-            json.set!(propName) do
-              json.set value[:set] || 'material'
-              json.name name
+            if (custom = data[:custom])
+              json.custom do
+                json.name custom[:name]
+                json.size custom[:size] if custom[:size]
+              end
+            end
 
-              if (badge = value[:badge]).is_a?(Hash)
+            if (badge = data[:badge])
+              if badge.is_a?(Hash)
                 json.badge badge
               else
                 json.badge do
                   json.text badge
                 end
               end
-
             end
-          else
-            name = value
 
-            json.set!(propName) do
-              json.name name
-            end
           end
 
-          instance_variable_set("@#{propName}", name) if options[:cache]
+          # instance_variable_set("@#{propName}", name) if options[:cache]
 
         end
       end

data/app/helpers/glib/json_ui/view_builder/panels.rb

@@ -3,22 +3,25 @@ class Glib::JsonUi::ViewBuilder
     class Form < View
       # boolean :local
 
-      def is_association?(prop)
+      def is_array_association?(prop)
+        # # Not all model is ActiveRecord
+        # if @model.class.respond_to?(:reflect_on_association)
+        #   return @model.class.reflect_on_association(prop).macro
+        # end
+        # false
+
         # Not all model is ActiveRecord
-        if @model.class.respond_to?(:reflect_on_association)
-          return @model.class.reflect_on_association(prop)
-        end
-        return false
+        @model.class.send(:reflect_on_association, prop)&.macro == :has_many
       end
 
       def field_name(prop, multiple)
-        suffix = is_association?(prop) || multiple ? '[]' : ''
+        suffix = is_array_association?(prop) || multiple ? '[]' : ''
         "#{@model_name}[#{prop}]#{suffix}"
       end
 
       def field_value(prop)
-        if is_association?(prop)
-          @model.send(prop).map { |record| record.id }
+        if is_array_association?(prop)
+          @model.send(prop)&.map { |record| record.id }
         else
           @model.send(prop)
         end
@@ -169,6 +172,10 @@ class Glib::JsonUi::ViewBuilder
       string :align
     end
 
+    class Flow < View
+      views :childViews
+    end
+
     class Carousel < View
       views :childViews
       string :distribution

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.29
 platform: ruby
 authors:
 - ''
@@ -75,6 +75,7 @@ files:
 - app/controllers/glib/home_controller.rb
 - app/helpers/glib/dynamic_images_helper.rb
 - app/helpers/glib/dynamic_texts_helper.rb
+- app/helpers/glib/forms_helper.rb
 - app/helpers/glib/json_ui/abstract_builder.rb
 - app/helpers/glib/json_ui/action_builder.rb
 - app/helpers/glib/json_ui/action_builder/dialogs.rb