glib-web 3.16.0 → 3.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8f74c09536b2840e41346cfef87cfe84896e61b4985ee60d45f576ddaf772d
-  data.tar.gz: f6f245a390e234a5910803043074638d9e55d72a4fc2c29eb07b570bee810bcb
+  metadata.gz: 6d5b87ed40b6899921ff69c27b36f7a7fdbd5bda372cc66e862fa118e5b3829e
+  data.tar.gz: d48ca7297c13cb43a969e274bf3090cd72bfed50dda1fa150de961db3cb53dfa
 SHA512:
-  metadata.gz: 07e4d74b157ba6ca4ffd1021806ab589c54750ee308901edb249ecf5af6a2c97ea50c2a779c516ef905751a4bb255a2101e054dfda3de2431749bc4057f0a768
-  data.tar.gz: d09d737aff6ddd5938e01d9ef4960ce0106a77cac80d5ca418d4ae8edddac79b9cd69da3d138f751e66f7aea4afa8b2a32a1b4c5d0ece72622739deb0902937b
+  metadata.gz: 93ec58c318c1568c69dcd7007b1cff9effd8a7048e885cf10df17c3065c7ad64d37220d8c30e9a44af01d592664f18d617832da3b88297e779893954f6aa95aa
+  data.tar.gz: 1aecb33728606c762df28283bfab3b21399748f27b9a709158a13859e8cd147031eee7cdfd71ada6d10f56fe13450f8f1615f175fb1648363fefbc03402dcec9

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

@@ -311,11 +311,13 @@ class Glib::JsonUi::ViewBuilder
         json.hint @hint if @hint
 
         if @prop && (form = page.current_form)
-          model = form.instance_variable_get(:@model)
-          @files ||= model.send(@prop).to_a.map { |file| { name: file.blob&.filename, signed_id: file.signed_id } }
+          association = form.nested_associations.last
+          context = association || form
 
-          json.files @files if @files.present?
+          @files ||= context.field_value(@prop, collect_ids: false).to_a.map { |file| { name: file.blob&.filename, signed_id: file.signed_id } }
         end
+
+        json.files @files if @files.present?
       end
     end
 

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

@@ -34,8 +34,6 @@ class Glib::JsonUi::ViewBuilder
 
       def field_assert_respond_to(prop)
         self.class.field_assert_respond_to(@model, prop)
-        # # Identify a prop being used on a nil model or incorrect model.
-        # raise "Invalid property `#{prop}` on '#{@model.class}'" unless @model.respond_to?(prop)
       end
 
       def self.field_assert_respond_to(model, prop)
@@ -74,12 +72,12 @@ class Glib::JsonUi::ViewBuilder
         "#{name}[#{prop}]#{suffix}"
       end
 
-      def field_value(prop)
-        self.class.field_value(@model, prop)
+      def field_value(prop, collect_ids: true)
+        self.class.field_value(@model, prop, collect_ids: collect_ids)
       end
 
-      def self.field_value(model, prop)
-        if is_array_association?(model, prop)
+      def self.field_value(model, prop, collect_ids:)
+        if is_array_association?(model, prop) && collect_ids
           model.send(prop)&.map { |record| record.id }
         else
           model.send(prop)
@@ -384,8 +382,8 @@ class Glib::JsonUi::ViewBuilder
         @delegate_class.field_name(@model, prop, multiple, page)
       end
 
-      def field_value(prop)
-        @delegate_class.field_value(@model, prop)
+      def field_value(prop, collect_ids: true)
+        @delegate_class.field_value(@model, prop, collect_ids: collect_ids)
       end
 
       def field_label(prop, args)

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

@@ -41,7 +41,7 @@ page.form options.merge(childViews: ->(form) do
     name: 'user[multi][]',
     accepts: { fileType: 'image', maxFileSize: 5000 },
     directUploadUrl: rails_direct_uploads_url,
-    uploadTitle: 'File added:',
+    uploadTitle: 'Files uploaded:',
     uploadFailedText: '(UPLOAD FAILED)',
     files: [
       { name: 'File (Example)', signed_id: ActiveStorage::Attachment.last&.signed_id }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.16.2
 platform: ruby
 authors:
 - ''