glib-web 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c258b37bbad81871f329c41e5b854b5b6563fb4f
-  data.tar.gz: 3e8d5f94006a46084869252b667d0c9e405de569
+  metadata.gz: 3a631905663a326cc5d4da2aa0be179812d12aae
+  data.tar.gz: a167fd02e4db101e5067832225762ba410bc401b
 SHA512:
-  metadata.gz: bece2c2bae109009e5b468e9e43cd52591b5c367977a8fec1b623e27876efd28d25a1432bde847943eb310fe62bef9f4e3b1b38ea93924f2767cb9e1a42c4477
-  data.tar.gz: 756e23d1771b4f1dae8eebe2d4d0f0c4f5397fc8762baac96c2c5bfe7ffc73a6fcab6cad2575d8aae760d84570edffeb456231d70a815918c234a8e5153895bf
+  metadata.gz: 0a5094637dbe44532c384bd7e30a49bb3dd5377ef87cee6ea13da3528620aae8f2a43eba21f3077df4530a3356087851dcbd8be150d72a3ff1af70b4b3493afb
+  data.tar.gz: 03b85596d99b043700a6818feef54b6e45017e905800358502052a68bdf0d6cb472c64bc9bb352849a9628b587479bfbab41314da1543cb1f92317371639ac07

data/app/helpers/glib/app_feature_support_helper.rb

@@ -0,0 +1,16 @@
+module Glib
+  module AppFeatureSupportHelper
+    def glib_app_feature_supported?(name, app_version, dictionary)
+      device = (app_device_os || :default).to_sym
+
+      version = dictionary[name.to_sym].try(:[], device)
+      except = dictionary[name.to_sym].try(:[], :except).try(:[], device)
+
+      !version.nil? && (version == :all || glib_app_version_gte(version, app_version)) && (except.nil? || except.to_s != app_version)
+    end
+
+    def glib_app_version_gte(feature_version, app_version)
+      app_version.blank? || Gem::Version.new(app_version) >= Gem::Version.new(feature_version)
+    end
+  end
+end

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

@@ -104,6 +104,9 @@ class Glib::JsonUi::ViewBuilder
 
     class Check < Text
       string :uncheckValue
+      string :checkValue
+
+      # Where possible, use value instead of this
       bool :checked
     end
 

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

@@ -123,6 +123,8 @@ class Glib::JsonUi::ViewBuilder
       hash :nextPage
       hash :export
       hash :import
+      action :onScrollToTop
+      action :onScrollToBottom
 
       def firstSection(block)
         json.sections [1] do

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

@@ -10,7 +10,8 @@ json_ui_page json do |page|
     value = [
       {
         'question': 'Punctuality',
-        'type': 'rating'
+        'type': 'rating',
+        'enabled': '1'
       },
       {
         'question': 'Quality of work',
@@ -21,30 +22,20 @@ json_ui_page json do |page|
         'type': 'yes_no'
       }
     ]
-    # form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, groupTitlePrefix: 'Entry', groupTemplateViews: ->(group) do
-    #   group.spacer height: 10
-    #   group.fields_text width: 'matchParent', name: 'question', label: 'Question'
-    #   group.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
-    # end
-
-    # form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, group: ->(group) do
-    #   group.titlePrefix 'Entry'
-    #   group.template childViews: ->(template) do
-    #     template.spacer height: 10
-    #     template.fields_text width: 'matchParent', name: 'question', label: 'Question'
-    #     template.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
-    #   end
-    # end
 
     form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, 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'
-        template.fields_text width: 'matchParent', name: 'type', label: 'Answer type'
+        template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'
+        options = [ :rating, :yes_no ]
+        template.fields_select width: 'matchParent', name: 'type', label: 'Answer Type', placeholder: 'Answer Type', options: options.map { |o| { text: o.to_s.humanize, value: o } }
+        template.fields_check width: 'matchParent', name: 'enabled', label: 'Enable', checkValue: '1'
+
+        template.spacer height: 14
       end
     end
 
     form.spacer height: 20
-    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    form.fields_submit text: 'Submit'
   end
 end

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

@@ -8,14 +8,16 @@ json_ui_page json do |page|
     form.spacer height: 6
     form.h4 text: 'Gender'
     form.fields_radioGroup name: 'user[gender]', value: 'F', childViews: ->(group) do
+      group.fields_radio value: '', label: 'Unknown'
       group.fields_radio value: 'M', label: 'Male'
       group.fields_radio value: 'F', label: 'Female'
     end
   
     form.spacer height: 20
     form.h2 text: 'Single Checkbox'
-    form.fields_check name: 'user[age_range]', value: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
-    form.fields_check name: 'user[employer]', value: 1, label: 'I am an employer (no default value)'
+    form.fields_check name: 'user[age_range]', value: '16+', checkValue: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
+    form.fields_check name: 'user[employer]', checkValue: 1, label: 'I am an employer (no default value)'
+    form.fields_check name: 'user[enabled]', checkValue: true, label: 'Enable', styleClass: 'switch', value: 'true'
 
     form.spacer height: 20
     form.h2 text: 'Date/Time'
@@ -36,7 +38,8 @@ json_ui_page json do |page|
       latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
       longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
 
-    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+    form.spacer height: 20
+    form.fields_submit text: 'Submit'
 
   end
 

data/app/views/json_ui/garage/notifications/web_socket.json.jbuilder

@@ -14,7 +14,7 @@ json.ws({
   # "topic" => "room:30",
   # "event" => "comments_updated",
   "topic" => "links",
-  "event" => "new_link_added",
+  "events" => ["new_link_added"],
   "header" => {
     "user_id" => 2,
     "prev_item_id" => nil,
@@ -23,31 +23,29 @@ json.ws({
 })
 
 page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, paramNameForFormData: 'formData', onSubmit: ->(action) do
-  # action.dialogs_alert
-  
-    json.action "ws/push"
-    json.topic "links"
-    json.event "new_link"
-    json.payload({
-      "club_id": "2",
-      "room_id": "30",
-      "user_id": "2"
-        #  title: "TITLE",
-        #  url: "URL"
-    })
-
-      # "topic": "room:30",
-      # "event": "create_comment",
-      # "payload": {
-      #   "club_id": "2",
-      #   "room_id": "30",
-      #   "user_id": "2"
-      # }
+  json.action "ws/push"
+  json.topic "links"
+  json.event "new_link"
+  json.payload({
+    "club_id": "2",
+    "room_id": "30",
+    "user_id": "2"
+      #  title: "TITLE",
+      #  url: "URL"
+  })
 
 end, childViews: ->(form) do
+  form.spacer height: 14
+  form.label text: "Message: #{params[:message]}"
+  form.spacer height: 14
+
   form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
+
+  # TODO: Change this to radio for selecting alert vs reload response
   form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
   
+  form.fields_hidden name: 'baseUrl', width: 'matchParent', value: json_ui_garage_url(path: 'notifications/web_socket')
+
   form.panels_split width: 'matchParent', content: ->(split) do
     # split.left childViews: ->(left) do
     #   if params[:mode] == 'dialog'

data/app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder

@@ -0,0 +1,39 @@
+
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'tables/autoload_all', page: page_index + 1, section_only: 'v1'),
+  autoload: 'asNeeded'
+}
+
+column_indexes = (1..3)
+if params[:section_only].present?
+  json.nextPage next_page if page_index < 3
+  json_ui_page json do |page|
+    json.sections do
+      json.child! do
+        render 'json_ui/garage/tables/autoload_section', page: page, page_index: page_index, column_indexes: column_indexes
+      end
+    end
+  end
+else
+  json.title 'Tables'
+
+  json_ui_page json do |page|
+    render "#{@path_prefix}/nav_menu", json: json, page: page
+
+    page.table nextPage: next_page, firstSection: ->(section) do
+      section.header cellViews: ->(header) do
+        column_indexes.each do |i|
+          header.label text: "Heading#{i}"
+        end
+      end
+
+      render "#{@path_prefix}/tables/autoload_section", page: page, page_index: page_index, column_indexes: column_indexes
+    end, onScrollToBottom: ->(action) do
+      action.snackbars_alert message: 'Scrolled to Bottom'
+    end, onScrollToTop: ->(action) do
+      action.snackbars_alert message: 'Scrolled to Top'
+    end
+  end
+
+end

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

@@ -17,6 +17,9 @@ json_ui_page json do |page|
       template.thumbnail title: 'Autoload All', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'tables/autoload_all')
       end
+      template.thumbnail title: 'Autoload as Needed', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'tables/autoload_as_needed')
+      end
     end
 
   end

data/lib/glib/json_crawler.rb

@@ -7,3 +7,4 @@ require_relative './json_crawler/action_crawlers/nav_initiate'
 require_relative './json_crawler/action_crawlers/windows_open'
 require_relative './json_crawler/action_crawlers/action_http'
 require_relative './json_crawler/action_crawlers/forms_submit'
+require_relative './json_crawler/action_crawlers/menu'

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

@@ -0,0 +1,12 @@
+module Glib
+  module JsonCrawler
+    class Menu < ActionCrawler
+      def initialize(http, args, action)
+        super(http)
+
+        @http.router.log action, nil
+        crawl args['buttons']
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Glib
     class NavInitiate < ActionCrawler
       def initialize(http, args, action)
         super(http)
-        
+
         @http = http
         if (json = (@http.get args['url'], action, args.except('url'))) && (left_drawer = json['leftDrawer'])
           crawl left_drawer['header']&.[]('childViews')

data/lib/glib/json_crawler/http.rb

@@ -8,8 +8,8 @@ module Glib
       VALID_RESPONSE_CODES = [
         (200..299).to_a,
         ## Note, the JSON API does not allow redirects
-        401, ## UNAUTHORIZED Should be used for not-logged-in
-        403, ## FORBIDDEN Should be used for logged-in but not allowed to access
+        # 401, ## UNAUTHORIZED Should be used for not-logged-in
+        # 403, ## FORBIDDEN Should be used for logged-in but not allowed to access
       ].flatten
 
       def initialize(context, user, router)
@@ -105,6 +105,7 @@ module Glib
               get redirect_uri.to_s, action, params
             else
               response_times << response.headers['X-Runtime'].to_f
+
               @context.assert_includes VALID_RESPONSE_CODES, code, "Expected a valid response but was [#{response.code}] #{Rack::Utils::HTTP_STATUS_CODES[response.code.to_i]}:\n#{url}"
               if response.media_type == 'application/json'
                 JSON.parse(response.body)

data/lib/glib/json_crawler/router.rb

@@ -36,7 +36,6 @@ module Glib
 
           if action.present?
             @depth += 1
-            # child = 
             case action
             when 'initiate_navigation'
               @read_only_actions.add([action, params['url']])
@@ -44,6 +43,8 @@ module Glib
             when 'windows/open-v1', 'dialogs/open-v1', 'windows/reload-v1', 'windows/open', 'dialogs/open', 'windows/reload'
               @read_only_actions.add([action, params['url']])
               JsonCrawler::WindowsOpen.new(http, params, action)
+            when 'sheets/select-v1', 'sheets/select'
+              JsonCrawler::Menu.new(http, params, action)
             when 'http/post-v1', 'http/post'
               JsonCrawler::ActionHttp.new(:post, http, params, action)
             when 'forms/submit-v1', 'forms/submit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - ''
@@ -73,6 +73,7 @@ files:
 - app/controllers/concerns/glib/json/ui.rb
 - app/controllers/concerns/glib/json/validation.rb
 - app/controllers/glib/home_controller.rb
+- app/helpers/glib/app_feature_support_helper.rb
 - app/helpers/glib/dynamic_images_helper.rb
 - app/helpers/glib/dynamic_texts_helper.rb
 - app/helpers/glib/forms_helper.rb
@@ -173,6 +174,7 @@ files:
 - app/views/json_ui/garage/services/index.json.jbuilder
 - app/views/json_ui/garage/tables/_autoload_section.json.jbuilder
 - app/views/json_ui/garage/tables/autoload_all.json.jbuilder
+- app/views/json_ui/garage/tables/autoload_as_needed.json.jbuilder
 - app/views/json_ui/garage/tables/export_import.json.jbuilder
 - app/views/json_ui/garage/tables/horizontal_scroll.json.jbuilder
 - app/views/json_ui/garage/tables/index.json.jbuilder
@@ -208,6 +210,7 @@ files:
 - lib/glib/json_crawler/action_crawler.rb
 - lib/glib/json_crawler/action_crawlers/action_http.rb
 - lib/glib/json_crawler/action_crawlers/forms_submit.rb
+- lib/glib/json_crawler/action_crawlers/menu.rb
 - lib/glib/json_crawler/action_crawlers/nav_initiate.rb
 - lib/glib/json_crawler/action_crawlers/windows_open.rb
 - lib/glib/json_crawler/coverage.rb