glib-web 3.24.0 → 3.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd39c10550b9bef746a929eef30b91bf4c71c38339d13c2afd874f3e5ac7858
-  data.tar.gz: bf8b5698b2a60b122f8ced2c312c73782daacf1b1c465e9655c64b658dd4d907
+  metadata.gz: a9b476d1e7ef1dc93819822ba3e2091c534d99fc7395246309f2224e522ca45b
+  data.tar.gz: fbd474cc63d4e30796ae43b2754bfdb0bf07416f923f90a7ec74d75f4924209a
 SHA512:
-  metadata.gz: fdd1ac28d0d3615a38145752d95f7a1bef47261c849936f498abeefcc49787ca79d488077fed7ef524e2994ae98e1d9aa45780a9ac05265939d7b15dc6cf7b9c
-  data.tar.gz: 88595a13ae7e0cd3fecc9b07f8087382980973cb98ea13ede1aa313c328f63473283a7861b8d16c7f73fa7330c372b20478e92aa8703696754f025046572e2ea
+  metadata.gz: 11e24fdad3d1538bda9d6c386053d54c6808e2ee1b1a239ea5839186faf5f097b56b04a5212572da8b11592bb07fa71200dc7f503b9e89ee59c3c9e6c9001d77
+  data.tar.gz: 3b7f3f4b4d4205d463410a87814018e1fcd482a69c8768609d9a87117ffb4d50ffaff22bf2b9f2cff5771b98bf6189cc598b48a200f3cb4692e16a50a05f088f

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

@@ -6,7 +6,8 @@ module Glib::Json::Libs
 
     helper_method :json_ui_app_bundle_id, :json_ui_app_build_version, :json_ui_app_device_os
     helper_method :json_ui_app_is_android?, :json_ui_app_is_ios?, :json_ui_app_is_web?
-    helper_method :json_ui_redirect_back_or_to
+    # helper_method :json_ui_redirect_back_or_to
+    helper_method :delete_redirect_back_url
 
     include Glib::Auth::Response
     helper_method :glib_json_dialog_mode?
@@ -115,7 +116,7 @@ module Glib::Json::Libs
 
   def glib_handle_401(sign_in_url)
     if !glib_json_dialog_mode? && request.get?
-      session[REDIRECT_BACK_KEY] = url_for(params.to_unsafe_h.merge(format: nil))
+      json_ui_save_return_url
     end
 
     respond_to do |format|
@@ -160,17 +161,22 @@ module Glib::Json::Libs
     session.delete(REDIRECT_BACK_KEY) || url
   end
 
+  def delete_redirect_back_url(url)
+    __delete_redirect_back_url(url)
+  end
+
   # def html_ui_redirect_back_or_to(default_url)
   #   redirect_url = __delete_redirect_back_url(default_url)
   #   redirect_to redirect_url
   # end
 
-  def json_ui_redirect_back_or_to(default_url, json_action)
-    redirect_url = __delete_redirect_back_url(default_url)
-    json_action.windows_closeAll onClose: ->(subaction) do
-      subaction.windows_open url: redirect_url
-    end
-  end
+  # def json_ui_redirect_back_or_to(default_url, json_action)
+  #   redirect_url = __delete_redirect_back_url(default_url)
+  #   json_action.windows_closeAll onClose: ->(subaction) do
+  #     puts "***** R2: #{redirect_url}"
+  #     subaction.windows_open url: redirect_url
+  #   end
+  # end
 
   def __glib_error_dialog(title, message)
     {
@@ -223,15 +229,17 @@ module Glib::Json::Libs
   end
 
   def json_ui_redirect_to(url)
-    # `onLoad` also executes in `onResponse` situation, e.g. form submit.
-    on_load = { action: 'windows/open', url: url }
+    on_response = { action: 'windows/open', url: url }
 
     if glib_json_dialog_mode?
       # Only do this in dialog mode because this seems to add to the rendering time
       # (i.e. longer flicker time), presumably due to the use of things like `nextTick()`.
-      on_load = { action: 'dialogs/close', onClose: on_load }
+      on_response = { action: 'dialogs/close', onClose: on_load }
     end
-    render json: { onLoad: on_load }
+
+    # Use onResponse because it is harder to guarantee that `onLoad` executes in Vuejs because it relies
+    # on app.vue's reactivity.
+    render json: { onResponse: on_response }
   end
 
   module ClassMethods

data/app/helpers/glib/enum_helper.rb

@@ -1,16 +1,24 @@
 module Glib
   module EnumHelper
-    def glib_enum_options(clazz, enum_field, keys: nil, include_hints: false)
+    def glib_enum_options(clazz, enum_field, keys: nil, hint_suffix: false, hint_subtitle: false)
       enum_name = enum_field.to_s
       keys ||= clazz.defined_enums[enum_name].keys
       keys.map do |i|
-        text = clazz.glib_enum_humanize(enum_field, i, include_hints: include_hints)
-        { text: text, value: i }
+        text = clazz.glib_enum_humanize(enum_field, i, hint_suffix: hint_suffix)
+        option = { text: text, value: i }
+        if hint_subtitle && (hint = clazz.glib_enum_hint(enum_field, i))
+          option[:subtitle] = hint
+        end
+        option
       end
     end
 
     # See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones and description
     def glib_time_zone_options
+      # For some reason, some offsets differ on some machines causing test failures.
+      # TZInfo::Timezone.default_dst = true
+      return [] if Rails.env.test?
+
       ActiveSupport::TimeZone.all.sort { |a, b|
         a.utc_offset <=> b.utc_offset
       }.collect { |tz|

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

@@ -30,6 +30,13 @@ class Glib::JsonUi::ActionBuilder
       required :fallbackUrl
     end
 
+    class CloseWithOpen < Action
+      string :url
+      action :onOpen
+
+      required :url
+    end
+
     # Any component can listen to the refresh_state event and react appropriately.
     # E.g. Stripe credit card component can refresh its token to make sure it is not stale.
     class RefreshState < Action

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

@@ -0,0 +1,24 @@
+module Glib
+  module JsonUi
+    module Default
+      def default_accepts(value)
+        default_max_size_error = {
+          body: I18n.t('common.accepts.max_file_size_error.body', default: '') || 'Files exceed the maximum size',
+          button: I18n.t('common.accepts.max_file_size_error.button', default: '') || 'Dismiss'
+        }
+        default_max_length_error = {
+          body: I18n.t('common.accepts.max_file_length_error.body', default: '') || 'Files exceed the maximum limit per upload',
+          button: I18n.t('common.accepts.max_file_length_error.button', default: '') || 'Dismiss'
+        }
+
+        {
+          fileType: value[:fileType],
+          maxFileSize: value[:maxFileSize] || 10000,
+          maxFileLength: value[:maxFileLength] || 10,
+          maxFileSizeErrorText: value[:maxFileSizeErrorText] || default_max_size_error,
+          maxFileLengthErrorText: value[:maxFileLengthErrorText] || default_max_length_error
+        }
+      end
+    end
+  end
+end

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

@@ -73,6 +73,8 @@ module Glib
       end
 
       class Page
+        include Glib::JsonUi::Default
+
         attr_reader :json, :context, :view_builder, :sview_builder, :action_builder, :menu_builder
         attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder
 
@@ -98,9 +100,9 @@ module Glib
           # @generic_content_builder = GenericBuilders::Content.new(json, self, @view_builder)
         end
 
-        def pasteFile(options = {})
-          json.pasteFile do
-            json.accepts options[:accepts]
+        def filePaster(options = {})
+          json.filePaster do
+            json.accepts default_accepts(options[:accepts])
             json.directUploadUrl options[:directUploadUrl]
             json.url options[:url]
             json.inputName options[:inputName]

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

@@ -317,7 +317,9 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class MultiUpload < AbstractField
-      hash :accepts
+      include Glib::JsonUi::Default
+
+      # hash :accepts
       array :files
       string :directUploadUrl
       string :uploadTitle
@@ -336,6 +338,10 @@ class Glib::JsonUi::ViewBuilder
         @hint = value
       end
 
+      def accepts(value)
+        @accepts = value
+      end
+
       def files(values)
         @files = values
       end
@@ -364,6 +370,8 @@ 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

data/app/helpers/glib/urls_helper.rb

@@ -1,7 +1,7 @@
 module Glib
   module UrlsHelper
-    def glib_url_current(override_params: params.to_unsafe_h, extra_params: {})
-      url_for(override_params.merge(extra_params.merge(only_path: false)))
+    def glib_url_current(replacement_params: params.to_unsafe_h, extra_params: {})
+      url_for(replacement_params.merge(extra_params.merge(only_path: false)))
     end
 
     def glib_url_equals_current?(url)

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

@@ -11,13 +11,13 @@ module Glib
       extend ClassMethods
     end
 
-    def glib_enum_humanize(enum_name, default_enum_value = nil, include_hints: false)
-      self.class.glib_enum_humanize(enum_name, send(enum_name) || default_enum_value, include_hints: include_hints)
+    def glib_enum_humanize(enum_name, default_enum_value = nil, hint_suffix: false)
+      self.class.glib_enum_humanize(enum_name, send(enum_name) || default_enum_value, hint_suffix: hint_suffix)
     end
   end
 
   module ClassMethods
-    def glib_enum_humanize(enum_name, enum_value, default_translation = nil, include_hints: false)
+    def glib_enum_humanize(enum_name, enum_value, default_translation = nil, hint_suffix: false)
       if enum_value
         translation_key = "activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}"
 
@@ -27,15 +27,22 @@ module Glib
           text = I18n.t(translation_key, default: default_translation)
         end
 
-        if include_hints
-          i18n_key = self.model_name.i18n_key
-          if (hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}.hint")).present?
-            text += " #{hint}"
-          end
+        if hint_suffix && (hint = glib_enum_hint(enum_name, enum_value))
+          text += " #{hint}"
         end
 
         text
       end
     end
+
+    def glib_enum_hint(enum_name, enum_value)
+      i18n_key = self.model_name.i18n_key
+      if (hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}.hint")).present?
+        # text += " #{hint}"
+        return hint
+      end
+
+      nil
+    end
   end
 end

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

@@ -84,6 +84,10 @@ section.rows builder: ->(template) do
     action.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_update2')
   end
 
+  template.thumbnail title: 'dialogs/open (with filePaster)', onClick: ->(action) do
+    action.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_update3')
+  end
+
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
     if respond_to?(:user_facebook_omniauth_authorize_url)
       provider = {

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

@@ -5,7 +5,7 @@ end
 
 section.rows builder: ->(template) do
   template.thumbnail title: 'sheets/select', onClick: ->(action) do
-    action.sheets_select message: 'Select one', buttons: ->(menu) do
+    action.sheets_select message: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed rutrum vel nisi in pharetra. Aenean mollis feugiat elementum. Donec tempor arcu fringilla risus finibus cursus. Donec eleifend ex sit amet odio rutrum, vitae ornare nunc congue. In hac habitasse platea dictumst. Curabitur at velit et odio ornare vestibulum sit amet vitae ex. Proin tincidunt rutrum libero vitae tempus.', buttons: ->(menu) do
       menu.button text: 'Option1', onClick: ->(subaction) do
         subaction.dialogs_alert message: 'Option 1'
       end

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

@@ -0,0 +1,28 @@
+json.title 'Forms'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.filePaster \
+  directUploadUrl: rails_direct_uploads_url,
+  accepts: {
+    fileType: 'image',
+    maxFileSize: 100,
+    maxFileLength: 1,
+    maxFileSizeErrorText: {
+      body: 'File too big. Max: 100KB',
+      button: 'Try again'
+    },
+    maxFileLengthErrorText: {
+      body: 'File count exceeded! Max: 1 file per paste',
+      button: 'Try again'
+    }
+  },
+  inputName: 'user',
+  url: json_ui_garage_url(path: 'forms/generic_post')
+
+page.body childViews: ->(body) do
+  body.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
+    res.h1 text: 'Paste file to this dialog'
+  end
+end

data/app/views/json_ui/garage/pages/paste_file.jbuilder

@@ -4,12 +4,25 @@ page = json_ui_page json
 
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.pasteFile \
+page.filePaster \
   directUploadUrl: rails_direct_uploads_url,
-  accepts: { fileType: 'image', maxFileSize: 1000 },
+  accepts: {
+    fileType: 'image',
+    maxFileSize: 100,
+    maxFileLength: 1,
+    maxFileSizeErrorText: {
+      body: 'File too big. Max: 100KB',
+      button: 'Try again'
+    },
+    maxFileLengthErrorText: {
+      body: 'File count exceeded! Max: 1 file per paste',
+      button: 'Try again'
+    }
+  },
   inputName: 'user',
   url: json_ui_garage_url(path: 'forms/generic_post')
 
+
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.label text: 'Paste image to this page'
 end

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

@@ -29,6 +29,7 @@ json_ui_page json do |page|
               id: 'parent-2',
               icon: 'folder',
               label: 'Custom drop',
+              dropData: {},
               children: [
                 { label: 'Child 1', id: 'parent-2-child-1', dropData: { to: 'child1'  } },
                 { label: 'Child 2', id: 'parent-2-child-2', dropData: { to: 'child2'  } },

data/lib/glib/crypt/utils.rb

@@ -1,4 +1,3 @@
-# Deprecated. Use Glib::Crypt instead.
 module Glib
   class Crypt
     class Utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.24.2
 platform: ruby
 authors:
 - ''
@@ -109,6 +109,7 @@ files:
 - app/helpers/glib/json_ui/action_builder/windows.rb
 - app/helpers/glib/json_ui/analytics_helper.rb
 - app/helpers/glib/json_ui/builder/mouse_events.rb
+- app/helpers/glib/json_ui/default.rb
 - app/helpers/glib/json_ui/dynamic_field_builders.rb
 - app/helpers/glib/json_ui/generic_builders.rb
 - app/helpers/glib/json_ui/list_builders.rb
@@ -165,6 +166,7 @@ files:
 - app/views/json_ui/garage/forms/dialogs_close.json.jbuilder
 - app/views/json_ui/garage/forms/dialogs_update.json.jbuilder
 - app/views/json_ui/garage/forms/dialogs_update2.json.jbuilder
+- app/views/json_ui/garage/forms/dialogs_update3.json.jbuilder
 - app/views/json_ui/garage/forms/dirty_prompt.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_group.json.jbuilder
 - app/views/json_ui/garage/forms/dynamic_select.json.jbuilder
@@ -292,7 +294,6 @@ files:
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
-- lib/glib/crypt.rb
 - lib/glib/crypt/utils.rb
 - lib/glib/direct_uploads_controller.rb
 - lib/glib/dynamic_text.rb
@@ -336,7 +337,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: ''

data/lib/glib/crypt.rb

@@ -1,28 +0,0 @@
-require_relative './crypt/utils'
-
-# A replacement of Glib::Crypt::Utils
-module Glib
-  class Crypt
-    # Recommended digest: 'SHA256'
-    def self.encrypt(original_message, encryption_secret, encryption_salt, digest)
-      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
-      CGI.escape(encryptor.encrypt_and_sign(original_message))
-    end
-
-    def self.decrypt(encrypted_message, encryption_secret, encryption_salt, digest)
-      encryptor = message_encryptor(encryption_secret, encryption_salt, digest)
-      begin
-        encryptor.decrypt_and_verify(CGI.unescape(encrypted_message))
-      rescue ActiveSupport::MessageEncryptor::InvalidMessage
-        nil
-      end
-    end
-
-    private
-      def self.message_encryptor(encryption_secret, encryption_salt, digest)
-        key_generator = ActiveSupport::KeyGenerator.new(encryption_secret, iterations: 1000)
-        key_secret = key_generator.generate_key(encryption_salt, 32)
-        ActiveSupport::MessageEncryptor.new(key_secret, digest: digest, serializer: JSON)
-      end
-  end
-end