glib-web 4.1.3 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ce4822a2cbafa2933d7bf884df8eb63af65ebcd4046e4484a652fda583b5c6
-  data.tar.gz: f652bfbdb23e198af85cd46f0afef1f753da089a196ff18a13c4cbc57bf834b2
+  metadata.gz: 74c8034dd7dd38d81a358b836e90332f2cd1b9445a3a765de052141ee9c26aaf
+  data.tar.gz: 31f47b9867591f3459ddf8fbd14ca8e8ef7227c89ee9cea4edde81a7cefd710d
 SHA512:
-  metadata.gz: ed0d06a31f63ab5fe4deffdf1995f1a673d751595da56fbbc2e1e8b3e3c55d7466957945cbf17f6aa78f094130480ea9c41d29c092b17f45aa6f4c5b90df60e5
-  data.tar.gz: 3ffb43696bb3c525282eead1ecd4232078acddc578091d056964b3c774e35e4c3be464a0ddb2230176a08d1a4578c53118d1cfe61893c6f802133d8cceecd7f2
+  metadata.gz: f39ee60b1d47d4b630940c039735f90cd729635d4cc8eeb93b0a1ede965dd52546d274748b9037fa0beee9129537a8282386fb424000730728b5c2023657a9c1
+  data.tar.gz: 9423dbc97f08201803f4bbf2f91fdaf5505124f402aa2d718405d29940824ab38bffbe09aeabf293c6ff657d42837564be463d5ffd828b70b180fe6581861cb9

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

@@ -66,7 +66,7 @@ class Glib::JsonUi::ViewBuilder
           @label ||= context.field_label(@prop, @label_args || {})
           @hint ||= context.hint_label(@prop, @hint_args || {})
           @placeholder ||= context.placeholder_label(@prop, @placeholder_args || {})
-          @validation ||= context.field_validation(@prop)
+          @validation ||= context.field_validation(@prop) if @autoValidate
 
           if form.current_dynamic_group.nil?
             # This is not relevant inside a dynamic group
@@ -83,7 +83,7 @@ class Glib::JsonUi::ViewBuilder
         # - Placeholder competes with label for space
         json.placeholder @placeholder if @placeholder
 
-        json.validation @validation if @autoValidate
+        json.validation @validation if @validation.present?
       end
 
       # To be overridden

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

@@ -118,35 +118,45 @@ class Glib::JsonUi::ViewBuilder
         self.class.field_validation(@model, prop)
       end
 
+      def self.lookup_error_message(model_name, attribute_name, key)
+        message = I18n.t("activerecord.errors.models.#{model_name}.attributes.#{attribute_name}.#{key}", default: nil) if model_name.present? && attribute_name.present?
+        message ||= I18n.t("activerecord.errors.models.#{model_name}.#{key}", default: nil) if model_name.present?
+        message ||= I18n.t("activerecord.errors.messages.#{key}", default: nil)
+        message ||= I18n.t("errors.attributes.#{attribute_name}.#{key}", default: nil) if attribute_name.present?
+        message ||= I18n.t("errors.messages.#{key}", default: nil)
+        message
+      end
+
       def self.field_validation(model, prop)
         validations = {}
+        ignored = ['confirmation', 'comparison', 'uniqueness', 'validates_associated', 'validates_each', 'validates_with', 'format']
         model.class.validators_on(prop).each do |validator|
+          next if ignored.include?(validator.kind.to_s)
+
           validations[validator.kind] = validator.options.except(:if, :unless)
           validations[validator.kind][:message] = validator.options[:message]
           case validator.kind
+          when :absence
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'present')
           when :presence
-            validations[validator.kind][:message] ||= I18n.t('errors.messages.present')
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'blank')
           when :acceptance
-            validations[validator.kind][:message] ||= I18n.t('errors.messages.accepted')
-          when :confirmation
-            # raise NotImplemented
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'accepted')
+            validations[validator.kind][:accept] ||= ['1', true]
           when :numericality
-            # raise NotImplemented
-          when :comparison
-            comparison = validator.options.first[0]
-            validations[validator.kind][:message] ||= I18n.t("errors.messages.#{comparison}")
+            validations[validator.kind][:message] ||= [
+              'not_a_number', 'not_an_integer', 'greater_than',
+              'greater_than_or_equal_to', 'equal_to', 'less_than',
+              'less_than_or_equal_to', 'other_than', 'in', 'odd', 'even'
+            ].inject({}) { |prev, curr| prev.merge(curr => lookup_error_message(model.to_s.underscore, prop, curr)) }
           when :format
-            validations[validator.kind][:message] ||= I18n.t('errors.messages.invalid')
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'invalid')
           when :inclusion
-            validations[validator.kind][:message] ||= I18n.t('errors.messages.inclusion')
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'inclusion')
           when :exclusion
-            validations[validator.kind][:message] ||= I18n.t('errors.messages.exclusion')
+            validations[validator.kind][:message] ||= lookup_error_message(model.to_s.underscore, prop, 'exclusion')
           when :length
-            validations[validator.kind][:message] = {
-              too_long: I18n.t('errors.messages.too_long'),
-              wrong_length: I18n.t('errors.messages.wrong_length'),
-              too_short: I18n.t('errors.messages.too_short')
-            }
+            validations[validator.kind][:message] ||= ['too_long', 'wrong_length', 'too_short'].inject({}) { |prev, curr| prev.merge(curr => lookup_error_message(model.to_s.underscore, prop, curr)) }
           end
         end
 

data/app/models/glib/dummy_job_application.rb

@@ -0,0 +1,16 @@
+module Glib
+  class DummyJobApplication
+    include ActiveModel::Validations
+    include ActiveModel::AttributeMethods
+
+    attr_accessor :name, :age, :position, :words, :accept
+
+    validates :name, :position, presence: true
+    validates :accept, acceptance: {}, allow_nil: false
+    validates :words, length: { maximum: 100, minimum: 1 }
+    validates :age, numericality: { only_integer: true, less_than_or_equal_to: 30, greater_than_or_equal_to: 18 }, allow_blank: true
+    # validates :name, format: { with: /Doe/, message: 'This job is for person named Doe' }
+    validates :position, inclusion: { in: ['programmer', 'devops', 'designer'] }, allow_blank: true
+
+  end
+end

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

@@ -4,15 +4,17 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.form \
+  model: Glib::DummyJobApplication.new,
   url: json_ui_garage_url(path: 'forms/generic_post'),
   method: 'post',
   padding: glib_json_padding_body,
   childViews: ->(form) do
     form.fields_text \
+      prop: :name,
       name: 'user[name]',
       width: 'matchParent',
       label: 'Name',
-      validation: { required: { message: 'Required' }, format: { regex: 'Doe$', message: 'The name has to end with "Doe"' } }
+      validation: { format: { regex: 'Doe', message: 'This job is only for person named Doe' } }
 
     form.fields_email \
       name: 'user[email]',
@@ -25,12 +27,11 @@ page.form \
       label: 'URL'
 
     form.fields_number \
-      name: 'user[number]',
+      prop: :age,
+      name: 'user[age]',
       width: 'matchParent',
-      label: 'Number',
-      validation: { required: { message: 'Required' } },
-      leftText: 'USD',
-      rightText: '.00'
+      label: 'Age',
+      autoValidate: true
 
     form.fields_phone \
       name: 'user[phone1]',
@@ -52,32 +53,21 @@ page.form \
       leftIcon: 'lock'
 
     form.fields_textarea \
-      name: 'user[textarea]',
+      prop: :words,
+      name: 'user[words]',
       width: 'matchParent',
       label: 'Textarea with maxLength',
-      maxLength: 50,
-      validation: { required: { message: 'Required' } }
-
-    # options = ['male', 'female'].map { |i| { text: i.humanize, value: i } }
-    # form.fields_select \
-    #   name: 'user[gender]',
-    #   width: 'matchParent',
-    #   label: 'Gender',
-    #   validation: { required: { message: 'Required' } },
-    #   options: options
+      maxLength: 1000,
+      autoValidate: true
 
-    languages = {
-      'brisbane' => 'Brisbane',
-      'canberra' => 'Canberra',
-      'melbourne' => 'Melbourne',
-      'sydney' => 'Sydney',
-    }
+    options = ['programmer', 'devops', 'designer', 'ceo', 'office_boy'].map { |v| { text: v.humanize, value: v } }
     form.fields_select \
-      name: 'user[city]',
+      prop: :position,
+      name: 'user[position]',
       width: 'matchParent',
-      label: 'City',
-      options: languages.map { |k, v| { value: k, text: v } },
-      validation: { required: { message: 'Required' } }
+      label: 'Position',
+      options: options,
+      autoValidate: true
 
     form.spacer height: 10
     form.h4 text: 'Gender'
@@ -104,6 +94,9 @@ page.form \
         group.fields_check checkValue: 4, label: 'Mobile Development'
       end
 
+    form.spacer height: 10
+    form.fields_check prop: :accept, label: 'Accept terms & condition', name: 'user[accept]', autoValidate: true
+
     form.spacer height: 30
     form.fields_submit text: 'Submit'
     form.fields_submit text: 'Submit (disable if form invalid)', disableIfFormInvalid: true

data/app/views/json_ui/garage/test_page/index.json.jbuilder

@@ -5,13 +5,13 @@ page = json_ui_page json
 page.body childViews: ->(body) do
   body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
     res.panels_column lg: { cols: 6 }, childViews: ->(col) do
-      res.h2 text: 'Reactivity'
+      res.h2 text: 'Reactivity & validation'
       res.spacer height: 8
       res.panels_form \
         url: json_ui_garage_url(path: 'forms/generic_post'),
         method: 'post',
         childViews: ->(form) do
-          form.panels_horizontal childViews: ->(hori) do
+          form.panels_flow innerPadding: { bottom: 0 }, width: 'matchParent', childViews: ->(hori) do
             hori.button text: 'components/set', onClick: ->(action) do
               action.runMultiple childActions: ->(saction) do
                 saction.components_set targetId: 'text', data: { value: 'Doe John' }
@@ -42,6 +42,10 @@ page.body childViews: ->(body) do
                 end
               end
             end
+            hori.spacer width: 4
+            hori.button text: 'hide select', onClick: ->(action) do
+              action.components_set targetId: 'select', data: { displayed: false }
+            end
           end
 
           form.spacer height: 8
@@ -53,7 +57,7 @@ page.body childViews: ->(body) do
 
           form.fields_date width: 'matchParent', name: 'user[date]', id: 'date', value: Date.new(2024, 7, 24), validation: validation
           form.hr width: 'matchParent'
-          form.fields_select multiple: true, width: 'matchParent', name: 'user[select]', id: 'select', options: options, value: ['option1', 'option2'], validation: validation
+          form.fields_select multiple: true, width: 'matchParent', name: 'user[select][]', id: 'select', options: options, value: ['option1', 'option2'], validation: validation
           form.hr width: 'matchParent'
           form.fields_chipGroup width: 'matchParent', name: 'user[chip_group]', id: 'chip_group', options: options, value: ['option2'], validation: validation
           form.hr width: 'matchParent'
@@ -66,7 +70,7 @@ page.body childViews: ->(body) do
           check_group_value = ['option3', 'option1']
           form.fields_checkGroup width: 'matchParent', name: 'user[check_group]', id: 'check_group', value: check_group_value, validation: validation, childViews: ->(radio) do
             options.each do |option|
-              radio.fields_check label: option['text'], value: check_group_value.include?(option['value']) ? option['value'] : nil, checkValue: option['value']
+              radio.fields_check label: option['text'], checkValue: option['value']
             end
           end
           form.hr width: 'matchParent'
@@ -100,6 +104,10 @@ page.body childViews: ->(body) do
                 ssaction.dialogs_show updateExisting: true, disableCloseButton: true, content: ->(sdialog) do
                   sdialog.body padding: glib_json_padding_body, childViews: ->(ssbody) do
                     ssbody.h1 text: 'Hello world (updated)'
+                    ssbody.spacer height: 8
+                    ssbody.button text: 'close', onClick: ->(xaction) do
+                      xaction.dialogs_close
+                    end
                   end
                 end
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.5
 platform: ruby
 authors:
 - ''
@@ -134,6 +134,7 @@ files:
 - app/models/glib/active_storage/attachment.rb
 - app/models/glib/active_storage/blob.rb
 - app/models/glib/application_record.rb
+- app/models/glib/dummy_job_application.rb
 - app/models/glib/dynamic_text_record.rb
 - app/models/glib/text.rb
 - app/policies/glib/application_policy.rb