glib-web 4.29.0 → 4.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a07fbc8b0073fa52868b3e79f133568487d2b16c230f8b93481992d61dab930
-  data.tar.gz: c949b616ab4a3e7f774d5fc21b1e9046c5f653e62c4ce5b25d619b96e54d701d
+  metadata.gz: e2383b2b6102e7ef3eefe20eee5597154badb36c36d92f8f05b38db845a78200
+  data.tar.gz: d5843df8082c4781b96c3116aaa93342dc6713510ef2c061b28b58a5833144a0
 SHA512:
-  metadata.gz: eca316a8bf2e3694f4f023a785bb6c15f20168d1f4a61335cb9645e095c17f91073a8d918589c23e663d253187c34232bf965ec3ccd977f2c592ea22e4d96ea2
-  data.tar.gz: 2215d6aaf581273cb6a5672d8baa73c4f79b8aa360bc24938d8953c7d2bbd965ce8c2e8284d1846ed7381103d1df4eb5111b7e15852e2232d202a4fb595ea7f0
+  metadata.gz: 44155bcc598d8cc5443b14a82975339d206ec92173ac21b20681cbf8c1137a4fe340a4ebf2f1821e654a57e92684af2fec901e25de424af8cb4f1f25f215da7b
+  data.tar.gz: aa13100f8b37a89da04c5577828e6119406e58d32f9d28ada01ad81bb6ab606e2c0be8946075bff75e4406ec67b0c1a4145384868084cb56570d071c4159f342

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

@@ -38,8 +38,20 @@ module Glib::Json::Ui
 
   def json_ui_page_lifecycle_prop(name)
     if (hash = json_transformation_start).is_a?(Hash) && hash['body']  # A valid page
-      hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
-      hash[name]['childActions']
+      original_action = hash[name]
+
+      if original_action && original_action['action'] == 'runMultiple'
+        child_actions = original_action['childActions']
+      else
+        hash[name] = { 'action' => 'runMultiple', 'childActions' => [] }
+        child_actions = hash[name]['childActions']
+        child_actions << original_action
+      end
+
+      # hash[name] ||= { 'action' => 'runMultiple', 'childActions' => [] }
+      # child_actions = hash[name]['childActions']
+
+      child_actions
     end
   end
 

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/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.29.0
+  version: 4.30.1
 platform: ruby
 authors:
 - ''