glib-web 3.18.0 → 3.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf4af5c0e02aea2238b616b170aa599142eec1ed727bfce9e8a8038a36e977f
-  data.tar.gz: 84f52100bf5e06d9483b25cac43f0b24348b49fdb1ad48e34e939325ba50d36a
+  metadata.gz: b694845415b32c179dd54e831edef944ae82293abefea78edd0e85f7d50f86ee
+  data.tar.gz: c67caa45c4f14951018bc6e518080580d0bec5b67a6f0ae1d81dd2d66798a053
 SHA512:
-  metadata.gz: 2e2c42eb2808ebe550d8893ff99da8d53214b881c05e59222344a28e267433653c747412950b367ff83edddb9d3f461f42e0bd6c474cd4d0486ee58787692377
-  data.tar.gz: 708220ca4f04d992f606bc579e90942b5e625f17e2fe80091396521203a1ef7026c614e7642e6438e7717f468aa8a2fefea46e65a32a27445f5644be98165e1f
+  metadata.gz: b4ddf953458f333208e87ae58f476ad23623762336e3b29d65b249528e37be86e378d07da26712e6180b698c98f1bc76ea7314d9a0814c4d2be52e65da0881f3
+  data.tar.gz: 84e6307d15fbebcbe60da0540df2a269f239fc7ec0701dd4647e9e27f13103450e82784d8218053b98194ec2a5c6ac720a188d6f664212183b38deb1a374df74

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

@@ -94,6 +94,10 @@ module Glib::Json::Traversal
       traverse_multiple view['leftButtons'], block
       traverse_multiple view['rightButtons'], block
 
+      # Select field
+      traverse_vertical_content view['header'], block
+      traverse_vertical_content view['footer'], block
+
       # Table row
       traverse_multiple view['cellViews'], block
 

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

@@ -269,7 +269,9 @@ module Glib
 
         def self.action(propName)
           define_method(propName) do |value|
-            json.set!(propName) { value.call(page.action_builder) }
+            if value # Allow nil value
+              json.set!(propName) { value.call(page.action_builder) }
+            end
           end
         end
 

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

@@ -1,5 +1,6 @@
 class Glib::JsonUi::ActionBuilder
   module Popovers
+    # Deprecated. Use popovers_show instead.
     class Open < Action
       string :key
       views :childViews
@@ -9,6 +10,17 @@ class Glib::JsonUi::ActionBuilder
       singleton_array :styleClass, :styleClasses
     end
 
+    class Show < Action
+      panels_builder :content, :body
+
+      string :key
+      # views :childViews
+      string :placement
+      int :offset
+      int :width
+      # singleton_array :styleClass, :styleClasses
+    end
+
     class Close < Action
       string :key
       action :onClose

data/app/helpers/glib/json_ui/builder/mouse_events.rb

@@ -15,12 +15,22 @@ module Glib
           key = 'tooltip_test'
         end
         onMouseEnter ->(action) do
-          action.popovers_open(
+          # action.popovers_open(
+          #   key: key,
+          #   placement: options[:placement] || 'top',
+          #   childViews: ->(view) {
+          #     view.p styleClass: 'tooltip', text: options[:text]
+          #   }
+          # )
+
+          action.popovers_show(
             key: key,
             placement: options[:placement] || 'top',
-            childViews: ->(view) {
-              view.p styleClass: 'tooltip', text: options[:text]
-            }
+            content: ->(popover) do
+              popover.body childViews: ->(view) {
+                view.p styleClass: 'tooltip', text: options[:text]
+              }
+            end
           )
         end
 

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

@@ -238,7 +238,11 @@ module Glib
           # TODO: try disabling this
           # options = options.reverse_merge(width: 'matchParent')
 
-          [:padding, :backgroundColor, :width, :height].each do |name|
+          if (styleClass = options.delete(:styleClass))
+            json.styleClasses [styleClass]
+          end
+
+          [:styleClasses, :padding, :backgroundColor, :width, :height].each do |name|
             if (value = options.delete(name))
               json.set! name, value
             end

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

@@ -301,7 +301,7 @@ class Glib::JsonUi::ViewBuilder
       array :files
       string :directUploadUrl
       string :uploadTitle
-      string :uploadFailedText
+      string :uploadFailedText # deprecated
 
       required :accepts, :directUploadUrl
 
@@ -319,12 +319,27 @@ class Glib::JsonUi::ViewBuilder
         @files = values
       end
 
+      def responseMessages(values)
+        @responseMessages = values
+      end
+
       def created
         super
 
         @placeholder ||= I18n.t('common.multi_upload.placeholder', default: nil)
         @hint ||= I18n.t('common.multi_upload.hint', default: nil)
 
+        ['200', '403', '401', 'else'].each do |status|
+          key = "common.multi_upload.responseMessages.#{status}"
+          @responseMessages[status] = I18n.t(key) if I18n.exists?(key)
+        end
+        json.responseMessages (@responseMessages || {}).reverse_merge({
+          '200' => 'File uploaded',
+          '403' => 'Forbidden',
+          '401' => 'Session expired',
+          'else' => 'Upload failed'
+        })
+
         json.placeholder @placeholder if @placeholder
         json.hint @hint if @hint
 

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

@@ -247,6 +247,7 @@ module Glib
 
         string :text
         action :onClick
+        icon :icon
       end
 
       class Calendar < View

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

@@ -39,6 +39,7 @@ page.form options.merge(childViews: ->(form) do
   form.spacer height: 16
   form.fields_multiUpload \
     name: 'user[multi][]',
+    width: 360,
     accepts: { fileType: 'image', maxFileSize: 5000 },
     directUploadUrl: rails_direct_uploads_url,
     uploadTitle: 'Files uploaded:',

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

@@ -3,8 +3,13 @@ json.title 'Forms'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
+if Object.const_defined?('User')
+  record = User.first
+end
+
 page.form \
   url: json_ui_garage_url(path: 'forms/generic_post'),
+  model: record,
   method: 'post',
   padding: glib_json_padding_body,
   childViews: ->(form) do
@@ -65,6 +70,14 @@ page.form \
     max: '2021-03-01',
     value: '2021-11'
 
+  if record.present?
+    form.fields_datetime \
+      prop: :created_at,
+      label: 'User created at',
+      placeholder: 'User created at',
+      width: 'matchParent'
+  end
+
   form.spacer height: 20
   form.h2 text: 'Country'
   form.spacer height: 6

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

@@ -1,6 +1,7 @@
 data = params[:user] || {}
 
 json_ui_response_with_view json do |action|
+  # Experimental. Continue to use `components_update` instead.
   action.components_replace targetId: 'preview', newView: ->(update) do
     update.panels_vertical childViews: ->(vertical) do
       vertical.label text: "Hello #{data[:name]},"

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

@@ -37,7 +37,7 @@ else
             'Thu, 15 Nov 2018' => 1,
             'Fri, 16 Nov 2018' => 5,
           }
-          json.points points.map { |k, v| { x: k, y: v } }
+          json.points points.map { |k, v| { x: k, y: v, label: v > 5 ? 'Greater than five' : v } }
         end,
         -> do
           json.title 'Line 2'
@@ -51,7 +51,7 @@ else
             'Thu, 15 Nov 2018' => 5,
             'Fri, 16 Nov 2018' => 1,
           }
-          json.points points.map { |k, v| { x: k, y: v } }
+          json.points points.map { |k, v| { x: k, y: v, label: v > 5 ? 'Greater than five' : v } }
         end
       ],
       plugins: default_plugins,
@@ -132,7 +132,7 @@ else
         legend: { display: false },
         colors: ['#fc5a8d', '#F5E216'],
         plugins: plugins,
-        dataPoints: [{ title: 'Strawberry', value: 25 }, { title: 'Banana', value: 75 }], legend: { display: false }
+        dataPoints: [{ title: 'Strawberry', value: 25, label: '❤ Strawberry' }, { title: 'Banana', value: 75, label: '❤ Banana' }], legend: { display: false }
 
       scroll.h2 text: 'Donut chart'
       scroll.charts_pie \
@@ -145,7 +145,7 @@ else
               {
                 text: 'Fruits',
                 font: {
-                  weigth: 'bold',
+                  weight: 'bold',
                   size: 20
                 }
               },

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

@@ -31,19 +31,38 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
 
   scroll.spacer height: 10
   scroll.button text: 'Button with dropdown', onClick: ->(action) do
-    action.popovers_open \
+    # action.popovers_open \
+    #   key: 'menu',
+    #   placement: 'left',
+    #   childViews: ->(view) do
+    #     view.panels_responsive styleClass: 'popover-menu', width: 200, childViews: ->(res) do
+    #       res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
+    #         saction.popovers_close key: 'menu'
+    #       end
+    #       res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
+    #         saction.popovers_close key: 'menu'
+    #       end
+    #       res.label text: 'Item 3', styleClass: 'popover-menu-item', onClick: ->(saction) do
+    #         saction.popovers_close key: 'menu'
+    #       end
+    #     end
+    #   end
+
+    action.popovers_show \
       key: 'menu',
       placement: 'left',
-      childViews: ->(view) do
-        view.panels_responsive styleClass: 'popover-menu', width: 200, childViews: ->(res) do
-          res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
-          end
-          res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
-          end
-          res.label text: 'Item 3', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
+      content: ->(dialog) do
+        dialog.body padding: glib_json_padding_body, childViews: ->(view) do
+          view.panels_responsive styleClass: 'popover-menu', width: 200, childViews: ->(res) do
+            res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
+              saction.popovers_close key: 'menu'
+            end
+            res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
+              saction.popovers_close key: 'menu'
+            end
+            res.label text: 'Item 3', styleClass: 'popover-menu-item', onClick: ->(saction) do
+              saction.popovers_close key: 'menu'
+            end
           end
         end
       end
@@ -54,20 +73,38 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     text: 'Button with tooltip and dropdown',
     tooltip: { text: 'Tooltip 1' },
     onClick: ->(action) do
-      action.popovers_open \
+      # action.popovers_open \
+      #   key: 'menu',
+      #   placement: 'bottom-start',
+      #   styleClass: 'popover-menu',
+      #   width: 200,
+      #   childViews: ->(res) do
+      #     res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
+      #       saction.popovers_close key: 'menu'
+      #     end
+      #     res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
+      #       saction.popovers_close key: 'menu'
+      #     end
+      #     res.label text: 'Item 3 with very very very very very long name', styleClass: 'popover-menu-item', onClick: ->(saction) do
+      #       saction.popovers_close key: 'menu'
+      #     end
+      #   end
+
+      action.popovers_show \
         key: 'menu',
         placement: 'bottom-start',
-        styleClass: 'popover-menu',
         width: 200,
-        childViews: ->(res) do
-          res.label text: 'Item 1', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
-          end
-          res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
-          end
-          res.label text: 'Item 3 with very very very very very long name', styleClass: 'popover-menu-item', onClick: ->(saction) do
-            saction.popovers_close key: 'menu'
+        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
+              saction.popovers_close key: 'menu'
+            end
+            res.label text: 'Item 2', styleClass: 'popover-menu-item', onClick: ->(saction) do
+              saction.popovers_close key: 'menu'
+            end
+            res.label text: 'Item 3 with very very very very very long name', styleClass: 'popover-menu-item', onClick: ->(saction) do
+              saction.popovers_close key: 'menu'
+            end
           end
         end
     end
@@ -87,13 +124,12 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
       action.dialogs_alert message: 'Perform action'
     end
 
-
-
   scroll.spacer height: 20
   scroll.h2 text: 'Chip'
   scroll.spacer height: 10
   scroll.chip \
     styleClass: 'success',
+    icon: 'done',
     text: 'Success',
     tooltip: { text: 'Tooltip text' }
   scroll.spacer height: 10

data/lib/glib/json_crawler/action_crawlers/dialogs_show.rb

@@ -0,0 +1,12 @@
+module Glib
+  module JsonCrawler
+    class DialogsShow < ActionCrawler
+      def initialize(http, args, action)
+        super(http)
+
+        @http.router.log action, nil
+        crawl args['body']&.[]('childViews')
+      end
+    end
+  end
+end

data/lib/glib/json_crawler/action_crawlers/forms_submit.rb

@@ -51,6 +51,12 @@ module Glib
           end
         end
 
+        if (on_submit = view['onSubmit']) && !on_submit[:__executed_by_crawler]
+          on_submit[:__executed_by_crawler] = true
+          perform(on_submit)
+          return
+        end
+
         case method
         when :patch, :put
           json = @http.patch url, action, params

data/lib/glib/json_crawler/router.rb

@@ -67,6 +67,8 @@ module Glib
             else
               self.log action, params['url']
             end
+          when 'dialogs/show-v1', 'dialogs/show', 'popovers/show-v1', 'popovers/show'
+            JsonCrawler::DialogsShow.new(http, params, action)
           when 'sheets/select-v1', 'sheets/select'
             JsonCrawler::Menu.new(http, params, action)
           when 'http/post-v1', 'http/post'

data/lib/glib/json_crawler.rb

@@ -8,5 +8,6 @@ require_relative './json_crawler/action_crawlers/windows_open'
 require_relative './json_crawler/action_crawlers/action_http'
 require_relative './json_crawler/action_crawlers/forms_submit'
 require_relative './json_crawler/action_crawlers/dialogs_alert'
+require_relative './json_crawler/action_crawlers/dialogs_show'
 require_relative './json_crawler/action_crawlers/menu'
 require_relative './json_crawler/action_crawlers/run_multiple'

data/lib/glib/mailer_tester.rb

@@ -15,6 +15,7 @@ module Glib
         preview_class.instance_methods(false).each do |mailer_method|
           test "mailer for #{preview_class}##{mailer_method}" do
             preview.send(mailer_method).deliver_now
+            Timecop.return # Allows mailer preview to use Timecop.freeze()
 
             logfile = File.join(log_dir, "#{preview_class.name.underscore}##{mailer_method}.txt")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.1
 platform: ruby
 authors:
 - ''
@@ -297,6 +297,7 @@ files:
 - lib/glib/json_crawler/action_crawler.rb
 - lib/glib/json_crawler/action_crawlers/action_http.rb
 - lib/glib/json_crawler/action_crawlers/dialogs_alert.rb
+- lib/glib/json_crawler/action_crawlers/dialogs_show.rb
 - lib/glib/json_crawler/action_crawlers/forms_submit.rb
 - lib/glib/json_crawler/action_crawlers/menu.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
@@ -328,7 +329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''