refactor: plugins reporting and versions hiding (#3287)

avo-hq · Oct 1, 2024 · 134de10 · 134de10
1 parent 701a608
commit 134de10
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 10 deletions.
diff --git a/app/controllers/avo/application_controller.rb b/app/controllers/avo/application_controller.rb
@@ -328,5 +328,13 @@ def choose_layout
         "avo/application"
       end
     end
+
+    def authenticate_developer_or_admin!
+      raise_404 unless Avo::Current.user_is_developer? || Avo::Current.user_is_admin?
+    end
+
+    def raise_404
+      raise ActionController::RoutingError.new "No route matches"
+    end
   end
 end
diff --git a/app/controllers/avo/debug_controller.rb b/app/controllers/avo/debug_controller.rb
@@ -2,7 +2,13 @@
 
 module Avo
   class DebugController < ApplicationController
+    before_action :authenticate_developer_or_admin!
+
     def status
+      respond_to do |format|
+        format.html { render :status }
+        format.text { render :status }
+      end
     end
 
     def send_to_hq

diff --git a/app/controllers/avo/private_controller.rb b/app/controllers/avo/private_controller.rb
@@ -2,6 +2,8 @@
 
 module Avo
   class PrivateController < ApplicationController
+    before_action :authenticate_developer_or_admin!
+
     def design
       @page_title = "Design [Private]"
     end

diff --git a/app/views/avo/debug/status.html.erb b/app/views/avo/debug/status.html.erb
@@ -76,7 +76,7 @@
               <ul>
                 <li>Avo <%= Avo::VERSION %></li>
                 <% Avo.plugin_manager.plugins.each do |plugin| %>
-                  <li><%= plugin.klass.name %> - <%= plugin.klass.version %></li>
+                  <li><%= plugin.name %> - <%= plugin.version %></li>
                 <% end %>
               </ul>
             </div>

diff --git a/app/views/avo/debug/status.text.erb b/app/views/avo/debug/status.text.erb
@@ -0,0 +1,6 @@
+<!-- Avo version: <%= Avo::VERSION %> -->
+<!-- Rails version: <%= Rails::VERSION::STRING %> -->
+<!-- Environment: <%= Rails.env %> -->
+<!-- License ID: <%= Avo.license.id %> -->
+<!-- License valid?: <%= Avo.license.valid ? "valid" : "invalid" %>  -->
+<!-- Plugins: <%= Avo.plugin_manager.to_s %> -->
diff --git a/app/views/layouts/avo/application.html.erb b/app/views/layouts/avo/application.html.erb
@@ -53,12 +53,6 @@
     <%= render partial: "avo/partials/alerts" %>
     <%= render partial: "avo/partials/scripts" %>
     <%= render partial: "avo/partials/confirm_dialog" %>
-    <!-- Avo version: <%= Avo::VERSION %> -->
-    <!-- Rails version: <%= Rails::VERSION::STRING %> -->
-    <!-- Environment: <%= Rails.env %> -->
-    <!-- License ID: <%= Avo.license.id %> -->
-    <!-- License valid?: <%= Avo.license.valid ? "valid" : "invalid" %>  -->
-    <!-- Plugins: <%= Avo.plugin_manager.to_s %> -->
   </body>
 </html>
 <!-- ✨ Built with Avo • https://www.avohq.io/ -->
diff --git a/lib/avo/plugin.rb b/lib/avo/plugin.rb
@@ -3,11 +3,17 @@ class Plugin
     attr_reader :name
     attr_reader :priority
 
+    delegate :version, :namespace, :engine, to: :class
+
     def initialize(*, name:, priority:, **, &block)
       @name = name
       @priority = priority
     end
 
+    def to_s
+      "#{name}-#{version}"
+    end
+
     class << self
       def name
         return gemspec.name if gemspec.present?

diff --git a/lib/avo/plugin_manager.rb b/lib/avo/plugin_manager.rb
@@ -37,15 +37,15 @@ def register_tool
     def as_json(*arg)
       plugins.map do |plugin|
         {
-          klass: plugin.klass.to_s,
+          klass: plugin.to_s,
           priority: plugin.priority,
         }
       end
     end
 
     def to_s
       plugins.map do |plugin|
-        plugin.klass.to_s
+        plugin.to_s
       end.join(",")
     rescue
       "Failed to fetch plugins."

diff --git a/lib/generators/avo/templates/initializer/avo.tt b/lib/generators/avo/templates/initializer/avo.tt
@@ -101,6 +101,7 @@ Avo.configure do |config|
   # }
 
   ## == Customization ==
+  config.click_row_to_view_record = true
   # config.app_name = 'Avocadelicious'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
@@ -114,7 +115,6 @@ Avo.configure do |config|
   # config.buttons_on_form_footers = true
   # config.field_wrapper_layout = true
   # config.resource_parent_controller = "Avo::ResourcesController"
-  # config.click_row_to_view_record = false
 
   ## == Branding ==
   # config.branding = {