glib-web 3.20.4 → 3.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0a9aabf5f0d62144bddff30fc741b14b1661580a26628a9b62428c55422202
-  data.tar.gz: 6db894d335f8541170d6ade933885c43bc925e0ab388a717473ceaf7ef134030
+  metadata.gz: 6a1d6390dceb59db91cdb5fea9a123375d9442af6941b74770881736a6f25de0
+  data.tar.gz: 46bfd89ea540dfd8fc125c5c486595fad64d5a40fc55de365b66bf1fb8dbccce
 SHA512:
-  metadata.gz: 16bb14ab3192323e5e2cb0ad7f5564c514c82fd3b63e8e15dffb689d40dbefa186a22b9041654a77c66f903ca107c856c9985c848a5ca77e94847a238b83a8a2
-  data.tar.gz: e71ae51ec669c61dc162cb7b598f9e66ac396cfe948069f7193340b64902bb3ea35f162768a1299e3babfe7fad892095e02a90874ccba67a696cb090e4d4ca74
+  metadata.gz: 4e3536a448117c3c53b26899cc02457dff0326386d187fd1f538d1169f677a2d231a1b3238ace6d53cca7ebbe0effd4b0319c59ec4477f90ec691a571a4c62ea
+  data.tar.gz: 32ecff8bb25917bd35605764f4e34c8d52f17e5d89be17738aa5c5230bac8fec4bab40d69c32e470473ad1425338197e0c201b6026985443f6ed4d14a383d4b9

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

@@ -68,6 +68,11 @@ module Glib::Json::Libs
         redirect_to url
       end
       format.json do
+        if __json_ui_rendering?
+          redirect_to url
+          return
+        end
+
         json_ui_redirect_to url
       end
     end
@@ -91,6 +96,10 @@ module Glib::Json::Libs
 
   REDIRECT_BACK_KEY = :glib_return_to_url
 
+  def json_ui_save_return_url(url = nil)
+    session[REDIRECT_BACK_KEY] = url || url_for(params.to_unsafe_h.merge(format: nil))
+  end
+
   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))
@@ -172,10 +181,29 @@ module Glib::Json::Libs
     }
   end
 
-  def glib_json_handle_500(exception)
-    if json_ui_activated? && Rails.env.production?
-      Rollbar.error(exception, :use_exception_level_filters => true) if defined?(Rollbar)
-      render file: Rails.root.join('public', '500.html'), status: :internal_server_error
+  def glib_json_handle_500(exception, preview_mode)
+    if json_ui_activated?
+      if Rails.env.production? || preview_mode
+        if defined?(Rollbar) && !preview_mode
+          Rollbar.error(exception, :use_exception_level_filters => true)
+        end
+
+        render file: Rails.root.join('public', '500.html'), status: :internal_server_error
+      else
+        raise exception
+      end
+    else
+      raise exception
+    end
+  end
+
+  def glib_json_handle_404(exception, preview_mode)
+    if json_ui_activated?
+      if Rails.env.production? || preview_mode
+        render file: Rails.root.join('public', '404.html'), status: :not_found
+      else
+        raise exception
+      end
     else
       raise exception
     end
@@ -262,18 +290,16 @@ module Glib::Json::Libs
 
     # Call this before other rescues. Later rescue_from statements will take precedence, so more specific
     # rescues have to be declared later.
-    def json_libs_rescue_500
+    def json_libs_rescue_500(preview_mode: false)
       rescue_from StandardError do |exception|
-        glib_json_handle_500(exception)
+        glib_json_handle_500(exception, preview_mode)
       end
     end
 
-    def json_libs_rescue_404
-      # Removed because it doesn't seem to offer anything extra
-      # rescue_from ActiveRecord::RecordNotFound do |exception|
-      #   glib_json_handle_404
-      # end
+    def json_libs_rescue_404(preview_mode: false)
+      rescue_from ActiveRecord::RecordNotFound do |exception|
+        glib_json_handle_404(exception, preview_mode)
+      end
     end
-
   end
 end

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

@@ -5,6 +5,10 @@ class Glib::JsonUi::ActionBuilder
       action :onFocus
     end
 
+    class Blur < Action
+      action :onBlur
+    end
+
     class Reset < Action
       string :targetId
       action :onReset

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

@@ -101,6 +101,7 @@ class Glib::JsonUi::ViewBuilder
       string :rightText
       action :onTypeStart
       action :onTypeEnd
+      action :onClick
     end
 
     class Number < Text

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

@@ -5,9 +5,11 @@ markdown = '## Emphasis' + "\n" +
   "\n" +
   '~~Strikethrough~~' + "\n"
 
-options = {
-  updateExisting: true
-}
+options = {}
+if (update_existing = local_assigns[:update_existing])
+  options[:updateExisting] = update_existing
+end
+
 action.send "dialogs_#{dialog_mode}", **options, content: ->(dialog) do
   dialog.body padding: glib_json_padding_body, childViews: ->(body) do
     body.markdown text: markdown

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

@@ -8,5 +8,12 @@ page.scroll childViews: ->(scroll) do
 end
 
 page.on load: ->(action) do
-  render 'json_ui/garage/actions/dialogs_show', json: json, action: action, dialog_mode: :show
+  action.timeouts_set interval: 500, onTimeout: ->(subaction) do
+    render \
+      'json_ui/garage/actions/dialogs_show',
+      json: json,
+      action: subaction,
+      dialog_mode: :show,
+      update_existing: true
+  end
 end

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

@@ -82,7 +82,8 @@ page.form \
   form.h2 text: 'Country'
   form.spacer height: 6
   region_field = { name: 'user[city]', label: 'City' }
-  form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: region_field
+  form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: nil
+  form.fields_country name: 'user[country_with_region]', width: 'matchParent', label: 'Country with region', region: region_field
 
   form.spacer height: 20
   form.h2 text: 'Map'

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

@@ -72,6 +72,14 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       end
       accessory.footer padding: { x: 16, y: 10 }, childViews: ->(footer) do
         footer.label text: 'Footer'
+        footer.spacer height: 14
+        footer.label text: 'Click me', onClick: ->(action) do
+          action.components_findClosest view: 'fields/select', onFind: ->(subaction) do
+            subaction.components_set data: { value: 'pt' }, onSet: ->(subsubaction) do
+              subsubaction.fields_blur
+            end
+          end
+        end
       end
     end
 

data/app/views/json_ui/garage/notifications/action_cable.json.jbuilder

@@ -19,13 +19,19 @@ if room.present?
       }
     ],
     onOpen: ->(action) do
-      action.labels_set targetId: 'label-1', text: "Room ##{room.upcase}"
+      action.components_update targetId: 'label-1', views: ->(view) do
+        view.p text: "Room ##{room.upcase}"
+      end
     end,
     onClose: ->(action) do
-      action.labels_set targetId: 'label-1', text: "Room ##{room.upcase} (OFF)"
+      action.components_update targetId: 'label-1', views: ->(view) do
+        view.p text: "Room ##{room.upcase} (OFF)"
+      end
     end,
     onError: ->(action) do
-      action.labels_set targetId: 'label-1', text: "Room ##{room.upcase} (ERROR)"
+      action.components_update targetId: 'label-1', views: ->(view) do
+        view.p text: "Room ##{room.upcase} (ERROR)"
+      end
     end
 end