glib-web 0.5.16 → 0.5.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f06e6697837bddfa0e71b0263a7dcc23452aff19
-  data.tar.gz: 57677ef8d290617ca0a3bc935450b9c729113623
+SHA256:
+  metadata.gz: 7d40fabbd2b44ff3a4c13a7095ea2f19b6b560de5d0c5d6a58616c94d000df1a
+  data.tar.gz: 1c4b8787db5d9fa131b18346e6b4d201b6c9b279f5a5e58d5debf6c4024475c4
 SHA512:
-  metadata.gz: 4bcfd89c5fbc018bb165b5a9c631435117415320c1465ae49a13975e7da3dfccc58f4a182ec9bd90fae1a7f42fd3426842e1a16b3db1e8bdf6b5bd8052e42ffb
-  data.tar.gz: 89d40c161a93ce26a558029697553801d0e5cae50f0c0bc4f7ab7aec619f917e2487478ff741654f326a4d21e2452d61b2c73000bb054d2571aa12d09e98f451
+  metadata.gz: 7d75eca6f60a6cfe859d529216300a16987fde43fc4960df8a1923080c0142be524f21e0ddf32e6f3c66182fa0c12d9f6d8f85bd65d2671ad34e921dd02c89f9
+  data.tar.gz: 1c0225f8bd8979c62e74e69941b033afc98067c93e1a699d4402a347c9e7f7bb3076df798d88fd79d02216da6c067112950249cd1b0d0740c23b895911cdf143

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

@@ -0,0 +1,60 @@
+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
+    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
@@ -66,12 +77,9 @@ module Glib::Json::Ui
   end
 
   private
-
-  def __json_ui_vue(hash, options)
-    renderer_path = options[:renderer_path]
-    @__json_ui_orig_page = response.body
-    response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
-
-    # response.body = render_to_string(template: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
-  end
+    def __json_ui_vue(hash, options)
+      renderer_path = options[:renderer_path]
+      @__json_ui_orig_page = response.body
+      response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
+    end
 end

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

@@ -16,6 +16,7 @@ module Glib
       end
 
       class Action < JsonUiElement
+        # TODO: Deprecated
         def analytics(value)
           if value.is_a?(String)
             @analyticsEnabled = true
@@ -27,6 +28,7 @@ module Glib
 
         # Override
         def created
+          # TODO: Deprecated
           if @analyticsEnabled
             suffix = @analyticsId
             # TODO: recognize_path() needs `method` as a second argument for POST request
@@ -71,6 +73,16 @@ module Glib
         end
       end
 
+      module Devices
+        class GetPushToken < Action
+          string :postUrl
+          string :paramNameForToken
+
+          # Use postUrl instead
+          # action :onGet
+        end
+      end
+
       module Analytics
         class LogEvent < Action
           string :name

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
@@ -15,13 +45,16 @@ module Glib
         bool :disabled
         singleton_array :styleClass, :styleClasses
 
-        def childItems(block)
-          json.childItems do
+        def childButtons(block)
+          json.childButtons do
             block.call page.menu_builder
           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,14 +74,21 @@ module Glib
 
         # Override
         def created
+          super
+
           json.type 'label'
         end
       end
 
-      class MenuLeftBottom < Button
-        icon :icon
-        array :buttons
-      end
+      # class MenuLeftBottom < Button
+      #   icon :icon
+      #   array :buttons
+      # end
+
+      # class Select < Button
+      #   icon :icon
+      #   array :buttons
+      # end
     end
   end
 end

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

@@ -10,9 +10,24 @@ module Glib
         )
       end
 
+      def json_ui_garage_current_url(options = {})
+        json_ui_garage_url(options.merge(path: params[:path]))
+      end
+
       # TODO: Remove the block
       def json_ui_page(json, &block)
         @__json_ui_page ||= Page.new(json, self)
+
+        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
+
         block&.call @__json_ui_page
         @__json_ui_page
       end
@@ -45,6 +60,12 @@ module Glib
         @__json_ui_section.action_builder
       end
 
+      def json_ui_action_payload(&block)
+        dataJson = Jbuilder.new
+        block&.call Page.new(dataJson, self).action_builder
+        dataJson.attributes!
+      end
+
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
         attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :split_content_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/helpers/glib/json_ui/view_builder/fields.rb

@@ -95,6 +95,7 @@ class Glib::JsonUi::ViewBuilder
     # - It has a default onClick so no need to specify `onClick: ->(action) { action.forms_submit }`
     class Submit < AbstractField
       string :text
+      color :color
     end
 
     class CheckGroup < AbstractField
@@ -157,6 +158,7 @@ class Glib::JsonUi::ViewBuilder
     class DynamicGroup < AbstractField
       string :titlePrefix
       panels_builder :content, :template
+      hash :groupFieldProperties
 
       # NOTE: Consider using sub-panel instead (e.g. groupTemplate)
       # views :groupTemplateViews

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

@@ -89,7 +89,6 @@ class Glib::JsonUi::ViewBuilder
           @childViewsBlock.call(page.view_builder)
           page.current_form = nil
         end
-
       end
 
       def childViews(block)
@@ -98,6 +97,7 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class List < View
+      hash :ws
       hash :nextPage
       action :onScrollToTop
       action :onScrollToBottom

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

@@ -1,6 +1,5 @@
 
 if local_assigns[:top_nav] || json_ui_app_is_web?
-
   page.leftDrawer content: ->(drawer) do
     drawer.header childViews: ->(header) do
       header.button text: 'App', styleClasses: ['link', 'logo'], onClick: ->(action) do

data/app/views/json_ui/garage/actions/_http.json.jbuilder

@@ -5,14 +5,20 @@ end
 
 section.rows builder: ->(template) do
   template.thumbnail title: 'http/post', onClick: ->(action) do
-    action.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+    end
   end
 
   template.thumbnail title: 'http/patch', onClick: ->(action) do
-    action.http_patch url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Edit Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_patch url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Edit Joe' }
+    end
   end
 
   template.thumbnail title: 'http/delete', onClick: ->(action) do
-    action.http_delete url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Delete Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_delete url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Delete Joe' }
+    end
   end
 end