glib-web 4.34.7 → 4.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5980f61e5437cc674d20591dae30b18a5241575a95c0358eaa5898bcac37d9
-  data.tar.gz: '08d19314cd7553a0e9c9b203f98577cd60b2693def0d19b04e3b9aa33608233c'
+  metadata.gz: cefea23c2039d47502f18d50116d608953d704316db5fd81150818d9a4d2fc04
+  data.tar.gz: 0c224f7552b8d7ced23dd166eb184afa257d0f821f3b7a838f214e35681a0a99
 SHA512:
-  metadata.gz: d87e4b603b08f8da09eae98ef4d011df5c7adbedf580bb4284b6a88823e4c3a3bbe726ccf87e94864c272e64509f7172002b74218548451ecc0a417fc818a17f
-  data.tar.gz: 2aeaa759c22c3d9cd24b40700280517dd3c6f70aa50936912f6d200875ef6249eab58cfd2c26fd30333b9aab1c21068d2f8ce0bb2552dd5cdd574de7d12dd015
+  metadata.gz: 4152bea87f6fd59ad0224ee40308c4366efbe62786572d2a4e439246c39de826217df01e2abd2a339b93d6370fb3d7e2694ada049ec965dfd6feaefefb2fd4e0
+  data.tar.gz: 98d35bb888090b3b3dae94cfb8567f7c9ea565f2e4a3eb78246f21b55bcbd92ad55ede6bcf08150912ba2ea33d4407bd8a5ff27e78c6650c82958e090ae82bee

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

@@ -114,14 +114,14 @@ module Glib::Json::Libs
     session[REDIRECT_BACK_KEY] = url || url_for(params.to_unsafe_h.merge(format: nil))
   end
 
-  def glib_handle_401(sign_in_url)
+  def glib_handle_401(sign_in_url, **redirect_options)
     if !glib_json_dialog_mode? && request.get?
       json_ui_save_return_url
     end
 
     respond_to do |format|
       format.html do
-        redirect_to sign_in_url
+        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
@@ -130,7 +130,7 @@ module Glib::Json::Libs
         if Rails.env.test?
           render status: :unauthorized
         else
-          redirect_to sign_in_url
+          redirect_to sign_in_url, **redirect_options
         end
       end
     end

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

@@ -72,13 +72,12 @@ module Glib::Json::Ui
 
     when_option = options[:when]
     if when_option.is_a?(Proc)
-      should_render = when_option.call(self)
+      # should_render = when_option.call(self)
+      should_render = instance_exec(&when_option)
     else
       should_render = when_option == :always
     end
 
-    # raise "should_render: #{should_render}"
-
     if should_render || params[:_render] == 'v1'
       @__json_ui_activated = true
       request.variant = :ui

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

@@ -17,7 +17,7 @@ class Glib::JsonUi::ActionBuilder
     end
 
     class OpenWeb < Action
-      # string :url
+      string :targetWindow
 
       def url(value, options = {})
         regex = /\/.+\.json|format=json/

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

@@ -15,6 +15,7 @@ module Glib
       class Button < MenuItem
         badgeable
 
+        hash :avatar, optional: [:size, :backgroundColor, :url, :initials]
         string :text
         icon :icon
         action :onClick

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

@@ -61,7 +61,7 @@ module Glib
         end
 
         def footer(options = {})
-          json.header do
+          json.footer do
             json.backgroundColor options.delete(:backgroundColor)
             json.cellViews do
               options.delete(:cellViews)&.call page.view_builder

data/app/models/concerns/glib/nilify_blanks.rb

@@ -0,0 +1,32 @@
+module Glib
+  module NilifyBlanks
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :_nilify_blanks_options, default: { only: nil, except: nil }
+
+      before_validation :_nilify_blanks
+    end
+
+    class_methods do
+      def nilify_blanks(options = {})
+        self._nilify_blanks_options = options
+      end
+    end
+
+    private
+      def _nilify_blanks
+        attrs = attributes
+
+        only   = self.class._nilify_blanks_options[:only]
+        except = self.class._nilify_blanks_options[:except]
+
+        attrs = attrs.slice(*only.map(&:to_s)) if only.present?
+        attrs = attrs.except(*except.map(&:to_s)) if except.present?
+
+        attrs.each do |attr, val|
+          self[attr] = nil if val.is_a?(String) && val.blank?
+        end
+      end
+  end
+end

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

@@ -25,7 +25,7 @@ page.table styleClass: 'table--grid', sections: [
         end
       end
 
-      header.label text: "Markdown"
+      header.label text: 'Markdown'
     end
 
     items = [1, 2, 3]
@@ -41,5 +41,18 @@ page.table styleClass: 'table--grid', sections: [
         cell.markdown text: markdown
       end
     end
+
+    section.footer cellViews: ->(header) do
+      column_indexes.each do |i|
+        # order_key = "footer#{i}"
+        # order = @order_headings[order_key]
+        header.label text: "Footer#{i}"
+        # , onClick: ->(action) do
+        #   action.windows_reload url: json_ui_garage_url(path: 'tables/layout', orders: reversed_order_params(order_key))
+        # end
+      end
+
+      header.label text: ''
+    end
   end
 ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.34.7
+  version: 4.35.1
 platform: ruby
 authors:
 - ''
@@ -206,6 +206,7 @@ files:
 - app/helpers/glib/json_ui/view_builder/panels.rb
 - app/helpers/glib/urls_helper.rb
 - app/models/concerns/glib/enum_humanization.rb
+- app/models/concerns/glib/nilify_blanks.rb
 - app/models/concerns/glib/soft_deletable.rb
 - app/models/glib/active_storage/attachment.rb
 - app/models/glib/active_storage/blob.rb