glib-web 0.5.21 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab6d2285eee13c5a9c1d1bf9181448fc1961d1b9437861b65e676faa406ee6d
-  data.tar.gz: 55edcf4b52c933b5951a201b992b240de8cfa87f5c48eb31bfb2326b7889e8e9
+  metadata.gz: d252c5420953a389ed9f8b0a981f383a66141bdc936229fc9b5c983265d0eef2
+  data.tar.gz: 1dad156eac314b636f0534011afc82f78e6eced5c1f5c5ea07f0ee7d12a44212
 SHA512:
-  metadata.gz: 83c13cdd4e8afff6b762df44a596a9baf52ad1b9b5de4b1a01d7d3ee7347a79605bcf868ef7d819433112b72a4ef1c32913e5bdd2a7a3d9b1939711f671e800c
-  data.tar.gz: c33ac49f4fa9aa206d11b20dd00e167e975d8e637bed7eaa7248ed24620c3096fa8de23462a33c2f70fd8b883bced85eba7dbb28bce7cf37681f0e9efc400125
+  metadata.gz: 675bdae2fffceb43ee5b67bf065103cae5804bdc78a74cfd705f1ca08ac09b2186aac5b74f5f47d3c2cee9a48c9c8b67a3ca7b584e0ba362bf832761ba94685d
+  data.tar.gz: 978559ce9fb7e52d5d2119f6cd45da338e9f0c01c76fe72de16afae59ec48ffaaa7f88d0ab9d3ab6276d9afc1572b78a05057d54680b1ee323e507375330f160

data/app/controllers/concerns/glib/analytics/funnel.rb

@@ -0,0 +1,61 @@
+module Glib::Analytics
+  module Funnel
+    extend ActiveSupport::Concern
+
+    included do
+      # include Overrides
+      extend ClassMethods
+
+      helper_method :glib_analytics_feature_segment
+      helper_method :glib_analytics_feature_referer
+      helper_method :glib_analytics_included?
+    end
+
+    # module Overrides
+
+    #   # Expose protected method
+    #   public  # Override
+    #   def policy_scope(*args)
+    #     super
+    #   end
+    # end
+
+    def glib_analytics_included?
+      true
+    end
+
+    def glib_analytics_feature_segment
+      # To be overridden
+      nil
+    end
+
+    def glib_analytics_feature_referer
+      group = request.headers['GApp-Analytics-Referer-Group']
+      action = request.headers['GApp-Analytics-Referer-Action']
+      segment = request.headers['GApp-Analytics-Referer-Segment']
+      placement = request.headers['GApp-Analytics-Referer-Placement']
+
+      if group && action
+        return { group: group, action: action, segment: segment, placement: placement }
+      end
+
+      nil
+    end
+
+
+
+    module ClassMethods
+      # def glib_auth_inited?
+      #   @@__glib_auth_init ||= false
+      # end
+
+      # def glib_analytics_init
+      #   @@__glib_analytics_init = true
+      # end
+
+      # def glib_analytics_inited?
+      #   @@__glib_analytics_init ||= false
+      # end
+    end
+  end
+end

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

@@ -9,17 +9,17 @@ module Glib::Json::Libs
   end
 
   def json_ui_app_bundle_id
-    @json_ui_app_bundle_id ||= request.headers['JsonUiApp-Bundle-Id']
+    @json_ui_app_bundle_id ||= request.headers['GApp-Bundle-Id'] || request.headers['JsonUiApp-Bundle-Id']
   end
 
   def json_ui_app_build_version
-    @json_ui_app_build_version ||= request.headers['JsonUiApp-Build-Version']
+    @json_ui_app_build_version ||= request.headers['GApp-Build-Version'] || request.headers['JsonUiApp-Build-Version']
     @json_ui_app_build_version = params[:build_version] if @json_ui_app_build_version.nil? && Rails.env.development?  # For easy testing
     @json_ui_app_build_version
   end
 
   def json_ui_app_device_os
-    @json_ui_app_device_os ||= request.headers['JsonUiApp-Device-Os']
+    @json_ui_app_device_os ||= request.headers['GApp-Device-Os'] || request.headers['JsonUiApp-Device-Os']
     @json_ui_app_device_os = params[:device_os] if @json_ui_app_device_os.nil? && Rails.env.development?  # For easy testing
     @json_ui_app_device_os || 'web'
   end
@@ -59,7 +59,7 @@ module Glib::Json::Libs
     #   raise exception
     # end
   end
-  
+
   def glib_json_handle_500(exception)
     if json_ui_activated? && Rails.env.production?
       Rollbar.error(exception) if defined?(Rollbar)

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

@@ -38,6 +38,17 @@ module Glib::Json::Ui
     end
   end
 
+  def json_ui_response_lifecycle_prop
+    prop_name = 'onResponse'
+    if (hash = json_transformation_start).is_a?(Hash) && hash[prop_name]  # A valid response
+      if hash[prop_name]['action'] != 'runMultiple'
+        childActions = [hash[prop_name]]
+        hash[prop_name] = { 'action' => 'runMultiple', 'childActions' => childActions }
+        childActions
+      end
+    end
+  end
+
   def __json_ui_start(options)
     @__json_ui_activated = false
     @__json_ui_rendering = nil

data/app/helpers/glib/dynamic_images_helper.rb

@@ -1,7 +1,7 @@
 module Glib
   module DynamicImagesHelper
     # NOTE: The bucket should probably be set as a parameter for json_libs
-    def dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket))
+    def glib_dynamic_image_url(blob_key, width: 100, height: 100, fit: 'clip', bucket: Rails.application.config.try(:aws_s3_bucket), signature_key: nil)
       return unless blob_key.present?
 
       full_params_hash = {
@@ -10,17 +10,20 @@ module Glib
         w: width,
         h: height,
         fit: fit,
-        expires: 1.hours.from_now.to_i
+        # expires: 1.hours.from_now.to_i
+        expires: 1.month.from_now.end_of_month.to_i
       }
+
       request_params_hash = full_params_hash.except(:bucket_name, :blob_key)
 
-      if (private_key = ENV['PRIVATE_API_KEY'])
+      if (private_key = signature_key)
         encryption_service = EncryptionService.new(bucket, private_key)
+        # This produces different signature every time.
+        # TODO: Use digest instead, because we really only need to verify. We don't need to be able to decrypt.
         signature = encryption_service.encrypt(full_params_hash)
         request_params_hash = request_params_hash.merge(signature: signature)
       end
 
-      # TODO: This should probably be set as a parameter for json_libs
       uri = URI::HTTPS.build(
         host: 'imageserver-demo.herokuapp.com',
         path: "/image/#{bucket}/#{blob_key}",

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

@@ -10,7 +10,7 @@ module Glib
 
       private
         def capitalize_first_letter_and_leave_others_alone(str)
-          str.slice(0,1).capitalize + str.slice(1..-1)
+          str.slice(0, 1).capitalize + str.slice(1..-1)
         end
 
         def add_singleton_element(type, name, *args)
@@ -19,7 +19,7 @@ module Glib
           args = [yield] if block_given?
 
           # TODO: consider caching these instances
-          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
         def add_element_to_array(type, name, *args)
@@ -29,15 +29,15 @@ module Glib
         end
 
         # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_singleton_element_v1 type, name, *args
+        def add_singleton_element_v1(type, name, *args)
           name_components = name.to_s.split('_')
           json.set! type, "#{name_components.join('/')}-v1" if type
           args = [yield] if block_given?
-          "#{self.class.name}::#{name_components.map{ |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
+          "#{self.class.name}::#{name_components.map { |str| capitalize_first_letter_and_leave_others_alone(str) }.join('::')}".constantize.new(json, @page).props(*args)
         end
 
         # TODO: Consider removing this in favour of non 'v1' suffix
-        def add_element_to_array_v1 type, name, *args
+        def add_element_to_array_v1(type, name, *args)
           json.child! do
             add_singleton_element_v1 type, name, *args
           end
@@ -68,219 +68,218 @@ module Glib
       end
 
       private
-
-      def self.any(propName)
-        define_method(propName) do |value|
-          json.set! propName, value
+        def self.any(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
         end
-      end
 
-      def self.date(propName)
-        define_method(propName) do |value|
-          json.set! propName, value&.to_date
+        def self.date(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_date
 
-          # if (value = value&.to_s)
-          #   if !Rails.env.production?
-          #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
-          #   end
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     raise "Invalid date for #{propName}: #{value}" unless value =~ /^\d{4}-\d{2}-\d{2}$/
+            #   end
 
-          #   json.set! propName, value
-          # end
+            #   json.set! propName, value
+            # end
+          end
         end
-      end
 
-      def self.date_time(propName)
-        define_method(propName) do |value|
-          json.set! propName, value&.to_datetime
+        def self.date_time(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_datetime
 
-          # if (value = value&.to_s)
-          #   if !Rails.env.production?
-          #     try Date.parse(value) rescue raise "Invalid date: #{value}"
-          #   end
+            # if (value = value&.to_s)
+            #   if !Rails.env.production?
+            #     try Date.parse(value) rescue raise "Invalid date: #{value}"
+            #   end
 
-          #   json.set! propName, value
-          # end
+            #   json.set! propName, value
+            # end
+          end
         end
-      end
 
-      def self.color propName
-        define_method(propName) do |value|
-          if (value = value&.to_s)
-            if !Rails.env.production?
-              if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
-                raise "Invalid color: #{value}"
+        def self.color(propName)
+          define_method(propName) do |value|
+            if (value = value&.to_s)
+              if !Rails.env.production?
+                if !value.match /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
+                  raise "Invalid color: #{value}"
+                end
               end
-            end
 
-            json.set! propName, value
+              json.set! propName, value
+            end
           end
         end
-      end
 
-      def self.length propName
-        define_method(propName) do |value|
-          if value
-            if !Rails.env.production?
-              case value
-              when 'matchParent'
-              when 'wrapContent'
-              else
-                if !value.is_a? Integer
-                  raise "Invalid length: #{value}"
+        def self.length(propName)
+          define_method(propName) do |value|
+            if value
+              if !Rails.env.production?
+                case value
+                when 'matchParent'
+                when 'wrapContent'
+                else
+                  if !value.is_a? Integer
+                    raise "Invalid length: #{value}"
+                  end
                 end
               end
-            end
 
-            json.set! propName, value
+              json.set! propName, value
+            end
           end
         end
-      end
 
-      def self.string propName, options = {}
-        define_method(propName) do |value|
-          str = value&.to_s
-          instance_variable_set("@#{propName}", str) if options[:cache]
-          json.set! propName, str
+        def self.string(propName, options = {})
+          define_method(propName) do |value|
+            str = value&.to_s
+            instance_variable_set("@#{propName}", str) if options[:cache]
+            json.set! propName, str
+          end
         end
-      end
 
-      # Support either string or dynamic_text hash
-      def self.text propName, options = {}
-        define_method(propName) do |value|
-          if value.is_a?(Hash)
-            json.set! propName, value
-          else
-            json.set! propName, value&.to_s
+        # Support either string or dynamic_text hash
+        def self.text(propName, options = {})
+          define_method(propName) do |value|
+            if value.is_a?(Hash)
+              json.set! propName, value
+            else
+              json.set! propName, value&.to_s
+            end
           end
         end
-      end
 
-      def self.int propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_i
+        def self.int(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_i
+          end
         end
-      end
 
-      def self.float propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_f
+        def self.float(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_f
+          end
         end
-      end
 
-      def self.bool propName, options = {}
-        define_method(propName) do |value|
-          bool = value == true
-          instance_variable_set("@#{propName}", bool) if options[:cache]
-          json.set! propName, bool
+        def self.bool(propName, options = {})
+          define_method(propName) do |value|
+            bool = value == true
+            instance_variable_set("@#{propName}", bool) if options[:cache]
+            json.set! propName, bool
+          end
         end
-      end
 
-      def self.icon propName, options = {}
-        define_method(propName) do |value|
+        def self.icon(propName, options = {})
+          define_method(propName) do |value|
 
-          if value.is_a?(Hash)
-            data = value
-            name = data[:name]
-          else
-            data = {}
-            name = value
-            # data = { material: { name: value } }
+            if value.is_a?(Hash)
+              data = value
+              name = data[:name]
+            else
+              data = {}
+              name = value
+              # data = { material: { name: value } }
 
-            # name = value
+              # name = value
 
-            # TODO: deprecated
-            # json.set!(propName) do
-            #   json.name name
-            # end
-          end
-
-          json.set!(propName) do
-            if name
-              data[:material] ||= {}
-              data[:material][:name] = name
+              # TODO: deprecated
+              # json.set!(propName) do
+              #   json.name name
+              # end
             end
 
-            if (material = data[:material])
-              json.material do
-                json.name material[:name]
-                json.size material[:size] if material[:size]
+            json.set!(propName) do
+              if name
+                data[:material] ||= {}
+                data[:material][:name] = name
               end
-            end
 
-            if (fa = data[:fa])
-              json.fa do
-                json.name fa[:name]
-                json.size fa[:size] if fa[:size]
+              if (material = data[:material])
+                json.material do
+                  json.name material[:name]
+                  json.size material[:size] if material[:size]
+                end
               end
-            end
 
-            if (custom = data[:custom])
-              json.custom do
-                json.name custom[:name]
-                json.size custom[:size] if custom[:size]
+              if (fa = data[:fa])
+                json.fa do
+                  json.name fa[:name]
+                  json.size fa[:size] if fa[:size]
+                end
               end
-            end
 
-            if (badge = data[:badge])
-              if badge.is_a?(Hash)
-                json.badge badge
-              else
-                json.badge do
-                  json.text badge
+              if (custom = data[:custom])
+                json.custom do
+                  json.name custom[:name]
+                  json.size custom[:size] if custom[:size]
                 end
               end
-            end
 
-          end
+              if (badge = data[:badge])
+                if badge.is_a?(Hash)
+                  json.badge badge
+                else
+                  json.badge do
+                    json.text badge
+                  end
+                end
+              end
 
-          # raise "Invalid properties: #{options.keys}" if options.size > 0
+            end
 
-          # instance_variable_set("@#{propName}", name) if options[:cache]
+            # raise "Invalid properties: #{options.keys}" if options.size > 0
 
+            # instance_variable_set("@#{propName}", name) if options[:cache]
+
+          end
         end
-      end
 
-      def self.action propName
-        define_method(propName) do |value|
-          json.set!(propName) { value.call(page.action_builder) }
+        def self.action(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.action_builder) }
+          end
         end
-      end
 
-      def self.views propName
-        define_method(propName) do |value|
-          json.set!(propName) { value.call(page.view_builder) }
+        def self.views(propName)
+          define_method(propName) do |value|
+            json.set!(propName) { value.call(page.view_builder) }
+          end
         end
-      end
 
-      def self.array propName
-        define_method(propName) do |value|
-          json.set! propName, value&.to_a
+        def self.array(propName)
+          define_method(propName) do |value|
+            json.set! propName, value&.to_a
+          end
         end
-      end
 
-      def self.hash propName
-        define_method(propName) do |value|
-          json.set! propName, value
+        def self.hash(propName)
+          define_method(propName) do |value|
+            json.set! propName, value
+          end
         end
-      end
 
-      def self.singleton_array singletonName, arrayName
-        array arrayName
+        def self.singleton_array(singletonName, arrayName)
+          array arrayName
 
-        define_method(singletonName) do |value|
-          json.set! arrayName, [value]
+          define_method(singletonName) do |value|
+            json.set! arrayName, [value]
+          end
         end
-      end
 
-      def self.panels_builder(propName, *panelNames)
-        define_method(propName) do |value|
-          value.call(page.content_builder(panelNames))
+        def self.panels_builder(propName, *panelNames)
+          define_method(propName) do |value|
+            value.call(page.content_builder(panelNames))
+          end
         end
-      end
 
-      def created
-        # To be overridden
-      end
+        def created
+          # To be overridden
+        end
 
     end
   end

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

@@ -16,34 +16,33 @@ module Glib
       end
 
       class Action < JsonUiElement
-        def analytics(value)
-          if value.is_a?(String)
-            @analyticsEnabled = true
-            @analyticsId = value
-          else
-            @analyticsEnabled = value == true
-          end
-        end
-
-        # Override
-        def created
-          if @analyticsEnabled
-            suffix = @analyticsId
-            # TODO: recognize_path() needs `method` as a second argument for POST request
-            if suffix.nil? && @url && (route = Rails.application.routes.recognize_path(@url))
-              suffix = "#{route[:controller]}_#{route[:action]}"
-            end
-
-            if suffix
-              json.analytics do
-                json.track :event
-                json.nameSuffix suffix
-              end
-            end
-
-          end
-        end
-
+        # def analytics(value)
+        #   if value.is_a?(String)
+        #     @analyticsEnabled = true
+        #     @analyticsId = value
+        #   else
+        #     @analyticsEnabled = value == true
+        #   end
+        # end
+
+        # # Override
+        # def created
+        #   if @analyticsEnabled
+        #     suffix = @analyticsId
+        #     # TODO: recognize_path() needs `method` as a second argument for POST request
+        #     if suffix.nil? && @url && (route = Rails.application.routes.recognize_path(@url))
+        #       suffix = "#{route[:controller]}_#{route[:action]}"
+        #     end
+
+        #     if suffix
+        #       json.analytics do
+        #         json.track :event
+        #         json.nameSuffix suffix
+        #       end
+        #     end
+
+        #   end
+        # end
       end
 
       ### Action definitions

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

@@ -0,0 +1,17 @@
+module Glib
+  module JsonUi
+    module AnalyticsHelper
+      def __json_ui_analytics(json)
+        if try(:glib_analytics_included?)
+          json.analytics do
+            json.feature do
+              json.group controller_name
+              json.action action_name
+              json.segment glib_analytics_feature_segment
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,9 @@
 module Glib
   module JsonUi
     module DynamicFieldBuilders
-      
+
       class Group < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end
@@ -15,11 +15,11 @@ module Glib
 
         def template(options = {})
           # json.template do
-            page.vertical_content(options)
+          page.vertical_content(options)
           # end
         end
       end
-      
+
     end
   end
 end

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

@@ -35,6 +35,9 @@ module Glib
           action :onLongPress
           icon :icon
           bool :avatar
+          action :onReorder
+          string :paramNameForFormData
+          string :paramNameForNewIndex
 
           # # NOTE: Experimental. Still deciding whether this needs to be a full blown panel or
           # # an array of badges (with relevant properties, e.g. text, color, etc)

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

@@ -1,11 +1,41 @@
 module Glib
   module JsonUi
     class MenuBuilder < AbstractBuilder
-      def method_missing m, *args
+      def method_missing(m, *args)
         add_element_to_array_v1 nil, m, *args
       end
 
       class MenuItem < JsonUiElement
+        hash :analytics
+
+        # def initialize(json, page)
+        #   super(json, page)
+
+        #   # Can be improved by making it configurable site-wide.
+        #   @analyticsEnabled = true
+        # end
+
+        # def analytics(value)
+        #   if value.is_a?(Hash)
+        #     @analyticsEnabled = true
+        #     @analyticsId = value
+        #   else
+        #     @analyticsEnabled = value == true
+        #   end
+        # end
+
+        # # Override
+        # def created
+        #   json.analytics do
+        #     if @analyticsEnabled
+        #       if @analyticsId
+        #         json.placement @analyticsId
+        #       end
+        #     else
+        #       json.disabled true
+        #     end
+        #   end
+        # end
       end
 
       class Button < MenuItem
@@ -21,7 +51,10 @@ module Glib
           end
         end
 
+        # Override
         def created
+          super
+
           json.type 'button'
         end
       end
@@ -29,6 +62,8 @@ module Glib
       class Divider < MenuItem
         # Override
         def created
+          super
+
           json.type 'divider'
         end
       end
@@ -39,6 +74,8 @@ module Glib
 
         # Override
         def created
+          super
+
           json.type 'label'
         end
       end

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

@@ -3,10 +3,10 @@ module Glib
     module PageHelper
       def json_ui_garage_url(options = {})
         Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-          protocol: request.protocol,
-          host: request.host,
-          port: request.port,
-          _render: params[:_render], format: params[:format])
+                                                                  protocol: request.protocol,
+                                                                  host: request.host,
+                                                                  port: request.port,
+                                                                  _render: params[:_render], format: params[:format])
         )
       end
 
@@ -17,6 +17,9 @@ module Glib
       # TODO: Remove the block
       def json_ui_page(json, &block)
         @__json_ui_page ||= Page.new(json, self)
+
+        __json_ui_analytics(json)
+
         block&.call @__json_ui_page
         @__json_ui_page
       end

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

@@ -2,6 +2,8 @@ module Glib
   module JsonUi
     module ResponseHelper
       def json_ui_response(json)
+        __json_ui_analytics(json)
+
         json.onResponse do
           response = Response.new(json, self)
           yield response.action_builder

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

@@ -3,7 +3,7 @@ module Glib
     module SplitBuilders
 
       class Content < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end

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

@@ -2,10 +2,10 @@ module Glib
   module JsonUi
     module TableBuilders
       class Template < AbstractBuilder
-        def method_missing m, *args
+        def method_missing(m, *args)
           add_element_to_array 'template', m, *args
         end
-      
+
         class AbstractTemplate < JsonUiElement
 
           def editButtons(block)
@@ -13,9 +13,9 @@ module Glib
               block.call page.menu_builder
             end
           end
-        
+
         end
-        
+
         class Default < AbstractTemplate
           views :cellViews
           action :onClick
@@ -23,9 +23,9 @@ module Glib
           array :colStyles
         end
       end
-      
+
       class Section < AbstractBuilder
-        def initialize json, page, template
+        def initialize(json, page, template)
           super json, page
           @template = template
         end
@@ -68,7 +68,7 @@ module Glib
         # end
 
       end
-      
+
     end
   end
 end

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

@@ -28,29 +28,46 @@ module Glib
         length :height
         color :backgroundColor
         hash :padding
-        # array :styleClasses
         singleton_array :styleClass, :styleClasses
         hash :showIf
+        hash :analytics
 
-        def analytics(value)
-          if value.is_a?(String)
-            @analyticsEnabled = true
-            @analyticsId = value
-          else
-            @analyticsEnabled = value == true
-          end
-        end
+        # def initialize(json, page)
+        #   super(json, page)
 
-        # Override
-        def created
-          if @analyticsEnabled
-            context = page.context
-            json.analytics do
-              content = @analyticsId || (@text || @icon)&.gsub(/\s+/, '_')&.downcase || 'nil'
-              json.namePrefix [context.controller_name, context.action_name, content].join('_')
-            end
-          end
-        end
+        #   # Can be improved by making it configurable site-wide.
+        #   @analyticsEnabled = true
+        # end
+
+        # def analytics(value)
+        #   if value.is_a?(String)
+        #     @analyticsEnabled = true
+        #     @analyticsId = value
+        #   else
+        #     @analyticsEnabled = value == true
+        #   end
+        # end
+
+        # # Override
+        # def created
+        #   # if @analyticsEnabled
+        #   #   context = page.context
+        #   #   json.analytics do
+        #   #     content = @analyticsId || (@text || @icon)&.gsub(/\s+/, '_')&.downcase || 'nil'
+        #   #     json.namePrefix [context.controller_name, context.action_name, content].join('_')
+        #   #   end
+        #   # end
+
+        #   json.analytics do
+        #     if @analyticsEnabled
+        #       if @analyticsId
+        #         json.placement @analyticsId
+        #       end
+        #     else
+        #       json.disabled true
+        #     end
+        #   end
+        # end
 
       end
 
@@ -182,4 +199,4 @@ module Glib
 
     end
   end
-end
+end

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

@@ -210,6 +210,7 @@ class Glib::JsonUi::ViewBuilder
     class LatLong < AbstractField
       hash :latitudeField
       hash :longitudeField
+      hash :zoomField
     end
 
     class StripeToken < AbstractField

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

@@ -156,6 +156,7 @@ class Glib::JsonUi::ViewBuilder
     class Responsive < View
       views :childViews
       string :align
+      action :onClick
     end
 
     class Column < View

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

@@ -2,7 +2,7 @@ json.title 'Forms'
 
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
-  
+
   page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
     form.h2 text: 'Radio Group'
     form.spacer height: 6
@@ -12,7 +12,7 @@ json_ui_page json do |page|
       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+', checkValue: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
@@ -36,7 +36,8 @@ json_ui_page json do |page|
     form.spacer height: 6
     form.fields_latLong name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
       latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
-      longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
+      longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true },
+      zoomField: { name: 'user[zoom]', label: 'Zoom' }
 
     form.spacer height: 20
     form.fields_submit text: 'Submit'

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

@@ -17,6 +17,12 @@ section.rows builder: ->(row) do
   batch_count = 30
   batch_count.times do |i|
     index = page_index * batch_count + i
-    row.thumbnail title: "Item #{index}"
+    if local_assigns[:reorder]
+      row.thumbnail title: "Item #{index}", onReorder: ->(action) do
+        action.dialogs_notification title: "Item #{index}"
+      end, paramNameForFormData: 'message', paramNameForNewIndex: 'new_index'
+    else
+      row.thumbnail title: "Item #{index}"
+    end
   end
 end

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

@@ -23,6 +23,9 @@ json_ui_page json do |page|
       template.thumbnail title: 'Autoload All', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/autoload_all')
       end
+      template.thumbnail title: 'Reordering', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'lists/reordering')
+      end
     end
 
   end

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

@@ -0,0 +1,24 @@
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'lists/reordering', page: page_index + 1, section_only: 'v1'),
+  autoload: 'asNeeded'
+}
+
+page = json_ui_page json
+
+if params[:section_only].present?
+  json.nextPage next_page if page_index < 3
+  json.sections do
+    json.child! do
+      render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index, reorder: true
+    end
+  end
+else
+  json.title 'Lists'
+
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.list nextPage: next_page, firstSection: ->(section) do
+    render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index, reorder: true
+  end
+end

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

@@ -2,13 +2,13 @@ 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: 'Thumbnail Template'
     scroll.spacer height: 6
     scroll.panels_custom template: 'thumbnail', width: 'matchParent', backgroundColor: '#fafafa',
       data: { imageUrl: glib_json_image_standard_url, title: 'Title', subtitle: 'Use the same template from list templates' }
-    
+
     scroll.spacer height: 20
     scroll.h2 text: 'Non-existent Template'
     scroll.spacer height: 6

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

@@ -71,7 +71,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     # responsive.panels_column lg: { cols: 4 }, childViews: ->(column) do
     #   column.button width: 'matchParent', text: '2'
     # end
-    
+
     responsive.panels_column lg: { cols: 8 }, backgroundColor: '#c3cad2', childViews: ->(column) do
       column.button text: '1'
     end
@@ -84,5 +84,15 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   end
 
   scroll.spacer height: 20
+  scroll.h2 text: 'With onClick'
+  scroll.spacer height: 6
+  scroll.panels_responsive backgroundColor: '#c3cad2', padding: { left: 20, right: 20, top: 10, bottom: 10 }, childViews: ->(responsive) do
+    responsive.h4 text: 'Heading'
+    responsive.label text: 'Label'
+  end, onClick: ->(action) do
+    action.windows_open url: json_ui_garage_url(path: 'home/blank')
+  end
+
+  scroll.spacer height: 20
 
 end

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

@@ -180,4 +180,3 @@ json_ui_page json do |page|
     end
   end
 end
-

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

@@ -2,7 +2,7 @@ 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.h1 text: 'Basic'
     scroll.panels_vertical backgroundColor: '#b3bac2', childViews: ->(panel) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.26
 platform: ruby
 authors:
 - ''
@@ -64,6 +64,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/concerns/glib/analytics/funnel.rb
 - app/controllers/concerns/glib/auth/policy.rb
 - app/controllers/concerns/glib/json/dynamic_text.rb
 - app/controllers/concerns/glib/json/libs.rb
@@ -84,6 +85,7 @@ files:
 - app/helpers/glib/json_ui/action_builder/sheets.rb
 - app/helpers/glib/json_ui/action_builder/snackbars.rb
 - app/helpers/glib/json_ui/action_builder/windows.rb
+- app/helpers/glib/json_ui/analytics_helper.rb
 - app/helpers/glib/json_ui/dynamic_field_builders.rb
 - app/helpers/glib/json_ui/generic_builders.rb
 - app/helpers/glib/json_ui/list_builders.rb
@@ -149,6 +151,7 @@ files:
 - app/views/json_ui/garage/lists/edit_actions.json.jbuilder
 - app/views/json_ui/garage/lists/fab.json.jbuilder
 - app/views/json_ui/garage/lists/index.json.jbuilder
+- app/views/json_ui/garage/lists/reordering.json.jbuilder
 - app/views/json_ui/garage/lists/templating.json.jbuilder
 - app/views/json_ui/garage/notifications/android_post.json.jbuilder
 - app/views/json_ui/garage/notifications/index.json.jbuilder