glib-web 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0baa732034691c909ee78b5633077586e67f5b55f8618338c5da6d057c573223
-  data.tar.gz: 0e64bbf1a81a5a2a65616e9c49603b2f15cf3b02fa10c407d595e0ad533aa151
+  metadata.gz: 884f9ef9236368bb5739d56715d0aca1196e6d85f905ad258aaf2d7942333d07
+  data.tar.gz: 3c870f312d7cb7b921ca4ff244d247d7c9b7e7f94ae359cd93696f6544c9682c
 SHA512:
-  metadata.gz: 8a013f8cb0b04c3a25cbe5d24040ff1b3a15e8037c81b6ef5d10f1aec864860739a9e864482d937f12142e9917f0aea036cb3e6c4175d2367b1180736126534a
-  data.tar.gz: ac9da570bc331ff64d35ac2ce511f29ead17cdf1beab0b67b4cadbfc15c7c7b98e0429431ba2c4992a1b9d856bc98b575a727a3cd524bf2e4836fe04fd18e6dd
+  metadata.gz: 34f43053111cf3304a15a0311fc0b85031554b7a0c3be65b7795ebab0d438850ad7550eb977c33cc099ba09ea2d06258880aed767b89398b6fe2a8d80327f7f9
+  data.tar.gz: f332e88b5d80b56c7b5fef95fce6551a7ca13a1a7a05b71626161b344d02f594a98c74b19e97d3247e4260c0cb5ab208ec83ac21d516d9ceb644706ddf1d6542

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

@@ -39,6 +39,12 @@ module Glib::Json::Traversal
       @forms = []
     end
 
+    def parse_page(spec)
+      if (form = spec['fullPageForm'])
+        @forms << form
+      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/response_helper.rb

@@ -16,25 +16,18 @@ module Glib
         end
 
         json.onResponse do
-          response = Response.new(json, self, true)
+          response = Glib::JsonUi::PageHelper::Page.new(json, self)
           yield response.action_builder
         end
       end
 
       class Response
-        attr_reader :action_builder, :view_builder, :list_section_builder, :table_section_builder, :current_form
+        attr_reader :action_builder
 
-        def initialize(json, context, with_view_builder = false)
+        def initialize(json, context)
           @json = json
           @context = context
-
           @action_builder = ActionBuilder.new(json, self, false)
-
-          if with_view_builder
-            @view_builder = ViewBuilder.new(json, self, true)
-            @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
-            @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
-          end
         end
       end
     end

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

data/app/views/json_ui/garage/forms/{full_window_form.json.jbuilder → full_page_form.json.jbuilder}

@@ -4,16 +4,13 @@ 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.label text: 'This button will submit the form above because this whole page is wrapped in a giant form.'
+  footer.spacer height: 6
   footer.fields_submit text: 'Submit'
 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/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.parse_page(json)
+
             crawl json['header']&.[]('childViews')
             crawl json['body']&.[]('childViews')
             crawl json['footer']&.[]('childViews')

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,11 @@ module Glib
         @visitor.traverse_multiple views, block
       end
 
+      def parse_page(spec)
+        @page_spec = spec
+        @visitor.parse_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.2
+  version: 0.15.0
 platform: ruby
 authors:
 - ''
@@ -153,7 +153,7 @@ 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/generic_post.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
 - app/views/json_ui/garage/forms/local_request.json.jbuilder