avo 1.2.2 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5cd3316f4906c09337ae6079468f6779b272ec800112cefa1db60a169acaddf
-  data.tar.gz: 6238d803e939ed4471cf6b67fbcf2568bc74fddd6f125eb10575d15f2ee6c244
+  metadata.gz: 29978f5965b8f3a7d37592960629537572e297b6c247793893f12ef662135271
+  data.tar.gz: 9b178a096a42375b531170a1d522568d96134523e94298787b670502ef09c350
 SHA512:
-  metadata.gz: 3e81e69fdb6f0094ccada08f1ca66c522fbf813b9dbc310de63a8c1ed64c9155d62e2dadee337b7ea937280755b157325e07ada2de94a88e219d4f29a8c58d66
-  data.tar.gz: f82850865b3a6592364534c33b4766f808e9d869025ea57bbe8148625fd0399d46575046d86bcca9115a68f604c302628c39965ba7f36f55c9822f2b3bf41480
+  metadata.gz: 2f14e3a6cad2b57e494fe73088903ab6f92aa9521860e5f47b8fe8d07e69b54393e25a80adb4f995a941503e62a403dfec2b7579c8982dcf022931e5fdc1990c
+  data.tar.gz: 3f8fcfe855e2c260015d5ed3d74b0a26e8621da2f3c404caeaf948c03f43922cc3de59d291fa6fc6145aa0921ace48fcfea1e8105469b214ec2bd274686bd638

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.2.2)
+    avo (1.2.6)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/controllers/avo/application_controller.rb

@@ -4,6 +4,7 @@ module Avo
     include Pagy::Backend
     protect_from_forgery with: :exception
     before_action :init_app
+    before_action :check_avo_license
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -34,6 +35,24 @@ module Avo
       end
     end
 
+    def render(*args)
+      raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:check_avo_license).source_location.first.match?(/.*\/app\/controllers\/avo\/application_controller\.rb/)
+
+      super(*args)
+    end
+
+    def check_avo_license
+      unless request.original_url.match?(/.*\/avo\/resources\/.*/)
+        if @license.invalid? || @license.lacks(:custom_tools)
+          if Rails.env.development?
+            @custom_tools_alert_visible = true
+          else
+            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
+          end
+        end
+      end
+    end
+
     def _current_user
       instance_eval(&Avo.configuration.current_user)
     end

data/app/controllers/avo/home_controller.rb

@@ -5,7 +5,9 @@ module Avo
     def index
       @page_title = "Get started"
 
-      unless Rails.env.development?
+      if Avo.configuration.home_path.present?
+        redirect_to Avo.configuration.home_path
+      elsif !Rails.env.development?
         redirect_to resources_path Avo::App.get_resources.min_by { |resource| resource.route_key }.model_class
       end
     end

data/app/packs/stylesheets/components/code.css

@@ -9,3 +9,8 @@
   height: var(--height) !important;
   min-height: auto;
 }
+
+/* overlay CodeMirror fullscreen & Preview on small screens */
+.CodeMirror-fullscreen, .editor-preview-active-side {
+  z-index: 50;
+}

data/app/views/avo/home/_actions.html.erb

@@ -1,16 +1,16 @@
 <div>
   <h3>Actions</h3>
 
-  <div class="mt-2" data-controller="hidden-input">
+  <div class="mt-2">
     Avo actions allow you to perform specific tasks on one or more of your records. For example, you might want to mark a user as inactive and optionally send a message that may be customized by the person that wants to run the action.
 
-    <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate action 👇</strong>
-
-    <div class="mt-2 hidden" data-hidden-input-target="content">
+    <div class="mt-2">
       <code class="text-lg">Toggle published</code>
-      <div>
+      <div class="mt-1">
         <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:action toggle_published</code>
       </div>
     </div>
+
+    <a href="https://docs.avohq.io/1.0/actions.html" target="_blank" title="Avo Actions documentation" class="text-bold cursor-pointer block mt-2">Actions in the docs 👉</a>
   </div>
 </div>

data/app/views/avo/home/_docs.html.erb

@@ -4,6 +4,6 @@
   <div class="mt-2">
     We take pride in our documentation. Please check it out to see what you can build with Avo
 
-    <a href="https://docs.avohq.io" class="text-bold cursor-pointer block mt-2">Check out the docs 👉</a>
+    <a href="https://docs.avohq.io" target="_blank" title="Avo documentation" class="text-bold cursor-pointer block mt-2">Check out the docs 👉</a>
   </div>
 </div>

data/app/views/avo/home/_filters.html.erb

@@ -4,13 +4,13 @@
   <div class="mt-2" data-controller="hidden-input">
     Filters allow you to better scope the index queries for records you are looking for.
 
-    <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate filter 👇</strong>
-
-    <div class="mt-2 hidden" data-hidden-input-target="content">
+    <div class="mt-2">
       <code class="text-lg">Published filter</code>
-      <div>
+      <div class="mt-1">
         <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:filter published_filter</code>
       </div>
     </div>
+
+    <a href="https://docs.avohq.io/1.0/filters.html" target="_blank" title="Avo Filters documentation" class="text-bold cursor-pointer block mt-2">Filters in the docs 👉</a>
   </div>
 </div>

data/app/views/avo/home/_resources.html.erb

@@ -1,5 +1,9 @@
 <%
-  models = ApplicationRecord.descendants
+  models = begin
+    ApplicationRecord.descendants
+  rescue => exception
+    []
+  end
 %>
 <div>
   <h3>Resources</h3>
@@ -10,7 +14,7 @@
     <div class="mt-2" data-controller="hidden-input">
       It seems you already have <%= models.count %> <%= 'model'.pluralize models.count %> in your app. You can generate resources for each one with the following commands.
 
-      <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate resources 👇</strong>
+      <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate resources 👇 (click to reveal)</strong>
 
       <div class="mt-2 hidden" data-hidden-input-target="content">
         <% models.each do |model| %>
@@ -22,7 +26,16 @@
       </div>
     </div>
   <% else %>
+    <div class="mt-2" data-controller="hidden-input">
+      You may generate a resource using the following command:
+      <br>
 
+      <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource post</code>
+    </div>
   <% end %>
+
+  <p>
+    <a href="https://docs.avohq.io/1.0/resources.html" target="_blank" title="Avo Resources documentation">Docs</a>
+  </p>
 </div>
 

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

@@ -27,7 +27,7 @@
               <li><span class="mr-2">👍</span> Grid view</li>
               <li><span class="mr-2">👍</span> Authorization</li>
               <li><span class="mr-2">👍</span> Localization</li>
-              <li><span class="mr-2">⏳</span> Custom tools</li>
+              <li><span class="mr-2">👍</span> Custom tools</li>
               <li><span class="mr-2">⏳</span> Custom fields</li>
               <li><span class="mr-2">⏳</span> Search</li>
               <li><span class="mr-2">🕐</span> Dashboards</li>

data/app/views/avo/partials/_custom_tools_alert.html.erb

@@ -0,0 +1,6 @@
+<div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
+    <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0" %> Warning. Your license is invalid or doesn't support custom tools. This page will not be visible in a production environment.
+  </a>
+</div>
+

data/app/views/avo/sidebar/_license_warning.html.erb

@@ -1,12 +1,8 @@
 <div class="w-10/12 ml-1/12 inset-auto bottom-0 z-50 my-4 opacity-50 hover:opacity-100 transition-opacity duration-150 group">
-  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-teal-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
-    <% if icon.present? %>
-      <div class="h-6 inline mr-1 text-bold" :is="iconElement" v-if="icon">
-        <%= title %>
-      </div>
-    <% end %>
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
+    <%= svg 'exclamation', class: 'h-6 inline mr-1 text-bold' %> <%= title %>
     <div class="group-hover:block hidden py-2">
-      <%= message %> <arrow-circle-right-icon class="h-6 inline float-right"></arrow-circle-right-icon>
+      <%= message %> <%= svg 'arrow-circle-right', class: "h-6 inline float-right" %>
     </div>
   </a>
 </div>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -6,7 +6,8 @@
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: '/avo', active: :exclusive if Rails.env.development? %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: Avo.configuration.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
+
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">

data/app/views/layouts/avo/application.html.erb

@@ -30,8 +30,12 @@
       </div>
 
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
-        <%= yield %>
-        <%= render partial: "avo/partials/footer" %>
+        <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
+
+        <div class="flex flex-1 flex-col justify-between items-stretch">
+          <%= yield %>
+          <%= render partial: "avo/partials/footer" %>
+        </div>
       </div>
     </div>
   </div>

data/lib/avo.rb

@@ -10,6 +10,10 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
 
+  class LicenseVerificationTemperedError < StandardError; end
+
+  class LicenseInvalidError < StandardError; end
+
   class << self
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(

data/lib/avo/app.rb

@@ -26,12 +26,16 @@ module Avo
         self.request = request
         self.context = context
 
+        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+
         # Set the current host for ActiveStorage
-        ActiveStorage::Current.host = request.base_url
+        begin
+          ActiveStorage::Current.host = request.base_url
+        rescue => exception
+          Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.host, #{exception.inspect}"
+        end
 
         init_resources
-
-        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
       end
 
       def cache_store

data/lib/avo/configuration.rb

@@ -21,6 +21,7 @@ module Avo
     attr_accessor :context
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
+    attr_accessor :home_path
 
     def initialize
       @root_path = "/avo"
@@ -54,6 +55,7 @@ module Avo
         add_breadcrumb I18n.t("avo.home").humanize, avo.root_path
       }
       @display_breadcrumbs = true
+      @home_path = nil
     end
 
     def locale_tag
@@ -81,6 +83,10 @@ module Avo
     def set_initial_breadcrumbs(&block)
       @initial_breadcrumbs = block if block.present?
     end
+
+    def namespace
+      root_path.delete "/"
+    end
   end
 
   def self.configuration

data/lib/avo/licensing/h_q.rb

@@ -3,8 +3,8 @@ module Avo
     class HQ
       attr_accessor :current_request
 
-      ENDPOINT = "https://avohq.io/api/v1/licenses/check" unless const_defined?(:ENDPOINT)
-      CACHE_KEY = "avo.hq.response" unless const_defined?(:CACHE_KEY)
+      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
 
       def initialize(current_request)
@@ -54,7 +54,7 @@ module Avo
       end
 
       def perform_request
-        puts "Performing request to avohq.io API to check license availability.".inspect if Rails.env.development?
+        ::Rails.logger.debug "[Avo] Performing request to avohq.io API to check license availability." if Rails.env.development?
 
         HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
       end

data/lib/avo/licensing/license.rb

@@ -4,11 +4,13 @@ module Avo
       attr_accessor :id
       attr_accessor :response
       attr_accessor :valid
+      attr_accessor :payload
 
       def initialize(response)
         @response = response
         @id = response["id"]
         @valid = response["valid"]
+        @payload = response["payload"]
       end
 
       def valid?

data/lib/avo/licensing/pro_license.rb

@@ -3,7 +3,8 @@ module Avo
     class ProLicense < License
       def abilities
         [
-          :authorization
+          :authorization,
+          :custom_tools
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.2.2"
+  VERSION = "1.2.6"
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -29,10 +29,10 @@ Avo.configure do |config|
   # }
 
   ## == Localization ==
+  # config.locale = 'en-US'
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
-  # config.locale = 'en-US'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
   # config.per_page = 24
@@ -43,4 +43,13 @@ Avo.configure do |config|
   # config.full_width_container = false
   # config.full_width_index_view = false
   # config.cache_resources_on_index_view = true
+
+  # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
+  # config.home_path = nil
+
+  ## == Breadcrumbs ==
+  # config.display_breadcrumbs = true
+  # config.set_initial_breadcrumbs do
+  #   add_breadcrumb "Home", '/<%= options[:path] %>'
+  # end
 end

data/lib/generators/avo/tool_generator.rb

@@ -34,8 +34,8 @@ module Generators
         template "tool/view.tt", "app/views/avo/tools/#{file_name}.html.erb"
 
         route <<-ROUTE
-namespace :#{::Avo.configuration.root_path.gsub('/', '')} do
-  get "#{file_name}", to: "tools##{file_name}"
+scope :#{::Avo.configuration.namespace} do
+  get "#{file_name}", to: "avo/tools##{file_name}"
 end
         ROUTE
       end

data/public/avo-packs/css/{application-13cc02fb.css → application-af3e670d.css}

@@ -3646,6 +3646,11 @@ span.CodeMirror-selectedtext { background: none; }
   min-height: auto;
 }
 
+/* overlay CodeMirror fullscreen & Preview on small screens */
+.CodeMirror-fullscreen, .editor-preview-active-side {
+  z-index: 50;
+}
+
 .container {
     width: 100%;
 }
@@ -4558,15 +4563,15 @@ span.CodeMirror-selectedtext { background: none; }
 .top-full {
     top: 100%
 }
+.bottom-0 {
+    bottom: 0px
+}
 .left-1\/2 {
     left: 50%
 }
 .top-1\/2 {
     top: 50%
 }
-.bottom-0 {
-    bottom: 0px
-}
 .top-\[-1px\] {
     top: -1px
 }
@@ -4632,6 +4637,12 @@ span.CodeMirror-selectedtext { background: none; }
 .mb-0 {
     margin-bottom: 0px
 }
+.mt-1 {
+    margin-top: 0.25rem
+}
+.mb-4 {
+    margin-bottom: 1rem
+}
 .-ml-20 {
     margin-left: -5rem
 }
@@ -4680,9 +4691,6 @@ span.CodeMirror-selectedtext { background: none; }
 .mb-2 {
     margin-bottom: 0.5rem
 }
-.mb-4 {
-    margin-bottom: 1rem
-}
 .ml-2 {
     margin-left: 0.5rem
 }
@@ -4716,6 +4724,9 @@ span.CodeMirror-selectedtext { background: none; }
 .h-5 {
     height: 1.25rem
 }
+.h-6 {
+    height: 1.5rem
+}
 .h-64 {
     height: 16rem
 }
@@ -4728,9 +4739,6 @@ span.CodeMirror-selectedtext { background: none; }
 .h-full {
     height: 100%
 }
-.h-6 {
-    height: 1.5rem
-}
 .h-16 {
     height: 4rem
 }
@@ -5126,9 +5134,9 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-bg-opacity: 1;
     background-color: rgba(243, 244, 246, var(--tw-bg-opacity))
 }
-.bg-teal-700 {
+.bg-green-700 {
     --tw-bg-opacity: 1;
-    background-color: rgba(15, 118, 110, var(--tw-bg-opacity))
+    background-color: rgba(4, 120, 87, var(--tw-bg-opacity))
 }
 .bg-blue-gray-200 {
     --tw-bg-opacity: 1;
@@ -5397,6 +5405,9 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-text-opacity: 1;
     color: rgba(185, 28, 28, var(--tw-text-opacity))
 }
+.opacity-75 {
+    opacity: 0.75
+}
 .opacity-50 {
     opacity: 0.5
 }
@@ -5903,4 +5914,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-13cc02fb.css.map*/
+/*# sourceMappingURL=application-af3e670d.css.map*/