glib-web 4.36.7 → 4.36.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8defef028088f5b2924990e19bbc9e3f046bf7ca1adcb9ba2ea12b8b91821b0
-  data.tar.gz: e8b48a98fea6164325bde300b81523f18343647c3e67293bbf6a7dc99f1a7d18
+  metadata.gz: a129200d9f396b24db166b36cb58d42ed7b4b82fef85effb1e4782b85b619a31
+  data.tar.gz: 8ff5a30a9cdd8bb2fd89372a239da566a35b4617effd71a35fe73f3bccb436cf
 SHA512:
-  metadata.gz: 197045903a729f2a05cab3e0466d6ea0f30513a1cb8fc555e2a3233537463dd6b9261afe05a8e8b9ce91eab943aa8f9fd801c2492e6413e9350ea86432c400e3
-  data.tar.gz: d64dd6940a50e85149fe84de93f37c4409fc8db35a25d3f7ca94516e1f92924143c75dc866c0e1b49306aa522b437af9aac21be25d862ee1be9a7bae2938a4d3
+  metadata.gz: 293918253138add8bf8cdac4478a149b70f937fefb30aeb48883ea0e0cc5c85141a1e1210045a91a42780ab625e81c27181253fc234fa7863823e802987a6fbe
+  data.tar.gz: c939145b8d54205bcafb938791a6ab7f837895c8ddd42a80d20a4e963aef843228f2ec87b293c53b7d8578870e118ba7576c69251506e513c4fdb1b472a75bf0

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

@@ -13,6 +13,7 @@ class Glib::JsonUi::ActionBuilder
         bool :persistent
         hash :overlay, required: [:closeOnFocus]
         singleton_array :styleClass, :styleClasses
+        bool :updateExisting
       end
     end
 
@@ -26,7 +27,6 @@ class Glib::JsonUi::ActionBuilder
       include PopoverAttributes
 
       string :url
-      bool :updateExisting
     end
 
     class Close < Action

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

@@ -20,7 +20,7 @@ module Glib
         icon :icon
         action :onClick
         bool :disabled
-        # hash :tooltip
+        bool :expanded
         singleton_array :styleClass, :styleClasses
 
         def childButtons(block)

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

@@ -324,6 +324,7 @@ class Glib::JsonUi::ViewBuilder
 
     class Radio < View
       string :label
+      string :subtitle
       string :value
       action :onClick
       string :offIcon
@@ -334,6 +335,7 @@ class Glib::JsonUi::ViewBuilder
       views :childViews
     end
 
+    # Deprecated
     class File < Text
       # file_rules = { fileType: 'image/*', maxFileSize: 5000 }
       # file_rules = { fileType: 'video/*', maxFileSize: 50000 }
@@ -379,19 +381,17 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
+    # deprecated
     class MultiUpload < AbstractField
       include Glib::JsonUi::Default
       include Glib::JsonUi::Upload
+      include Glib::JsonUi::FileUploadErrorHandler
 
       array :files
       string :uploadTitle
       action :onFinishUpload
       string :url # http post end point if you don't want to use onFinishUpload
 
-      def accepts(value)
-        @accepts = value
-      end
-
       def files(values)
         @files = values
       end
@@ -402,6 +402,7 @@ class Glib::JsonUi::ViewBuilder
 
       def created
         super
+        file_upload_error_handler_on_create
 
         @placeholder ||= I18n.t('glib.multi_upload.placeholder', default: nil)
         @hint ||= I18n.t('glib.multi_upload.hint', default: nil)
@@ -420,8 +421,6 @@ class Glib::JsonUi::ViewBuilder
         json.placeholder @placeholder if @placeholder
         json.hint @hint if @hint
 
-        json.accepts default_accepts(@accepts)
-
         if @prop && context
           # association = form.nested_associations.last
           # context = association || form
@@ -433,6 +432,52 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
+    class Upload < AbstractField
+      include Glib::JsonUi::Upload
+      include Glib::JsonUi::FileUploadErrorHandler
+
+      action :onFinishUpload
+      bool :multiple
+      hash :placeholderView, required: [:type, :width, :height], optional: [:url]
+      hash :inputView, optional: [:multiple, :files, :variant]
+
+      def multiProgressView(values)
+        @multi_progress = values
+      end
+
+      def created
+        super
+        file_upload_error_handler_on_create
+
+        @placeholder ||= I18n.t('glib.multi_upload.placeholder', default: nil)
+        @hint ||= I18n.t('glib.multi_upload.hint', default: nil)
+
+        if @prop && context && @multi_progress
+          @multi_progress['files'] ||= context.field_value(@prop, collect_ids: false).to_a.map { |file| { name: file.blob&.filename, signed_id: file.signed_id, url: url_for(file) } }
+        end
+
+        if @multi_progress
+          @multi_progress['responseMessages'] ||= {}
+          ['200', '403', '401', 'else'].each do |status|
+            key = "glib.multi_upload.responseMessages.#{status}"
+            @multi_progress['responseMessages'][status] = I18n.t(key) if I18n.exists?(key)
+          end
+
+          json.responseMessages (@multi_progress['responseMessages'] || {}).reverse_merge({
+            '200' => 'Completed',
+            '403' => 'Forbidden',
+            '401' => 'Session expired',
+            'else' => 'Failed'
+          })
+
+          json.placeholder @placeholder if @placeholder
+          json.hint @hint if @hint
+
+          json.multiProgressView @multi_progress
+        end
+      end
+    end
+
     class Sign < AbstractField
       string :directUploadUrl
       required :directUploadUrl

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

@@ -15,6 +15,79 @@ module Glib
       end
     end
 
+    module FileUploadErrorHandler
+      extend ActiveSupport::Concern
+
+      included do
+        def accepts(options)
+          @accepts = options.with_indifferent_access
+        end
+
+        def onMaxFileLengthError(handler)
+          @onMaxFileLengthError = handler
+        end
+
+        def onMaxFileSizeError(handler)
+          @onMaxFileSizeError = handler
+        end
+
+        def onFileTypeError(handler)
+          @onFileTypeError = handler
+        end
+
+        def file_upload_error_handler_on_create
+          @accepts ||= {}
+          if @onMaxFileSizeError.blank?
+            @onMaxFileSizeError = ->(action) do
+              action.snackbars_alert \
+                message: I18n.t(
+                  'glib.fields.upload.on_max_file_size_error',
+                  max: @accepts['maxFileSize'],
+                  default: "Your upload failed because your file is too large. Please select a file that is smaller than the maximum allowed size of #{@accepts['maxFileSize']} KB and try again."),
+                styleClass: 'error'
+            end
+          end
+
+          if @onMaxFileLengthError.blank?
+            @onMaxFileLengthError = ->(action) do
+              action.snackbars_alert \
+                message: I18n.t(
+                  'glib.fields.upload.on_max_file_length_error',
+                  max: @accepts['maxFileLength'],
+                  default: "You can't upload more than the maximum number of files allowed. The limit is #{@accepts['maxFileLength']} files."),
+                styleClass: 'error'
+            end
+          end
+
+          if @onMaxFileLengthError.blank?
+            @onMaxFileLengthError = ->(action) do
+              action.snackbars_alert \
+                message: I18n.t(
+                  'glib.fields.upload.on_max_file_length_error',
+                  max: @accepts['maxFileLength'],
+                  default: "You can't upload more than the maximum number of files allowed. The limit is #{@accepts['maxFileLength']} files."),
+                styleClass: 'error'
+            end
+          end
+
+          if @onFileTypeError.blank?
+            @onFileTypeError = ->(action) do
+              action.snackbars_alert \
+                message: I18n.t(
+                  'glib.fields.upload.on_file_type_error',
+                  default: 'The file you uploaded is not a supported file type.'),
+                styleClass: 'error'
+            end
+          end
+
+          json.accepts @accepts
+          json.set!('onMaxFileSizeError') { @onMaxFileSizeError.call(page.action_builder) }
+          json.set!('onMaxFileLengthError') { @onMaxFileLengthError.call(page.action_builder) }
+          json.set!('onFileTypeError') { @onFileTypeError.call(page.action_builder) }
+        end
+      end
+    end
+
     class ViewBuilder < AbstractBuilder
       def initialize(json, page, multiple)
         super(json, page)

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

@@ -58,6 +58,17 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
       menu.divider
       menu.label text: 'Misc Menu'
 
+      menu.button icon: 'list', text: 'Parent', expanded: true, onClick: ->(action) do
+      end, childButtons: ->(parent) do
+        parent.button text: 'Child 1', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'lists/index')
+        end
+        parent.button text: 'Child 2', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/index')
+        end
+      end
+
+
       menu.button icon: 'notifications', text: 'Notifications', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'notifications/index')
       end

data/app/views/json_ui/garage/actions/_reload.json.jbuilder

@@ -16,6 +16,12 @@ section.rows builder: ->(template) do
     action.windows_reload url: json_ui_garage_url(path: 'actions/index', reload_counter: reload_counter + 1)
   end
 
+  template.thumbnail title: 'windows/reload (onReload)', onClick: ->(action) do
+    action.windows_reload onReload: ->(saction) do
+      saction.snackbars_alert message: 'onReload called'
+    end
+  end
+
   template.thumbnail title: "components/replace (counter: #{reload_counter})", onClick: ->(action) do
     action.http_get url: json_ui_garage_url(path: 'actions/partial_update', reload_counter: reload_counter + 1)
   end

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

@@ -48,7 +48,7 @@ page.form options.merge(childViews: ->(form) do
     width: 360,
     accepts: {
       fileType: 'image',
-      maxFileSize: 10,
+      maxFileSize: 100,
       maxFileLength: 2,
       maxFileLengthErrorText: {
         body: 'try with a smaller number of files',

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

@@ -0,0 +1,128 @@
+json.title 'Forms'
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+image = OpenStruct.new(
+  url: 'https://picsum.photos/id/11/100/60',
+  signed_id: 'test',
+  filename: 'upload.png'
+)
+
+accepts = {
+  fileType: 'image',
+  maxFileSize: 100,
+  maxFileLength: 2
+}
+
+if params[:mode] == 'html'
+  directUploadUrl = nil
+else
+  directUploadUrl = glib_direct_uploads_url
+end
+
+properties = {
+  styleClass: 'pb-2',
+  directUploadUrl: params,
+  accepts: accepts,
+  directUploadUrl: directUploadUrl,
+  value: image&.signed_id
+}
+
+# properties[:onMaxFileLengthError] = ->(action) do
+#   action.snackbars_alert message: 'max file length exceeded'
+# end
+
+# properties[:onMaxFileSizeError] = ->(action) do
+#   action.snackbars_alert message: 'max file size exceeded'
+# end
+
+# properties[:onFileTypeError] = ->(action) do
+#   action.snackbars_alert message: 'file type invalid'
+# end
+
+properties[:onFinishUpload] = ->(action) do
+  action.snackbars_alert message: 'Get the signed ids!'
+end
+
+page.form \
+  url: json_ui_garage_url(path: 'forms/generic_post'),
+   method: 'post',
+   padding: { top: 12, left: 20, right: 20, bottom: 12 },
+   childViews: ->(form) do
+     form.panels_flow styleClass: 'items-center justify-center gap-2 pb-4', childViews: ->(flow) do
+       flow.label text: "MODE: #{params[:mode] || 'directUpload'}"
+       change = params[:mode] == 'html' ? 'directUpload' : 'html'
+       flow.button text: 'Change', onClick: ->(action) { action.windows_open url: json_ui_garage_current_url({ mode: change }) }
+     end
+
+     form.h2 text: 'Field Upload', styleClass: 'pb-4'
+     form.label text: 'placeholder image', styleClass: 'pb-1'
+     form.panels_flow styleClass: 'align-center', xs: { gap: { all: 4 } }, childViews: ->(flow) do
+       form.fields_upload properties.merge(
+         name: 'user[file_placeholderView]',
+         id: 'pv1',
+         placeholderView: { type: 'image', url: image&.url, width: 144, height: 144 }
+        )
+
+       flow.button text: 'trigger', onClick: ->(action) do
+         action.components_invoke targetId: 'pv1', name: 'trigger'
+       end
+       flow.button text: 'reset', onClick: ->(action) do
+         action.components_invoke targetId: 'pv1', name: 'reset'
+       end
+     end
+
+     form.label text: 'placeholder avatar', styleClass: 'pb-1'
+     form.panels_flow styleClass: 'align-center', xs: { gap: { all: 4 } }, childViews: ->(flow) do
+       flow.fields_upload \
+         properties.merge(
+           name: 'user[file_placeholderView2]',
+           id: 'pv2',
+           placeholderView: { type: 'avatar', url: image&.url, width: 64, height: 64 }
+         )
+
+     end
+
+     form.label text: 'file input', styleClass: 'pb-1'
+     form.fields_upload \
+       properties.merge(
+         name: 'user[file_input1]',
+         id: 'fi1',
+         label: 'Upload file',
+         width: 300,
+         label: 'Choose file',
+         inputView: { variant: 'outlined' },
+         multiple: false
+       )
+
+
+     form.label text: 'multiprogress', styleClass: 'pb-1'
+     form.fields_upload \
+       properties.merge(
+         name: 'user[file_multiprogress1][]',
+         id: 'mp1',
+         width: 300,
+         label: 'Upload file',
+         multiple: true,
+         multiProgressView: { files: [] }
+       )
+
+
+     form.label text: 'Button file upload', styleClass: 'pb-1'
+     form.button text: 'click me to select file', onClick: ->(action) do
+       action.components_invoke targetId: 'btn1', name: 'trigger'
+     end
+     form.fields_upload \
+       properties.merge(
+         name: 'user[file_btn1][]',
+         id: 'btn1',
+         width: 300,
+         label: 'Upload file',
+         multiple: true,
+         inputView: { files: [] },
+         styleClass: 'pb-4 d-none'
+       )
+
+     form.fields_submit text: 'submit'
+
+   end

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

@@ -72,6 +72,9 @@ page.list sections: [
       template.thumbnail title: 'File Upload', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/file_upload')
       end
+      template.thumbnail title: 'File Upload (NEW)', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'forms/file_upload_new')
+      end
       template.thumbnail title: 'Floating Submit', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/floating_submit')
       end

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

@@ -65,6 +65,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
         key: 'menu2',
         placement: 'right-start',
         width: 200,
+        updateExisting: true,
         content: ->(dialog) do
           dialog.body styleClass: 'popover-menu', padding: glib_json_padding_body, childViews: ->(res) do
             res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
@@ -95,7 +96,8 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
       action.popovers_open \
         url: json_ui_garage_url(path: 'views/popovers_open', key: key),
         styleClass: 'popover-container',
-        key: key
+        key: key,
+        updateExisting: true
     end
 
   scroll.spacer height: 10

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

@@ -1,7 +1,10 @@
+sleep 1
+
 page = json_ui_page json
 
 page.body childViews: ->(body) do
-  body.panels_responsive styleClass: 'popover-menu', childViews: ->(sres) do
+  body.panels_form styleClass: 'popover-menu', childViews: ->(sres) do
+    sres.fields_select options: ['A', 'B'].map { |v|  { text: v, value: v } }, name: 'user[select]', label: 'Select', width: 'matchParent'
     sres.p text: "Current time: #{DateTime.current}", styleClass: 'pb-2'
     sres.button text: 'Update', onClick: ->(action) do
       action.popovers_open url: json_ui_garage_url(path: 'views/popovers_open', key: params[:key]), key: params[:key], updateExisting: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.36.7
+  version: 4.36.9
 platform: ruby
 authors:
 - ''
@@ -268,6 +268,7 @@ files:
 - app/views/json_ui/garage/forms/dynamic_select.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder
 - app/views/json_ui/garage/forms/file_upload.json.jbuilder
+- app/views/json_ui/garage/forms/file_upload_new.json.jbuilder
 - app/views/json_ui/garage/forms/floating_submit.json.jbuilder
 - app/views/json_ui/garage/forms/full_page_form.json.jbuilder
 - app/views/json_ui/garage/forms/full_page_form_dialog.json.jbuilder