glib-web 4.36.0 → 4.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94b3768dec74f3a05c32ffd19612d151afce3829643e070f173899d02627e72f
-  data.tar.gz: e7f8124643269e1634a979683210b93a7ca613fd1cf975a0ff20419a3f08f9f2
+  metadata.gz: e4fa3a5bc80fc1354db7030f213da3db807b948797c729500015f8f1d9e11ba1
+  data.tar.gz: b9174c228c32924fdbc7ecb87214bfce37d4c63ce0a5d3b905be0e4ac0c2143f
 SHA512:
-  metadata.gz: 91cf7697395548ce7d8ee306269688c1166ed9e9d1ca0778a5d2d2dfd72d26dab277a3d22069a1d4ef31727511816854bd12de8ef984629069b4413f295095c5
-  data.tar.gz: 4b655db49df2bfba84b0c524d02e41fdaadcacfb687418f7d3651c24712c9c7a55ed1b5bf4a1951b3107264a5db09b348b892293efaee7212c06d05b9b36408e
+  metadata.gz: 9609485c6c0339b27600efbfd1fbea22f8b676c16b792c69cdb2a1c6a44f75ad3d2632d9868ed142bdfef70dd8fc22b876c1946c4d5de208d0a4d4ee0225d595
+  data.tar.gz: e2e758483ccba38788bd0e06139aef0ad4acd2c0c9a71d85cd017aa92ac1320abb51b45613d46480a798f31e851da480b2e8f93929d0ee6c8b3f2ad6540c0fc9

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

@@ -68,10 +68,10 @@ module Glib::Json::Libs
 
     # As much as possible, try retaining the front fragment by matching the back, because
     # the front could be either a `?` or `&`
-    url = url.sub(/format=json\&/, '');
+    url = url.sub(/format=json\&/, '')
 
     # If no match, then we replace the front fragment
-    url.sub(/[\&\?]format=json/, '');
+    url.sub(/[\&\?]format=json/, '')
   end
 
   def glib_redirect_to(url, return_to_previous: false, status: :ok)
@@ -87,6 +87,13 @@ module Glib::Json::Libs
           return
         end
 
+        # Inside a dialog, it's easier to simply use HTTP redirect, as opposed to trying to
+        # get the dialog to perform manual redirection.
+        if glib_json_dialog_mode?
+          redirect_to url
+          return
+        end
+
         json_ui_redirect_to url, status: status
       end
     end
@@ -152,14 +159,14 @@ module Glib::Json::Libs
         end
 
         render json: if glib_json_dialog_mode?
-          { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
-        else
-          {
-            onResponse: {
-              action: 'windows/open', url: user_default_url
-            }
-          }
-        end, status: Rails.env.test? ? :forbidden : :ok
+                       { onLoad: __glib_error_dialog('Access denied', "Make sure you're logged in with the correct account.") }
+                     else
+                       {
+                         onResponse: {
+                           action: 'windows/open', url: user_default_url
+                         }
+                       }
+                     end, status: Rails.env.test? ? :forbidden : :ok
       end
       format.csv do
         if Rails.env.test?
@@ -229,7 +236,7 @@ module Glib::Json::Libs
     if json_ui_activated?
       if Rails.env.production? || preview_mode
         if defined?(Rollbar) && !preview_mode
-          Rollbar.error(exception, :use_exception_level_filters => true)
+          Rollbar.error(exception, use_exception_level_filters: true)
         end
 
         render file: Rails.root.join('public', '500.html'), status: :internal_server_error
@@ -261,7 +268,7 @@ module Glib::Json::Libs
     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_response = { action: 'dialogs/close', onClose: on_load }
+      on_response = { action: 'dialogs/close', onClose: on_response }
     end
 
     # Use onResponse because it is harder to guarantee that `onLoad` executes in Vuejs because it relies

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

@@ -162,6 +162,9 @@ module Glib
         # hash :actionCable
         # string :format
         action :onClick
+
+        # Whether the label is focusable using the Tab key.
+        bool :disableKeyboardFocus
       end
 
       class Image < View

data/app/views/json_ui/garage/lists/_autoload_section.json.jbuilder

@@ -13,7 +13,54 @@ section.rows builder: ->(row) do
     if local_assigns[:reorder]
       row.thumbnail title: "Item #{index}"
     else
-      row.thumbnail title: "Item #{index}", subtitle: "Sub Item #{index}", subsubtitle: "Sub Sub Item #{index}"
+      row.thumbnail \
+        title: "Item #{index}",
+        subtitle: "Sub Item #{index}",
+        subsubtitle: "Sub Sub Item #{index}"
+      # onClick: ->(action) do
+      #   action.windows_openWeb url: 'https://www.google.com'
+      # end,
+      # content: ->(content) do
+      #     content.footer \
+      #       childViews: ->(footer) do
+      #         footer.panels_horizontal \
+      #           padding: { x: 10, y: 5 },
+      #           childViews: ->(horizontal) do
+      #             horizontal.label \
+      #               text: 'View',
+      #               onClick: ->(action) do
+      #                 # TODO: For some reason this causes the auto-scrolling issue
+      #                 # action.windows_openWeb url: frontend_place_url(place)
+
+      #                 # action.windows_openWeb url: frontend_place_url(place)
+      #               end
+
+      #             horizontal.spacer styleClass: 'width-sm'
+
+      #             horizontal.label \
+      #               text: symbol_horizontal_separator,
+      #               styleClasses: ['text-muted']
+
+      #             horizontal.spacer styleClass: 'width-sm'
+
+      #             horizontal.label \
+      #               text: 'Delete',
+      #               onClick: ->(action) do
+      #                 action.windows_openWeb url: 'https://www.google.com'
+      #                 # action.windows_openWeb url: frontend_place_url(place)
+
+      #                 # render \
+      #                 #   'shared/confirmation_sheet',
+      #                 #   panel: action,
+      #                 #   message: 'Are you sure you want to delete this favorite?',
+      #                 #   confirmation_text: 'Yes, delete the favorite',
+      #                 #   confirmation_action: ->(subsubaction) do
+      #                 #     subsubaction.http_delete url: favorite_list_favorite_url(@favorite_list, favorite)
+      #                 #   end
+      #               end
+      #           end
+      #       end
+      #   end
     end
   end
 end

data/app/views/json_ui/garage/pages/layout.json.jbuilder

@@ -13,6 +13,16 @@ end
 
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   (1..100).each do |index|
-    scroll.label text: 'Content'
+    scroll.panels_vertical \
+      width: 'matchParent',
+      backgroundColor: '#b3bac2',
+      height: 'matchParent',
+      childViews: ->(panels) do
+        panels.label text: 'Content'
+        panels.spacer height: 4
+        panels.label text: 'view', onClick: ->(action) do
+          action.windows_openWeb url: 'https://www.google.com'
+        end
+      end
   end
 end

metadata

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