glib-web 0.5.20 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d6528e82e0ce768820820d544d382db8f412e2e0ea2d5e572ab16065f7b173
-  data.tar.gz: 2c8d52f0b60d4ac9b8253bbc1f7cc67c7172647981b5e036d4bedc306827f97a
+  metadata.gz: d08542637c79970affe100bdedd24353ab9fa549c8fdc719e3c47cb51cef2896
+  data.tar.gz: 4c7864a098a56b650bc97855a4b8c3251d638bc6f129d0d6997fc26d0f6acf25
 SHA512:
-  metadata.gz: 591bb9bb58b8034ee825c49f27483f8b1a756efc586de444c49b9bce35727fac47eb7852511b81dd0762736cdad7fd5972172c74d73d3b8f69218beaead56611
-  data.tar.gz: b7a9552472085631f0123187103b1667652428f58a45863539e1ca2d8a2ef219b59357655f88abe4c9a2291fda805627ddc9a385b51f69d4bdd04d37aac80c95
+  metadata.gz: 1a9a74182efee4e14507965ddbf55f56f0321974938463422d6303286bb81b9c96cf6f12630108afb181f358ff5de1dea68524b85690cebe9a506c9a5625933c
+  data.tar.gz: cb2d0dbc95f38b4cbfc2b2957c8bf8c4d96491416464b8e19900dabdbcb7d6e6cef85a9091bd8b2d808d614d3ad5963cd6be1f8d7b988f0d462b2648b20d13b2

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/traversal.rb

@@ -66,6 +66,7 @@ module Glib::Json::Traversal
 
       # Generic menu buttons
       traverse_multiple view['buttons'], block
+      traverse_multiple view['childButtons'], block
 
       # Split panel
       traverse_vertical_content view['left'], block

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/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/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

@@ -6,6 +6,36 @@ module Glib
       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

@@ -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/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
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.25
 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