glib-web 4.36.4 → 4.36.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9263cfb74f958fdf57439259ab5c8bc58662845bb7ea05fb1be8d5c4cd1a8c89
-  data.tar.gz: 87718fc39abc6797fe0b333cc54df6a082b198809fc2d1dd01dbf633081eaac5
+  metadata.gz: e657850bcd9c7e8e881d35180ee54e239302bdf680511cb49f4cdde2b87c9379
+  data.tar.gz: 106a0f38b451f40536fb00f76ad24a62105ae53dcd2f5047239b1ec7dd2b7d72
 SHA512:
-  metadata.gz: 3dc998e34afa4e0c88cad3a2b53a4a08933c93538fd163612bf857a3f527d6a5d04007703e54dca432398e3c9781c0e9bbd090362ca3b6892f679dd443f7a932
-  data.tar.gz: 6d69e9ffe8566cfff01f612f495601a9da09ae70d244b8560a06aeebf2e0a987567f8afdc30dfc944110e591a492c9463b2d331b591b92903b8c460ba71323e2
+  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/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

@@ -104,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',

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.36.4
+  version: 4.36.5
 platform: ruby
 authors:
 - ''
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-10-04 00:00:00.000000000 Z
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: ''
 executables: []
 extensions: []
@@ -445,10 +445,10 @@ files:
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -464,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []