avo 2.3.1.pre.2 → 2.3.1.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98f3ea3aac47b1c6715e7bd419f10d29070292b8b9efaabd3cd3112199edce4
-  data.tar.gz: 42cc3a86497712bc59fffe72ae27300de0b1d1bc154b7877935e039398d18d26
+  metadata.gz: 6256e502b9bb22a7d924ea43f8d0f6d7dbe6a28f9ad58877515f8d0a6954d481
+  data.tar.gz: 17956bd16b76b1f7017b20cbff9f841e8a7b942d7ad5d73c3442658e8bcfb7f1
 SHA512:
-  metadata.gz: fb97341bdf6540f657dfa211861daca585db29415cdfe69fdafec33a3dab7025f5776e20ca62e716be253e74d19bef7921e0836b6bbc2dfa0f89ad46676033d6
-  data.tar.gz: 23a64af8908c963aea35f533f913f87c41b52bfe838c0ee0d05b42bf93d210ab278e10329b4c4ead17ad216374c8994b00a3f86bb5c85fdf9447a5053f387728
+  metadata.gz: cfea2ebe1abcbfcea4dfaf340791f44c7691a1b9b41ccfea534218aab32c0c4ec283a5494cb0369025690a0e4c73da42b04c3351aa9a5acf81bc30cf47d5af88
+  data.tar.gz: 6078470d3fe8efdb049f4bc49735589b6db7fb55bafe1417bd0130d5046a4b60a20246cff2c65464b72c6977ecea8b4bf4d141c53b95129c8be816056f552c58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.3.1.pre.2)
+    avo (2.3.1.pre.5)
       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,7 +46,9 @@
                   <% 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>
+                  <% 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>
                 </dl>
@@ -67,7 +69,11 @@
         <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) %>
+            <% 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',

data/config/routes.rb

@@ -39,8 +39,10 @@ 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"
+    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.2" unless const_defined?(:VERSION)
+  VERSION = "2.3.1.pre.5" 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.2
+  version: 2.3.1.pre.5
 platform: ruby
 authors:
 - Adrian Marin