avo 2.51.0 → 3.0.0.beta1

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

@@ -0,0 +1,9 @@
+<% if valid %>
+  <span class="text-green-700 text-xl">
+    <%= svg "check-badge", class: "h-5 inline -mt-1 relative" %> <span>Valid</span>
+  </span>
+<% else %>
+  <span class="text-orange-700 text-xl">
+    <%= svg "exclamation-circle", class: "h-5 inline -mt-1 relative" %> <span>Invalid</span>
+  </span>
+<% end %>

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

@@ -1,22 +1,37 @@
 <turbo-frame id="debug-report">
-  <div class="font-semibold">Debug report <small class="font-normal">(don't post this anywhere public)</small></div>
-  <div>
-    <% if defined?(ap) %>
-      <%== ap Avo::App.debug_report(request) %>
-    <% else %>
-      <pre><%== JSON.pretty_generate(Avo::App.debug_report(request)) %></pre>
+  <div class="flex gap-2">
+    <%= form_with url: avo.avo_private_send_to_hq_path, data: {turbo_frame: :send_to_hq}, class: "w-full" do |f| %>
+      <div class="space-y-8 divide-y divide-gray-200">
+        <div>
+          <div>
+            <h3 class="text-lg font-medium leading-6 text-gray-900">Send in a bug report (pro feature)</h3>
+            <p class="mt-1 text-sm text-gray-500">If you think there is something wrong with Avo and you'd like to report with some (anonymized) telemetry about the app, please fill in any relevant details and send it in.</p>
+            <p class="mt-1 text-sm text-gray-500">Otherwise, please <a href="https://avo.cool/new-issue" target="_blank">create a GitHub issue</a> where everyone can contribute.</p>
+          </div>
+
+          <div class="sm:col-span-6 mt-4">
+            <label for="about" class="block text-sm font-medium text-gray-700">Details</label>
+            <div class="mt-1">
+              <%= f.text_area :body, rows: 3, class: "block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm disabled:bg-gray-100", disabled: !Avo::Current.license.pro? %>
+            </div>
+          </div>
+          <%= f.hidden_field :license_key, value: Avo::Services::DebugService.debug_report(request)[:license_response]["license_key"] %>
+          <%= a_button icon: 'heroicons/outline/paper-airplane',
+            color: :primary,
+            style: :primary,
+            class: "mt-4",
+            disabled: !Avo::Current.license.pro?,
+            type: :submit do %>
+            Send to HQ
+          <% end %>
+        </div>
+      </div>
     <% end %>
   </div>
-  <div class="flex justify-end">
-    <%= a_button icon: 'heroicons/outline/clipboard',
-      color: :primary,
-      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 class="text-right">
+    <%= turbo_frame_tag :send_to_hq %>
+  </div>
+  <div class="overflow-auto max-w-full">
+
   </div>
 </turbo-frame>

data/app/views/avo/debug/{index.html.erb → status.html.erb}

@@ -1,7 +1,6 @@
 <%
-  license = Avo::App.license
+  license = Avo.license
   information_items = [
-    'license',
     'license_key',
     'ruby_version',
     'rails_version',
@@ -14,14 +13,14 @@
   hq_payload = Avo::Licensing::HQ.new(request).payload
 %>
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new(name: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
+  <%= render Avo::PanelComponent.new(name: 'Avo Status', description: 'Use this page to debug your Avo instance.') do |c| %>
     <% c.with_tools do %>
     <% end %>
     <% c.with_bare_content do %>
-      <div class="grid gap-4 sm:grid-cols-3">
-        <div class="relative flex flex-col bg-white rounded shadow-panel p-4 space-y-4 h-full col-span-1">
-        <div class="flex justify-between w-full">
-          <div class="font-semibold">License info</div>
+      <div class="grid gap-4 grid-cols-2">
+        <div class="relative flex flex-col bg-white rounded shadow-panel p-4 space-y-4 h-full">
+          <div class="flex justify-between w-full">
+            <div class="font-semibold">License info</div>
             <div class="flex justify-self-end">
               <%= a_button style: :outline,
                 color: :blue,
@@ -33,10 +32,10 @@
                 Refresh license
               <% end %>
             </div>
-        </div>
+          </div>
           <div class="flex flex-col flex-1">
             <div>
-              <div class="text-xl font-semibold"><%= license.name %></div>
+              <div class="text-xl font-semibold"><%= render partial: "valid_indicator", locals: {valid: license.valid?} %> <%= license.name %> license </div>
               <% if license.response['reason'] %>
                 <dl>
                   <dt class="font-semibold text-sm">Error</dt>
@@ -63,17 +62,35 @@
                       (<%= 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>
               </div>
             </div>
           </div>
         </div>
-        <div class="relative bg-white rounded shadow-panel p-4 space-y-4 col-span-2">
-          <turbo-frame id="debug-report" src="<%= root_path %>avo_private/debug/report" target="_top" class="block">
-            Loading...
-          </turbo-frame>
+        <div class="relative flex flex-col bg-white rounded shadow-panel p-4 space-y-4 h-full">
+          <div class="flex justify-between w-full">
+            <div class="font-semibold">Plugins</div>
+          </div>
+          <div class="flex flex-col flex-1">
+            <div>
+              <ul>
+                <li>Avo <%= Avo::VERSION %></li>
+                <% Avo.plugin_manager.plugins.each do |plugin| %>
+                  <li><%= plugin.klass.to_s.split("::").first %> <%= plugin.klass.version %></li>
+                <% end %>
+              </ul>
+            </div>
+          </div>
         </div>
+        <%= render Avo::PanelComponent.new(title: "Report") do |c| %>
+          <% c.with_body do %>
+            <div class="p-4">
+              <turbo-frame id="debug-report" src="<%= root_path %>avo_private/debug/report" target="_top" class="block">
+                Loading...
+              </turbo-frame>
+            </div>
+          <% end %>
+        <% end %>
       </div>
     <% end %>
   <% end %>

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

@@ -5,8 +5,8 @@
     </a>
   </div>
 <% end %>
-<% if Avo::App.error_messages.present? %>
-  <% Avo::App.error_messages.each do |error| %>
+<% if Avo.error_manager.has_errors?.present? %>
+  <% Avo.error_manager.all.each do |error| %>
     <% if error.is_a? Hash %>
       <%
         url, message, target = error.values_at :url, :message, :target

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

@@ -1,3 +1,3 @@
 <div class="text-center text-sm text-gray-700 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>">
-  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo::App.license.valid ? 'valid' : 'invalid'%> <%= Avo::App.license.id %> license">v<%= Avo::VERSION %></span>
+  <a href="https://avohq.io/" target="_blank">Avo</a> · &copy; <%= Date.today.year %> AvoHQ · <span title="<%= Avo.license.valid ? 'valid' : 'invalid'%> <%= Avo.license.id %> license">v<%= Avo::VERSION %></span>
 </div>

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

@@ -4,4 +4,9 @@
   Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
   Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
+  <% if Avo.avo_filters_installed? %>
+  Avo.configuration.avo_filters = {
+    param_key: '<%= Avo::DynamicFilters.configuration.param_key %>'
+  }
+  <% end %>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= link_to root_path, class: 'logo-placeholder h-full w-full flex justify-start' do %>
+<%= link_to avo.root_path, class: 'logo-placeholder h-full w-full flex justify-start' do %>
   <%= image_tag Avo.configuration.branding.logo, class: 'hidden sm:block object-contain', title: 'Avo' %>
   <%= image_tag Avo.configuration.branding.logomark, class: 'sm:hidden object-contain', title: 'Avo' %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div
-  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 h-16 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
+  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 border-b space-x-4 lg:space-x-0 h-16 <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   v-if="layout !== 'blank'"
 >
   <div class="flex items-center space-x-2 w-auto lg:w-64 flex-shrink-0 h-full">
@@ -9,10 +9,8 @@
     </div>
     <%= render partial: "avo/partials/logo" %>
   </div>
-  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-2 sm:space-x-8 lg:pl-4">
-    <div class="flex">
-      <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
-    </div>
+  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-2 sm:space-x-8 lg:px-2">
+    <%= render Avo::Pro::GlobalSearchComponent.new rescue nil %>
     <div class="m-0">
       <%= render partial: "avo/partials/header" %>
     </div>

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

@@ -1,4 +1,6 @@
-<thead class="bg-white border-b border-gray-200 pb-1">
+<thead
+  data-component-name="avo/partials/table_header"
+  class="bg-white border-b border-gray-200 pb-1">
   <% if @resource.record_selector %>
     <th class="rounded-lg" data-control="item-select-th">
       <%== item_select_all_input %>
@@ -35,14 +37,6 @@
         sort_direction = 'desc'
       end
       classes = "text-gray-500 tracking-tight leading-tight text-xs font-semibold"
-      classes += case field.index_text_align.to_sym
-        when :right
-          " text-right"
-        when :center
-          " text-center"
-        else
-          ""
-        end
     %>
     <%= content_tag :th,
       class: "text-left uppercase px-3 py-3 whitespace-nowrap rounded-l",
@@ -53,12 +47,12 @@
       } do %>
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
-          <%= field.name %>
+          <%= field.table_header_label %>
           <%= render partial: 'avo/partials/sortable_component', locals: {field: field} %>
         <% end %>
       <% else %>
         <div class="block w-full <%= classes %>">
-          <%= field.name %>
+          <%= field.table_header_label %>
         </div>
       <% end %>
     <% end %>

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

@@ -9,6 +9,7 @@
     <%= render partial: 'avo/partials/javascript' %>
     <%= render partial: 'avo/partials/branding' %>
     <%= render partial: 'avo/partials/pre_head' %>
+    <%= render Avo::AssetManager::StylesheetComponent.new asset_manager: Avo.asset_manager %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
       <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
@@ -19,6 +20,7 @@
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>
     <% end %>
+    <%= render Avo::AssetManager::JavascriptComponent.new asset_manager: Avo.asset_manager %>
     <%= render partial: 'avo/partials/head' %>
   </head>
   <body class="bg-application os-mac">
@@ -58,8 +60,8 @@
     <%= render partial: "avo/partials/scripts" %>
     <!-- Avo version: <%= Avo::VERSION %> -->
     <!-- Environment: <%= Rails.env %> -->
-    <!-- License ID: <%= Avo::App.license.id %> -->
-    <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
+    <!-- License ID: <%= Avo.license.id %> -->
+    <!-- License valid?: <%= Avo.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>
 <!-- ✨ Built with Avo • https://www.avohq.io/ -->

data/avo.gemspec

@@ -1,19 +1,18 @@
-$:.push File.expand_path("lib", __dir__)
+# $:.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
-require "avo/version"
+require_relative "lib/avo/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
   spec.name = "avo"
   spec.version = Avo::VERSION
-  spec.authors = ["Adrian Marin", "Mihai Marin", "Paul Bob"]
+  spec.authors = ["Adrian Marin", "Mihai Marin"]
   spec.email = ["avo@avohq.io"]
   spec.homepage = "https://avohq.io"
-  spec.summary = "Admin panel framework and Content Management System for Ruby on Rails."
-  spec.description = "Avo is a very custom Content Management System for Ruby on Rails that saves engineers and teams months of development time by building user interfaces and logic using configuration rather than traditional coding; When configuration is not enough, you can fallback to familiar Ruby on Rails code."
-  spec.license = "LGPL-3.0"
-  spec.licenses = ["LGPL-3.0", "Commercial"]
+  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin panel framework."
+  spec.description = "Avo abstracts away the common parts of building apps, letting your engineers work on your app's essential components. The result is a full-featured admin panel that works out of the box, ready to give to your end-users."
+  spec.license = "Commercial"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -28,20 +27,20 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 3.0.0"
   spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
-  spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "actionview", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 6.1"
+  spec.add_dependency "activesupport", ">= 6.1"
+  spec.add_dependency "actionview", ">= 6.1"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk", ">= 2.6.2"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
-  spec.add_dependency "view_component", ">= 2.54.0"
+  spec.add_dependency "view_component", ">= 3.0.0"
   spec.add_dependency "turbo-rails"
-  spec.add_dependency "turbo_power", "~> 0.5.0"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "dry-initializer"

data/bin/dev

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 PORT="${PORT:-3030}"
 export PORT

data/config/i18n-tasks.yml

@@ -3,7 +3,7 @@
 # The "main" locale.
 base_locale: en
 ## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
-locales: [ar, en, es, fr, nb, nn, pt-BR, pt, ro, tr]
+locales: [en, fr, nb, nn, pt-BR, pt, ro, tr]
 ## Reporting locale, default: en. Available: en, ru.
 # internal_locale: en
 

data/config/initializers/pagy.rb

@@ -1,5 +1,4 @@
 require "pagy/extras/trim"
-require "pagy/extras/countless"
 
 # For locales without native pagy i18n support
 def pagy_locale_path(file_name)
@@ -8,7 +7,6 @@ end
 
 extra_locales = [
   {locale: "en"},
-  {locale: "es"},
   {locale: "fr"},
   {locale: "nb"},
   {locale: "pt-BR"},

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/config/routes.rb

@@ -4,11 +4,11 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect(Avo.configuration.root_path)
   get "dashboards", to: redirect(Avo.configuration.root_path)
 
-  post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
+  mount Avo::DynamicFilters::Engine, at: "/avo-dynamic_filters" if defined?(Avo::DynamicFilters::Engine)
+  mount Avo::Dashboards::Engine, at: "/dashboards" if defined?(Avo::Dashboards::Engine)
+  mount Avo::Pro::Engine, at: "/avo/avo-pro" if defined?(Avo::Pro::Engine)
 
-  resources :dashboards do
-    resources :cards, controller: "dashboards/cards"
-  end
+  post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
   scope "avo_api", as: "avo_api" do
     get "/search", to: "search#index"
@@ -16,11 +16,6 @@ Avo::Engine.routes.draw do
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
-  # Records ordering
-  scope "reorder", as: "reorder" do
-    patch "/:resource_name/:id", to: "reorder#order", as: "order"
-  end
-
   get "failed_to_load", to: "home#failed_to_load"
 
   scope "resources", as: "resources" do
@@ -44,7 +39,8 @@ Avo::Engine.routes.draw do
   end
 
   scope "/avo_private", as: "avo_private" do
-    get "/debug", to: "debug#index", as: "debug_index"
+    get "/status", to: "debug#status", as: "status"
+    post "/status/send_to_hq", to: "debug#send_to_hq", as: "send_to_hq"
     get "/debug/report", to: "debug#report", as: "debug_report"
     post "/debug/refresh_license", to: "debug#refresh_license"
   end

data/db/factories.rb

@@ -9,6 +9,12 @@ FactoryBot.define do
     custom_css { ".header {\n  color: red;\n}" }
   end
 
+  trait :with_post do
+    after(:create) do |user|
+      create(:post, user_id: user.id)
+    end
+  end
+
   factory :team do
     name { Faker::Company.name }
     description { Faker::Lorem.paragraph(sentence_count: 4) }
@@ -32,7 +38,7 @@ FactoryBot.define do
   factory :project do
     name { Faker::App.name }
     status { ['closed', :rejected, :failed, 'loading', :running, :waiting].sample }
-    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled", "Drafting"].sample }
+    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
     description { Faker::Markdown.sandwich(sentences: 5) }

data/lib/avo/action_model.rb

@@ -0,0 +1,20 @@
+module Avo
+  class ActionModel
+    include ActiveModel::Model
+
+    # This class augments a model the action form declaration.
+    def initialize(attributes = {})
+      set_attr_accessors attributes
+
+      super(attributes)
+    end
+
+    private
+
+    def set_attr_accessors(attributes)
+      attributes.each do |k, v|
+        self.class.class_eval { attr_accessor k }
+      end
+    end
+  end
+end

data/lib/avo/asset_manager.rb

@@ -0,0 +1,30 @@
+module Avo
+  class AssetManager
+    include ActionView::Helpers::AssetTagHelper
+
+    attr_reader :stylesheets
+    attr_reader :javascripts
+
+    def initialize
+      @stylesheets = []
+      @javascripts = []
+    end
+
+    def reset
+      @stylesheets = []
+      @javascripts = []
+    end
+
+    def add_stylesheet(path)
+      @stylesheets.push path
+    end
+
+    def add_javascript(path)
+      @javascripts.push path
+    end
+  end
+
+  def self.asset_manager
+    @manager ||= AssetManager.new
+  end
+end