glib-web 4.1.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36f47f5f0236550243e1344d2bdee89559141b549575142afbd1ea5a13464d1
-  data.tar.gz: c772a7b58eb06904c442d220a7eae112eaeb5416774a8db28623caa770ec95e5
+  metadata.gz: faf0d291c51c0fa43711bc1e563a85693087ac7979784ef50144838227b36f51
+  data.tar.gz: 99cb79b91991380f89387958d6f7378a5e9dd18db2517b3ee24888369e09d01a
 SHA512:
-  metadata.gz: 176d31f10a75945b693d0e0f26497d19a95ee63863d9cf585004cfe4b9011c64d5908ee622b3a0a83dd01b3a7d4c8babee9cd84af5c2ec3315aaac8e860dc536
-  data.tar.gz: e75efdc5c2b79a11c380d3905cb2d8d495c74cb01c88264dc0b362c0393007037d3bb814af0bb70ec0c82ce6779db51ca9ecd2be2f7ebb79a2880636645508ae
+  metadata.gz: 0cc7697604c728d1999a4da910991c75e6a9750e9492e8c4489971c60e91f0b8233276a9b6b806737229e7b7950bf14609b89d04845d8b5ef0c6f25d966dd19e
+  data.tar.gz: 925654476843e66088de357fe3c6f94b5f16411a8e6e70552dcb0c0199198dd607d519c117d079543d8678c86731f11beb9b28c5760548760d3a162445ad0a85

data/app/controllers/glib/glib_direct_uploads_controller.rb

@@ -0,0 +1,52 @@
+module Glib
+  class GlibDirectUploadsController < ::ActiveStorage::DirectUploadsController
+    before_action :authenticate_user!
+
+    rescue_from StandardError do |e|
+      if !Rails.env.production?
+        raise e
+      end
+      render json: { message: 'Upload failed' }, status: 500
+    end
+
+    rescue_from Glib::Auth::Policy::UnauthorizedError do
+      render json: { message: 'Forbidden' }, status: 403
+    end
+
+    rescue_from ActionController::InvalidAuthenticityToken do
+      render json: { message: 'Session expired. Please refresh page' }, status: 401
+    end
+
+    def create
+      blob = ActiveStorage::Blob.new # generate blob key
+      if blob_args[:prefix].present?
+        blob.key = "#{blob_args[:prefix]}/#{blob.key}"
+      end
+      blob.assign_attributes(**blob_args.except(:tagging, :prefix))
+      blob.save!
+
+      if blob.service.instance_of?(::ActiveStorage::Service::GlibS3Service)
+        blob.service.tagging = blob_args[:tagging]
+      end
+
+      render json: direct_upload_json(blob)
+    end
+
+    private
+      def blob_args
+        params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, :tagging, metadata: {}).to_h.symbolize_keys
+      end
+
+      def direct_upload_json(blob)
+        url, headers = blob.service_url_for_direct_upload
+        blob.as_json(root: false, methods: :signed_id).merge(direct_upload: {
+          url: url,
+          headers: headers.merge(blob.service_headers_for_direct_upload)
+        })
+      end
+
+      def raise_error
+        raise Glib::Auth::Policy::UnauthorizedError
+      end
+  end
+end

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

@@ -279,8 +279,23 @@ module Glib
           end
         end
 
-        def self.hash(propName)
+        def self.hash(propName, **options)
           define_method(propName) do |value|
+            value = ActiveSupport::HashWithIndifferentAccess.new(value)
+
+            required = options[:required] || []
+            optional = options[:optional] || []
+
+            required.each do |req|
+              raise ArgumentError, "Hash property: '#{req}' is requred" if value[req.to_s].blank?
+            end
+
+            if optional.present?
+              value.except(*required).each do |k, v|
+                raise ArgumentError, "Unknown hash property: '#{k}'" if !optional.include?(k.to_sym)
+              end
+            end
+
             json.set! propName, value
           end
         end
@@ -326,7 +341,7 @@ module Glib
 
           if value
             if !Rails.env.production?
-              if !value.match /^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
+              if !value.match(/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i)
                 raise "Invalid color: #{value}"
               end
             end

data/app/helpers/glib/json_ui/action_builder/logics.rb

@@ -2,6 +2,7 @@ class Glib::JsonUi::ActionBuilder
   module Logics
     class Set < Action
       string :targetId
+      array :targetIds
       hash :conditionalData
       hash :data
       hash :variables

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

@@ -19,6 +19,15 @@ module Glib
         )
       end
 
+      def glib_direct_uploads_url(options = {})
+        Glib::Web::Engine.routes.url_helpers.glib_direct_uploads_url(options.merge(
+                                                                       protocol: request.protocol,
+                                                                       host: request.host,
+                                                                       port: request.port,
+                                                                       _render: params[:_render], format: params[:format])
+        )
+      end
+
       def json_ui_garage_current_url(options = {})
         json_ui_garage_url(options.merge(path: params[:path]))
       end
@@ -237,7 +246,7 @@ module Glib
         def form(options = {})
           form = Glib::JsonUi::ViewBuilder::Panels::Form.new(json, self)
           form.childViews(->(view_builder) { })
-          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model, :onChange, :onChangeAndLoad)
+          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model, :onChange, :onChangeAndLoad, :autoValidate)
 
           json.fullPageForm do
             json.view 'panels/fullPageForm'

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 form._autoValidate || @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
@@ -219,7 +219,7 @@ class Glib::JsonUi::ViewBuilder
 
       string :titlePrefix
       panels_builder :content, :template
-      hash :groupFieldProperties
+      array :groupFieldProperties
 
       # NOTE: Consider using sub-panel instead (e.g. groupTemplate)
       # views :groupTemplateViews
@@ -326,6 +326,7 @@ class Glib::JsonUi::ViewBuilder
       string :storagePrefix
       hash :metadata
       string :tagging
+      hash :tags
 
       required :accepts, :directUploadUrl
 

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

@@ -1,7 +1,10 @@
+require 'js_regex'
+
 class Glib::JsonUi::ViewBuilder
   module Panels
     class Form < View
       attr_reader :model_name # See Panels::Form.field_name
+      attr_reader :_autoValidate
       attr_accessor :current_dynamic_group
 
       action :onSubmit
@@ -10,6 +13,10 @@ class Glib::JsonUi::ViewBuilder
       string :paramNameForFormData
       bool :local
 
+      def autoValidate(autoValidate)
+        @_autoValidate = autoValidate
+      end
+
       def nested_associations
         @nested_associations ||= []
       end
@@ -118,35 +125,51 @@ 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']
         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')
+            if validations[validator.kind][:with].instance_of?(Regexp)
+              validations[validator.kind][:with] = JsRegex.new(validations[validator.kind][:with]).source
+            end
+            if validations[validator.kind][:without].instance_of?(Regexp)
+              validations[validator.kind][:without] = JsRegex.new(validations[validator.kind][:without]).source
+            end
+            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/helpers/glib/json_ui/view_builder.rb

@@ -320,7 +320,7 @@ module Glib
         string :directUploadUrl
         hash :accepts
         string :selected
-        hash :items
+        array :items
         hash :dropData
         string :strategy
         string :storagePrefix

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\z/, message: 'This job is for person end with Doe' }
+    validates :position, inclusion: { in: ['programmer', 'devops', 'designer'] }, allow_blank: true
+
+  end
+end

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

@@ -30,11 +30,7 @@ page.form \
     form.h2 text: 'Check/uncheck All'
     form.spacer height: 6
     form.fields_check name: 'user[check_all]', label: 'All', checkValue: true, onChangeAndLoad: ->(action) do
-      action.runMultiple childActions: ->(saction) do
-        saction.logics_set targetId: 'check1', conditionalData: { value: { "==": [{ "var": 'user[check_all]' }, true] } }
-        saction.logics_set targetId: 'check2', conditionalData: { value: { "==": [{ "var": 'user[check_all]' }, true] } }
-        saction.logics_set targetId: 'check3', conditionalData: { value: { "==": [{ "var": 'user[check_all]' }, true] } }
-      end
+      action.logics_set targetIds: ['check1', 'check2', 'check3'], conditionalData: { value: { "==": [{ "var": 'user[check_all]' }, true] } }
     end
     form.fields_check id: 'check1', name: 'user[check1]', label: 'Check 1', checkValue: true
     form.fields_check id: 'check2', name: 'user[check2]', label: 'Check 2', checkValue: true

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

@@ -4,7 +4,7 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.filePaster \
-  directUploadUrl: rails_direct_uploads_url,
+  directUploadUrl: glib_direct_uploads_url,
   accepts: {
     fileType: 'image',
     maxFileSize: 100,

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

@@ -11,29 +11,29 @@ render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.form options.merge(childViews: ->(form) do
   rules = { fileType: 'image', maxFileSize: 5000 }
-  form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Landscape Photo', accepts: rules, directUploadUrl: rails_direct_uploads_url,
+  form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Landscape Photo', accepts: rules, directUploadUrl: glib_direct_uploads_url,
     value: 'eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4',
     fileUrl: 'https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100',
     fileTitle: '1 month ago',
     placeholderView: { type: 'image', width: 100, height: 75, url: 'https://www.atms.com.au/wp-content/uploads/2019/10/placeholder-1-1024x683.png?x93630' }
 
   rules = { fileType: 'image', maxFileSize: 1, fileTypeErrorText: 'Invalid!', maxFileSizeErrorText: 'Too big!' }
-  form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Avatar', accepts: rules, directUploadUrl: rails_direct_uploads_url,
+  form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Avatar', accepts: rules, directUploadUrl: glib_direct_uploads_url,
     placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' }
 
   rules = { fileType: 'pdf', maxFileSize: 5000 }
-  form.fields_file name: 'user[pdf1][]', width: 'matchParent', label: 'PDF Document', accepts: rules, directUploadUrl: rails_direct_uploads_url,
+  form.fields_file name: 'user[pdf1][]', width: 'matchParent', label: 'PDF Document', accepts: rules, directUploadUrl: glib_direct_uploads_url,
     placeholderView: { type: 'image', width: 100, height: 100, url: 'data:image/webp;base64,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' }
 
   rules = { fileType: ['pdf', 'image'], maxFileSize: 5000 }
-  form.fields_file name: 'user[pdf2][]', width: 'matchParent', label: 'PDF/Image File', accepts: rules, directUploadUrl: rails_direct_uploads_url
+  form.fields_file name: 'user[pdf2][]', width: 'matchParent', label: 'PDF/Image File', accepts: rules, directUploadUrl: glib_direct_uploads_url
 
   rules = { fileType: 'zip', maxFileSize: 5000 }
-  form.fields_file name: 'user[zip][]', width: 'matchParent', label: 'ZIP Document', accepts: rules, directUploadUrl: rails_direct_uploads_url
+  form.fields_file name: 'user[zip][]', width: 'matchParent', label: 'ZIP Document', accepts: rules, directUploadUrl: glib_direct_uploads_url
 
   # TODO
   # rules = { fileType: 'image/*', maxFileSize: 1, fileTypeErrorText: 'Invalid!', maxFileSizeErrorText: 'Too big!' }
-  # form.fields_multiImage name: 'user[photos][]', width: 'matchParent', label: 'Avatar', accepts: rules, directUploadUrl: rails_direct_uploads_url,
+  # form.fields_multiImage name: 'user[photos][]', width: 'matchParent', label: 'Avatar', accepts: rules, directUploadUrl: glib_direct_uploads_url,
   #   placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' }
 
   form.spacer height: 16
@@ -41,35 +41,51 @@ page.form options.merge(childViews: ->(form) do
   form.spacer height: 8
   form.fields_multiUpload \
     name: 'user[multi][]',
+    id: 'upload_1',
     width: 360,
     accepts: { fileType: 'image', maxFileSize: 10 },
-    directUploadUrl: rails_direct_uploads_url,
+    directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     storagePrefix: 'glib',
     metadata: {
       foo: 'bar',
       zoo: 'baz'
     },
-    tagging: 'key=value&key1=value1',
+    # tagging: 'key=value&key1=value1',
+    tags: { key: 'value', key1: 'value1' },
     files: [
-      { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
+      { name: 'File (Example)', signed_id: ActiveStorage::Attachment.first&.signed_id }
     ]
+  form.button text: 'Clear files', onClick: ->(action) do
+    action.components_set targetId: 'upload_1', data: { files: [], value: nil }
+  end
+
   form.spacer height: 16
   form.label text: 'File upload with onFinishUpload'
   form.spacer height: 8
   form.fields_multiUpload \
     name: 'user[multi2][]',
+    id: 'upload_2',
     width: 360,
     accepts: { fileType: 'image', maxFileSize: 5000 },
-    directUploadUrl: rails_direct_uploads_url,
+    directUploadUrl: glib_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     onFinishUpload: ->(action) { action.forms_submit }
+  form.button text: 'Populate files', onClick: ->(action) do
+    action.components_set targetId: 'upload_2', data: {
+      files: [
+        { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
+      ],
+      value: [1]
+    }
+  end
+
   form.spacer height: 16
   form.label text: 'Sign'
   form.spacer height: 8
   form.fields_sign \
     name: 'user[sign]',
-    directUploadUrl: rails_direct_uploads_url,
+    directUploadUrl: glib_direct_uploads_url,
     width: 300, height: 150,
     validation: { required: { message: 'add your signature!' } }
   form.spacer height: 24

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

@@ -23,16 +23,16 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
 
     json.images do
       json.child! do
-        json.value "eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4"
+        json.value 'eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4'
         # json.fileTitle "hita i hanom hg.jpg"
-        json.fileUrl "https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100"
+        json.fileUrl 'https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100'
       end
     end
 
     json.imageUploader do
       json.fieldName 'user[images_attributes]'
-      json.accepts(fileType: "image/*", maxFileSize: 5000)
-      json.directUploadUrl rails_direct_uploads_url
+      json.accepts(fileType: 'image/*', maxFileSize: 5000)
+      json.directUploadUrl glib_direct_uploads_url
     end
   end
 

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

@@ -47,7 +47,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
       imageUploader: {
         name: 'user[images_attributes][]',
         accepts: { fileType: 'image/*', maxFileSize: 5000 },
-        directUploadUrl: rails_direct_uploads_url
+        directUploadUrl: glib_direct_uploads_url
       },
       onChange: ->(action) do
         action.forms_submit overrideUrl: json_ui_garage_url(path: 'forms/rich_text_preview')
@@ -72,7 +72,7 @@ page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', pad
     #   json.imageUploader do
     #     json.name 'user[images_attributes][]'
     #     json.accepts(fileType: 'image/*', maxFileSize: 5000)
-    #     json.directUploadUrl rails_direct_uploads_url
+    #     json.directUploadUrl glib_direct_uploads_url
     #   end
     # end
   end

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

@@ -342,6 +342,40 @@ page.form \
       form.fields_text id: 'field4', name: 'user[loadif_target8]', width: 'matchParent', value: params[:key]
     end
 
+    # form.fields_check name: 'user[loadif7]', label: 'Show target nested panels', checkValue: 'true', uncheckValue: 'false', value: 'false', onChangeAndLoad: ->(action) do
+    #   action.logics_set targetId: 'panel7a', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'true'] } }
+    # end
+
+    form.spacer height: 20
+    options = [
+      { text: 'Option 1', value: 'option1' },
+      { text: 'Option 2', value: 'option2' }
+    ]
+    form.fields_select name: 'user[loadif7]', width: 'matchParent', label: 'Select "show"', options: options, value: '', onChangeAndLoad: ->(action) do
+      action.runMultiple childActions: ->(saction) do
+        saction.logics_set targetId: 'panel7a', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'option1'] } }
+        saction.logics_set targetId: 'panel7b', conditionalData: { displayed: { "==": [{ "var": 'user[loadif7]' }, 'option2'] } }
+      end
+    end
+
+    form.panels_vertical \
+      id: 'panel7a',
+      styleClass: 'border-2',
+      width: 'matchParent',
+      padding: { top: 8, right: 8, bottom: 8, left: 8 },
+      childViews: ->(res) do
+        res.fields_text name: 'user[loadif_target9]', width: 'matchParent', value: 'Value 7a'
+      end
+
+    form.panels_vertical \
+      id: 'panel7b',
+      styleClass: 'border-2',
+      width: 'matchParent',
+      padding: { top: 8, right: 8, bottom: 8, left: 8 },
+      childViews: ->(res) do
+        res.fields_text name: 'user[loadif_target9]', width: 'matchParent', value: 'Value 7b'
+      end
+
     form.spacer height: 20
     form.fields_submit text: 'Submit'
 

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

@@ -113,7 +113,7 @@ page.scroll childViews: ->(scroll) do
         width: 'matchParent',
         label: 'Avatar',
         accepts: rules,
-        directUploadUrl: rails_direct_uploads_url,
+        directUploadUrl: glib_direct_uploads_url,
         placeholderView: { type: 'avatar', width: 100, height: 100, url: 'data:image/jpeg;base64,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' },
         onChange: ->(action) do
           action.sheets_select message: 'Submit data?', buttons: ->(menu) do

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

@@ -4,15 +4,18 @@ 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,
+  autoValidate: true,
   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"' } }
+      label: 'Name'
+
 
     form.fields_email \
       name: 'user[email]',
@@ -25,12 +28,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'
+
 
     form.fields_phone \
       name: 'user[phone1]',
@@ -52,32 +54,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
-
-    languages = {
-      'brisbane' => 'Brisbane',
-      'canberra' => 'Canberra',
-      'melbourne' => 'Melbourne',
-      'sydney' => 'Sydney',
-    }
+      maxLength: 1000
+
+
+    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
+
 
     form.spacer height: 10
     form.h4 text: 'Gender'
@@ -104,6 +95,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]'
+
     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/pages/paste_file.jbuilder

@@ -5,7 +5,7 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.filePaster \
-  directUploadUrl: rails_direct_uploads_url,
+  directUploadUrl: glib_direct_uploads_url,
   accepts: {
     fileType: 'image',
     maxFileSize: 100,

data/app/views/json_ui/garage/panels/flow.json.jbuilder

@@ -4,6 +4,19 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h1 text: 'Show/hide'
+  scroll.panels_flow id: 'flow1', width: 300, innerPadding: { top: 0 }, backgroundColor: '#b3bac2', childViews: ->(panel) do
+    panel.button text: '1'
+    panel.button text: '2'
+    panel.button text: '3'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'flow1', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'flow1', data: { displayed: false }
+  end
+
   scroll.h1 text: 'Basic'
   scroll.panels_flow width: 300, innerPadding: { top: 0 }, backgroundColor: '#b3bac2', childViews: ->(panel) do
     panel.button text: '1'

data/app/views/json_ui/garage/panels/horizontal.json.jbuilder

@@ -4,6 +4,19 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+    scroll.h1 text: 'Show/hide'
+    scroll.panels_horizontal id: 'hor1', width: 200, height: 100, backgroundColor: '#b3bac2', childViews: ->(panel) do
+      panel.button text: '1'
+    end
+    scroll.button text: 'show', onClick: ->(action) do
+      action.components_set targetId: 'hor1', data: { displayed: true }
+    end
+    scroll.button text: 'hide', onClick: ->(action) do
+      action.components_set targetId: 'hor1', data: { displayed: false }
+    end
+
+    scroll.label text: "\n"
+
     scroll.h1 text: 'Basic'
     scroll.panels_horizontal backgroundColor: '#b3bac2', childViews: ->(panel) do
       panel.button text: '1'

data/app/views/json_ui/garage/panels/responsive.json.jbuilder

@@ -4,6 +4,18 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h1 text: 'Show/hide'
+  scroll.panels_responsive id: 'res1', width: 300, backgroundColor: '#b3bac2', childViews: ->(panel) do
+    panel.button text: '1'
+    panel.button text: '2'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'res1', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'res1', data: { displayed: false }
+  end
+
   scroll.h1 text: 'Panels Columns'
   scroll.label text: 'Shrink the browser\'s width to see how the column panels are rearranged. On mobile screens, they are always arranged vertically'
   scroll.spacer height: 8

data/app/views/json_ui/garage/panels/ul.json.jbuilder

@@ -4,6 +4,19 @@ page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.h2 text: 'Show/hide'
+  scroll.spacer height: 6
+  scroll.panels_ul id: 'ul', childViews: ->(li) do
+    li.label text: 'text1'
+    li.label text: 'text2'
+  end
+  scroll.button text: 'show', onClick: ->(action) do
+    action.components_set targetId: 'ul', data: { displayed: true }
+  end
+  scroll.button text: 'hide', onClick: ->(action) do
+    action.components_set targetId: 'ul', data: { displayed: false }
+  end
+  scroll.spacer height: 14
   scroll.h2 text: 'Standard Usage'
   scroll.spacer height: 6
   scroll.panels_ul childViews: ->(ul) do

data/app/views/json_ui/garage/panels/vertical.json.jbuilder

@@ -4,6 +4,19 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
 
   page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+
+    scroll.h1 text: 'Show/Hide'
+    scroll.panels_vertical id: 'vert1', width: 200, height: 100, backgroundColor: '#b3bac2', childViews: ->(panel) do
+      panel.button text: 'Button1'
+    end
+    scroll.button text: 'show', onClick: ->(action) do
+      action.components_set targetId: 'vert1', data: { displayed: true }
+    end
+    scroll.button text: 'hide', onClick: ->(action) do
+      action.components_set targetId: 'vert1', data: { displayed: false }
+    end
+
+    scroll.label text: "\n"
     scroll.h1 text: 'Basic'
     scroll.panels_vertical backgroundColor: '#b3bac2', childViews: ->(panel) do
       panel.button text: 'Button1'

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

@@ -2257,7 +2257,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     icon_names.each do |icon_name|
       scroll.panels_column lg: { cols: 4 }, childViews: ->(column) do
         column.panels_horizontal align: 'middle', childViews: ->(horizontal) do
-          horizontal.icon spec: icon_name
+          horizontal.icon name: icon_name
           horizontal.spacer width: 6
           horizontal.label text: icon_name
 

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

@@ -11,7 +11,7 @@ json_ui_page json do |page|
         flow.treeView \
           inputName: 'user',
           url: json_ui_garage_url(path: 'forms/generic_post'),
-          directUploadUrl: rails_direct_uploads_url,
+          directUploadUrl: glib_direct_uploads_url,
           width: 240,
           selected: 'parent-1',
           items: [

data/config/routes.rb

@@ -5,5 +5,7 @@ Glib::Web::Engine.routes.draw do
     patch 'json_ui_garage', to: 'home#json_ui_garage'
     delete 'json_ui_garage', to: 'home#json_ui_garage'
     post 'chat', to: 'home#chat'
+
+    resources :glib_direct_uploads, only: [:create]
   end
 end

data/lib/active_storage/service/glib_s3_service.rb

@@ -0,0 +1,22 @@
+require 'active_storage/service/s3_service'
+
+module ActiveStorage
+  class Service::GlibS3Service < Service::S3Service
+    attr_accessor :tagging
+
+    # This is cause problem because S3 server ignore `x-amz-tagging` query params so it fails to tagging an object
+    # API: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Presigner.html#presigned_request-instance_method
+    # Detail about problem: https://github.com/aws/aws-sdk/issues/782
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
+      instrument :url, key: key do |payload|
+        generated_url, headers = object_for(key).presigned_request :put, expires_in: expires_in.to_i,
+          content_type: content_type, content_length: content_length, content_md5: checksum,
+          metadata: custom_metadata, whitelist_headers: ['content-length'], tagging: tagging, **upload_options
+
+        payload[:url] = generated_url
+
+        [generated_url, headers]
+      end
+    end
+  end
+end

data/lib/glib/engine.rb

@@ -2,13 +2,6 @@ module Glib
   module Web
     class Engine < ::Rails::Engine
       # isolate_namespace Glib::Web
-
-      # modify direct upload
-      config.to_prepare do
-        require_relative 's3_service'
-        require_relative 'blob'
-        require_relative 'direct_uploads_controller'
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.2.0
 platform: ruby
 authors:
 - ''
@@ -14,16 +14,16 @@ dependencies:
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,30 @@ dependencies:
   name: actioncable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: js_regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '3.11'
 description: 
 email: ''
 executables: []
@@ -86,6 +100,7 @@ files:
 - app/controllers/concerns/glib/json/traversal.rb
 - app/controllers/concerns/glib/json/ui.rb
 - app/controllers/concerns/glib/json/validation.rb
+- app/controllers/glib/glib_direct_uploads_controller.rb
 - app/controllers/glib/home_controller.rb
 - app/helpers/glib/app_feature_support_helper.rb
 - app/helpers/glib/dynamic_images_helper.rb
@@ -134,6 +149,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
@@ -301,6 +317,7 @@ files:
 - app/views/layouts/json_ui/no_custom.html.erb
 - app/views/layouts/json_ui/renderer.html.erb
 - config/routes.rb
+- lib/active_storage/service/glib_s3_service.rb
 - lib/generators/glib/install_generator.rb
 - lib/generators/templates/20191017062519_create_texts.rb
 - lib/generators/templates/20191024063257_add_scope_to_texts.rb
@@ -309,9 +326,7 @@ files:
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
-- lib/glib/blob.rb
 - lib/glib/crypt/utils.rb
-- lib/glib/direct_uploads_controller.rb
 - lib/glib/dynamic_text.rb
 - lib/glib/dynamic_text/config.rb
 - lib/glib/engine.rb
@@ -329,7 +344,6 @@ files:
 - lib/glib/json_crawler/http.rb
 - lib/glib/json_crawler/router.rb
 - lib/glib/mailer_tester.rb
-- lib/glib/s3_service.rb
 - lib/glib/test_helpers.rb
 - lib/glib/time_freezable_mailer.rb
 - lib/glib/time_returning_mailer.rb

data/lib/glib/blob.rb

@@ -1,23 +0,0 @@
-::ActiveStorage::Blob.class_eval do
-  attr_accessor :tagging
-
-  # removing custom_metadata and add tagging
-  def service_headers_for_direct_upload
-    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum, tagging: tagging
-  end
-  def service_url_for_direct_upload(expires_in: ActiveStorage.service_urls_expire_in)
-    service.url_for_direct_upload key, expires_in: expires_in, content_type: content_type, content_length: byte_size, checksum: checksum, custom_metadata: custom_metadata, tagging: tagging
-  end
-
-  class << self
-    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil, tagging: nil)
-      key_name = key || generate_unique_secure_token
-      if prefix.present?
-        key_name = "#{prefix}/#{key_name}"
-      end
-      blob = create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
-      blob.tagging = tagging
-      blob
-    end
-  end
-end

data/lib/glib/direct_uploads_controller.rb

@@ -1,32 +0,0 @@
-::ActiveStorage::DirectUploadsController.class_eval do
-  # include Rails.application.routes.url_helpers
-  before_action :authenticate_user!
-
-  rescue_from StandardError do |e|
-    if !Rails.env.production?
-      raise e
-    end
-    render json: { message: 'Upload failed' }, status: 500
-  end
-
-  rescue_from Glib::Auth::Policy::UnauthorizedError do
-    render json: { message: 'Forbidden' }, status: 403
-  end
-
-  rescue_from ActionController::InvalidAuthenticityToken do
-    render json: { message: 'Session expired. Please refresh page' }, status: 401
-  end
-
-  private
-    def blob_args
-      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, :tagging, metadata: {}).to_h.symbolize_keys
-    end
-
-    def authenticate_user!
-      current_user.present? ? nil : raise_error
-    end
-
-    def raise_error
-      raise Glib::Auth::Policy::UnauthorizedError
-    end
-end

data/lib/glib/s3_service.rb

@@ -1,30 +0,0 @@
-require 'active_storage/service/s3_service'
-
-::ActiveStorage::Service::S3Service.class_eval do
-  attr_reader :headers_for_request
-
-  # Change presigned_url to presigned_request
-  # appearently presigned_url hoist all header `x-amz-` to query params.
-  # This is cause problem because S3 server ignore `x-amz-tagging` query params so it fails to tagging an object
-  # API: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Presigner.html#presigned_request-instance_method
-  # Detail about problem: https://github.com/aws/aws-sdk/issues/782
-  def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, tagging: nil, custom_metadata: {})
-    instrument :url, key: key do |payload|
-      generated_url, headers = object_for(key).presigned_request :put, expires_in: expires_in.to_i,
-        content_type: content_type, content_length: content_length, content_md5: checksum,
-        metadata: custom_metadata, whitelist_headers: ['content-length'], tagging: tagging, **upload_options
-
-      payload[:url] = generated_url
-      @headers_for_request = headers
-
-      generated_url
-    end
-  end
-
-  def headers_for_direct_upload(key, content_type:, checksum:, filename: nil, disposition: nil, tagging: nil, custom_metadata: {}, **)
-    content_disposition = content_disposition_with(type: disposition, filename: filename) if filename
-
-    headers = { 'Content-Type' => content_type, 'Content-MD5' => checksum, 'Content-Disposition' => content_disposition, **custom_metadata_headers(custom_metadata) }
-    headers.merge(headers_for_request)
-  end
-end