glib-web 0.14.3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a291c995ace4d47df8d25452fb05610864b635e2b9d5389cc8355350d3deef22
-  data.tar.gz: 74ae4397312a86bca319d08e21f06d166d27ac98e4e5bb7181e8d18877a70eed
+  metadata.gz: 6ee300b7e05299ffaed9427513fada06ef2f248c68f8329bc6d07de7faf947a0
+  data.tar.gz: 8c11c15ae46e15b7fcfaf5c43744fbe2f872a6b6ea2e185e75f882759473c3db
 SHA512:
-  metadata.gz: 87a1ba8c343d1bd48978452a14ede6ee419cfe7694eb5935c72ae3437e4077264d29a15dc23f049fddbc9c6bf6f3d4622904cd534fbef509c3b67f332420084e
-  data.tar.gz: 99894f959d190a9ce3c515b5a4c9bece814e59ffa87826f69675c78f6592ec1400f387f7d7226c7bc9d236ec0e705c77c45ce9d7d9d1502c3177bc65068f1266
+  metadata.gz: 4b97228f7f53ea4f1fb86877c08c1cecadf12aaee9536e2ee8488eed58ffff4502c253984c9bc38d0e7df839e46283a5ac5aebbc6b63de63dcc98fa968e77bd6
+  data.tar.gz: b5a3e5a45469e5486465a7b5f3c12400d15ade17bcee01c237528cda747b404478cbc500347b5442992a1a8ae84efd0895f8fb9eefa4ef91493a340977d0df6a

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

@@ -39,6 +39,22 @@ module Glib::Json::Traversal
       @forms = []
     end
 
+    def fullPageForm(spec)
+      spec['fullPageForm']
+    end
+
+    def begin_page(spec)
+      if (form = fullPageForm(spec))
+        @forms << form
+      end
+    end
+
+    def end_page(spec)
+      if fullPageForm(spec)
+        @forms.pop
+      end
+    end
+
     def traverse_multiple(views, block)
       if views.is_a? Array
         views.each do |view|

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

@@ -174,9 +174,19 @@ module Glib
         end
 
         def form(options = {})
-          scroll childViews: ->(scroll) do
-            @view_builder.add_view('panels_form', options.reverse_merge(width: 'matchParent'))
+          form = Glib::JsonUi::ViewBuilder::Panels::Form.new(json, self)
+          form.childViews(->(view_builder) {})
+          panel_options = options.slice!(:url, :method, :local, :onSubmit, :paramNameForFormData, :model)
+
+          json.fullPageForm do
+            json.view 'panels/fullPageForm'
+            form.props(options)
           end
+
+          # So that the containing fields have context (e.g. can use form's model for naming).
+          self.current_form = form
+          scroll panel_options
+          self.current_form = nil
         end
 
         def data(options = {})

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

@@ -24,7 +24,6 @@ module Glib
       end
 
       class View < JsonUiElement
-        string :compId
         string :id
         length :width
         length :height
@@ -140,6 +139,7 @@ module Glib
 
         int    :size
         string :url
+        string :base64Data
         action :onClick
       end
 

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

@@ -0,0 +1,28 @@
+json.title 'Forms'
+
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+  form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+  form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
+end
+
+page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+  footer.label text: 'This button will submit the form above because this whole page is wrapped in a giant form.'
+  footer.spacer height: 6
+
+  footer.panels_split width: 'matchParent', content: ->(content) do
+    content.left childViews: ->(left) do
+      left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+        horizontal.label styleClass: 'link', text: 'Open Nested Form', onClick: ->(action) do
+          action.dialogs_open url: json_ui_garage_url(path: 'forms/full_page_form_dialog', mode: 'dialog')
+        end
+      end
+    end
+    content.right childViews: ->(right) do
+      right.fields_submit text: 'Submit'
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+json.title 'Forms'
+
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+page.form url: json_ui_garage_url(path: 'forms/basic_post?id=dialog'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+  form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+  form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
+end
+
+page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+  footer.label text: 'This button will submit the form above because this whole page is wrapped in a giant form.'
+  footer.spacer height: 6
+
+  footer.panels_split width: 'matchParent', content: ->(content) do
+    content.right childViews: ->(right) do
+      right.fields_submit text: 'Submit'
+    end
+  end
+end

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

@@ -91,11 +91,11 @@ page.list sections: [
         action.windows_open url: json_ui_garage_url(path: 'forms/styled_boxes')
       end
     end
-    # section.rows builder: ->(template) do
-    #   template.thumbnail title: 'Full Window', onClick: ->(action) do
-    #     action.windows_open url: json_ui_garage_url(path: 'forms/full_window_form')
-    #   end
-    # end
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Full Page', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'forms/full_page_form')
+      end
+    end
   end, ->(section) do
     section.header padding: glib_json_padding_list, childViews: ->(header) do
       header.h2 text: 'Web Only'

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

@@ -152,3 +152,72 @@ page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', p
   form.fields_submit text: 'Submit'
   form.spacer height: 40
 end
+
+# if text.length > 100
+#   inner_column.panels_form local: true, childViews: ->(form) do
+#     form.markdown \
+#       text: text,
+#       styleClasses: ['many-line'],
+#       showIf: {
+#         "!=": [
+#           {
+#             "var": 'expand[bundle_description]'
+#           },
+#           'expand'
+#         ]
+#       }
+#     form.markdown \
+#       text: text,
+#       showIf: {
+#         "==": [
+#           {
+#             "var": 'expand[bundle_description]'
+#           },
+#           'expand'
+#         ]
+#       }
+#     form.fields_check \
+#       width: 'matchParent',
+#       offIcon: 'expand_more',
+#       onIcon: 'expand_less',
+#       label: 'Read more',
+#       onLabel: 'Read less',
+#       checkValue: 'expand',
+#       uncheckValue: nil,
+#       name: 'expand[bundle_description]',
+#       disableDirtyCheck: true
+#   end
+# else
+#   inner_column.markdown text: text
+# end
+
+# panel.panels_form width: 'matchParent', childViews: ->(visibility) do
+#   state = {
+#     has_content: false
+#   }
+#   style_classes ||= nil
+#   style_class ||= nil
+#   padding ||= nil
+#   id ||= nil
+
+#   visibility.banners_select \
+#     id: id,
+#     width: 'matchParent',
+#     styleClass: style_class || (style_classes ? nil : 'warning'),
+#     message: message,
+#     padding: padding,
+#     buttons: ->(menu) do
+#       yield(menu, state)
+#     end,
+#     showIf: {
+#       "==": [
+#         {
+#           "var": 'banner'
+#         },
+#         'show'
+#       ]
+#     }
+#   visibility.fields_hidden name: 'banner', value: state[:has_content] ? 'show' : 'hide'
+# end
+
+

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

@@ -36,31 +36,69 @@ page.scroll childViews: ->(scroll) do
         group.fields_radio value: 'alert_close', label: 'alert+close - useful for non-model form (e.g. contact us)'
       end
 
-      form.spacer height: 14
+      form.spacer height: 6
       form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
 
+  scroll.spacer height: 14
   scroll.panels_form \
+    width: 'matchParent',
     url: json_ui_garage_url(path: 'forms/generic_post'),
     method: 'post',
     padding: { top: 12, left: 20, right: 20, bottom: 12 },
     childViews: ->(form) do
       form.h3 text: 'Perform custom actions on submit'
+      form.spacer height: 6
+      form.label text: 'This also works when you press ENTER in the following text fields'
+      form.spacer height: 6
 
-      form.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[text]', value: 'Hello'
-
-      form.spacer height: 14
-      # form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+      form.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[first_name]', value: 'Jane'
+      form.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[last_name]', value: 'Doe'
 
+      form.spacer height: 6
       form.fields_submit text: 'Submit'
     end,
     onSubmit: ->(action) do
-      # action.forms_submit
-
       action.dialogs_alert \
         message: 'The form will submit after the dialog is closed',
         onClose: ->(subaction) do
           subaction.forms_submit
         end
     end
+
+  scroll.spacer height: 14
+  scroll.panels_form \
+    width: 'matchParent',
+    url: json_ui_garage_url(path: 'forms/generic_post'),
+    method: 'post',
+    padding: { top: 12, left: 20, right: 20, bottom: 12 },
+    childViews: ->(form) do
+      form.h3 text: 'Submit without using a submit button'
+      form.spacer height: 6
+      form.label text: 'Note: In general using a submit button is better because it will allow the browser to handle the form functionality in a consistent manner.'
+      form.spacer height: 6
+      form.label text: 'For example, without a submit button, you cannot submit the form by pressing ENTER in the following text fields'
+      form.spacer height: 6
+
+      form.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[first_name]', value: 'John'
+      form.fields_text width: 'matchParent', styleClass: 'outlined', name: 'user[last_name]', value: 'Doe'
+
+      form.spacer height: 6
+
+      form.panels_split width: 'matchParent', content: ->(split) do
+        split.left childViews: ->(left) do
+          left.panels_horizontal height: 'matchParent', align: 'middle', childViews: ->(horizontal) do
+            horizontal.label text: 'Submit using label', onClick: ->(subaction) do
+              subaction.forms_submit
+            end
+          end
+        end
+
+        split.right childViews: ->(right) do
+          right.banners_select width: 'matchParent', message: 'Banner Menu', buttons: ->(menu) do
+            menu.button text: 'Submit using banner', onClick: ->(action) { action.forms_submit }
+          end
+        end
+      end
+    end
 end

data/app/views/json_ui/garage/lists/edit_mode.json.jbuilder

@@ -4,6 +4,22 @@ json.title 'Lists'
 
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
+tab_index = params[:tab].to_i
+
+page.header childViews: ->(header) do
+  # Allow navigating to another "edit mode" page to test reuse issues.
+  header.tabBar buttons: ->(menu) do
+    ['FIRST', 'SECOND'].each_with_index do |text, index|
+      menu.button \
+        text: text,
+        disabled: tab_index == index,
+        onClick: ->(action) do
+          action.windows_reload url: json_ui_garage_url(path: 'lists/edit_mode', tab: index)
+        end
+    end
+  end
+end
+
 page.form \
   width: 'matchParent',
   url: json_ui_garage_url(path: 'forms/generic_post'),
@@ -34,7 +50,8 @@ page.form \
         section.rows builder: ->(row) do
           batch_count = 20
           batch_count.times do |index|
-            row.thumbnail title: "Item #{index}", recordId: "PK_#{index}"
+            id = (batch_count * tab_index) + index
+            row.thumbnail title: "Item #{id}", recordId: "PK_#{id}"
           end
         end
       end

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

@@ -19,13 +19,19 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     url: glib_json_image_avatar_url,
     badge: { text: '1', backgroundColor: '#0000ff' }
 
+  base64_data = 'data:image/gif;base64,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'
+
+  scroll.h2 text: 'Avatar with base64 data '
+  scroll.spacer height: 6
+  scroll.avatar \
+    base64Data: base64_data
+
   scroll.spacer height: 20
   scroll.h2 text: 'Image with base64 data'
   scroll.spacer height: 6
   scroll.image \
-    height: 100,
     tooltip: { text: 'This is a tooltip' },
-    base64Data: 'data:image/gif;base64,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'
+    base64Data: base64_data
 
   scroll.spacer height: 20
   scroll.h2 text: 'QR Code as base64 image'

data/lib/glib/json_crawler/action_crawlers/forms_submit.rb

@@ -1,3 +1,4 @@
+
 module Glib
   module JsonCrawler
     class FormsSubmit < ActionCrawler
@@ -24,7 +25,18 @@ module Glib
         url = view['url']
         fields = []
         params = {}
-        @http.router.crawl_multiple view['childViews'], ->(child) do
+        child_views = view['childViews'] || []
+
+        # If this form is page level, we need to check the child views of the entire page.
+        if view['view'] == 'panels/fullPageForm'
+          child_views += @http.router.page_spec['header']&.[]('childViews') || []
+          child_views += @http.router.page_spec['body']&.[]('childViews') || []
+          child_views += @http.router.page_spec['footer']&.[]('childViews') || []
+        end
+
+        @http.router.crawl_multiple child_views, ->(child) do
+          next if child['template'].present?
+
           name = child['view']
           if name.start_with?('fields/')
             fields << child

data/lib/glib/json_crawler/action_crawlers/windows_open.rb

@@ -8,6 +8,8 @@ module Glib
           json = @http.get(url, action, args.except('url'))
 
           unless json.nil?
+            @http.router.begin_page(json)
+
             crawl json['header']&.[]('childViews')
             crawl json['body']&.[]('childViews')
             crawl json['footer']&.[]('childViews')
@@ -25,6 +27,8 @@ module Glib
             if (on_load = (args.fetch('onLoad', nil)))
               perform(on_load)
             end
+
+            @http.router.end_page(json)
           end
         end
       end

data/lib/glib/json_crawler/router.rb

@@ -1,7 +1,7 @@
 module Glib
   module JsonCrawler
     class Router
-      attr_reader :read_only_actions, :logger
+      attr_reader :read_only_actions, :logger, :page_spec
       attr_accessor :host
 
       def log(action, url, response = nil)
@@ -19,6 +19,7 @@ module Glib
         @read_only_actions = Set.new
         # default rails's development host
         @host ||= 'localhost:3000'
+        @page_spec = nil
       end
 
       def step(http, args)
@@ -53,7 +54,8 @@ module Glib
             JsonCrawler::NavInitiate.new(http, params, action)
           when 'runMultiple-v1', 'runMultiple'
             JsonCrawler::RunMultiple.new(http, params, action)
-          when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open', 'dialogs/open', 'windows/reload', 'windows/openWeb', 'windows/openWeb-v1'
+          when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open',
+            'dialogs/open', 'windows/reload', 'windows/openWeb', 'windows/openWeb-v1'
             if allowed?(params['url'])
               @read_only_actions.add([action, params['url']])
               JsonCrawler::WindowsOpen.new(http, params, action)
@@ -66,7 +68,6 @@ module Glib
             JsonCrawler::ActionHttp.new(:post, http, params, action)
           when 'forms/submit-v1', 'forms/submit'
             forms = @visitor.forms
-            # raise 'Submit action needs to be inside a form' if forms.size < 1
             JsonCrawler::FormsSubmit.new(http, forms.last)
           else
             unless [
@@ -93,6 +94,16 @@ module Glib
         @visitor.traverse_multiple views, block
       end
 
+      def begin_page(spec)
+        @page_spec = spec
+        @visitor.begin_page spec
+      end
+
+      def end_page(spec)
+        @page_spec = nil
+        @visitor.end_page spec
+      end
+
       def allowed?(url)
         regex = Regexp.new("#{host}.+(?<!\.pdf)$")
         regex.match(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.1
 platform: ruby
 authors:
 - ''
@@ -153,7 +153,8 @@ files:
 - app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder
 - app/views/json_ui/garage/forms/file_upload.json.jbuilder
 - app/views/json_ui/garage/forms/floating_submit.json.jbuilder
-- app/views/json_ui/garage/forms/full_window_form.json.jbuilder
+- 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/index.json.jbuilder
 - app/views/json_ui/garage/forms/local_request.json.jbuilder
@@ -301,7 +302,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ''

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

@@ -1,19 +0,0 @@
-json.title 'Forms'
-
-page = json_ui_page json
-
-render "#{@path_prefix}/nav_menu", json: json, page: page
-
-# The form will be automatically injected into the window.
-#page.template 'full_window_form'
-
-# TODO: This needs to produce page-level form attributes
-page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
-  # page.scroll padding: glib_json_padding_body, childViews: ->(form) do
-  form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
-  form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
-end
-
-page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
-  footer.fields_submit text: 'Submit'
-end