glib-web 4.28.0 → 4.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee8313aa1ae50db85b81497dfa6d47de690106be60c0988f78140c58b4675684
-  data.tar.gz: af785896e1910e22e8976d6c704cdafd8526493af8e10c5f277bb39cf0c29dea
+  metadata.gz: 2a50b0fa5825fa2970b43e4771a42fbe86d1c49360514ec4c8bae4b5554f1596
+  data.tar.gz: 6fd65894cc019aba9777c6d9ff74d76a3ae40d8fc86e15c4eba73e9aa67822e9
 SHA512:
-  metadata.gz: 7a74d29938372885d743d1b4fedadff59f09c68b253e3cd02992c474012911226b83393d934ab0844512d9cfdbc1a9fb40c5a6fec2c97d2ea23c9379aa69a5b6
-  data.tar.gz: 07f3267385aaf07bf5a1267d8788142d07633377604ccc0ff43c5218e18dceebaefbe5f6cb09f453861429767919999c5c5a3db59536b981bc2b49ee88bb67a6
+  metadata.gz: 64878db62f6fa1e21b896270394a04d3f9fdbab5a35efae8095f2c1f4a4bd8a70dd637f81aeb3716477f0aed6dba5a2eda8a95d70e778f7192674c26a9e38b49
+  data.tar.gz: b117f01edb9d5b3ce19cde4bf8ee53ff4895057d26a973b8ab28a1233a4b3fb452ab4dc9e0105061465307d441bd619afd544b9a8b82f668bf1eb6e2ef05410e

data/app/helpers/glib/enum_helper.rb

@@ -1,12 +1,12 @@
 module Glib
   module EnumHelper
-    def glib_enum_options(clazz, enum_field, keys: nil, hint_suffix: false, hint_subtitle: false)
+    def glib_enum_options(clazz, enum_field, keys: nil, hint_suffix: false, hint_subtitle: false, i18n_args: {})
       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, hint_suffix: hint_suffix)
+        text = clazz.glib_enum_humanize(enum_field, i, hint_suffix: hint_suffix, i18n_args: i18n_args)
         option = { text: text, value: i }
-        if hint_subtitle && (hint = clazz.glib_enum_hint(enum_field, i))
+        if hint_subtitle && (hint = clazz.glib_enum_hint(enum_field, i, i18n_args: i18n_args))
           option[:subtitle] = hint
         end
         option

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

@@ -28,6 +28,7 @@ class Glib::JsonUi::ActionBuilder
     end
 
     class Open < Action
+      views :loaderViews
       string :url, cache: true
       bool :disableCloseButton
       string :fullscreen
@@ -39,6 +40,7 @@ class Glib::JsonUi::ActionBuilder
     end
 
     class Reload < Action
+      views :loaderViews
       string :url, cache: true
       bool :disableCloseButton
       string :fullscreen # mobile, always

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

@@ -26,6 +26,7 @@ class Glib::JsonUi::ActionBuilder
     class Open < Action
       string :url
       string :placement # top, right, bottom, left
+      views :loaderViews
     end
 
     class Show < Action

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

@@ -13,20 +13,20 @@ class Glib::JsonUi::ActionBuilder
       string :url, cache: true
       bool :updateExisting
       action :onOpen
+      views :loaderViews
     end
 
     class OpenWeb < Action
       # string :url
 
       def url(value, options = {})
-        other_host = !!options[:other_host]
         regex = /\/.+\.json|format=json/
 
-        if Rails.env.development? || Rails.env.test? && !other_host
+        if Rails.env.development? || Rails.env.test? && same_host?(value)
           raise "JSON url detected #{value}" if value.to_s.match?(regex)
         end
 
-        if value.to_s.match?(regex) && Rails.env.production? && !other_host
+        if value.to_s.match?(regex) && Rails.env.production? && same_host?(value)
           Rollbar.error("JSON url detected #{value}")
           # value = value.gsub('.json', '')
         end
@@ -35,16 +35,15 @@ class Glib::JsonUi::ActionBuilder
         json.set! 'url', value
       end
 
-      # private
+      private
+        def same_host?(url)
+          host = URI(url.to_s).host
 
-      # def same_host?(url)
-      #   host = URI(url.to_s).host
-
-      #   return true if host == request.host
-      #   return false unless host.nil?
-      #   return false unless url.to_s.start_with?("/")
-      #   !url.to_s.start_with?("//")
-      # end
+          return true if host == page.context.request.host
+          return false unless host.nil?
+          return false unless url.to_s.start_with?('/')
+          !url.to_s.start_with?('//')
+        end
     end
 
     class Reload < Action
@@ -63,6 +62,7 @@ class Glib::JsonUi::ActionBuilder
     class CloseWithOpen < Action
       string :url
       action :onOpen
+      views :loaderViews
 
       required :url
     end
@@ -70,6 +70,7 @@ class Glib::JsonUi::ActionBuilder
     class CloseAllWithOpen < Action
       string :url
       action :onOpen
+      views :loaderViews
     end
 
     class Print < Action

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

@@ -357,6 +357,12 @@ module Glib
         array :items
         hash :dropData
       end
+
+      class Skeleton < View
+        def template(value)
+          json.set! 'template', value
+        end
+      end
     end
   end
 end

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

@@ -11,23 +11,23 @@ module Glib
       extend ClassMethods
     end
 
-    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)
+    def glib_enum_humanize(enum_name, default_enum_value = nil, hint_suffix: false, i18n_args: {})
+      self.class.glib_enum_humanize(enum_name, send(enum_name) || default_enum_value, hint_suffix: hint_suffix, i18n_args: i18n_args)
     end
   end
 
   module ClassMethods
-    def glib_enum_humanize(enum_name, enum_value, default_translation = nil, hint_suffix: false)
+    def glib_enum_humanize(enum_name, enum_value, default_translation = nil, hint_suffix: false, i18n_args: {})
       if enum_value
         translation_key = "activerecord.attributes.#{model_name.i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}"
 
         if default_translation.nil? && (Rails.env.development? || Rails.env.test?)
-          text = I18n.t(translation_key, raise: I18n::MissingTranslationData)
+          text = I18n.t(translation_key, **i18n_args.merge(raise: I18n::MissingTranslationData))
         else
-          text = I18n.t(translation_key, default: default_translation)
+          text = I18n.t(translation_key, **i18n_args.merge(default: default_translation))
         end
 
-        if hint_suffix && (hint = glib_enum_hint(enum_name, enum_value))
+        if hint_suffix && (hint = glib_enum_hint(enum_name, enum_value, i18n_args: i18n_args))
           text += " #{hint}"
         end
 
@@ -35,9 +35,9 @@ module Glib
       end
     end
 
-    def glib_enum_hint(enum_name, enum_value)
+    def glib_enum_hint(enum_name, enum_value, i18n_args: {})
       i18n_key = self.model_name.i18n_key
-      if (hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}.hint")).present?
+      if (hint = I18n.t("dt_models.#{i18n_key}.#{enum_name.to_s.pluralize}.#{enum_value}.hint", **i18n_args)).present?
         # text += " #{hint}"
         return hint
       end

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

@@ -48,12 +48,18 @@ section.rows builder: ->(template) do
     render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show, include_form: true
   end
 
-  template.thumbnail title: 'dialogs/open', onClick: ->(action) do
+  template.thumbnail title: 'dialogs/open with loaderViews', onClick: ->(action) do
     action.dialogs_open \
       width: 950,
-      url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog'),
+      url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog', sleep: true),
       disableCloseButton: true,
       closeOnBlur: true,
+      loaderViews: ->(view) do
+        view.panels_responsive padding: glib_json_padding_body, childViews: ->(res) do
+          res.skeleton template: 'textArea'
+          res.skeleton template: 'commentList'
+        end
+      end,
       onClose: ->(saction) do
         saction.snackbars_alert message: 'dialog closed'
       end

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

@@ -18,9 +18,15 @@ section.rows builder: ->(template) do
   template.thumbnail title: "sheets/open placement: 'top'", onClick: ->(action) do
     action.sheets_open placement: 'top', url: json_ui_garage_url(path: 'actions/sheet_content')
   end
-  template.thumbnail title: "sheets/open placement: 'right'", onClick: ->(action) do
-    action.sheets_open placement: 'right', url: json_ui_garage_url(path: 'actions/sheet_content')
-  end
+  template.thumbnail \
+    title: "sheets/open placement: 'right' with loaderViews", onClick: ->(action) do
+      action.sheets_open placement: 'right', url: json_ui_garage_url(path: 'actions/sheet_content'), loaderViews: ->(sview) do
+        sview.panels_responsive padding: { all: 16 }, childViews: ->(res) do
+          res.skeleton template: 'textArea'
+          res.skeleton template: 'commentList'
+        end
+      end
+    end
   template.thumbnail title: "sheets/open placement: 'bottom'", onClick: ->(action) do
     action.sheets_open placement: 'bottom', url: json_ui_garage_url(path: 'actions/sheet_content')
   end

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

@@ -11,16 +11,29 @@ section.rows builder: ->(template) do
   end
 
   template.thumbnail title: 'windows/open', onClick: ->(action) do
-    action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    action.windows_open url: json_ui_garage_url(path: 'home/blank', sleep: true), loaderViews: ->(view) do
+      view.panels_responsive padding: { all: 16 }, childViews: ->(res) do
+        res.skeleton template: 'bigProgressCircle'
+      end
+    end
   end
 
   template.thumbnail title: 'windows/open (updateExisting: true)', onClick: ->(action) do
-    action.windows_open updateExisting: true, url: json_ui_garage_url(path: 'home/blank')
+    action.windows_open updateExisting: true, url: json_ui_garage_url(path: 'home/blank', sleep: true), loaderViews: ->(view) do
+      view.panels_responsive padding: { all: 16 }, childViews: ->(res) do
+        res.skeleton template: 'textArea'
+        res.skeleton template: 'commentList'
+      end
+    end
   end
 
   template.thumbnail title: 'windows/closeAllWithOpen', onClick: ->(action) do
-    action.windows_closeAllWithOpen url: json_ui_garage_url(path: 'home/index')
-
+    action.windows_closeAllWithOpen url: json_ui_garage_url(path: 'home/index', sleep: true), loaderViews: ->(view) do
+      view.panels_responsive padding: { all: 16 }, childViews: ->(res) do
+        res.skeleton template: 'textArea'
+        res.skeleton template: 'commentList'
+      end
+    end
   end
 
   template.thumbnail title: 'windows/openWeb', onClick: ->(action) do

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

@@ -1,3 +1,4 @@
+sleep 3
 page = json_ui_page json
 
 page.body childViews: ->(body) do

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

@@ -1,5 +1,9 @@
 json.title 'Forms'
 
+if params[:sleep].present?
+  sleep 3
+end
+
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 

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

@@ -31,6 +31,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       template.spacer height: 10
       template.fields_hidden name: 'message[error]'
       template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'
+      template.fields_richText width: 'matchParent', name: 'description', label: 'Desc', placeholder: 'Desc'
 
       form.panels_responsive id: 'responsive_{{entryIndex}}', childViews: ->(column) do
           column.panels_split width: 'matchParent', content: ->(split) do

data/app/views/json_ui/garage/home/blank.json.jbuilder

@@ -1,4 +1,6 @@
-sleep 0.5
+if params[:sleep].present?
+  sleep 1
+end
 
 json.title 'Menu'
 

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

@@ -1,3 +1,7 @@
+if params[:sleep].present?
+  sleep 1
+end
+
 json.title 'Menu'
 
 page = json_ui_page json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.28.0
+  version: 4.30.0
 platform: ruby
 authors:
 - ''