glib-web 3.27.0 → 3.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0abd2e16afb07a3fd1a273acc664bde10d9355fb66e5aec0e26cb1fc568e9f
-  data.tar.gz: e2c72cf8ff18e4ca3e711f8481a81fd7c03e5f3cea5b86da916bf6675a990af5
+  metadata.gz: 575e99be2d5c58f1f7c9422f254b6a4b5b24180c82b38496e84c8dec22c41bcc
+  data.tar.gz: 76e6c254672deb1e9cd34a9452978ef4c9c32fc276fb8ac3e1e6eec1cbe8df85
 SHA512:
-  metadata.gz: 7b82ab5f93bf800bd5436c05e7e7ea1e54d3a9bf269a3d691f8a8591c31ab785bf6ed6d22b2992a0dee1de87b6efcc65358aaf4ac2a7de9804f5c056d6e7053a
-  data.tar.gz: 594cfd8502b6d515bcab04423c8d327ffc5fddab9ce879d88f34a3ded04dcf500f77581f7865641b83877be90b2c5e29672a69e41888501f31de3b9569fc476b
+  metadata.gz: a32237713616d6611d7cc6e57f57d81e7ff02823a68ed1d633e5de7276d4894ce67f30ff1766bda40df3bde0d53a9d69db2c677b740b266ae040e98f91c72a0b
+  data.tar.gz: 5fb068a0f809fc0ab4245fcbf1116758c253b04629a378fe8bd262486dc18d55490ac1cd854e0b4c1494a98cc4414abb108eb7f60baf1a84752565f66b7049ff

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

@@ -57,6 +57,10 @@ module Glib::Auth
 
     end
 
+    def glib_raise_forbidden
+      raise UnauthorizedError
+    end
+
     private
       def raise_access_denied(record, policy)
         raise UnauthorizedError.new(record: record, policy: policy, query: "#{action_name}?")

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

@@ -11,28 +11,6 @@ module Glib::Auth
       params[:_dialog].present? # E.g. _dialog=v1
     end
 
-    def __glib_error_dialog(title, message, bottom_views = [])
-      {
-        action: 'dialogs/show',
-        # Don't show another dialog, just use the current one since it's a new dialog anyway, which means
-        # that it wouldn't contain existing user data.
-        updateExisting: glib_json_dialog_mode?,
-        title: title,
-        body: {
-          childViews: [
-            {
-              view: 'label',
-              text: message
-            },
-          ].concat(bottom_views),
-          padding: {
-            x: 20,
-            y: 22,
-          },
-        }
-      }
-    end
-
     def json_ui_401_response(sign_in_url)
       {
         # Handle dialogs_open and windows_open

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

@@ -178,7 +178,7 @@ module Glib::Json::Libs
   #   end
   # end
 
-  def __glib_error_dialog(title, message)
+  def __glib_error_dialog(title, message, bottom_views = [])
     {
       action: 'dialogs/show',
       # Don't show another dialog, just use the current one since it's a new dialog anyway, which means
@@ -188,14 +188,21 @@ module Glib::Json::Libs
       body: {
         childViews: [
           {
-            "view": "label",
-            "text": message
-          },
-        ],
-        "padding": {
-          "x": 20,
-          "y": 22,
-        },
+            view: 'panels/vertical',
+            styleClasses: ['glib-error-dialog'],
+            childViews: [
+              {
+                view: 'label',
+                text: message
+              },
+            ].concat(bottom_views),
+          }
+        ]
+        # Set this in the project's custom CSS.
+        # padding: {
+        #   x: 20,
+        #   y: 22,
+        # },
       }
     }
   end
@@ -229,7 +236,9 @@ module Glib::Json::Libs
   end
 
   def json_ui_redirect_to(url)
-    on_response = { action: 'windows/open', url: url }
+    # Use windows_reload instead of windows_open so clicking back will skip the bridging page.
+    # on_response = { action: 'windows/open', url: url }
+    on_response = { action: 'windows/reload', url: url }
 
     if glib_json_dialog_mode?
       # Only do this in dialog mode because this seems to add to the rendering time
@@ -308,7 +317,23 @@ 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.', [
+                  {
+                    view: 'button',
+                    text: 'Refresh',
+                    onClick: {
+                      action: 'dialogs/close',
+                      onClose: {
+                        action: 'windows/reload',
+                        onReload: {
+                          action: 'snackbars/alert',
+                          message: 'Refreshed. You can try again now.'
+                        }
+                      }
+                    }
+                  },
+                ]
+              )
             }
           end
         end

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

@@ -54,9 +54,11 @@ class Glib::JsonUi::ActionBuilder
       bool :updateExisting
     end
 
-    # deprecated
+    # Deprecation canceled. This is still useful for a scenario where the previous dialog
+    # was unknown, so we simply want to reload its content.
     class Reload < Action
-      panels_builder :content, :body
+      # Deprecated. Should just use dialogs_show or dialogs_open if
+      # these attributes are needed.
       string :url, cache: true
       bool :showClose # deprecated
       bool :disableCloseButton
@@ -68,6 +70,10 @@ class Glib::JsonUi::ActionBuilder
       action :onClose
     end
 
+    class CloseAll < Action
+      action :onClose
+    end
+
     class Oauth < Action
       hash :provider
       action :onSuccess

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

@@ -30,6 +30,18 @@ class Glib::JsonUi::ActionBuilder
       required :fallbackUrl
     end
 
+    class CloseWithOpen < Action
+      string :url
+      action :onOpen
+
+      required :url
+    end
+
+    class CloseAllWithOpen < Action
+      string :url
+      action :onOpen
+    end
+
     # Any component can listen to the refresh_state event and react appropriately.
     # E.g. Stripe credit card component can refresh its token to make sure it is not stale.
     class RefreshState < Action

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

@@ -107,6 +107,8 @@ module Glib
             json.url options[:url]
             json.inputName options[:inputName]
             json.strategy options[:strategy]
+            json.storagePrefix options[:storagePrefix]
+            json.metadata options[:metadata]
           end
       end
 
@@ -235,7 +237,7 @@ module Glib
         def form(options = {})
           form = Glib::JsonUi::ViewBuilder::Panels::Form.new(json, self)
           form.childViews(->(view_builder) { })
-          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model)
+          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model, :onChange)
 
           json.fullPageForm do
             json.view 'panels/fullPageForm'

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

@@ -289,6 +289,8 @@ class Glib::JsonUi::ViewBuilder
       string :uploadIcon # deprecated
       hash :placeholderView
       hash :infoSpec
+      string :storagePrefix
+      hash :metadata
 
       def buttonLabels(obj)
         @buttonLabels = ActiveSupport::HashWithIndifferentAccess.new(obj)
@@ -334,6 +336,9 @@ class Glib::JsonUi::ViewBuilder
       string :strategy # can be "delegate" or "dropUpload"
       string :url # http post end point if you don't want to use onFinishUpload
 
+      string :storagePrefix
+      hash :metadata
+
       required :accepts, :directUploadUrl
 
       # deprecated
@@ -391,6 +396,17 @@ class Glib::JsonUi::ViewBuilder
       end
     end
 
+    class Sign < AbstractField
+      string :directUploadUrl
+
+      required :directUploadUrl
+
+      # Override
+      # Signature field doesn't have default value
+      def value(value)
+      end
+    end
+
     # TODO
     # class MultiImage < Text
     #   # file_rules = { fileType: 'image/*', maxFileSize: 5000 }

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

@@ -334,6 +334,8 @@ module Glib
         hash :items
         hash :dropData
         string :strategy
+        string :storagePrefix
+        hash :metadata
       end
     end
   end

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

@@ -66,6 +66,15 @@ section.rows builder: ->(template) do
     action.dialogs_open fullscreen: 'mobile', url: json_ui_garage_url(path: 'forms/basic', mode: 'dialog')
   end
 
+  template.thumbnail title: 'dialogs/reload (without url)', onClick: ->(action) do
+    action.runMultiple childActions: ->(saction) do
+      saction.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_form')
+      saction.timeouts_set interval: 1000, onTimeout: ->(ssaction) do
+        ssaction.dialogs_reload
+      end
+    end
+  end
+
   if !Rails.env.test? # Prevent test failure
     template.thumbnail title: 'dialogs/open (page with error)', onClick: ->(action) do
       action.dialogs_open url: json_ui_garage_url(path: 'forms/non_existent', mode: 'dialog')
@@ -96,6 +105,16 @@ section.rows builder: ->(template) do
     action.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_form')
   end
 
+  template.thumbnail title: 'dialogs/closeAll', onClick: ->(action) do
+    action.runMultiple childActions: ->(saction) do
+      saction.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_form')
+      saction.dialogs_open url: json_ui_garage_url(path: 'forms/dialogs_form')
+      saction.timeouts_set interval: 1000, onTimeout: ->(ssaction) do
+        ssaction.dialogs_closeAll
+      end
+    end
+  end
+
   template.thumbnail title: 'dialogs/oauth', onClick: ->(action) do
     if respond_to?(:user_facebook_omniauth_authorize_url)
       provider = {

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

@@ -14,6 +14,11 @@ section.rows builder: ->(template) do
     action.windows_open url: json_ui_garage_url(path: 'home/blank')
   end
 
+  template.thumbnail title: 'windows/closeAllWithOpen', onClick: ->(action) do
+    action.windows_closeAllWithOpen url: json_ui_garage_url(path: 'home/index')
+
+  end
+
   template.thumbnail title: 'windows/openWeb', onClick: ->(action) do
     action.windows_openWeb url: 'http://www.google.com'
   end

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

@@ -46,6 +46,11 @@ page.form options.merge(childViews: ->(form) do
     directUploadUrl: rails_direct_uploads_url,
     uploadTitle: 'Files uploaded:',
     uploadFailedText: '(UPLOAD FAILED)',
+    storagePrefix: 'glib',
+    metadata: {
+      foo: 'bar',
+      zoo: 'baz'
+    },
     files: [
       { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }
     ]
@@ -61,5 +66,13 @@ page.form options.merge(childViews: ->(form) do
     uploadFailedText: '(UPLOAD FAILED)',
     onFinishUpload: ->(action) { action.forms_submit }
   form.spacer height: 16
+  form.label text: 'Sign'
+  form.spacer height: 8
+  form.fields_sign \
+    name: 'user[sign]',
+    directUploadUrl: rails_direct_uploads_url,
+    width: 300, height: 150,
+    validation: { required: { message: 'add your signature!' } }
+  form.spacer height: 24
   form.fields_submit text: 'Submit'
 end)

data/lib/glib/blob.rb

@@ -0,0 +1,15 @@
+::ActiveStorage::Blob.class_eval do
+  def service_headers_for_direct_upload
+    service.headers_for_direct_upload key, filename: filename, content_type: content_type, content_length: byte_size, checksum: checksum
+  end
+
+  class << self
+    def create_before_direct_upload!(key: nil, filename:, byte_size:, checksum:, content_type: nil, metadata: nil, service_name: nil, record: nil, prefix: nil)
+      key_name = key || generate_unique_secure_token
+      if prefix.present?
+        key_name = "#{prefix}/#{key_name}"
+      end
+      create! key: key_name, filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata, service_name: service_name
+    end
+  end
+end

data/lib/glib/direct_uploads_controller.rb

@@ -2,7 +2,10 @@
   # include Rails.application.routes.url_helpers
   before_action :authenticate_user!
 
-  rescue_from StandardError do
+  rescue_from StandardError do |e|
+    if !Rails.env.production?
+      raise e
+    end
     render json: { message: 'Upload failed' }, status: 500
   end
 
@@ -14,11 +17,16 @@
     render json: { message: 'Session expired. Please refresh page' }, status: 401
   end
 
-  def authenticate_user!
-    current_user.present? ? nil : raise_error
-  end
+  private
+    def blob_args
+      params.require(:blob).permit(:filename, :byte_size, :checksum, :content_type, :prefix, metadata: {}).to_h.symbolize_keys
+    end
 
-  def raise_error
-    raise Glib::Auth::Policy::UnauthorizedError
-  end
+    def authenticate_user!
+      current_user.present? ? nil : raise_error
+    end
+
+    def raise_error
+      raise Glib::Auth::Policy::UnauthorizedError
+    end
 end

data/lib/glib/engine.rb

@@ -5,6 +5,7 @@ module Glib
 
       # modify direct upload
       config.to_prepare do
+        require_relative 'blob'
         require_relative 'direct_uploads_controller' 
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.27.0
+  version: 3.28.0
 platform: ruby
 authors:
 - ''
@@ -307,6 +307,7 @@ files:
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb
+- lib/glib/blob.rb
 - lib/glib/crypt/utils.rb
 - lib/glib/direct_uploads_controller.rb
 - lib/glib/dynamic_text.rb