glib-web 3.16.2 → 3.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5b87ed40b6899921ff69c27b36f7a7fdbd5bda372cc66e862fa118e5b3829e
-  data.tar.gz: d48ca7297c13cb43a969e274bf3090cd72bfed50dda1fa150de961db3cb53dfa
+  metadata.gz: 26d2c5c409ff911326efa81f445217d859f62b5350630c28185ca4e8a0ef85ad
+  data.tar.gz: edb315e653b13110b2cdfb896bdbc20e980adc593155ecb8527951a8cfaf232f
 SHA512:
-  metadata.gz: 93ec58c318c1568c69dcd7007b1cff9effd8a7048e885cf10df17c3065c7ad64d37220d8c30e9a44af01d592664f18d617832da3b88297e779893954f6aa95aa
-  data.tar.gz: 1aecb33728606c762df28283bfab3b21399748f27b9a709158a13859e8cd147031eee7cdfd71ada6d10f56fe13450f8f1615f175fb1648363fefbc03402dcec9
+  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,9 @@ class Glib::JsonUi::ViewBuilder
         json.placeholder @placeholder if @placeholder
         json.hint @hint if @hint
 
-        if @prop && (form = page.current_form)
-          association = form.nested_associations.last
-          context = association || form
+        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

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.2
+  version: 3.16.3
 platform: ruby
 authors:
 - ''