glib-web 3.24.4 → 3.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba0dc03db2778a7a62e6222b3024ace73faa22c47d158a9088ed334db9515b0
-  data.tar.gz: 2aa5ad7d865b21b3ae466aec5213af9553b118ac73db120a8def60aa624bee0a
+  metadata.gz: 838475dd1c241022699ae4cb206a3fac310be83932b8ec6d6094b61a9889d224
+  data.tar.gz: f24efaef3bf63350fb001bd461e3f73c47c0110b2d2b10bc53ef97258eea774a
 SHA512:
-  metadata.gz: 2798441528eaab4548b034b65f79704daf77295ef8ed6751f2e1ea3f1719e9df12308d823fb251a0427d012e6bc5298bcbaf232ba47ada41128738bd8feee6a1
-  data.tar.gz: c83bbb97e419a24350383d4a6ad3e83322a5a153f4da1437f028437aef50987721a494d58e9cf20ad5ae5efc356d757eb16112c2716bb82e931ce40063157290
+  metadata.gz: 8eaa39d50da3e146150414e1491d73170a1d833037bc623b50d46d83dfc111a762b67e7dc47825b7c3a89d6332c52a0e67f63c5de9049f7164e77f881658c753
+  data.tar.gz: '0940c9ba1f0beebf6088da4a42c1853defd8e67f8728c2ddf135e4c06168e39c0eec299f812e3e9601f1090aadf6b3295a6d265ca1309592325cc863dfa31440'

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

@@ -16,6 +16,12 @@ class Glib::JsonUi::ActionBuilder
     end
 
     # Experimental
+    class ReplaceChildren < Action
+      string :targetId
+      views :childViews
+    end
+
+    # Experimental. Can this be merged with `components_set` ?
     class Replace < Action
       string :targetId
       action :onReplace

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

@@ -109,6 +109,30 @@ module Glib
         end
       end
 
+      module Logics
+        # Future: Replace showIf and loadIf
+        # Example:
+        # `submitWhenNotDisplayed` is false by default
+        # fields_text id: 'my_text', displayed: false, submitWhenNotDisplayed: true
+        #
+        # logics_if condition: { '==', BLAH1, BLAH2 }, true: ->(action) do
+        #   action.components_set targetId: 'my_text', displayed: true
+        # end
+        #
+        # class If < Action
+        #   hash :condition
+        #   action :true
+        #   action :false
+        # end
+
+        class Set < Action
+          string :targetId
+          hash :conditionalData
+          hash :variables
+          action :onSet
+        end
+      end
+
       module Timeouts
         class Set < Action
           string :timerId
@@ -141,7 +165,24 @@ module Glib
         end
       end
 
+      module Cookies
+        class Save < Action
+          string :key
+          string :value
+          action :onSave
+        end
+
+        # FUTURE
+        # class Remove < Action
+        # end
+
+        # FUTURE
+        # class Clear < Action
+        # end
+      end
+
       # FUTURE
+
       module Data
         class Save < Action
           string :key

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

@@ -183,6 +183,12 @@ module Glib
           end
         end
 
+        def bodyFooter(options = {})
+          json.bodyFooter do
+            vertical_content(options)
+          end
+        end
+
         def header(options = {})
           json.header do
             vertical_content(options)

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

@@ -50,6 +50,17 @@ module Glib
 
       ###
 
+      ### Chart
+
+      def glib_chart_tooltip_template(options)
+        %{
+          <div style="border: 1px solid gray; border-radius: 6px;">
+            <div style="border-radius: 6px 6px 0 0; background-color: gray; padding: 4px; color: white;">#{options[:title]}</div>
+            <div style="border-radius: 0 0 6px 6px; background-color: white; padding: 4px" color: black;>#{options[:content]}</div>
+          </div>
+        }
+      end
+
     end
   end
 end

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

@@ -10,6 +10,7 @@ class Glib::JsonUi::ViewBuilder
       bool :disableDirtyCheck
       action :onChange
       string :paramNameForFormData
+      string :paramNameForFieldName
 
       def default_url_options
         { only_path: true }
@@ -172,6 +173,11 @@ class Glib::JsonUi::ViewBuilder
       string :cacheKey
     end
 
+    # Deprecated
+    # Just use fields_select with options provided by the backend. This allows greater flexibility,
+    # which is important because different systems might want to use different values for
+    # countries as well as for regions, e.g. alpha2 vs alpha3
+    # See app/views/json_ui/garage/forms/pickers.json.jbuilder for an example
     class Country < AbstractField
       hash :region
     end

data/app/views/json_ui/garage/actions/_cookies.json.jbuilder

@@ -0,0 +1,12 @@
+
+section.header padding: glib_json_padding_list, childViews: ->(header) do
+  header.h3 id: 'cookie', text: 'Cookies'
+end
+
+section.rows builder: ->(template) do
+  template.thumbnail title: 'cookies/save', onClick: ->(action) do
+    action.cookies_save key: 'glib_cookie', value: "test_cookie_#{DateTime.current.to_i}", onSave: ->(subaction) do
+      subaction.snackbars_alert message: 'Saved'
+    end
+  end
+end

data/app/views/json_ui/garage/actions/_list.json.jbuilder

@@ -23,5 +23,7 @@ panel.panels_list id: 'action_list', sections: [
     render "#{@path_prefix}/actions/components", section: section
   end, ->(section) do
     render "#{@path_prefix}/actions/fields", section: section
+  end, ->(section) do
+    render "#{@path_prefix}/actions/cookies", section: section
   end
 ]

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

@@ -81,9 +81,82 @@ page.form \
   form.spacer height: 20
   form.h2 text: 'Country'
   form.spacer height: 6
-  region_field = { name: 'user[city]', label: 'City' }
-  form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: nil
-  form.fields_country name: 'user[country_with_region]', width: 'matchParent', label: 'Country with region', region: region_field
+  # region_field = { name: 'user[city]', label: 'City' }
+  # form.fields_country name: 'user[country]', width: 'matchParent', label: 'Country', region: nil
+  # form.fields_country name: 'user[country_with_region]', width: 'matchParent', label: 'Country with region', region: region_field
+
+  countries = [
+    {
+      code: 'AU',
+      name: 'Australia',
+      regions: ['ACT', 'New South Wales', 'Victoria', 'Western Australia']
+    },
+    {
+      code: 'ID',
+      name: 'Indonesia',
+      regions: ['Jawa Barat', 'Java Tengah', 'Jawa Timur', 'Sumatra Utara', 'Sumatra Barat', 'Sumatra Selatan']
+    }
+  ]
+  region_registry = countries.map do |c|
+    [c[:code], c[:regions].map { |r| { value: r, text: r } } ]
+  end.to_h
+  form.fields_select \
+    name: 'user[country1]',
+    width: 'matchParent',
+    label: 'Country',
+    options: countries.map { |c| { value: c[:code], text: c[:name] } },
+    paramNameForFormData: 'variables',
+    onChange: ->(action) do
+      action.logics_set targetId: 'region_code1', conditionalData: {
+        options: {
+          '[]' => [{ 'var': 'static[region_registry]' }, { 'var': 'user[country1]' }]
+        }
+      }, variables: {
+        'static[region_registry]' => region_registry
+      }
+    end
+
+  form.fields_select \
+    name: 'user[region1]',
+    width: 'matchParent',
+    label: 'Region',
+    id: 'region_code1',
+    options: []
+
+  form.spacer height: 20
+
+  selected_country = 'AU'
+  form.fields_select \
+    name: 'user[country2]',
+    width: 'matchParent',
+    label: 'Country',
+    options: countries.map { |c| { value: c[:code], text: c[:name] } },
+    paramNameForFormData: 'variables',
+    value: selected_country,
+    onChange: ->(action) do
+      action.logics_set targetId: 'region_code2', conditionalData: {
+        options: {
+          '??' => [
+            {
+              '[]' => [{ 'var': 'static[region_registry]' }, { 'var': 'user[country2]' }]
+            },
+            []
+          ]
+        },
+        value: nil
+      }, variables: {
+        'static[region_registry]' => region_registry
+      }
+    end
+
+  form.fields_select \
+    name: 'user[region2]',
+    width: 'matchParent',
+    label: 'Region',
+    id: 'region_code2',
+    value: 'Victoria',
+    options: region_registry[selected_country]
+  form.label text: 'This select options should not be blank'
 
   form.spacer height: 20
   form.h2 text: 'Map'

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

@@ -70,8 +70,12 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
       accessory.header padding: { x: 16, y: 10 }, childViews: ->(header) do
         header.label text: 'Header'
       end
-      accessory.footer padding: { x: 16, y: 10 }, childViews: ->(footer) do
-        footer.label text: 'Footer'
+      accessory.footer styleClass: 'select-footer', padding: { x: 16, y: 10 }, childViews: ->(footer) do
+        footer.h3 text: 'Footer'
+        # footer.spacer height: 4
+        footer.p styleClass: 'select-footer-paragraph', text: %(
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Tortor consequat id porta nibh venenatis cras sed. Amet consectetur adipiscing elit duis tristique sollicitudin nibh. Proin sagittis nisl rhoncus mattis rhoncus urna neque viverra justo. Velit egestas dui id ornare arcu odio. Pretium nibh ipsum consequat nisl vel pretium. Bibendum at varius vel pharetra. Leo duis ut diam quam nulla porttitor massa id. Consectetur libero id faucibus nisl tincidunt eget nullam non. Eu facilisis sed odio morbi quis. Eu volutpat odio facilisis mauris sit amet massa vitae tortor. Sed odio morbi quis commodo odio aenean sed. Sit amet justo donec enim diam. Ullamcorper a lacus vestibulum sed arcu non odio euismod.
+        )
         footer.spacer height: 14
         footer.label text: 'Click me', onClick: ->(action) do
           action.components_findClosest view: 'fields/select', onFind: ->(subaction) do

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

@@ -61,6 +61,32 @@ else
       # scroll.h1 text: 'Line chart using remote data'
       # render "#{@path_prefix}/views/chart_data", json: json, builder: scroll
 
+      scroll.h2 text: 'Line chart with custom tooltip'
+      scroll.charts_line \
+        plugins: { customTooltip: true },
+        colors: ['#79AC78', '#3085C3'], legend: { display: false },
+        dataSeries: [
+          -> do
+            json.title 'Line'
+
+            points = {
+              'Jan' => 100,
+              'Feb' => 78,
+              'Mar' => 70,
+              'Apr' => 62,
+            }
+            prev = points['Jan']
+
+
+            json.points points.map { |k, v|
+              delta = prev - v
+              tooltip = v < prev ? "<div>Delta</div><div>▼ #{delta}</div>" : "<div>Delta</div><div>▲ #{delta}</div>"
+              prev = v
+              { x: k, y: v, tooltip: glib_chart_tooltip_template(title: "Summary #{k}", content: tooltip) }
+            }
+          end
+        ]
+
       scroll.h2 text: 'Column chart (Clustered)'
       scroll.charts_column dataGroups: [
         -> do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.24.4
+  version: 3.25.1
 platform: ruby
 authors:
 - ''
@@ -140,6 +140,7 @@ files:
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/_commands.json.jbuilder
 - app/views/json_ui/garage/actions/_components.json.jbuilder
+- app/views/json_ui/garage/actions/_cookies.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs.json.jbuilder
 - app/views/json_ui/garage/actions/_dialogs_show.json.jbuilder
 - app/views/json_ui/garage/actions/_fields.json.jbuilder