glib-web 3.9.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d627b99feb7c052188e21ff35b225428e2c5affb1ea7f8111582681ba92a88
-  data.tar.gz: 216d55f78c01ef928f54d1c4971b9c0fe4e632a4add7da00f9dc218c658cb201
+  metadata.gz: 017c468688e16caca324d9eb790e5392cdcf220b5f259cfd926f7d05a0f2823f
+  data.tar.gz: 473404c0d90bf386e723e1c62f65456b4e0375932c144063d1c07526dad3e3f2
 SHA512:
-  metadata.gz: 62d0d1bfd6619de0f66d3332abad1eb7971952c98000982d4ef1fa7dfa5c2258978b1ee3f78907fd0e0e8a8b1a9a1117f843410bac26a045aee29f2a9513f6fe
-  data.tar.gz: 88f948b5cb7c56269d68b8afbf56ffee729813c60061eb7fc10369e945d813d93d037efd2e5ad1ac482f446b5c28bab981c60dee59832c0ddff3f63d7ea12396
+  metadata.gz: e35b713b672704816511274ee46282209d190b067c4ae012cb4b0a00cf5d443d00345384f487e7afdb33526df82178bf621deaef3a04b001653ca772b651e028
+  data.tar.gz: 224571d4d294707c2f9b1967f8a444e0718b333a616923d62c69a808b9852111b870a1d9d30f9036ad2e950cf7fb0cde45acdad91eb592b643c1c7c2e77d90b3

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

@@ -48,15 +48,20 @@ class Glib::JsonUi::ViewBuilder
       # Override
       def created
         if @prop && (form = page.current_form)
-          form.field_assert_respond_to(@prop)
+          dynamic_group = form.current_dynamic_group
+          context = dynamic_group || form
 
-          @name ||= form.field_name(@prop, @multiple || false)
-          @value ||= form.field_value(@prop)
-          @label ||= form.field_label(@prop, @label_args || {})
-          @hint ||= form.hint_label(@prop, @hint_args || {})
-          @placeholder ||= form.placeholder_label(@prop, @placeholder_args || {})
+          context.field_assert_respond_to(@prop)
 
-          @validation ||= form.field_validation(@prop)
+          @name ||= context.field_name(@prop, @multiple || false)
+          @label ||= context.field_label(@prop, @label_args || {})
+          @hint ||= context.hint_label(@prop, @hint_args || {})
+          @placeholder ||= context.placeholder_label(@prop, @placeholder_args || {})
+
+          if dynamic_group.nil?
+            @value ||= form.field_value(@prop)
+            @validation ||= form.field_validation(@prop)
+          end
         end
         json.name @name
         json.value @value if @value
@@ -197,16 +202,51 @@ class Glib::JsonUi::ViewBuilder
 
     class DynamicGroup < AbstractField
       string :titlePrefix
-      panels_builder :content, :template
+      # panels_builder :content, :template
       hash :groupFieldProperties
 
       # NOTE: Consider using sub-panel instead (e.g. groupTemplate)
       # views :groupTemplateViews
+
+      attr_writer :model
+
+      def model(model)
+        @model = model
+        @model_name = @model.class.model_name.singular
+      end
+
+      def field_name(prop, multiple)
+        prop
+      end
+
+      def field_label(prop, args)
+        @delegate_class.field_label(@model, @model_name, prop, args)
+      end
+
+      def hint_label(prop, args)
+        @delegate_class.hint_label(@model_name, prop, args)
+      end
+
+      def placeholder_label(prop, args)
+        @delegate_class.placeholder_label(@model_name, prop, args)
+      end
+
+      def field_assert_respond_to(prop)
+        raise "Please specify a model for #{self.class.component_name} before using its property" unless @model
+        @delegate_class.field_assert_respond_to(@model, prop)
+      end
+
+      def content(value)
+        @delegate_class = Glib::JsonUi::ViewBuilder::Panels::Form
+        form = page.current_form
+
+        form.current_dynamic_group = self
+        value.call(page.content_builder([:template]))
+        form.current_dynamic_group = nil
+      end
     end
 
     class RadioGroup < AbstractField
-      # string :name
-      # string :value
       views :childViews
       bool :row
 

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

@@ -1,6 +1,8 @@
 class Glib::JsonUi::ViewBuilder
   module Panels
     class Form < View
+      attr_accessor :current_dynamic_group
+
       action :onSubmit
       string :paramNameForFormData
       bool :local
@@ -9,7 +11,7 @@ class Glib::JsonUi::ViewBuilder
       # Even for pure client-side apps, this is required because form.validate() requires a URL to construct form data.
       # required :url
 
-      def is_array_association?(prop)
+      def self.is_array_association?(model, prop)
         # # Not all model is ActiveRecord
         # if @model.class.respond_to?(:reflect_on_association)
         #   return @model.class.reflect_on_association(prop).macro
@@ -17,21 +19,36 @@ class Glib::JsonUi::ViewBuilder
         # false
 
         # Not all model is ActiveRecord
-        @model.class.try(:reflect_on_association, prop)&.macro == :has_many
+        model.class.try(:reflect_on_association, prop)&.macro == :has_many
+      end
+
+      def self.is_single_association?(model, prop)
+        # Not all model is ActiveRecord
+        model.class.try(:reflect_on_association, prop)&.macro == :belongs_to
       end
 
       def field_assert_respond_to(prop)
+        self.class.field_assert_respond_to(@model, prop)
+        # # Identify a prop being used on a nil model or incorrect model.
+        # raise "Invalid property `#{prop}` on '#{@model.class}'" unless @model.respond_to?(prop)
+      end
+
+      def self.field_assert_respond_to(model, prop)
         # Identify a prop being used on a nil model or incorrect model.
-        raise "Invalid property `#{prop}` on '#{@model.class}'" unless @model.respond_to?(prop)
+        raise "Invalid property `#{prop}` on '#{model.class}'" unless model.respond_to?(prop)
       end
 
       def field_name(prop, multiple)
-        suffix = is_array_association?(prop) || multiple ? '[]' : ''
-        "#{@model_name}[#{prop}]#{suffix}"
+        self.class.field_name(@model, @model_name, prop, multiple)
+      end
+
+      def self.field_name(model, model_name, prop, multiple)
+        suffix = is_array_association?(model, prop) || multiple ? '[]' : ''
+        "#{model_name}[#{prop}]#{suffix}"
       end
 
       def field_value(prop)
-        if is_array_association?(prop)
+        if self.class.is_array_association?(@model, prop)
           @model.send(prop)&.map { |record| record.id }
         else
           @model.send(prop)
@@ -39,15 +56,31 @@ class Glib::JsonUi::ViewBuilder
       end
 
       def field_label(prop, args)
-        I18n.t("dt_models.#{@model_name}.#{prop}.label", **args.merge(default: nil)) || I18n.t("activerecord.attributes.#{@model_name}.#{prop}", **args)
+        self.class.field_label(@model, @model_name, prop, args)
+      end
+
+      def self.field_label(model, model_name, prop, args)
+        name = prop.to_s
+        if name.ends_with?('_id') && is_single_association?(model, name.chomp('_id'))
+          name = name.chomp('_id') # Always uses non-ID property name in i18n files
+        end
+        I18n.t("dt_models.#{model_name}.#{name}.label", **args.merge(default: nil)) || I18n.t("activerecord.attributes.#{model_name}.#{name}", **args)
       end
 
       def hint_label(prop, args)
-        I18n.t("dt_models.#{@model_name}.#{prop}.hint", **args.merge(default: nil))
+        self.class.hint_label(@model_name, prop, args)
+      end
+
+      def self.hint_label(model_name, prop, args)
+        I18n.t("dt_models.#{model_name}.#{prop}.hint", **args.merge(default: nil))
       end
 
       def placeholder_label(prop, args)
-        I18n.t("dt_models.#{@model_name}.#{prop}.placeholder", **args.merge(default: nil))
+        self.class.placeholder_label(@model_name, prop, args)
+      end
+
+      def self.placeholder_label(model_name, prop, args)
+        I18n.t("dt_models.#{model_name}.#{prop}.placeholder", **args.merge(default: nil))
       end
 
       def field_validation(prop)

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

@@ -47,6 +47,9 @@ module Glib
         # hash :tooltip
         array :extensions
 
+        def self.component_name
+          @component_name ||= self.name.sub('Glib::JsonUi::ViewBuilder::', '')
+        end
 
         # def initialize(json, page)
         #   super(json, page)

data/app/models/concerns/glib/enum_humanization.rb

@@ -19,7 +19,12 @@ module Glib
   module ClassMethods
     def glib_enum_humanize(enum_name, enum_value, default_value = nil)
       if enum_value
-        I18n.t("activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}", default: default_value)
+        if default_value.nil? && Rails.env.development?
+          i18n_key = "activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}"
+          I18n.t(i18n_key, raise: I18n::MissingTranslationData)
+        else
+          I18n.t(i18n_key, default: default_value)
+        end
       end
     end
   end

data/app/views/json_ui/garage/forms/dynamic_group.json.jbuilder

@@ -15,7 +15,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     [
       { name: 'question', value: 'Quality of work' },
       { name: 'type', value: 'rating' },
-      { name: 'enabled', value: '1', styleClasses: ['success'] },
+      { name: 'enabled', value: '1' },
     ],
     [
       { name: 'question', value: 'Satisfied?' },
@@ -26,9 +26,21 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     group.template padding: { left: 32 }, childViews: ->(template) do
       template.spacer height: 10
       template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'
+
       options = [ :rating, :yes_no ]
-      template.fields_select width: 'matchParent', name: 'type', label: 'Answer Type', placeholder: 'Answer Type', options: options.map { |o| { text: o.to_s.humanize, value: o } }
-      template.fields_check width: 'matchParent', name: 'enabled', label: 'Enable', checkValue: '1'
+      template.fields_select \
+        width: 'matchParent',
+        name: 'type',
+        label: 'Answer Type',
+        placeholder: 'Answer Type',
+        options: options.map { |o| { text: o.to_s.humanize, value: o } }
+
+      template.fields_check \
+        width: 'matchParent',
+        name: 'enabled',
+        label: 'Enable',
+        checkValue: '1',
+        showIf: { "==": [{ "var": 'user[evaluation][{{index}}][type]' }, 'rating'] }
 
       template.spacer height: 14
     end

data/app/views/json_ui/garage/forms/show_hide.json.jbuilder

@@ -99,7 +99,13 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
 
   form.spacer height: 20
   form.h1 text: 'Select'
-  options = ['', 'show', 'hide']
+  # options = ['', 'show', 'hide']
+  options = {
+    '' => '<EMPTY>',
+    'show' => 'Show',
+    'hide' => 'Hide',
+    nil => '<NULL>'
+  }.map { |k, v| { value: k, text: v } }
   form.fields_select name: 'user[select1]', width: 'matchParent', label: 'Select "show"', options: options, value: ''
   form.label text: 'Selected', showIf: {
     "==": [
@@ -117,6 +123,22 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       ''
     ]
   }
+  form.label text: 'Null', showIf: {
+    "==": [
+      {
+        "var": 'user[select1]'
+      },
+      nil
+    ]
+  }
+  form.label text: 'Any', showIf: {
+    "!=": [
+      {
+        "var": 'user[select1]'
+      },
+      nil
+    ]
+  }
 
   form.spacer height: 20
   form.h1 text: 'Combined conditions'

data/app/views/json_ui/garage/views/images.json.jbuilder

@@ -7,11 +7,6 @@ render "#{@path_prefix}/nav_menu", json: json, page: page
 small_image_url = 'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSGQpSWjtELISLBlmugOZ6wzl1JamYXQvbFeYywpfg3E8b8DrO0Kg&s'
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
-  scroll.panels_column lg: { cols: 3 }, md: { cols: 1 }, sm: { cols: 1 }, xs: { cols: 1 }
-  scroll.panels_column backgroundColor: '#333333', height: 'matchParent', lg: { cols: 3 }, xs: { cols: 4 }, childViews: ->(column) do
-    column.image width: 'matchParent', url: glib_json_image_standard_url
-  end
-
   scroll.h2 text: 'Avatar'
   scroll.spacer height: 6
   scroll.avatar \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - ''