glib-web 3.24.0 → 3.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd39c10550b9bef746a929eef30b91bf4c71c38339d13c2afd874f3e5ac7858
-  data.tar.gz: bf8b5698b2a60b122f8ced2c312c73782daacf1b1c465e9655c64b658dd4d907
+  metadata.gz: efea09ac466f54d5eb3b868b7ab7f1f042d8f7185969f9fb6f8201c23de313c1
+  data.tar.gz: c09fe47288f977d7e8d61835294f66d10be6c4a8974845ca054123f94c0e5ad2
 SHA512:
-  metadata.gz: fdd1ac28d0d3615a38145752d95f7a1bef47261c849936f498abeefcc49787ca79d488077fed7ef524e2994ae98e1d9aa45780a9ac05265939d7b15dc6cf7b9c
-  data.tar.gz: 88595a13ae7e0cd3fecc9b07f8087382980973cb98ea13ede1aa313c328f63473283a7861b8d16c7f73fa7330c372b20478e92aa8703696754f025046572e2ea
+  metadata.gz: 803e0cd9bb622b0810e622a996c2d3e9ed26903d773280eae32e3c78877b04e1bed20f261ebcadd1b5124e21a08fb4ac8598b51ef203aa8c052bd9eddf424337
+  data.tar.gz: 31c43c485528da181ac17a78301f919d1c743d358adf0a72ec96908680cf5325fa6621ac4239b052f313e0b76fb0dc0a7e007201c1acf32294fa250c75bdefce

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,11 +1,15 @@
 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
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.24.0
+  version: 3.24.1
 platform: ruby
 authors:
 - ''
@@ -336,7 +336,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: ''