glib-web 4.11.3 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 909f15289f876cff26ef1f742d864fd58291b7e2b775ada6a946bd9d0335e5f6
-  data.tar.gz: 4de45fc74a77622b05d3cd957d00c3af2f625948b3f82c48e050f951a3f8049e
+  metadata.gz: fea0c9ca22e2cd6a190a3be52be84ed1a79ec94bfec2c17ee766793adb3941d1
+  data.tar.gz: 3a19e361ff4609642e13f2c616af927d40f7094eb25c0aa9174609d19a3aa4a9
 SHA512:
-  metadata.gz: 72e7c7106e83e247cba86d588ecbdfec6e67eeb4831009b88c1d008771bcbea319d1a5f3db8f910eca9a8d84ca72cb87528828f944dee6775630945cca7208e6
-  data.tar.gz: f4543608557ee088e0271b856bb50d0e61096837daf2bda6f9c84b968921e5855659fbd857bad33585adc23b69ef22a0dc362aa2c0f68629ea7536595a3fc777
+  metadata.gz: d2fc7867a17b4aa08b5a37068f50315c726725e47b82a6dd8b9feff0271a0dac1476c4c1b01588f44bb649ca86a17e2a26340c52143357ef978276dccc22d939
+  data.tar.gz: 20c3582468ce979b149fa170980f0aa2c4c575595d714427bb922548aa975a3a12d5f6d624b90c26afaa45f95abea3dd7586fb380ca9f744cc7409ea29c7a17c

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

@@ -9,6 +9,7 @@ class Glib::JsonUi::ActionBuilder
       string :placement
       int :offset
       int :width
+      bool :persistent
       # singleton_array :styleClass, :styleClasses
     end
 

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

@@ -8,7 +8,7 @@ module Glib
       class MenuItem < JsonUiElement
         include Builder::MouseEvents
 
-        hash :analytics, optional: [:featured, :disabled]
+        hash :analytics, optional: [:featured, :disabled, :group, :action]
         hash :tooltip, required: [:text], optional: [:placement, :position]
       end
 

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

@@ -7,6 +7,7 @@ class Glib::JsonUi::ViewBuilder
       bool :readOnly
       bool :disabled
       bool :disableDirtyCheck
+      bool :clearable
       action :onChange
       action :onChangeAndLoad
       string :paramNameForFormData
@@ -201,7 +202,7 @@ class Glib::JsonUi::ViewBuilder
 
       panels_builder :accessory, :header, :footer
       bool :clearable
-      bool :csvMode
+      # bool :csvMode
 
       def options(value)
         @_options = value
@@ -294,8 +295,8 @@ class Glib::JsonUi::ViewBuilder
       action :onClick
       string :offIcon
       string :onIcon
-      hash :image, required: [:url, :template], optional: [:width, :height]
-      hash :icon, required: [:name, :template], optional: [:color, :size]
+      hash :image, required: [:url, :template], optional: [:width, :height, :subtitle]
+      hash :icon, required: [:name, :template], optional: [:color, :size, :subtitle]
 
       views :childViews
     end

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

@@ -2,7 +2,7 @@ sleep 1
 row_id = params[:user]['row_id']
 status = [:succeeded, :failed][rand(0..1)]
 # status = :succeeded
-#status = :failed
+# status = :failed
 
 json_ui_response json do |action|
   action.components_invoke \

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

@@ -22,73 +22,80 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       { name: 'type', value: 'yes_no' },
     ]
   ]
-  form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', groupFieldProperties: properties, titlePrefix: 'Entry', content: ->(group) do
+  form.fields_dynamicGroup id: 'form_dynamic_group', width: 'matchParent', name: 'user[evaluation]', groupFieldProperties: properties, titlePrefix: 'Entry', content: ->(group) do
     group.template padding: { left: 32 }, childViews: ->(template) do
       template.spacer height: 10
       template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'
 
       form.panels_responsive id: 'responsive_{{entry_index}}', childViews: ->(column) do
-        options = [:rating, :yes_no, :choices]
-        template.fields_select \
-          width: 'matchParent',
-          name: 'type',
-          label: 'Answer Type',
-          placeholder: 'Answer Type',
-          options: options.map { |o| { text: o.to_s.humanize, value: o } },
-          onChangeAndLoad: ->(action) do
-            action.runMultiple childActions: ->(multiple) do
-              multiple.logics_set \
-                cacheData: true, # This is so that the the new data is retained when the `dynamicGroup` gets re-rendered.
-                debug: true,
-                targetId: 'responsive_{{entry_index}}', dataBuilder: ->(set) do
-                  set.panels_responsive width: 'matchParent', accessory: ->(accessory) do
-                    accessory.footer childViews: ->(footer) do
-                      footer.fields_check \
-                        width: 'matchParent',
-                        id: 'check_{{entry_index}}',
-                        name: 'enabled',
-                        label: 'Enable',
-                        checkValue: true
+          options = [:rating, :yes_no, :choices]
+          template.fields_select \
+            width: 'matchParent',
+            name: 'type',
+            label: 'Answer Type',
+            placeholder: 'Answer Type',
+            options: options.map { |o| { text: o.to_s.humanize, value: o } },
+            onChangeAndLoad: ->(action) do
+              action.runMultiple childActions: ->(multiple) do
+                multiple.logics_set \
+                  cacheData: true, # This is so that the the new data is retained when the `dynamicGroup` gets re-rendered.
+                  debug: true,
+                  targetId: 'responsive_{{entry_index}}', dataBuilder: ->(set) do
+                    set.panels_responsive width: 'matchParent', accessory: ->(accessory) do
+                      accessory.footer childViews: ->(footer) do
+                        footer.fields_check \
+                          width: 'matchParent',
+                          id: 'check_{{entry_index}}',
+                          name: 'enabled',
+                          label: 'Enable',
+                          checkValue: true
 
-                      footer.panels_split width: 'matchParent', content: ->(split) do
-                        split.right childViews: ->(right) do
-                          right.label text: 'This should be right-aligned'
+                        footer.panels_split width: 'matchParent', content: ->(split) do
+                          split.right childViews: ->(right) do
+                            right.label text: 'This should be right-aligned'
+                          end
                         end
                       end
                     end
-                  end
-                end, onSet: ->(subaction) do
-                  subaction.logics_set \
-                    targetId: 'check_{{entry_index}}',
-                    conditionalData: {
-                      value: {
-                        "==": [{ "var": 'user[evaluation][{{entry_index}}][type]' }, 'rating']
+                  end, onSet: ->(subaction) do
+                    subaction.logics_set \
+                      targetId: 'check_{{entry_index}}',
+                      conditionalData: {
+                        value: {
+                          "==": [{ "var": 'user[evaluation][{{entry_index}}][type]' }, 'rating']
+                        }
                       }
-                    }
-                end
+                  end
 
-              multiple.logics_set \
-                targetId: 'choices_panel',
-                debug: true,
-                conditionalData: {
-                  displayed: {
-                    "==": [{ "var": 'user[evaluation][{{entry_index}}][type]' }, 'choices']
+                multiple.logics_set \
+                  targetId: 'choices_panel_{{entry_index}}',
+                  debug: true,
+                  conditionalData: {
+                    displayed: {
+                      "==": [{ "var": 'user[evaluation][{{entry_index}}][type]' }, 'choices']
+                    }
                   }
-                }
+              end
             end
-          end
         end, accessory: ->(accessory) do
           accessory.footer childViews: ->(footer) do
 
           end
         end
 
-      template.panels_vertical id: 'choices_panel', childViews: ->(vertical) do
+      template.panels_vertical id: 'choices_panel_{{entry_index}}', childViews: ->(vertical) do
         (1..5).each do |i|
           vertical.fields_text \
+            id: "input_choice_{{entry_index}}_#{i}",
             width: 'matchParent',
-            name: "choices[#{i}]",
-            label: "Choice #{i}"
+            name: "choices_#{i}",
+            label: "Choice #{i}",
+            displayed: i <= 1,
+            onChange: ->(action) do
+              action.logics_set targetId: "input_choice_{{entry_index}}_#{i + 1}", conditionalData: {
+                displayed: { "isPresent": [{ "var": "user[evaluation][{{entry_index}}][choices_#{i}]" }] }
+              }
+            end
         end
       end
 
@@ -96,6 +103,20 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     end
   end
 
+  form.panels_horizontal \
+    align: 'middle',
+    childViews: ->(horizontal) do
+      horizontal.icon \
+        name: 'add_circle',
+        styleClasses: ['success']
+
+      horizontal.spacer width: 10
+      horizontal.h4 text: 'Add item'
+    end,
+    onClick: ->(action) do
+      action.components_invoke targetId: 'form_dynamic_group', name: 'addGroup'
+    end
+
   form.spacer height: 20
   form.fields_submit text: 'Submit'
 end

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

@@ -11,13 +11,15 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
 
   form.fields_dynamicSelect name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language',
     selectedOptions: [ { value: 'id3', text: 'Item 3' } ],
-    url: json_ui_garage_url(path: 'forms/dynamic_select_data')
+    url: json_ui_garage_url(path: 'forms/dynamic_select_data'),
+    placeholder: 'Start typing'
 
   form.spacer height: 14
   form.fields_dynamicSelect name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages',
     selectedOptions: [ { value: 'id3', text: 'Item 3' }, { value: 'id5', text: 'Item 5' } ],
     url: json_ui_garage_url(path: 'forms/dynamic_select_data'),
-    multiple: true
+    multiple: true,
+    placeholder: 'Start typing'
 
   form.spacer height: 14
   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

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

@@ -22,17 +22,22 @@ end
 #   end
 # end
 
-section = json_ui_section json
-section.rows builder: ->(row) do
-  count_per_page = 20
-  count_per_page.times do |i|
-    index = page * count_per_page + i
-    row.custom title: "City #{index} (#{params[:q]})",
-      subtitle: "State #{index}",
-      subsubtitle: "Country #{index}",
-      extra: {
-        value: "id#{index}",
-        text: "Item #{index}"
-      }
+if (query_keyword = params[:q]).present?
+  section = json_ui_section json
+  section.rows builder: ->(row) do
+    count_per_page = 20
+    count_per_page.times do |i|
+      index = page * count_per_page + i
+      # title: "City #{index} (#{query_keyword})",
+      row.custom \
+        subtitle: "State #{index}",
+        subsubtitle: "Country #{index}",
+        extra: {
+          value: "id#{index}",
+          text: "City #{index} (#{query_keyword})"
+        }
+    end
   end
+else
+  json.rows []
 end

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

@@ -142,7 +142,7 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     name: 'user[animal_or_plant]',
     width: 'matchParent',
     label: 'Animal or Plant',
-    options: [{ text: 'Animal', value: 'animal' }, { text: 'Plant', value: 'plant' }],
+    options: [{ icon: { name: 'pets' }, text: 'Animal', value: 'animal' }, { icon: { name: 'forest' }, text: 'Plant', value: 'plant' }],
     value: 'animal',
     onChangeAndLoad: ->(action) do
       action.http_get url: json_ui_garage_url(path: 'forms/update_options')

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

@@ -129,7 +129,7 @@ page.form \
 
             res.panels_column width: 'matchParent', lg: { cols: 4 }, childViews: ->(column) do
               column.fields_radio\
-                width: 350,
+                width: 'matchParent',
                 value: 'yes', label: 'Yes', icon: { template: 'featured', name: 'edit', size: 40, color: '#d1d1d1' },
                 onClick: ->(action) do
                   action.windows_openWeb url: 'http://www.google.com'
@@ -137,7 +137,7 @@ page.form \
             end
             res.panels_column width: 'matchParent', lg: { cols: 4 }, childViews: ->(column) do
               column.fields_radio\
-                width: 350,
+                width: 'matchParent',
                 value: 'no', label: 'No',
                 image: { template: 'featured', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 80, height: 80 },
                 onClick: ->(action) do

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

@@ -48,12 +48,12 @@ page.scroll childViews: ->(scroll) do
       horizontal.label text: 'Total: '
       horizontal.label id: 'loaded_count', text: '0'
 
-      horizontal.label text: " #{symbol_horizontal_separator} "
+      # horizontal.label text: " #{symbol_horizontal_separator} "
 
       horizontal.label text: 'Selected: '
       horizontal.label id: 'selected_count', text: '0'
 
-      horizontal.label text: " #{symbol_horizontal_separator} "
+      # horizontal.label text: " #{symbol_horizontal_separator} "
       horizontal.chip \
         id: 'succeeded_count',
         styleClass: 'success',
@@ -64,11 +64,10 @@ page.scroll childViews: ->(scroll) do
     scroll.panels_bulkEdit2 \
       id: 'import_table',
       width: 'matchParent',
-      backgroundColor: '#e2e2e2',
       paramNameForRowId: 'row_id',
       import: { submitUrl: json_ui_garage_url(path: 'forms/bulk_edit_post2'), paramName: 'user' },
       viewHeaders: [
-        { text: 'Month', id: 'month', importable: true },
+        { text: 'Month', id: 'month', importable: true, tooltip: { text: 'Month' } },
         { text: 'Electricity usage', id: 'electricity_usage', importable: true },
         { text: 'Gas usage', id: 'gas_usage', importable: true },
         { text: 'Sources', id: 'sources', importable: true },
@@ -142,7 +141,7 @@ page.scroll childViews: ->(scroll) do
           conditionalData: {
             text: {
               "printf": [
-                "Uploaded: {0}",
+                'Uploaded: {0}',
                 { "count": [{ "var": 'data.succeededRows' }] }
               ]
             },

data/app/views/json_ui/garage/views/icons.json.jbuilder

@@ -3,14 +3,28 @@ json.title 'Views'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+page.form padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.h2 text: 'Icon'
   # scroll.icon spec: { name: 'home' }
   scroll.icon name: 'home'
 
   scroll.spacer height: 20
   scroll.h2 text: 'Icon with color'
-  scroll.icon name: 'home', color: '#9370DB'
+  scroll.fields_select \
+    name: 'input_icon',
+    value: 'verified',
+    options: ['pending', 'verified', 'cancel'].map { |icon_name| { text: icon_name, value: icon_name } }
+  scroll.button text: 'update', onClick: ->(action) do
+    action.logics_set \
+      targetId: 'icon1',
+      conditionalData: {
+        'material.name': { "var": 'input_icon' }
+      },
+      data: {
+        'tooltip.text': 'TEST123'
+      }
+  end
+  scroll.icon id: 'icon1', name: 'home', color: '#9370DB'
   scroll.icon name: 'home', color: '#9370DB80'
 
   scroll.spacer height: 20
@@ -19,5 +33,19 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
 
   scroll.spacer height: 20
   scroll.h2 text: 'Icon with styleClasses'
-  scroll.icon name: 'home', styleClasses: ['small']
+  scroll.icon id: 'icon2', name: 'home', styleClasses: ['small']
+
+  scroll.button text: 'Hide icon', onClick: ->(action) do
+    action.logics_set targetId: 'icon2', data: {
+      displayed: false
+    }
+  end
+
+  scroll.spacer height: 20
+  scroll.h2 text: 'Icon with onLoad'
+  scroll.icon id: 'icon3', name: 'home', onLoad: ->(action) do
+    action.logics_set targetId: 'icon3', data: {
+      'material.name': 'info'
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.11.3
+  version: 4.12.0
 platform: ruby
 authors:
 - ''
@@ -403,7 +403,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: ''