glib-web 4.36.2 → 4.36.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fa536f763a59dac5250be221ff17106a5bac2fadea370d85e980d81fff6d25
-  data.tar.gz: 1ab54307c650b074396467ef5c94a9f09b840fbc2348f43cbf287797e263b36f
+  metadata.gz: e657850bcd9c7e8e881d35180ee54e239302bdf680511cb49f4cdde2b87c9379
+  data.tar.gz: 106a0f38b451f40536fb00f76ad24a62105ae53dcd2f5047239b1ec7dd2b7d72
 SHA512:
-  metadata.gz: 1ce0a37c6434ee753bf8a9a41f2937f4aa2b5d22e939147cf994b0446a6869e110dc497c4121a5fcff5b880d247a5a37db16d216762d390cc91d938164d709d5
-  data.tar.gz: 91db1d16e51c6596083805196e1fbfa7c3be45245a02b81a46600f5958e0b306867b3df300d5bc87abf0899d7d71da7a796d265d6b01d5fe2b5adefa6de1aa20
+  metadata.gz: 4d9fbae4fcc33c99c7081f0aaf458e41e26228df11f6709d537f2ec584140af02dd8c2b4252c4e0356cd9dffee152dd273457e12b96b6ce0898680f96998353e
+  data.tar.gz: 84dfef2ffce458eacfe1d9e279d09b2c0fd818cd4ba0f26eb4db16ea6f1c87d6f8bdd5f7c6fa71c0cb3244d54cb3fc41acfb4f0c2a4a6420682149c49ed9dd66

data/app/controllers/concerns/glib/auth/response.rb

@@ -11,23 +11,21 @@ module Glib::Auth
       params[:_dialog].present? # E.g. _dialog=v1
     end
 
-    def json_ui_401_response(sign_in_url)
+    def json_ui_401_response(sign_in_url, **redirect_options)
+      allow_other_host = redirect_options[:allow_other_host]
       {
         # Handle dialogs_open and windows_open
         glib_json_dialog_mode? ? :onLoad : :onResponse => __glib_error_dialog(
-          'Your session has ended', 'Please re-login.', [
-          {
-            view: 'spacer',
-            height: 20
-          },
+          'Your session has ended', 'Please re-login.', ['dialog-401-error'], [
           {
             view: 'button',
             text: 'Re-login',
             onClick: {
               action: 'dialogs/close',
               onClose: {
-                action: 'windows/open',
-                url: sign_in_url
+                action: allow_other_host ? 'windows/openWeb' : 'windows/open',
+                url: sign_in_url,
+                targetWindow: allow_other_host ? '_self' : nil
               }
             }
           },

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)
@@ -131,7 +131,9 @@ module Glib::Json::Libs
         redirect_to sign_in_url, **redirect_options
       end
       format.json do
-        render json: json_ui_401_response(sign_in_url), status: Rails.env.test? ? :unauthorized : :ok
+        render \
+          json: json_ui_401_response(sign_in_url, **redirect_options),
+          status: Rails.env.test? ? :unauthorized : :ok
       end
       format.csv do
         if Rails.env.test?
@@ -158,15 +160,23 @@ module Glib::Json::Libs
           return
         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
+        json_response = \
+          if glib_json_dialog_mode?
+            {
+              onLoad: __glib_error_dialog(
+                'Access denied',
+                "Make sure you're logged in with the correct account.",
+                ['dialog-403-error']
+              )
             }
-          }
-        end, status: Rails.env.test? ? :forbidden : :ok
+          else
+            {
+              onResponse: {
+                action: 'windows/open', url: user_default_url
+              }
+            }
+          end
+        render json: json_response, status: Rails.env.test? ? :forbidden : :ok
       end
       format.csv do
         if Rails.env.test?
@@ -203,7 +213,7 @@ module Glib::Json::Libs
   #   end
   # end
 
-  def __glib_error_dialog(title, message, bottom_views = [])
+  def __glib_error_dialog(title, message, style_classes, bottom_views = [])
     {
       action: 'dialogs/show',
       # Don't show another dialog, just use the current one since it's a new dialog anyway, which means
@@ -214,7 +224,7 @@ module Glib::Json::Libs
         childViews: [
           {
             view: 'panels/vertical',
-            styleClasses: ['glib-error-dialog'],
+            styleClasses: ['glib-error-dialog'].concat(style_classes),
             childViews: [
               {
                 view: 'label',
@@ -236,7 +246,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
@@ -342,7 +352,7 @@ module Glib::Json::Libs
           format.json do
             render json: {
               glib_json_dialog_mode? ? :onLoad : :onResponse => __glib_error_dialog(
-                'Your session has expired', 'Please refresh the page and retry.', [
+                'Your session has expired', 'Please refresh the page and retry.', ['dialog-csrf-error'], [
                   {
                     view: 'button',
                     text: 'Refresh',

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

@@ -1,17 +1,32 @@
 class Glib::JsonUi::ActionBuilder
   module Popovers
 
+    module PopoverAttributes
+      extend ActiveSupport::Concern
+
+      included do
+        string :key
+        # views :childViews
+        string :placement
+        int :offset
+        int :width
+        bool :persistent
+        hash :overlay, required: [:closeOnFocus]
+        singleton_array :styleClass, :styleClasses
+      end
+    end
+
     class Show < Action
+      include PopoverAttributes
+
       panels_builder :content, :body
+    end
 
-      string :key
-      # views :childViews
-      string :placement
-      int :offset
-      int :width
-      bool :persistent
-      hash :overlay, required: [:closeOnFocus]
-      singleton_array :styleClass, :styleClasses
+    class Open < Action
+      include PopoverAttributes
+
+      string :url
+      bool :updateExisting
     end
 
     class Close < Action

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

@@ -27,6 +27,14 @@ section.rows builder: ->(template) do
     end
   end
 
+  template.thumbnail title: 'windows/closeWithOpen1', onClick: ->(action) do
+    action.windows_closeWithOpen url: json_ui_garage_url(path: 'home/print', encoded_key: 'Hello+World')
+  end
+
+  template.thumbnail title: 'windows/closeWithOpen2', onClick: ->(action) do
+    action.windows_closeWithOpen url: json_ui_garage_url(path: 'home/print', encoded_key: 'Hello%2BWorld')
+  end
+
   template.thumbnail title: 'windows/closeAllWithOpen', onClick: ->(action) do
     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

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

@@ -0,0 +1,14 @@
+if params[:sleep].present?
+  sleep 1
+end
+
+json.title 'Menu'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: false
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  params.each do |key, value|
+    scroll.label text: "#{key}: #{value}"
+  end
+end

data/app/views/json_ui/garage/panels/flow.json.jbuilder

@@ -77,4 +77,34 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     panel.spacer width: 10
     panel.label text: 'bottom'
   end
+
+  scroll.label text: "\n"
+  scroll.h1 text: 'Changed when Hover'
+  scroll.panels_flow \
+    id: 'default1',
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#b3bac2',
+    onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: false }
+        saction.components_set targetId: 'hovered1', data: { displayed: true }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover me'
+    end
+  scroll.panels_flow \
+    id: 'hovered1',
+    displayed: false,
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#b3bac2',
+    onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: true }
+        saction.components_set targetId: 'hovered1', data: { displayed: false }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover active'
+    end
+
+  scroll.label text: "\n"
 end

data/app/views/json_ui/garage/panels/horizontal.json.jbuilder

@@ -163,5 +163,63 @@ json_ui_page json do |page|
       }
 
     scroll.label text: "\n"
+    scroll.h1 text: 'Changed when Hover'
+    scroll.panels_horizontal \
+      id: 'default1',
+      padding: { left: 20, right: 20, top: 10, bottom: 10 },
+      backgroundColor: '#b3bac2',
+      onMouseEnter: ->(action) {
+        action.runMultiple childActions: ->(saction) do
+          saction.components_set targetId: 'default1', data: { displayed: false }
+          saction.components_set targetId: 'hovered1', data: { displayed: true }
+        end
+      }, childViews: ->(panel) do
+        panel.label text: 'Hover me'
+      end
+    scroll.panels_horizontal \
+      id: 'hovered1',
+      displayed: false,
+      padding: { left: 20, right: 20, top: 10, bottom: 10 },
+      backgroundColor: '#b3bac2',
+      onMouseLeave: ->(action) {
+        action.runMultiple childActions: ->(saction) do
+          saction.components_set targetId: 'default1', data: { displayed: true }
+          saction.components_set targetId: 'hovered1', data: { displayed: false }
+        end
+      }, childViews: ->(panel) do
+        panel.label text: 'Hover active'
+      end
+
+    scroll.label text: "\n"
+    scroll.h1 text: 'Changed when Hover (with onClick)'
+    scroll.panels_horizontal \
+      id: 'default2',
+      padding: { left: 20, right: 20, top: 10, bottom: 10 },
+      backgroundColor: '#b3bac2',
+      onMouseEnter: ->(action) {
+        action.runMultiple childActions: ->(saction) do
+          saction.components_set targetId: 'default2', data: { displayed: false }
+          saction.components_set targetId: 'hovered2', data: { displayed: true }
+        end
+      }, childViews: ->(panel) do
+        panel.label text: 'Hover me'
+      end
+    scroll.panels_horizontal \
+      id: 'hovered2',
+      displayed: false,
+      padding: { left: 20, right: 20, top: 10, bottom: 10 },
+      backgroundColor: '#b3bac2',
+      onMouseLeave: ->(action) {
+        action.runMultiple childActions: ->(saction) do
+          saction.components_set targetId: 'default2', data: { displayed: true }
+          saction.components_set targetId: 'hovered2', data: { displayed: false }
+        end
+      }, childViews: ->(panel) do
+        panel.label text: 'Click me'
+      end, onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'home/blank')
+      end
+
+    scroll.label text: "\n"
   end
 end

data/app/views/json_ui/garage/panels/responsive.json.jbuilder

@@ -158,7 +158,67 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
       action.windows_open url: json_ui_garage_url(path: 'home/blank')
     end
 
-  scroll.spacer height: 16
+  scroll.spacer height: 32
+  scroll.h1 text: 'Changed when Hover'
+  scroll.spacer height: 8
+  scroll.panels_responsive \
+    id: 'default1',
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#c3cad2',
+    onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: false }
+        saction.components_set targetId: 'hovered1', data: { displayed: true }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover me'
+    end
+  scroll.panels_responsive \
+    id: 'hovered1',
+    displayed: false,
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#c3cad2',
+    onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: true }
+        saction.components_set targetId: 'hovered1', data: { displayed: false }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover active'
+    end
+
+  scroll.spacer height: 32
+  scroll.h1 text: 'Changed when Hover (with onClick)'
+  scroll.spacer height: 8
+  scroll.panels_responsive \
+    id: 'default2',
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#c3cad2',
+    onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default2', data: { displayed: false }
+        saction.components_set targetId: 'hovered2', data: { displayed: true }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover me'
+    end
+  scroll.panels_responsive \
+    id: 'hovered2',
+    displayed: false,
+    padding: { left: 20, right: 20, top: 10, bottom: 10 },
+    backgroundColor: '#c3cad2',
+    onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default2', data: { displayed: true }
+        saction.components_set targetId: 'hovered2', data: { displayed: false }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Click me'
+    end, onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    end
+
+  scroll.spacer height: 32
   scroll.h4 text: 'With grid-like functionality'
   scroll.spacer height: 8
   scroll.panels_responsive \

data/app/views/json_ui/garage/panels/vertical.json.jbuilder

@@ -66,5 +66,45 @@ json_ui_page json do |page|
     end, childViews: ->(panel) do
       panel.label text: 'Click me'
     end
+
+    scroll.label text: "\n"
+    scroll.h1 text: 'Changed when Hover'
+    scroll.panels_vertical id: 'default1', width: 100, height: 100, backgroundColor: '#b3bac2', align: 'center', onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: false }
+        saction.components_set targetId: 'hovered1', data: { displayed: true }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover me'
+    end
+    scroll.panels_vertical id: 'hovered1', displayed: false, width: 100, height: 100, backgroundColor: '#b3bac2', align: 'center', onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default1', data: { displayed: true }
+        saction.components_set targetId: 'hovered1', data: { displayed: false }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover active'
+    end
+
+    scroll.label text: "\n"
+    scroll.h1 text: 'Changed when Hover (with onClick)'
+    scroll.panels_vertical id: 'default2', width: 100, height: 100, backgroundColor: '#b3bac2', align: 'center', onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default2', data: { displayed: false }
+        saction.components_set targetId: 'hovered2', data: { displayed: true }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Hover me'
+    end
+    scroll.panels_vertical id: 'hovered2', displayed: false, width: 100, height: 100, backgroundColor: '#b3bac2', align: 'center', onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default2', data: { displayed: true }
+        saction.components_set targetId: 'hovered2', data: { displayed: false }
+      end
+    }, childViews: ->(panel) do
+      panel.label text: 'Click me'
+    end, onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    end
   end
 end

data/app/views/json_ui/garage/views/controls.json.jbuilder

@@ -87,6 +87,16 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     onClick: ->(action) do
       action.windows_reload
     end
+  scroll.spacer height: 10
+  scroll.button \
+    text: 'Button with popover from server',
+    onClick: ->(action) do
+      key = SecureRandom.hex(3)
+      action.popovers_open \
+        url: json_ui_garage_url(path: 'views/popovers_open', key: key),
+        styleClass: 'popover-container',
+        key: key
+    end
 
   scroll.spacer height: 10
   scroll.button \
@@ -94,6 +104,29 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     tooltip: { text: 'Hello world' },
     disabled: true
 
+  scroll.spacer height: 10
+  scroll.button \
+    text: 'Button with mouse enter and leave',
+    id: 'default',
+    onMouseEnter: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default', data: { displayed: false }
+        saction.components_set targetId: 'hovered', data: { displayed: true }
+      end
+    }
+  scroll.button \
+    text: 'Button with mouse enter and leave (Active)',
+    id: 'hovered',
+    displayed: false,
+    onMouseLeave: ->(action) {
+      action.runMultiple childActions: ->(saction) do
+        saction.components_set targetId: 'default', data: { displayed: true }
+        saction.components_set targetId: 'hovered', data: { displayed: false }
+      end
+    }, onClick: ->(action) do
+      action.dialogs_alert message: 'Perform action'
+    end
+
   scroll.spacer height: 20
   scroll.button \
     icon: 'info',

data/app/views/json_ui/garage/views/popovers_open.json.jbuilder

@@ -0,0 +1,10 @@
+page = json_ui_page json
+
+page.body childViews: ->(body) do
+  body.panels_responsive styleClass: 'popover-menu', childViews: ->(sres) do
+    sres.p text: "Current time: #{DateTime.current}", styleClass: 'pb-2'
+    sres.button text: 'Update', onClick: ->(action) do
+      action.popovers_open url: json_ui_garage_url(path: 'views/popovers_open', key: params[:key]), key: params[:key], updateExisting: true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.36.2
+  version: 4.36.5
 platform: ruby
 authors:
 - ''
@@ -300,6 +300,7 @@ files:
 - app/views/json_ui/garage/forms/update_options.json.jbuilder
 - app/views/json_ui/garage/home/blank.json.jbuilder
 - app/views/json_ui/garage/home/index.json.jbuilder
+- app/views/json_ui/garage/home/print.json.jbuilder
 - app/views/json_ui/garage/home/slow.json.jbuilder
 - app/views/json_ui/garage/lists/_autoload_section.json.jbuilder
 - app/views/json_ui/garage/lists/autoload_all.json.jbuilder
@@ -396,6 +397,7 @@ files:
 - app/views/json_ui/garage/views/markdowns.json.jbuilder
 - app/views/json_ui/garage/views/misc.json.jbuilder
 - app/views/json_ui/garage/views/multimedia.json.jbuilder
+- app/views/json_ui/garage/views/popovers_open.json.jbuilder
 - app/views/json_ui/garage/views/progress.json.jbuilder
 - app/views/json_ui/garage/views/shareButton.json.jbuilder
 - app/views/json_ui/garage/views/steppers.json.jbuilder