avo 2.3.1.pre.3 → 2.3.1.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e1805ff89ebee46cd3c45191d38f8a8953e09f3521df78f8ef922ff471065c
-  data.tar.gz: 8a290c25c54ddf3d3a0708f4f859df219d9c5766c331bafbaffbe5320e3b50a2
+  metadata.gz: aa5d2395db02e3b37f787b0680a4cae6748c99049f369d8e2a3db2fb6c2a2dd8
+  data.tar.gz: 4de2e1dcc865e6ebbc693ddefd4e5407f9d6a6c60f3c1153deeb8d7dcc6ba17b
 SHA512:
-  metadata.gz: 4288cfcdc4072c1e6916a0ea1da1d93369544198e4aa0f91a018ba2ed656bdf9bf4f80493a96eedf4dea956c7258c6021f7badbbc954784c2dfbefedce32673b
-  data.tar.gz: 205ccbae96213b426456acfa1495a00cd383a8fdf7e270a29979a046623bc0907caa85a43b9a0d4eb0207a5b705437bb974ef6d9a80cae66fabab74279420881
+  metadata.gz: 498b612171a47529d988c8ba89ac0330013afef141a0a4d74df9d41fe60b7d00543777be08b0fa35bf1a5972c06f512a2be76510f4b5a9fd90d779c7fc90a2e8
+  data.tar.gz: fefaff30ae62e0c5de60d64f3e5952bca7b1ae816d454613f3803ca268b2724505231dff2d9d9ce348a625a7ecf74fc9c669179fbbf03366f2c4c26a52c9b277

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.3.1.pre.3)
+    avo (2.3.1.pre.6)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/assets/builds/avo.css

@@ -8526,6 +8526,12 @@ trix-editor {
   padding-top:1rem
 }
 
+@media print{
+  .print\:hidden{
+    display:none
+  }
+}
+
 @media (min-width: 495px){
   .xs\:grid-cols-2{
     grid-template-columns:repeat(2, minmax(0, 1fr))

data/app/views/avo/debug/index.html.erb

@@ -46,8 +46,8 @@
                   <% end %>
                   <dt class="font-semibold text-sm">Last fetched at</dt>
                   <dd><%= license.response['fetched_at'] %> <br>
-                  <% if license.response['fetched_at'].present? %>
-                     (<%= time_ago_in_words license.response['fetched_at'] %> ago)</dd>
+                    <% if license.response['fetched_at'].present? %>
+                      (<%= time_ago_in_words license.response['fetched_at'] %> ago)</dd>
                   <% end %>
                   <dt class="font-semibold text-sm">Cache store</dt>
                   <dd><%= Avo::App.cache_store.class.to_s %> - <%= Avo::App.cache_store.options.inspect %></dd>
@@ -67,21 +67,9 @@
           </div>
         </div>
         <div class="relative bg-white rounded shadow-panel p-4 space-y-4 col-span-2">
-          <div class="font-semibold">Debug report</div>
-          <div>
-            <%== ap Avo::App.debug_report(request) %>
-          </div>
-          <div class="flex justify-end">
-            <%= a_button icon: 'heroicons/outline/clipboard',
-              style: :primary,
-              data: {
-                controller: 'copy-to-clipboard',
-                action: "click->copy-to-clipboard#copy",
-                text: Avo::App.debug_report(request),
-              } do %>
-              Copy debug info
-            <% end %>
-          </div>
+          <turbo-frame id="debug-report" src="/admin/avo_private/debug/report" target="_top" class="block">
+            Loading...
+          </turbo-frame>
         </div>
       </div>
     <% end %>

data/app/views/avo/debug/report.html.erb

@@ -0,0 +1,21 @@
+<turbo-frame id="debug-report">
+  <div class="font-semibold">Debug report</div>
+  <div>
+    <% if defined?(ap) %>
+      <%== ap Avo::App.debug_report(request) %>
+    <% else %>
+      <pre><%== JSON.pretty_generate(Avo::App.debug_report(request)) %></pre>
+    <% end %>
+  </div>
+  <div class="flex justify-end">
+    <%= a_button icon: 'heroicons/outline/clipboard',
+      style: :primary,
+      data: {
+        controller: 'copy-to-clipboard',
+        action: "click->copy-to-clipboard#copy",
+        text: Avo::App.debug_report(request),
+      } do %>
+      Copy debug info
+    <% end %>
+  </div>
+</turbo-frame>

data/config/routes.rb

@@ -39,8 +39,11 @@ Avo::Engine.routes.draw do
     delete "/:resource_name/:id/:related_name/:related_id", to: "associations#destroy", as: "associations_destroy"
   end
 
-  get "/debug", to: "debug#index", as: "debug_index"
-  post "/debug/refresh_license", to: "debug#refresh_license"
+  scope "/avo_private", as: "avo_private" do
+    get "/debug", to: "debug#index", as: "debug_index"
+    get "/debug/report", to: "debug#report", as: "debug_report"
+    post "/debug/refresh_license", to: "debug#refresh_license"
+  end
 
   if Rails.env.development? or Rails.env.staging?
     scope "/avo_private", as: "avo_private" do

data/lib/avo/app.rb

@@ -105,13 +105,15 @@ module Avo
       end
 
       def main_menu
-        return nil if Avo::App.license.lacks_with_trial(:menu_builder)
+        return [] if Avo::App.license.lacks_with_trial(:menu_builder)
+        return [] if Avo.configuration.main_menu.nil?
 
         Avo::Menu::Builder.parse_menu(&Avo.configuration.main_menu)
       end
 
       def profile_menu
-        return nil if Avo::App.license.lacks_with_trial(:menu_builder)
+        return [] if Avo::App.license.lacks_with_trial(:menu_builder)
+        return [] if Avo.configuration.profile_menu.nil?
 
         Avo::Menu::Builder.parse_menu(&Avo.configuration.profile_menu)
       end

data/lib/avo/licensing/h_q.rb

@@ -6,6 +6,7 @@ module Avo
       ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       CACHE_KEY = "avo.hq.response".freeze unless const_defined?(:CACHE_KEY)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
+      CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
 
       def initialize(current_request)
         @current_request = current_request
@@ -60,8 +61,8 @@ module Avo
           field_types: field_types,
           **other_metadata(:actions),
           **other_metadata(:filters),
-          main_menu_present: Avo::App.main_menu.present?,
-          profile_menu_present: Avo::App.profile_menu.present?,
+          main_menu_present: Avo.configuration.main_menu.present?,
+          profile_menu_present: Avo.configuration.profile_menu.present?,
         }
       end
 
@@ -94,10 +95,12 @@ module Avo
 
         return cache_and_return_error "Avo HQ Internal server error.", hq_response.body if hq_response.code == 500
 
-        cache_response 1.hour.to_i, hq_response.parsed_response if hq_response.code == 200
+        if hq_response.code == 200
+          cache_response response: hq_response.parsed_response
+        end
       end
 
-      def cache_response(time, response)
+      def cache_response(response: nil, time: CACHE_TIME)
         response.merge!(
           expiry: time,
           fetched_at: Time.now,
@@ -135,7 +138,7 @@ module Avo
       end
 
       def cache_and_return_error(error, exception_message = "")
-        cache_response 5.minutes.to_i, {error: error, exception_message: exception_message}.stringify_keys
+        cache_response response: {error: error, exception_message: exception_message}.stringify_keys, time: 5.minutes.to_i
       end
 
       def has_cached_response

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.3.1.pre.3" unless const_defined?(:VERSION)
+  VERSION = "2.3.1.pre.6" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.3.1.pre.3
+  version: 2.3.1.pre.6
 platform: ruby
 authors:
 - Adrian Marin
@@ -1097,6 +1097,7 @@ files:
 - app/views/avo/dashboards/card.html.erb
 - app/views/avo/dashboards/show.html.erb
 - app/views/avo/debug/index.html.erb
+- app/views/avo/debug/report.html.erb
 - app/views/avo/home/_actions.html.erb
 - app/views/avo/home/_docs.html.erb
 - app/views/avo/home/_filters.html.erb