glib-web 4.35.2 → 4.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f641f7071417ce8d17c9485a2a1484faf3896768668d2e8213fe1683a1aa90fb
-  data.tar.gz: e55f947ea933f5b318411fb0d22e349799f26fac9b5945689aa965151994df03
+  metadata.gz: 94b3768dec74f3a05c32ffd19612d151afce3829643e070f173899d02627e72f
+  data.tar.gz: e7f8124643269e1634a979683210b93a7ca613fd1cf975a0ff20419a3f08f9f2
 SHA512:
-  metadata.gz: 0d5edeb473e656e26a481849654819dec6c0050ad8bc362a2d18567b8cb6ecf455ca8c7db4ca63a8f42f3be3ec982f2ec78c2f4c10cf786a38978bca2752b819
-  data.tar.gz: a33efa4e3074fa2c56cc259ce5ab1255772138d9535d39b1abdbfc092a1121fbc29b2c6463729a0d8015119a3a952d53f33f4392ddacfc1c934b2f5c05b036fc
+  metadata.gz: 91cf7697395548ce7d8ee306269688c1166ed9e9d1ca0778a5d2d2dfd72d26dab277a3d22069a1d4ef31727511816854bd12de8ef984629069b4413f295095c5
+  data.tar.gz: 4b655db49df2bfba84b0c524d02e41fdaadcacfb687418f7d3651c24712c9c7a55ed1b5bf4a1951b3107264a5db09b348b892293efaee7212c06d05b9b36408e

data/app/controllers/concerns/glib/json/ui.rb

@@ -14,7 +14,7 @@ module Glib::Json::Ui
   end
 
   # Override
-  def form_authenticity_token(*args)
+  def form_authenticity_token(**args)
     Rails.env.test? ? 'test_token' : super
   end
 

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

@@ -7,7 +7,7 @@ module Glib
           button: I18n.t('glib.accepts.max_file_size_error.button', default: nil) || 'Dismiss'
         }
         default_max_length_error = {
-          body: I18n.t('glib.accepts.max_file_length_error.body', default: nil) || 'Files exceed the maximum limit per upload',
+          body: I18n.t('glib.accepts.max_file_length_error.body', default: nil) || 'Files exceed the maximum limit',
           button: I18n.t('glib.accepts.max_file_length_error.button', default: nil) || 'Dismiss'
         }
 

data/app/validators/mutually_exclusive_with_validator.rb

@@ -0,0 +1,22 @@
+class MutuallyExclusiveWithValidator < ActiveModel::EachValidator
+  include ActiveSupport::Inflector
+
+  def validate_each(record, attribute, _value)
+    other_attribute = options[:with]
+
+    validate_mutual_exclusivity(record, attribute, other_attribute)
+    validate_mutual_exclusivity(record, other_attribute, attribute)
+  end
+
+  private
+    def validate_mutual_exclusivity(record, attribute, other_attribute)
+      attribute_value = record.send(attribute)
+      other_attribute_value = record.send(other_attribute)
+
+      if attribute_value.present? && other_attribute_value.present?
+        record.errors.add(attribute, :present, **options)
+      elsif attribute_value.nil? && other_attribute_value.nil?
+        record.errors.add(attribute, :blank, **options)
+      end
+    end
+end

data/app/validators/presence_only_if_validator.rb

@@ -0,0 +1,22 @@
+class PresenceOnlyIfValidator < ActiveModel::EachValidator
+  include ActiveSupport::Inflector
+
+  def validate_each(record, attribute, _value)
+    condition = options[:with]
+
+    if condition.is_a?(Symbol)
+      evaluate_condition(record, attribute, ->(record) { record.send(condition) })
+    elsif condition.respond_to?(:call)
+      evaluate_condition(record, attribute, condition)
+    else
+      raise 'Invalid option'
+    end
+  end
+
+  private
+    def evaluate_condition(record, attribute, condition)
+      if condition.call(record) && record.send(attribute).nil?
+        record.errors.add(attribute, :blank, **options)
+      end
+    end
+end

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

@@ -46,7 +46,15 @@ page.form options.merge(childViews: ->(form) do
     name: 'user[multi][]',
     id: 'upload_1',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 10 },
+    accepts: {
+      fileType: 'image',
+      maxFileSize: 10,
+      maxFileLength: 2,
+      maxFileLengthErrorText: {
+        body: 'try with a smaller number of files',
+        button: 'OK'
+      }
+     },
     directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     storagePrefix: 'glib',
@@ -70,7 +78,10 @@ page.form options.merge(childViews: ->(form) do
     name: 'user[multi2][]',
     id: 'upload_2',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 5000 },
+    accepts: {
+      fileType: 'image',
+      maxFileSize: 5000
+    },
     directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     onFinishUpload: ->(action) { action.forms_submit }
@@ -89,7 +100,7 @@ page.form options.merge(childViews: ->(form) do
   form.fields_multiUpload \
     name: 'user[multi3][]',
     width: 360,
-    accepts: { fileType: 'image', maxFileSize: 100 },
+    accepts: { fileType: 'image', maxFileSize: 100, maxFileLength: 2 },
     uploadTitle: 'Files uploaded:',
     onFinishUpload: ->(action) { action.forms_submit }
 

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

@@ -73,17 +73,27 @@ page.body childViews: ->(body) do
 
         validation = { required: { message: 'Required' } }
         options = ['option1', 'option2', 'option3', 'option4'].map { |option| { 'text'=> option.humanize, 'value' => option } }
+        options_with_icon = options.map.with_index do |option, index|
+          obj = option.dup
+          obj['icon'] = { name: "filter_#{index + 1}" }
+          obj
+        end
+        options_with_image = options.map.with_index do |option, index|
+          obj = option.dup
+          obj['imageUrl'] = 'https://flagsapi.com/ID/flat/24.png'
+          obj
+        end
 
         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 clearable: true, multiple: true, width: 'matchParent', name: 'user[select][]', id: 'select', options: options, value: ['option1', 'option2'], validation: validation
         form.hr width: 'matchParent'
         form.panels_flow innerPadding: { bottom: 0 }, width: 'matchParent', id: 'select1', childViews: ->(flow) do
-          form.fields_select clearable: true, width: 'matchParent', name: 'user[select1]', options: options, value: 'option1'
+          form.fields_select clearable: true, width: 'matchParent', name: 'user[select1]', options: options_with_icon, value: 'option1'
           form.hr width: 'matchParent'
         end
         form.panels_horizontal id: 'select2', width: 'matchParent', childViews: ->(hori) do
-          form.fields_select clearable: true, width: 'matchParent', name: 'user[select2]', options: options, value: 'option2'
+          form.fields_select clearable: true, width: 'matchParent', name: 'user[select2]', options: options_with_image, value: 'option2'
           form.hr width: 'matchParent'
         end
         form.panels_split id: 'select3', width: 'matchParent', content: ->(split) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.35.2
+  version: 4.36.0
 platform: ruby
 authors:
 - ''
@@ -217,6 +217,8 @@ files:
 - app/policies/glib/application_policy.rb
 - app/validators/email_typo_validator.rb
 - app/validators/email_validator.rb
+- app/validators/mutually_exclusive_with_validator.rb
+- app/validators/presence_only_if_validator.rb
 - app/validators/url_validator.rb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_commands.json.jbuilder