glib-web 3.16.1 → 3.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6506d01810212bd6a00ece4f282642215269a2f959748bc89c6f6f030c1b89c
-  data.tar.gz: 8d882c41d4155f53e3d6a41b2de5b96c98fbd03fb9d6419fc23c0ec67e9155d8
+  metadata.gz: 26d2c5c409ff911326efa81f445217d859f62b5350630c28185ca4e8a0ef85ad
+  data.tar.gz: edb315e653b13110b2cdfb896bdbc20e980adc593155ecb8527951a8cfaf232f
 SHA512:
-  metadata.gz: a1edf3c7be0d464dbe4969b14e5355c623703ea3b6824891cb055cf186e1c019b9057fb125d85d9c4e223679ca145f9a1bb37dec0c4a8f775b67360d761813a9
-  data.tar.gz: 9a460d9990353da55df488ec6675178be435296ce2e846da4284e9fc0a758b46b2b51a698450e1eca5ee3ffeddca4b3e265e63ec3fa845a4e5ebf2574e67f64b
+  metadata.gz: '05778a76d110933cd70d86343d645d680b19c48df67027affcfdd59a89cbfa7d74489826d116f450c881a9bb67059fbc83f04b22dd80edf228649e9515da0f89'
+  data.tar.gz: eb2db140e67e307c7cdd5a52ea48887bb5414b4949e6fa154a490822ea64863cfbe85369fc1695036976e49db0009015adb7593f600d53768ef856cbea820441

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

@@ -48,9 +48,6 @@ class Glib::JsonUi::ViewBuilder
       # Override
       def created
         if @prop && (form = page.current_form)
-          association = form.nested_associations.last
-          context = association || form
-
           context.field_assert_respond_to(@prop)
 
           @name ||= context.field_name(@prop, @multiple || false)
@@ -61,7 +58,7 @@ class Glib::JsonUi::ViewBuilder
 
           if form.current_dynamic_group.nil?
             # This is not relevant inside a dynamic group
-            @value ||= context.field_value(@prop)
+            @value ||= determine_value(context, @prop)
           end
         end
         json.name @name
@@ -78,6 +75,16 @@ class Glib::JsonUi::ViewBuilder
         # json.validation @validation if @validation
       end
 
+      # To be overridden
+      def determine_value(context, prop)
+        context.field_value(prop)
+      end
+
+      def context
+        form = page.current_form
+        association = form.nested_associations.last
+        @context ||= association || form
+      end
     end
 
     class Text < AbstractField
@@ -168,6 +175,8 @@ class Glib::JsonUi::ViewBuilder
       bool :multiple, cache: true
       # bool :manualEntry
       hash :append
+
+      panels_builder :accessory, :header, :footer
     end
 
     class TimeZone < AbstractField
@@ -274,8 +283,17 @@ class Glib::JsonUi::ViewBuilder
 
         json.set! :buttonLabels, @buttonLabels
 
+        if @prop && context
+          json.fileTitle context.field_value(@prop).blob&.filename
+        end
+
         super
       end
+
+      @Override
+      def determine_value(context, prop)
+        context.field_value(prop)&.signed_id || ''
+      end
     end
 
     class MultiUpload < AbstractField
@@ -310,9 +328,11 @@ class Glib::JsonUi::ViewBuilder
         json.placeholder @placeholder if @placeholder
         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 } }
+        if @prop && context
+          # association = form.nested_associations.last
+          # context = association || form
+
+          @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?

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 }

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

@@ -60,8 +60,29 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     options << { type: 'divider' }
   end
 
-  form.fields_select name: 'user[language]', width: 'matchParent', label: 'Primary Language', options: options, value: 'nl'
-  form.fields_select name: 'user[languages][]', width: 'matchParent', label: 'Primary Language', options: options, value: ['ja', 'de'], multiple: true
+  form.fields_select \
+    name: 'user[language]',
+    width: 'matchParent',
+    label: 'Primary Language',
+    options: options,
+    value: 'nl',
+    accessory: ->(accessory) do
+      accessory.header padding: { x: 16, y: 10 }, childViews: ->(header) do
+        header.label text: 'Header'
+      end
+      accessory.footer padding: { x: 16, y: 10 }, childViews: ->(header) do
+        header.label text: 'Footer'
+      end
+      # footer.label text: 'TEST123'
+    end
+
+  form.fields_select \
+    name: 'user[languages][]',
+    width: 'matchParent',
+    label: 'Primary Language',
+    options: options,
+    value: ['ja', 'de'],
+    multiple: true
 
   form.spacer height: 20
   form.h2 text: 'Select fields with empty values'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.16.1
+  version: 3.16.3
 platform: ruby
 authors:
 - ''
@@ -327,7 +327,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''