glib-web 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e075cfe5041ccb4a1f0f6836a9fb5fe294fff00698ad0974a1ef70e34d8bb8
-  data.tar.gz: 5ebb6ca2859d77329531ebec64019f655da409adc0a617c6567be6ef3acf9c88
+  metadata.gz: 324be9293b997d23666ea14d20515bb5e8aef6e7fa962f4cf1ccba6ade3d6d1e
+  data.tar.gz: 0b4a0e7f36dfb0e6cbac8f83dbc904451d1c59e02d212b5a6c2af4bda8e8c092
 SHA512:
-  metadata.gz: 6dc692a9e877c4686fb64600813c1b14e6c9926a69a2d9ffaf0c65cb7ac7a48976ad727eea965c024694e79f5b2af9ae945bb013e02f68d0d434fe57f1bb2640
-  data.tar.gz: 6e8a5f227bc198f957372c7de511f8e5b65d197419f3bc6a2e461cf894f6c26e3dbfab25859b0b76b22775186f8ed2106d58d309bfc1118ee68c9f33186389e0
+  metadata.gz: 752f7e4b42626d97625f169b933a9e44eb6d968a54c3adfc0945434e785a2d0ef03daf7708cd63f36cb28c6f6e235d3eb5e0cc491abd9ad10da3e377fcdeabd4
+  data.tar.gz: 7b9d408aeff03b974f026a26c96128569d0976f2d5bd4745cebaa0c3877a652fc335dc03e62b2ab3949c7dbff53a922b8462243b2f4a1bcc83df19b29409c515

data/app/helpers/glib/enum_helper.rb

@@ -19,12 +19,11 @@ module Glib
       # TZInfo::Timezone.default_dst = true
       return [] if Rails.env.test?
 
-      ActiveSupport::TimeZone.all.sort { |a, b|
-        a.utc_offset <=> b.utc_offset
-      }.collect { |tz|
-        utc_offset = "#{tz.utc_offset >= 0 ? '+' : ''}#{tz.utc_offset / 60 / 60}h"
-        { value: tz.tzinfo.identifier, text: "#{utc_offset}  #{tz.name}" }
-      }
+      ActiveSupport::TimeZone.all.group_by { |tz| tz.tzinfo.identifier }.map do |identifier, timezones|
+       utc_offset = "#{timezones.first.utc_offset >= 0 ? '+' : ''}#{timezones.first.utc_offset / 60 / 60}h"
+       locations = timezones.map(&:name).join(', ')
+       { value: identifier, text: "#{utc_offset} #{locations}" }
+     end
     end
   end
 end

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

@@ -0,0 +1,8 @@
+class Glib::JsonUi::ActionBuilder
+  module Files
+    class Upload < Action
+      include Glib::JsonUi::Upload
+      action :onFinished
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Glib
   module JsonUi
     module ListBuilders
-      class Template < AbstractBuilder
+      class ListTemplate < AbstractBuilder
         def method_missing(m, *args)
           add_element_to_array 'template', m, *args
         end
@@ -76,6 +76,21 @@ module Glib
         end
       end
 
+      class TreeTemplate < AbstractBuilder
+        def method_missing(m, *args)
+          add_element_to_array 'template', m, *args
+        end
+
+        class Standard < JsonUiElement
+          string :id
+          string :title
+          action :onClick
+          hash :dropData
+          hash :icon, required: [:name], optional: [:color]
+          array :rows
+        end
+      end
+
       class Section < AbstractBuilder
         def initialize(json, page, template)
           super json, page

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

@@ -85,7 +85,7 @@ module Glib
         include Glib::JsonUi::Default
 
         attr_reader :json, :context, :view_builder, :sview_builder, :action_builder, :menu_builder
-        attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder
+        attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :tree_section_builder
 
         # See Panels::Form
         attr_accessor :current_form
@@ -99,7 +99,8 @@ module Glib
           @action_builder = ActionBuilder.new(json, self, false)
           @menu_builder = MenuBuilder.new(json, self)
 
-          @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
+          @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::ListTemplate.new(json, self))
+          @tree_section_builder = ListBuilders::Section.new(json, self, ListBuilders::TreeTemplate.new(json, self))
           @drawer_content_builder = ListBuilders::Section.new(json, self, @menu_builder)
           @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
           # @split_content_builder = SplitBuilders::Content.new(json, self, @view_builder)

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

@@ -75,7 +75,9 @@ class Glib::JsonUi::ViewBuilder
           @label ||= context.field_label(@prop, @label_args || {})
           @hint ||= context.hint_label(@prop, @hint_args || {})
           @placeholder ||= context.placeholder_label(@prop, @placeholder_args || {})
-          @validation ||= context.field_validation(@prop) if form._autoValidate || @autoValidate
+          if form._autoValidate && @autoValidate.nil? || !@autoValidate.nil? && @autoValidate
+            @validation ||= context.field_validation(@prop)
+          end
 
           if form.current_dynamic_group.nil?
             # This is not relevant inside a dynamic group
@@ -151,6 +153,8 @@ class Glib::JsonUi::ViewBuilder
       string :text
       color :color
       icon :icon
+      # This will not work if the form contains multiple fields with the same name,
+      # even if only one field is showing at any one time"
       bool :disableIfFormInvalid
     end
 
@@ -165,6 +169,7 @@ class Glib::JsonUi::ViewBuilder
       string :onIcon
       string :offIcon
       string :onLabel
+      hash :image, required: [:url, :template], optional: [:width, :height]
 
       def value(value)
         @value = value if value != Glib::Value::DEFAULT
@@ -266,10 +271,15 @@ class Glib::JsonUi::ViewBuilder
       action :onClick
       string :offIcon
       string :onIcon
-      string :imageUrl
-      string :icon
-      string :iconColor
-      string :iconSize
+      hash :image, required: [:url, :template], optional: [:width, :height]
+      hash :icon, required: [:name, :template], optional: [:color, :size]
+      # bool :featured
+      # bool :thumbnail
+      # hash :image
+      # string :imageUrl
+      # string :icon
+      # string :iconColor
+      # string :iconSize
 
       views :childViews
     end
@@ -352,10 +362,10 @@ class Glib::JsonUi::ViewBuilder
           @responseMessages[status] = I18n.t(key) if I18n.exists?(key)
         end
         json.responseMessages (@responseMessages || {}).reverse_merge({
-          '200' => 'File uploaded',
+          '200' => 'Completed',
           '403' => 'Forbidden',
           '401' => 'Session expired',
-          'else' => 'Upload failed'
+          'else' => 'Failed'
         })
 
         json.placeholder @placeholder if @placeholder

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

@@ -424,6 +424,23 @@ class Glib::JsonUi::ViewBuilder
       views :childViews
     end
 
+    class Tree < View
+      include Glib::JsonUi::Upload
+
+      string :selected
+      action :onDrop
+
+      def sections(blocks)
+        json.sections do
+          blocks.each do |block|
+            json.child! do
+              block.call page.tree_section_builder
+            end
+          end
+        end
+      end
+    end
+
     class Web < View
       string :url
     end

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

@@ -0,0 +1,4 @@
+info = "Method: #{request.method}\nForm Data:\n"
+info += JSON.pretty_generate(params.to_unsafe_h)
+
+action.dialogs_alert message: info

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

@@ -0,0 +1,3 @@
+json_ui_response json do |action|
+  render "#{@path_prefix}/forms/alert_post_all_data", action: action
+end

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

@@ -54,7 +54,6 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
     value: ['melbourne', 'sydney'],
     multiple: true,
     onChange: ->(action) do
-      # TODO: Fix needed. When closing this dialog, the dirty prompt appears.
       action.dialogs_alert message: 'Options selected'
     end
 

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

@@ -76,6 +76,23 @@ page.form \
     form.spacer height: 10
     form.label id: 'label5', text: 'Both Checked'
 
+    form.spacer height: 6
+    form.fields_check\
+      image: { template: 'thumbnail', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 24, height: 24 },
+      name: 'user[check22]', checkValue: 'on', label: 'check thumbnail', uncheckValue: 'off', onChangeAndLoad: ->(action) do
+        action.logics_set targetId: 'label22', conditionalData: { displayed: { "==": [{ "var": 'user[check22]' }, 'on'] } }
+      end
+    form.fields_check\
+      image: { template: 'featured', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 80, height: 80 },
+      name: 'user[check25]', checkValue: 'on', label: 'Check featured', uncheckValue: 'off', onChangeAndLoad: ->(action) do
+        action.logics_set targetId: 'label25', conditionalData: { displayed: { "==": [{ "var": 'user[check25]' }, 'on'] } }
+      end
+    form.spacer height: 10
+    form.label id: 'label25', text: 'Is Checked25'
+
+    form.spacer height: 10
+    form.label id: 'label22', text: 'Is Checked22'
+
     form.spacer height: 20
     form.h1 text: 'Radio Group'
     form.fields_radioGroup \
@@ -106,8 +123,14 @@ page.form \
         end
       end,
       childViews: ->(group) do
-        group.fields_radio value: 'show', label: 'Show', icon: 'edit', iconSize: 40
-        group.fields_radio value: 'hide', label: 'Hide', imageUrl: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png'
+        group.fields_radio\
+          value: 'show', label: 'Show', icon: { template: 'featured', name: 'edit', size: 40, color: '#d1d1d1' }
+        group.fields_radio\
+          value: 'hide', label: 'Hide',
+          image: { template: 'featured', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 80, height: 80 }
+        group.fields_radio\
+          value: 'no', label: 'No',
+           image: { template: 'thumbnail', url: 'https://cdn.pixabay.com/photo/2020/08/05/13/12/eco-5465432_1280.png', width: 24, height: 24 }
         group.fields_radio value: '', label: 'Empty'
       end
     form.spacer height: 10

data/app/views/json_ui/garage/panels/index.json.jbuilder

@@ -131,6 +131,10 @@ json_ui_page json do |page|
           action.windows_open url: json_ui_garage_url(path: 'panels/grid')
         end
 
+        template.thumbnail title: 'Tree', subtitle: 'Tree like view just like folder and subfolder', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/tree')
+        end
+
         template.thumbnail title: 'List Template Accessory', onClick: ->(action) do
           # TODO
         end

data/app/views/json_ui/garage/panels/tree.json.jbuilder

@@ -0,0 +1,77 @@
+json.title 'Panels'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+    scroll.h2 text: 'Standard'
+    scroll.spacer height: 4
+
+    scroll.panels_tree selected: params[:selected] || 'arabian-1.mp3', width: 300, sections: [
+      ->(section) do
+        section.header childViews: ->(header) do
+          header.h2 text: 'Music 🎶'
+        end
+
+        section.rows builder: ->(template) do
+          template.standard id: 'pop', title: 'Pop', rows: ['pop-1.mp3', 'pop-2.mp3', 'pop-3.mp3']
+          template.standard id: 'arab', title: 'Arabian', rows: ['arabian-1.mp3', 'arabian-2.mp3', 'arabian-3.mp3']
+          template.standard id: 'phonk', title: 'Phonk', rows: ['phonk1.mp3', 'phonk-2.mp3', { id: 'hard-phonk', title: 'Hard Phonk', rows: ['hard-phonk-1.mp3', 'hard-phonk-2.mp3'] }]
+        end
+      end,
+      ->(section) do
+        section.header childViews: ->(header) do
+          header.h2 text: 'onClick windows/reload'
+        end
+
+        section.rows builder: ->(template) do
+          template.standard title: 'funny-video.mp4', id: 'fun', onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'fun') }
+          template.standard title: 'animal-planet.mp4', id: 'animal', onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'animal') }
+          template.standard title: 'wedding.mp4', id: 'wedding', onClick: ->(action) { action.windows_reload url: json_ui_garage_current_url(selected: 'wedding') }
+        end
+      end
+    ]
+
+    scroll.spacer height: 8
+    scroll.h2 text: 'Standard with drop functionality'
+    scroll.spacer height: 4
+
+    objects = [
+      { id: 'folder', name: 'folder', icon: { name: 'folder', color: '#6e6e6e' }, rows: ['subfolder1', 'subfolder2'], dropData: { key: 'folder' } },
+      { id: 'folder1', name: 'folder1', icon: { name: 'folder', color: '#6e6e6e' }, rows: ['subfolder1', 'subfolder2'] },
+      { id: 'folder2', name: 'folder2', icon: { name: 'folder', color: '#6e6e6e' }, rows: ['subfolder1', 'subfolder2'] },
+    ]
+
+    scroll.panels_column md: { cols: 6 }, childViews: ->(col) do
+      col.panels_tree \
+        selected: 'folder2',
+        width: 300,
+        onDrop: ->(action) do
+          action.files_upload directUploadUrl: glib_direct_uploads_url, onFinished: ->(saction) do
+            saction.http_post url: json_ui_garage_url(path: 'forms/generic_post_all')
+          end
+        end,
+        sections: [
+          ->(section) do
+            section.header childViews: ->(header) do
+              header.h2 text: 'Folder'
+            end
+
+            section.rows objects: objects, builder: ->(row, item, index) do
+              row.standard id: item[:id], title: item[:name], rows: item[:rows], dropData: item[:dropData], icon: item[:icon]
+            end
+          end
+        ]
+    end
+
+    scroll.panels_column md: { cols: 4 }, childViews: ->(col) do
+      col.panels_ul childViews: ->(li) do
+        li.label text: '🍌 Banana', dragData: { item: 'banana'  }
+        li.label text: '💣 Bomb', dragData: { item: 'bomb'  }
+        li.label text: '🍈 Melon', dragData: { item: 'melon' }
+        li.label text: '🐻 Bear', dragData: {  item: 'bear'  }
+        li.label text: '🍴 Fork and knife', dragData: {  item: 'fork_and_knife' }
+      end
+    end
+  end
+end

data/app/views/json_ui/garage/test_page/form.json.jbuilder

@@ -82,7 +82,7 @@ page.body childViews: ->(body) do
         end
         form.hr width: 'matchParent'
         check_group_value = ['option3', 'option1']
-        form.fields_checkGroup width: 'matchParent', name: 'user[check_group]', id: 'check_group', value: check_group_value, validation: validation, childViews: ->(radio) do
+        form.fields_checkGroup width: 'matchParent', name: 'user[check_group][]', id: 'check_group', value: check_group_value, validation: validation, childViews: ->(radio) do
           options.each do |option|
             radio.fields_check label: option['text'], checkValue: option['value']
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - ''
@@ -116,6 +116,7 @@ files:
 - app/helpers/glib/json_ui/action_builder/components.rb
 - app/helpers/glib/json_ui/action_builder/dialogs.rb
 - app/helpers/glib/json_ui/action_builder/fields.rb
+- app/helpers/glib/json_ui/action_builder/files.rb
 - app/helpers/glib/json_ui/action_builder/global_states.rb
 - app/helpers/glib/json_ui/action_builder/http.rb
 - app/helpers/glib/json_ui/action_builder/iap.rb
@@ -178,6 +179,7 @@ files:
 - app/views/json_ui/garage/actions/index.json.jbuilder
 - app/views/json_ui/garage/actions/partial_update.json.jbuilder
 - app/views/json_ui/garage/empty.json.jbuilder
+- app/views/json_ui/garage/forms/_alert_post_all_data.json.jbuilder
 - app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
 - app/views/json_ui/garage/forms/_conditional_banner.json.jbuilder
 - app/views/json_ui/garage/forms/_partial_update_execute.json.jbuilder
@@ -203,6 +205,7 @@ files:
 - app/views/json_ui/garage/forms/full_page_form.json.jbuilder
 - app/views/json_ui/garage/forms/full_page_form_dialog.json.jbuilder
 - app/views/json_ui/garage/forms/generic_post.json.jbuilder
+- app/views/json_ui/garage/forms/generic_post_all.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
 - app/views/json_ui/garage/forms/local_request.json.jbuilder
 - app/views/json_ui/garage/forms/new_rich_text.json.jbuilder
@@ -275,6 +278,7 @@ files:
 - app/views/json_ui/garage/panels/responsive.json.jbuilder
 - app/views/json_ui/garage/panels/split.json.jbuilder
 - app/views/json_ui/garage/panels/timeline.json.jbuilder
+- app/views/json_ui/garage/panels/tree.json.jbuilder
 - app/views/json_ui/garage/panels/ul.json.jbuilder
 - app/views/json_ui/garage/panels/vertical.json.jbuilder
 - app/views/json_ui/garage/panels/web.json.jbuilder