glib-web 4.11.4 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6425e97b504cd239d61b88d1ca636fbb5da75d6ccc9bd72ed75905fb3d3d83f
-  data.tar.gz: a93a58d86b0a593a6b7ba5dd8fd9c0156754273317fd1844e182d1f2984ae61a
+  metadata.gz: 3c597b4f85658814671fef38361d34b1a4210d7ee40b1644e10396b43f6232e7
+  data.tar.gz: ac3eaacdc14a17abad4f020f3a27382c0eb2a44d5da68600367fa0c710b8d1b1
 SHA512:
-  metadata.gz: 930d634554a8c80295757893b9eb5996d05469906673860ff3dac26705772bd453c52242c2e89ee37fb4e1565900a18c079ef4e86717828a681d6de42b7177d4
-  data.tar.gz: 174d1ec5746418db41d5f419d66147285d772e3f239706593966cbfb802bdb4b5dd855b21758d10ec30b64a898cb4f700cf0904ce880547812167baf29a7cb19
+  metadata.gz: fbbd8349fb818a58a6785c1f32f44b5e3126ae1cd7c975f91e9b6916fb776252cfcfa35f55e70aa62b831c0a35a2377b2e6e9ffd6642733c5d524d83c1030855
+  data.tar.gz: e45bcc94a58ba3e482f805d890ce01ae2ce4ba1f55a9f22c5a194c89dc7c0aa6c69fc89668d3085bcf0683380d59da638da6e863507c41a8b0560669d2d41c82

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

@@ -84,7 +84,13 @@ module Glib::Json::Ui
   end
 
   private
+    def glib_theme
+      {}
+    end
+
     def __json_ui_vue(hash, options)
+      @__json_ui_setting = { theme: glib_theme }.to_json
+
       renderer_path = params[:_skip_custom_render] == 'true' ? 'layouts/json_ui/no_custom' : options[:renderer_path]
       @__json_ui_orig_page = response.body
       response.body = render_to_string(

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

@@ -37,6 +37,7 @@ class Glib::JsonUi::ActionBuilder
       string :targetId
       hash :data
       action :onSet
+      bool :skipOnChange
 
       def dataBuilder(block)
         json.data do

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

@@ -8,6 +8,7 @@ class Glib::JsonUi::ActionBuilder
       hash :variables
       action :onSet
       bool :cacheData
+      bool :skipOnChange
 
       def dataBuilder(block)
         json.data do

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

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

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

@@ -3,6 +3,7 @@ class Glib::JsonUi::ActionBuilder
 
     class Select < Action
       string :message
+      bool :overlay
 
       def buttons(block)
         json.buttons do

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
@@ -162,6 +163,7 @@ class Glib::JsonUi::ViewBuilder
     class CheckGroup < AbstractField
       views :childViews
       string :uncheckValue
+      bool :watchNoneOfAbove
     end
 
     class Check < Text
@@ -171,6 +173,7 @@ class Glib::JsonUi::ViewBuilder
       string :offIcon
       string :onLabel
       hash :image, required: [:url, :template], optional: [:width, :height]
+      bool :indeterminate
 
       def value(value)
         @value = value if value != Glib::Value::DEFAULT
@@ -201,7 +204,9 @@ class Glib::JsonUi::ViewBuilder
 
       panels_builder :accessory, :header, :footer
       bool :clearable
-      bool :csvMode
+      bool :watchNoneOfAbove
+      bool :prependSelectAll
+      # bool :csvMode
 
       def options(value)
         @_options = value
@@ -294,8 +299,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/actions/_sheets.json.jbuilder

@@ -5,7 +5,7 @@ end
 
 section.rows builder: ->(template) do
   template.thumbnail title: 'sheets/select', onClick: ->(action) do
-    action.sheets_select message: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed rutrum vel nisi in pharetra. Aenean mollis feugiat elementum. Donec tempor arcu fringilla risus finibus cursus. Donec eleifend ex sit amet odio rutrum, vitae ornare nunc congue. In hac habitasse platea dictumst. Curabitur at velit et odio ornare vestibulum sit amet vitae ex. Proin tincidunt rutrum libero vitae tempus.', buttons: ->(menu) do
+    action.sheets_select overlay: true, message: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed rutrum vel nisi in pharetra. Aenean mollis feugiat elementum. Donec tempor arcu fringilla risus finibus cursus. Donec eleifend ex sit amet odio rutrum, vitae ornare nunc congue. In hac habitasse platea dictumst. Curabitur at velit et odio ornare vestibulum sit amet vitae ex. Proin tincidunt rutrum libero vitae tempus.', buttons: ->(menu) do
       menu.button text: 'Option1', onClick: ->(subaction) do
         subaction.dialogs_alert message: 'Option 1'
       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/checkboxes.json.jbuilder

@@ -8,6 +8,12 @@ page.scroll childViews: ->(scroll) do
     url: json_ui_garage_url(path: 'forms/generic_post'),
     method: 'post',
     padding: glib_json_padding_body,
+    onChange: ->(action) do
+      action.logics_set targetId: 'checker2', skipOnChange: true, conditionalData: {
+        value: { "==": [{ "countNonNull": [{ "var": 'user[foo][]' }] }, 3] },
+        indeterminate: { "<": [0, { "countNonNull": [{ "var": 'user[foo][]' }] }, 3] }
+      }
+    end,
     childViews: ->(form) do
       form.spacer height: 20
       form.h2 text: 'Check Group'
@@ -38,6 +44,61 @@ page.scroll childViews: ->(scroll) do
       form.fields_check name: 'user[choice][]', label: 'Choice 1', checkValue: 'choice_1'
       form.fields_check name: 'user[choice][]', label: 'Choice 2', checkValue: 'choice_2'
 
+      form.spacer height: 20
+      form.h2 text: 'Checkboxes with none_of_above'
+      form.fields_checkGroup \
+        watchNoneOfAbove: true,
+          name: 'user[favorite_fruits][]',
+          value: 'grape',
+          uncheckValue: 1,
+          childViews: ->(group) do
+            group.fields_check label: 'Grape', checkValue: 'grape'
+            group.fields_check label: 'Banana', checkValue: 'banana'
+            group.fields_check label: 'Durian', checkValue: 'durian'
+            group.fields_check label: 'I dont like fruits', checkValue: 'none_of_above'
+          end
+
+      form.spacer height: 20
+      form.h2 text: 'Check all with checkGroup'
+      form.button id: 'checker', text: 'check all', onClick: ->(action) do
+        action.components_invoke targetId: 'check_all', name: 'checkAll'
+      end
+      form.fields_checkGroup \
+        id: 'check_all',
+        name: 'user[favorite_fruits2][]',
+        uncheckValue: 1,
+        onChangeAndLoad: ->(action) do
+          action.logics_set targetId: 'checker', conditionalData: {
+            text: {
+              "if": [
+                {
+                  "==": [
+                    {
+                      "count": [{ "var": 'user[favorite_fruits2][]' }]
+                    },
+                    3
+                  ]
+                },
+                'uncheck all',
+                'check all'
+              ]
+            }
+          }
+        end,
+        childViews: ->(group) do
+          group.fields_check label: 'Grape', checkValue: 'grape'
+          group.fields_check label: 'Banana', checkValue: 'banana'
+          group.fields_check label: 'Durian', checkValue: 'durian'
+        end
+
+      form.spacer height: 20
+      form.h2 text: 'Check all without checkGroup'
+      form.fields_check name: 'check_all_1', id: 'checker2', label: 'check all', checkValue: true, onChange: ->(action) do
+        action.logics_set targetIds: ['check1', 'check2', 'check3'], conditionalData: { value: { "!!": [{ "var": 'check_all_1' }] } }
+      end
+      form.fields_check id: 'check1', name: 'user[foo][]', label: 'Option 1', checkValue: true
+      form.fields_check id: 'check2', name: 'user[foo][]', label: 'Option 2', checkValue: true
+      form.fields_check id: 'check3', name: 'user[foo][]', label: 'Option 3', checkValue: true
 
       form.spacer height: 20
       form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

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

@@ -26,16 +26,6 @@ page.form \
     end
     form.fields_datetime id: 'date2', name: 'user[datetime_end]', width: 'matchParent', label: 'End Date', min: '2010-01-01', max: '2012-01-01'
 
-    form.spacer height: 20
-    form.h2 text: 'Check/uncheck All'
-    form.spacer height: 6
-    form.fields_check name: 'user[check_all]', label: 'All', checkValue: true, onChangeAndLoad: ->(action) do
-      action.logics_set targetIds: ['check1', 'check2', 'check3'], conditionalData: { value: { "==": [{ "var": 'user[check_all]' }, true] } }
-    end
-    form.fields_check id: 'check1', name: 'user[check1]', label: 'Check 1', checkValue: true
-    form.fields_check id: 'check2', name: 'user[check2]', label: 'Check 2', checkValue: true
-    form.fields_check id: 'check3', name: 'user[check3]', label: 'Check 3', checkValue: true
-
     form.spacer height: 20
     form.h2 text: 'Divided by 3 (with precision set)'
     form.spacer height: 6

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

@@ -22,7 +22,7 @@ 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'
@@ -103,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

@@ -50,9 +50,10 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
 
   form.spacer height: 6
 
-  options = languages.map { |k, v| { value: k, text: v, deselect: [-1] } }
-  options << { value: -1, text: 'None of the above', deselect: languages.keys }
+  options = languages.map { |k, v| { value: k, text: v } }
+  options << { value: 'none_of_above', text: 'None of the above' }
   form.fields_select \
+    watchNoneOfAbove: true,
     name: 'user[cities][]',
     width: 'matchParent',
     label: 'Cities',
@@ -63,6 +64,17 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       action.dialogs_alert message: 'Options selected'
     end
 
+  form.spacer height: 6
+  form.fields_select \
+    watchNoneOfAbove: true,
+    prependSelectAll: true,
+    name: 'user[cities2][]',
+    width: 'matchParent',
+    label: 'Cities',
+    options: options[0..-2],
+    value: ['melbourne', 'sydney'],
+    multiple: true
+
   form.spacer height: 20
   form.h2 text: 'Select fields with grouping'
   form.spacer height: 6
@@ -142,7 +154,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', placement: 'top' } },
         { 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/controls.json.jbuilder

@@ -34,6 +34,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
 
     action.popovers_show \
       key: 'menu',
+      overlay: true,
       placement: 'left',
       content: ->(dialog) do
         dialog.body padding: glib_json_padding_body, childViews: ->(view) do
@@ -57,10 +58,10 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     text: 'Button with tooltip and dropdown',
     tooltip: { text: 'Tooltip 1' },
     onClick: ->(action) do
-
       action.popovers_show \
         key: 'menu',
         placement: 'bottom-start',
+        overlay: true,
         width: 200,
         content: ->(dialog) do
           dialog.body styleClass: 'popover-menu', padding: glib_json_padding_body, childViews: ->(res) do

data/app/views/layouts/json_ui/renderer.html.erb

@@ -25,6 +25,7 @@
   <div id="app"></div>
   <script>
     var __page = <%= raw @__json_ui_orig_page%>;
+    var __settings = <%= raw @__json_ui_setting%>;
   </script>
   <%= yield :footer %>
 </body>

metadata

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