glib-web 4.38.0 → 4.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca33d92529f1bfd367964ea67c24ec29da7611dd98f12ee342ede700c4bada87
-  data.tar.gz: 1ea6e1b7a09f8711ad1d6218613c2f52a5283de3aa820bdfb1d9d4d96bf74cca
+  metadata.gz: 04bdbf508e9bae2d875e880a1ccff951cacb80d7eae24a543e82a816d9eaff4f
+  data.tar.gz: 3f209d236fafbb17c2a40a5cf570bfd5166be900059abbf71b0b652260e035ec
 SHA512:
-  metadata.gz: 5f68c18e3c52fea1c3ccf33ae9fe8099ab6c79addde92e2fa5745c041985e4bc637164356559e354b4a0b62e0e3c869e5be34eb799914d802079ff064ce3af06
-  data.tar.gz: a4f7a944532dd4ca3dfa7dbdf8e0cb71b7a10888d81a3fa464d278a959cc6004a6b06aa13bfa9315726d89e89d3a9cfe00172a4669e651410df5d4159b9cc183
+  metadata.gz: 480b89089e395f1b123bab2e0b161d485406eb537c215fab96c464e8be22bd7e42a44d7ef460cf37d32396642dcf37eb46afe7625bae126e19cae89d3870f1bc
+  data.tar.gz: 3ad20d4a121a87e14b496ad5e179b4f7db2be6812a7bc086086e000ec12c52558b6768192300cdcd273a676824beed495d5db8a4fa97854aff76957310f6fee3

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

@@ -100,6 +100,14 @@ module Glib::Auth
       raise_access_denied(resource_instance, policy_instance) unless policy_instance.public_send(query)
     end
 
+    def glib_skip_controller_action_if_permission_test
+      permission_test = params[:__glib_permission_test].present?
+
+      if permission_test
+        render status: 200, json: { status: 'ok' }
+      end
+    end
+
     class UnauthorizedError < Pundit::NotAuthorizedError
     end
 
@@ -110,6 +118,7 @@ module Glib::Auth
 
         before_action :glib_load_resource
         before_action :glib_authorize_resource
+        before_action :glib_skip_controller_action_if_permission_test
       end
 
       def glib_auth_inited?

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

@@ -5,6 +5,7 @@ class Glib::JsonUi::ActionBuilder
       string :message
       action :onLoad
       action :onClose
+      singleton_array :styleClass, :styleClasses
     end
 
 
@@ -16,6 +17,7 @@ class Glib::JsonUi::ActionBuilder
       bool :closeOnBlur
       bool :updateExisting
       action :onClose
+      singleton_array :styleClass, :styleClasses
 
       # def initialize(json, page)
       #   @json = json
@@ -37,6 +39,7 @@ class Glib::JsonUi::ActionBuilder
       bool :closeOnBlur
       bool :updateExisting
       action :onClose
+      singleton_array :styleClass, :styleClasses
     end
 
     class Reload < Action

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

@@ -31,6 +31,8 @@ class Glib::JsonUi::ActionBuilder
 
     class Show < Action
       panels_builder :content, :body
+      bool :scrim
+      int :elevation # 0-24
       string :placement
     end
 

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

@@ -356,7 +356,7 @@ module Glib
 
       class AppBar < View
         color :color
-        panels_builder :content, :logo
+        panels_builder :content, :logo, :body
         string :imageUrl
         action :onCLick
         bool :showTitle

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

@@ -176,7 +176,7 @@ page.form \
                 {
                   "var": 'user[radio1]'
                 },
-                ''
+                '<EMPTY_STRING>'
               ]
             }
           }

data/app/views/json_ui/garage/test_page/_header.json.jbuilder

@@ -1,14 +1,22 @@
-navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window', 'selectable', 'lifecycle']
+navs = ['form', 'dialog', 'form_dynamic', 'auto_validate', 'multiupload', 'dirty_state', 'window', 'selectable', 'lifecycle', 'file_upload_new']
 
-view.panels_flow innerPadding: { bottom: 0 }, styleClass: 'align-right', width: 'matchParent', childViews: ->(res) do
-  navs.each_with_index do |nav, index|
-    if index < navs.size && index != 0
-      res.spacer width: 4
-      res.label text: '|'
-      res.spacer width: 4
-    end
-    res.label text: nav, onClick: ->(action) do
-      action.windows_open url: json_ui_garage_url(path: "test_page/#{nav}")
+view.panels_flow(
+  innerPadding: { bottom: 0 },
+  styleClass: 'align-right',
+  width: 'matchParent',
+  childViews: ->(res) do
+    navs.each_with_index do |nav, index|
+      if index < navs.size && index != 0
+        res.spacer width: 4
+        res.label text: '|'
+        res.spacer width: 4
+      end
+      res.label(
+        text: nav,
+        onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: "test_page/#{nav}")
+        end
+      )
     end
   end
-end
+)

data/app/views/json_ui/garage/test_page/file_upload_new.json.jbuilder

@@ -0,0 +1,158 @@
+json.title 'Forms'
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+params[:mode] ||= 'html'
+
+image = OpenStruct.new(
+  url: 'https://picsum.photos/id/11/100/60',
+  signed_id: 'test',
+  filename: 'upload.png'
+)
+
+accepts = {
+  fileType: 'image',
+  maxFileSize: 10,
+  maxFileLength: 2
+}
+
+if params[:mode] == 'html'
+  directUploadUrl = nil
+else
+  directUploadUrl = glib_direct_uploads_url
+end
+
+properties = {
+  styleClass: 'pb-2',
+  directUploadUrl: params,
+  accepts: accepts,
+  directUploadUrl: directUploadUrl,
+  value: image&.signed_id
+}
+
+# properties[:onMaxFileLengthError] = ->(action) do
+#   action.snackbars_alert message: 'max file length exceeded'
+# end
+
+# properties[:onMaxFileSizeError] = ->(action) do
+#   action.snackbars_alert message: 'max file size exceeded'
+# end
+
+# properties[:onFileTypeError] = ->(action) do
+#   action.snackbars_alert message: 'file type invalid'
+# end
+
+properties[:onFinishUpload] = ->(action) do # rubocop:disable Glib/MultilineMethodCallStyle
+  action.snackbars_alert message: 'Get the signed ids!'
+end
+
+page.form(
+  url: json_ui_garage_url(path: 'forms/generic_post'),
+  method: 'post',
+  childViews: ->(form) do
+    render 'json_ui/garage/test_page/header', view: form
+
+    # form.panels_flow(
+    #   styleClass: 'items-center justify-center gap-2 pb-4',
+    #   childViews: ->(flow) do
+    #     flow.label text: "MODE: #{params[:mode] || 'directUpload'}"
+    #     change = params[:mode] == 'html' ? 'directUpload' : 'html'
+    #     flow.button text: 'Change', onClick: ->(action) { action.windows_open url: json_ui_garage_current_url({ mode: change }) }
+    #   end
+    #  )
+
+    form.h2 text: 'Field Upload', styleClass: 'pb-4'
+    form.label text: 'placeholder image', styleClass: 'pb-1'
+    form.panels_flow(
+      styleClass: 'align-center',
+      xs: { gap: { all: 4 } },
+      childViews: ->(flow) do
+        form.fields_upload(
+          properties.merge(
+            name: 'user[file_placeholderView]',
+            id: 'pv1',
+            placeholderView: { type: 'image', url: image&.url, width: 144, height: 144 }
+         )
+        )
+
+        flow.button(
+          text: 'Trigger',
+          onClick: ->(action) do
+            action.components_invoke targetId: 'pv1', name: 'trigger'
+          end
+        )
+        flow.button(
+          text: 'Reset',
+          onClick: ->(action) do
+            action.components_invoke targetId: 'pv1', name: 'reset'
+          end
+        )
+      end
+     )
+
+    form.label text: 'placeholder avatar', styleClass: 'pb-1'
+    form.panels_flow(
+      styleClass: 'align-center',
+      xs: { gap: { all: 4 } },
+      childViews: ->(flow) do
+        flow.fields_upload(
+          properties.merge(
+            name: 'user[file_placeholderView2]',
+            id: 'pv2',
+            placeholderView: { type: 'avatar', url: image&.url, width: 64, height: 64 }
+          )
+        )
+
+      end
+     )
+
+    form.label text: 'file input', styleClass: 'pb-1'
+    form.fields_upload(
+      properties.merge(
+        name: 'user[file_input1]',
+        id: 'fi1',
+        label: 'Upload file',
+        width: 300,
+        label: 'Choose file',
+        inputView: { variant: 'outlined' },
+        multiple: false
+      )
+     )
+
+
+    form.label text: 'multiprogress', styleClass: 'pb-1'
+    form.fields_upload(
+      properties.merge(
+        name: 'user[file_multiprogress1][]',
+        id: 'mp1',
+        width: 300,
+        label: 'Upload file',
+        multiple: true,
+        multiProgressView: { files: [] }
+      )
+     )
+
+
+    form.label text: 'Button file upload', styleClass: 'pb-1'
+    form.button(
+      text: 'click me to select file',
+      onClick: ->(action) do
+        action.components_invoke targetId: 'btn1', name: 'trigger'
+      end
+     )
+    form.fields_upload(
+      properties.merge(
+        name: 'user[file_btn1][]',
+        id: 'btn1',
+        width: 300,
+        label: 'Upload file',
+        multiple: true,
+        inputView: { files: [] },
+        styleClass: 'pb-4 d-none'
+      )
+     )
+
+    form.fields_submit text: 'submit'
+
+  end
+)

data/lib/glib/json_crawler/router.rb

@@ -9,11 +9,17 @@ module Glib
       attr_accessor :host, :skip_similar_page
 
       def log(action, url, response = nil)
+        if url.present?
+          url = remove_params(url, [:__glib_permission_test])
+        end
+
         @last_log = [
           action,
           response.present? ? response.code : nil,
           url
-        ].compact.join(' :: ')
+        ].compact.join(
+          ' :: '
+                    )
 
         # puts @last_log
 
@@ -127,7 +133,9 @@ module Glib
               'dialogs/oauth-v1',
               'http/delete',
               'dialogs/oauth'
-            ].include?(action)
+            ].include?(
+              action
+                   )
               # @read_only_actions.add([action, params['url']])
               http_actions.add([action, params['url']])
             end
@@ -164,6 +172,10 @@ module Glib
         crawler_actions.each do |crawler_action|
           action, url, params = crawler_action
 
+          if url.present?
+            url = add_params(url, __glib_permission_test: true)
+          end
+
           params = JSON.parse(params) if params.is_a?(String)
           params ||= {}
 
@@ -212,6 +224,21 @@ module Glib
       end
 
       private
+        def add_params(url, new_params)
+          uri = URI(url)
+          existing = URI.decode_www_form(uri.query || '')
+          uri.query = URI.encode_www_form(existing + new_params.to_a)
+          uri.to_s
+        end
+
+        def remove_params(url, keys)
+          keys = keys.map(&:to_s)
+          uri = URI(url)
+          filtered = URI.decode_www_form(uri.query || '').reject { |name, _| name.empty? || keys.include?(name) }
+          uri.query = filtered.empty? ? nil : URI.encode_www_form(filtered)
+          uri.to_s
+        end
+
         def similar_page?(params)
           return false if http_actions.blank? || params['url'].blank?
           return false if !skip_similar_page

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.38.0
+  version: 4.39.0
 platform: ruby
 authors:
 - ''
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-10-04 00:00:00.000000000 Z
@@ -135,6 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+description:
 email: ''
 executables: []
 extensions: []
@@ -370,6 +372,7 @@ files:
 - app/views/json_ui/garage/test_page/dialog.json.jbuilder
 - app/views/json_ui/garage/test_page/dialog_open.json.jbuilder
 - app/views/json_ui/garage/test_page/dirty_state.json.jbuilder
+- app/views/json_ui/garage/test_page/file_upload_new.json.jbuilder
 - app/views/json_ui/garage/test_page/form.json.jbuilder
 - app/views/json_ui/garage/test_page/form_dynamic.json.jbuilder
 - app/views/json_ui/garage/test_page/lifecycle.json.jbuilder
@@ -448,8 +451,10 @@ files:
 - lib/glib/value.rb
 - lib/glib/version.rb
 - lib/tasks/db.rake
+homepage:
 licenses: []
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -464,7 +469,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []