glib-web 5.0.4 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e524f15bee8e6c628653e76d1785f79410bed28efd00504e6dfeab4368e0d2
-  data.tar.gz: e7aef35ec5bdee993bef230ebda57dcbbee5c20f2b7b15633f4b2bea5aba0375
+  metadata.gz: 2e9d0b6eb1a02d147f08a0166a4d67075ebbf903af3601e78ab592c5f9a11808
+  data.tar.gz: ee0d8980dfa1158fa65126b8d29dad29e2b788f1b51e4fb062a2de306a1d789a
 SHA512:
-  metadata.gz: 6cf36807eaf18d6260a603451835ccfbf449aef03ba8a37141428dc094997e6130c304756d473f198419852b504b7aad8c2fe84f36594036cf82a526857558e3
-  data.tar.gz: 40888a54de77dc4560411d06b3a05bdbf805e12b90985fd87b0a03dcce600c4029c7bd2c8c36e140c61147d060b23d1d61eb14aaaaa4e8a38b113a05ac99af1a
+  metadata.gz: 21960f43365ee50457f2ad2856d5bf5e6cf6c1a5014332006e9fe43e7f2e6cec9633a35cb5678a34388310d88e69222ab4641d1267125e87e01d822d00fb7e4f
+  data.tar.gz: cf920f5f56177c092fc2bd84bacf4b096d1b41ae4364b47bcfe3beba1b58bb8afa76883a33210a9f9ad709085c7dc33644933128cddbe93b4ff2251e6f2367b5

data/app/controllers/concerns/glib/analytics/funnel.rb

@@ -38,7 +38,16 @@ module Glib::Analytics
       referrer_url = request.headers['referer'] # Notice that the HTTP header uses one "r"
       if group.nil? && action.nil? && !referrer_url.nil?
         current_host = request.host
-        referrer_host = URI.parse(referrer_url).host
+        # The Referer header is attacker-controlled and may not be a valid URI
+        # (scanners send junk like "() { ignored; }; cat /etc/passwd"). Treat an
+        # unparseable referer as "no referer" rather than letting URI::InvalidURIError
+        # bubble up mid-render, where the 500 rescue then double-renders.
+        referrer_host =
+          begin
+            URI.parse(referrer_url).host
+          rescue URI::InvalidURIError
+            nil
+          end
 
         # Replace the subdomain portion with regex so it will only match the non-subdomain part.
         # This will allow cross-subdomain referral, but it will not work if the host is a bare domain,

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

@@ -249,6 +249,13 @@ module Glib::Json::Libs
           Rollbar.error(exception, use_exception_level_filters: true)
         end
 
+        # The exception may have been raised AFTER a response was already rendered
+        # (e.g. from an after_action injection). Rendering the error page on top of that
+        # would raise AbstractController::DoubleRenderError, which masks the genuine
+        # exception reported above. The real cause is already logged, so leave the
+        # already-rendered response in place rather than double-rendering.
+        return if performed?
+
         render file: Rails.root.join('public', '500.html'), status: :internal_server_error
       else
         raise exception
@@ -261,6 +268,12 @@ module Glib::Json::Libs
   def glib_json_handle_404(exception, preview_mode)
     if json_ui_activated?
       if Rails.env.production? || preview_mode
+        # As with glib_json_handle_500: if a response was already rendered (e.g. an
+        # after_action raised RecordNotFound), rendering the 404 page on top would raise
+        # AbstractController::DoubleRenderError and mask the real exception. Keep the
+        # already-rendered response instead of double-rendering.
+        return if performed?
+
         render file: Rails.root.join('public', '404.html'), status: :not_found
       else
         raise exception

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

@@ -641,6 +641,7 @@ class Glib::JsonUi::ViewBuilder
       def created
         super
 
+        json.searchable true
         json.options glib_time_zone_options
       end
     end
@@ -761,7 +762,8 @@ class Glib::JsonUi::ViewBuilder
       action :onFinishUpload
       bool :multiple
       hash :placeholderView, required: [:type, :width, :height], optional: [:url]
-      hash :inputView, optional: [:multiple, :files, :variant]
+      hash :inputView, optional: [:files, :variant]
+      hash :clipboardView, optional: [:icon]
 
       def multiProgressView(values)
         @multi_progress = values
@@ -775,7 +777,9 @@ class Glib::JsonUi::ViewBuilder
         @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) } }
+          value = context.field_value(@prop, collect_ids: false)
+          attachments = value.is_a?(::ActiveStorage::Attached::One) ? Array.wrap(value.attachment) : value.to_a
+          @multi_progress['files'] ||= attachments.map { |file| { name: file.blob&.filename, signed_id: file.signed_id, url: url_for(file) } }
         end
 
         if @multi_progress

data/app/models/concerns/glib/enum_symbolization.rb

@@ -0,0 +1,26 @@
+module Glib
+  # Class-level helper that overrides one or more enum readers to return a
+  # symbol instead of Rails' default string form. Lets callers compare with
+  # `record.status == :active` without having to remember which form they're
+  # holding (see backend/01a_defensive_programming.md item 7).
+  #
+  # Usage:
+  #
+  #   class Order < ApplicationRecord
+  #     enum :payment_status, { draft: 0, pending: 1, finalized: 2 }
+  #     enum :finalize_intent, { unknown: 0, charge: 1 }, prefix: true
+  #
+  #     enum_symbolize :payment_status, :finalize_intent
+  #   end
+  module EnumSymbolization
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def enum_symbolize(*attrs)
+        attrs.each do |attr|
+          define_method(attr) { super()&.to_sym }
+        end
+      end
+    end
+  end
+end

data/app/models/glib/application_record.rb

@@ -1,6 +1,7 @@
 module Glib
   class ApplicationRecord < ActiveRecord::Base
     include EnumHumanization
+    include EnumSymbolization
 
     self.abstract_class = true
 

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

@@ -23,12 +23,14 @@ nav_groups = {
   'Forms' => [
     'auto_validate',
     'dirty_state',
+    'fields_text',
     'fields_select',
     'fields_dynamicSelect',
     'fields_date_time',
     'fields_location',
     'fields_phone',
     'fields_otp',
+    'fields_radio',
     'fields_rating',
     'fields_richText',
     'fields_sign',
@@ -59,6 +61,7 @@ nav_groups = {
     'responsive',
     'scroll',
     'split',
+    'tabBar',
     'timeline',
     'ul',
     'vertical',
@@ -72,40 +75,40 @@ nav_groups = {
     'charts',
     'image',
     'multimedia_video',
-    'progressCircle'
+    'progressCircle',
+    'switch'
   ]
 }
 
 current_path = params[:path].to_s
 
-view.panels_vertical(
-  styleClass: 'align-right',
-  width: 'matchParent',
-  childViews: ->(res) do
+page.navBar height: 44, backgroundColor: '#a8c4e3', color: '#ffffff', showTitle: true, rightButtons: ->(menu) do
+  menu.button icon: { name: 'refresh' }, onClick: ->(action) do
+    action.windows_reload
+  end
+  menu.button icon: { name: 'open_in_new' }, onClick: ->(action) do
+    action.windows_open url: json_ui_garage_current_url(step: params[:step].to_i + 1)
+  end
+end
+
+page.leftDrawer content: ->(drawer) do
+  drawer.header childViews: ->(header) do
+    header.button text: 'Test Page', styleClasses: ['link', 'logo'], onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'test_page/form')
+    end
+  end
+
+  drawer.rows builder: ->(menu) do
     nav_groups.each_with_index do |(group_name, items), group_index|
-      res.panels_flow(
-        innerPadding: { bottom: 0 },
-        childViews: ->(flow) do
-          flow.label text: "#{group_name}:"
-          flow.spacer width: 6
-          items.each_with_index do |nav, index|
-            nav_path = "test_page/#{nav}"
-            is_current = current_path == nav_path
-            if index != 0
-              flow.spacer width: 8
-            end
-            label_options = {
-            text: nav,
-            onClick: ->(action) do
-              action.windows_open url: json_ui_garage_url(path: nav_path)
-            end
-            }
-            label_options[:styleClass] = 'font-weight-bold' if is_current
-            flow.label(**label_options)
-          end
+      menu.divider if group_index > 0
+      menu.label text: group_name
+      items.each do |nav|
+        nav_path = "test_page/#{nav}"
+        is_current = current_path == nav_path
+        menu.button text: nav, styleClasses: (is_current ? ['font-weight-bold'] : []), onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: nav_path)
         end
-      )
-      res.spacer height: 4 if group_index < nav_groups.size - 1
+      end
     end
   end
-)
+end

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Auth)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Form)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     model = Glib::DummyJobApplication.new(
       name: 'John Deo',
       accept: '0',

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Browsers)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Calendar)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,8 +2,9 @@ json.title 'Test Page (Carousel)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body childViews: ->(body) do
-  render 'json_ui/garage/test_page/header', view: body
 
   body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
     res.h2 text: 'Overview'

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

@@ -68,8 +68,9 @@ line_series_churn = [
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body childViews: ->(body) do
-  render 'json_ui/garage/test_page/header', view: body
 
   body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
     res.h2 text: 'Charts'

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Column)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Commands)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Components)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Cookies)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Custom)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -4,9 +4,10 @@ json.title 'Test Page (Form)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_responsive(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -4,8 +4,9 @@ json.title 'Test Page (Dirty state)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body childViews: ->(body) do
-  render 'json_ui/garage/test_page/header', view: body
 
   body.panels_form padding: glib_json_padding_body, childViews: ->(form) do
     form.h2 text: 'Dirty state'

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Actions)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
     body.panels_form(
       padding: glib_json_padding_body,
       childViews: ->(res) do

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Captcha)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Credit Card)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Date/Datetime)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Dynamic Select)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Location)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields OTP)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,

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

@@ -2,9 +2,10 @@ json.title 'Test Page (Fields Phone)'
 
 page = json_ui_page json
 
+render 'json_ui/garage/test_page/header', json: json, page: page
+
 page.body(
   childViews: ->(body) do
-    render 'json_ui/garage/test_page/header', view: body
 
     body.panels_responsive(
       padding: glib_json_padding_body,