avo 3.0.0.beta1 → 3.0.0.pre1

data/app/helpers/avo/application_helper.rb

@@ -97,23 +97,16 @@ module Avo
     end
 
     def root_path_without_url
-      "#{Avo.configuration.prefix_path}#{mount_path}"
+      Avo::App.root_path
+        .to_s
+        .delete_prefix(request.base_url.to_s)
+        .delete_suffix("/")
+        .gsub("/?", "?")
+        .query = ""
     rescue
       Avo.configuration.root_path
     end
 
-    def mount_path
-      Avo::Engine.routes.find_script_name(params.permit!.to_h.symbolize_keys)
-    end
-
-    def decode_filter_params(encoded_params)
-      Avo::Filters::BaseFilter.decode_filters(encoded_params)
-    end
-
-    def encode_filter_params(filter_params)
-      Avo::Filters::BaseFilter.encode_filters(filter_params)
-    end
-
     def number_to_social(number, start_at: 10_000)
       return number_with_delimiter(number) if number < start_at
 

data/app/javascript/js/application.js

@@ -1,5 +1,3 @@
-import 'mapkick/bundle'
-
 import { Alert, Popover } from 'tailwindcss-stimulus-components'
 import { Application } from '@hotwired/stimulus'
 

data/app/javascript/js/controllers/fields/{easy_mde_controller.js → simple_mde_controller.js}

@@ -1,5 +1,5 @@
 import { Controller } from '@hotwired/stimulus'
-import EasyMDE from 'easymde'
+import SimpleMDE from 'simplemde'
 
 export default class extends Controller {
   static targets = ['element']
@@ -20,7 +20,6 @@ export default class extends Controller {
     const options = {
       element: this.elementTarget,
       spellChecker: this.componentOptions.spell_checker,
-      autoRefresh: { delay: 500},
     }
 
     if (this.view === 'show') {
@@ -28,9 +27,9 @@ export default class extends Controller {
       options.status = false
     }
 
-    const easyMde = new EasyMDE(options)
+    const simpleMde = new SimpleMDE(options)
     if (this.view === 'show') {
-      easyMde.codemirror.options.readOnly = true
+      simpleMde.codemirror.options.readOnly = true
     }
   }
 }

data/app/javascript/js/controllers/search_controller.js

@@ -211,9 +211,7 @@ export default class extends Controller {
   searchUrl(query) {
     const url = URI()
 
-    return url.segment([window.Avo.configuration.root_path, ...this.searchSegments()])
-      .search(this.searchParams(encodeURIComponent(query)))
-      .readable().toString()
+    return url.segment([window.Avo.configuration.root_path, ...this.searchSegments()]).search(this.searchParams(query)).readable().toString()
   }
 
   searchSegments() {

data/app/javascript/js/controllers.js

@@ -10,7 +10,6 @@ import CodeFieldController from './controllers/fields/code_field_controller'
 import CopyToClipboardController from './controllers/copy_to_clipboard_controller'
 import DashboardCardController from './controllers/dashboard_card_controller'
 import DateFieldController from './controllers/fields/date_field_controller'
-import EasyMdeController from './controllers/fields/easy_mde_controller'
 import FilterController from './controllers/filter_controller'
 import HiddenInputController from './controllers/hidden_input_controller'
 import InputAutofocusController from './controllers/input_autofocus_controller'
@@ -32,6 +31,7 @@ import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SelfDestroyController from './controllers/self_destroy_controller'
 import SidebarController from './controllers/sidebar_controller'
+import SimpleMdeController from './controllers/fields/simple_mde_controller'
 import TabsController from './controllers/tabs_controller'
 import TextFilterController from './controllers/text_filter_controller'
 import TippyController from './controllers/tippy_controller'
@@ -73,9 +73,9 @@ application.register('toggle', ToggleController)
 application.register('belongs-to-field', BelongsToFieldController)
 application.register('code-field', CodeFieldController)
 application.register('date-field', DateFieldController)
-application.register('easy-mde', EasyMdeController)
 application.register('key-value', KeyValueController)
 application.register('progress-bar-field', ProgressBarFieldController)
+application.register('simple-mde', SimpleMdeController)
 application.register('trix-field', TrixFieldController)
 
 // Custom controllers

data/app/views/avo/actions/show.html.erb

@@ -9,21 +9,19 @@
   >
     <%= form_with model: @record,
       scope: 'fields',
-      url: Avo::Services::URIService.parse(@resource.records_path).append_paths("actions").to_s,
+      url: "#{@resource.records_path}/actions/#{@action.param_id}",
       local: true,
       data: @action.class.form_data_attributes do |form|
     %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.with_heading do %>
+      <% c.heading do %>
         <%= @action.action_name %>
       <% end %>
       <div class="flex-1 flex">
         <%= @action.get_message %>
       </div>
-      <%= hidden_field_tag :action_id, @action.param_id %>
       <%= form.hidden_field :avo_resource_ids, value: params[:id] || params[:resource_ids], 'data-action-target': 'resourceIds' %>
       <%= form.hidden_field :avo_selected_query, 'data-action-target': 'selectedAllQuery' %>
-      <%= form.hidden_field :arguments, value: params[:arguments] %>
       <% if @action.get_fields.present? %>
         <div class="my-4 -mx-6">
           <% @action.get_fields.each_with_index do |field, index| %>
@@ -35,7 +33,7 @@
           <% end %>
         </div>
       <% end %>
-      <% c.with_controls do %>
+      <% c.controls do %>
         <%= a_button type: :button,
           data: { action: 'click->modal#close' },
           size: :sm,

data/app/views/avo/associations/new.html.erb

@@ -11,13 +11,13 @@
       'turbo-frame': '_top'
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.with_heading do %>
+      <% c.heading do %>
         <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
       <% end %>
 
       <div class="flex-1 flex items-center justify-center px-0 lg:px-8 text-lg mt-8 mb-12">
         <% if @field.is_searchable? %>
-          <%= render Avo::Pro::SearchableAssociations::AutocompleteComponent.new form: form,
+          <%= render AvoPro::SearchableAssociations::AutocompleteComponent.new form: form,
             classes: input_classes("w-full"),
             field: @field,
             model_key: @field.target_resource&.model_key,
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <% c.with_controls do %>
+      <% c.controls do %>
         <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :gray do %>
           <%= t('avo.cancel') %>
         <% end %>

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

@@ -1,5 +1,5 @@
 <%
-  license = Avo.license
+  license = Avo::App.license
   information_items = [
     'license_key',
     'ruby_version',
@@ -14,9 +14,9 @@
 %>
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Avo Status', description: 'Use this page to debug your Avo instance.') do |c| %>
-    <% c.with_tools do %>
+    <% c.tools do %>
     <% end %>
-    <% c.with_bare_content do %>
+    <% c.bare_content do %>
       <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">
@@ -74,16 +74,15 @@
           <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>
+                  <li><%= plugin.klass.to_s.split("::").first %></li>
                 <% end %>
               </ul>
             </div>
           </div>
         </div>
         <%= render Avo::PanelComponent.new(title: "Report") do |c| %>
-          <% c.with_body do %>
+          <% c.body do %>
             <div class="p-4">
               <turbo-frame id="debug-report" src="<%= root_path %>avo_private/debug/report" target="_top" class="block">
                 Loading...

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

@@ -1,6 +1,6 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
-    <% c.with_body do %>
+    <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
           <h3>About</h3>

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

@@ -5,8 +5,8 @@
     </a>
   </div>
 <% end %>
-<% if Avo.error_manager.has_errors?.present? %>
-  <% Avo.error_manager.all.each do |error| %>
+<% if Avo::App.errors.has_errors?.present? %>
+  <% Avo::App.errors.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.license.valid ? 'valid' : 'invalid'%> <%= Avo.license.id %> license">v<%= Avo::VERSION %></span>
+  <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>
 </div>

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

@@ -6,7 +6,7 @@
   Avo.configuration.cookies_key = '<%= Avo::COOKIES_KEY %>'
   <% if Avo.avo_filters_installed? %>
   Avo.configuration.avo_filters = {
-    param_key: '<%= Avo::DynamicFilters.configuration.param_key %>'
+    param_key: '<%= AvoFilters.configuration.param_key %>'
   }
   <% end %>
 <% end %>

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

@@ -10,7 +10,7 @@
     <%= 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:px-2">
-    <%= render Avo::Pro::GlobalSearchComponent.new rescue nil %>
+    <%= render AvoPro::GlobalSearchComponent.new rescue nil %>
     <div class="m-0">
       <%= render partial: "avo/partials/header" %>
     </div>

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

@@ -37,6 +37,14 @@
         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",

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

@@ -11,15 +11,6 @@
         new_icon: 'grid-view-type',
         translation_key: 'avo.grid_view',
       },
-      list: {
-        new_view_type: 'list',
-        new_icon: 'queue-list',
-      },
-      map: {
-        new_view_type: 'map',
-        new_icon: 'map-view-type',
-        translation_key: 'avo.map_view',
-      },
     }
   %>
   <div class="flex">

data/app/views/avo/private/design.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
-    <% c.with_tools do %>
+    <% c.tools do %>
       <%= a_link('/admin', icon: 'arrow-left', color: :green, style: :primary, is_link: true) do %>
         Primary
       <% end %>
@@ -18,7 +18,7 @@
       <% end %>
     <% end %>
 
-    <% c.with_body do %>
+    <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <%= render 'links_and_buttons' %>
       </div>

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

@@ -48,6 +48,7 @@
     </div>
     <%= turbo_frame_tag 'actions_show' %>
     <%= turbo_frame_tag 'attach_modal' %>
+    <%= turbo_frame_tag 'destroy_attachment_form' %>
     <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-[100] pointer-events-none" do %>
       <%= render Avo::FlashAlertsComponent.new flashes: flash %>
       <% # In case we have other general error messages %>
@@ -60,8 +61,8 @@
     <%= render partial: "avo/partials/scripts" %>
     <!-- Avo version: <%= Avo::VERSION %> -->
     <!-- Environment: <%= Rails.env %> -->
-    <!-- License ID: <%= Avo.license.id %> -->
-    <!-- License valid?: <%= Avo.license.valid ? "valid" : "invalid" %>  -->
+    <!-- License ID: <%= Avo::App.license.id %> -->
+    <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
   </body>
 </html>
 <!-- ✨ Built with Avo • https://www.avohq.io/ -->

data/avo.gemspec

@@ -33,13 +33,12 @@ Gem::Specification.new do |spec|
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
   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", ">= 3.0.0"
+  spec.add_dependency "view_component"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"

data/config/initializers/pagy.rb

@@ -5,15 +5,13 @@ def pagy_locale_path(file_name)
   Avo::Engine.root.join("lib", "generators", "avo", "templates", "locales", "pagy", file_name)
 end
 
-extra_locales = [
-  {locale: "en"},
-  {locale: "fr"},
-  {locale: "nb"},
-  {locale: "pt-BR"},
-  {locale: "pt"},
-  {locale: "tr"},
-  {locale: "nn", filepath: pagy_locale_path("nn.yml")},
-  {locale: "ro", filepath: pagy_locale_path("ro.yml")}
-]
-
-Pagy::I18n.send(:build, *extra_locales)
+Pagy::I18n.load(
+  { locale: 'en' },
+  { locale: 'fr' },
+  { locale: 'nb' },
+  { locale: 'pt-BR' },
+  { locale: 'pt' },
+  { locale: 'tr' },
+  { locale: 'nn', filepath: pagy_locale_path("nn.yml") },
+  { locale: 'ro', filepath: pagy_locale_path("ro.yml") },
+)

data/config/routes.rb

@@ -4,9 +4,9 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect(Avo.configuration.root_path)
   get "dashboards", to: redirect(Avo.configuration.root_path)
 
-  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)
+  mount AvoFilters::Engine, at: "/avo_filters" if defined?(AvoFilters)
+  mount AvoDashboards::Engine, at: "/dashboards" if defined?(AvoDashboards::Engine)
+  mount AvoPro::Engine, at: "/avo_pro" if defined?(AvoPro)
 
   post "/rails/active_storage/direct_uploads", to: "/active_storage/direct_uploads#create"
 
@@ -23,8 +23,8 @@ Avo::Engine.routes.draw do
     delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:attachment_id", to: "attachments#destroy"
 
     # Actions
-    get "/:resource_name(/:id)/actions/(:action_id)", to: "actions#show"
-    post "/:resource_name(/:id)/actions/(:action_id)", to: "actions#handle"
+    get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
+    post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"
 
     # Generate resource routes as below:
     # resources :posts

data/db/factories.rb

@@ -48,20 +48,6 @@ FactoryBot.define do
     progress { Faker::Number.between(from: 0, to: 100) }
   end
 
-  trait :with_files do
-    after(:create) do |project|
-      ["watch.jpg", "dummy-video.mp4"].each do |filename|
-        file = Rails.root.join("db", "seed_files", filename)
-        project.files.attach(io: file.open, filename: filename)
-      end
-
-      ["dummy-file.txt", "dummy-audio.mp3"].each do |filename|
-        file = Avo::Engine.root.join("spec", "dummy", filename)
-        project.files.attach(io: file.open, filename: filename)
-      end
-    end
-  end
-
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
     posted_at { Time.now - rand(10...365).days }
@@ -110,8 +96,6 @@ FactoryBot.define do
   factory :city do
     name { Faker::Address.city }
     population { rand(10000..999000) }
-    latitude { Faker::Address.latitude }
-    longitude { Faker::Address.longitude }
     is_capital { [true, false].sample }
     features { Faker::Address.community }
     metadata { Faker::Address.community }
@@ -119,7 +103,6 @@ FactoryBot.define do
     description { Faker::Address.community }
     status { ["open", "closed"].sample }
     tiny_description { Faker::Address.community }
-    city_center_area { [[[10.0, 11.2], [10.5, 11.9], [10.8, 12.0], [10.0, 11.2]]].to_json }
   end
 
   factory :product do

data/lib/avo/app.rb

@@ -0,0 +1,165 @@
+module Avo
+  class App
+    class_attribute :field_manager
+    class_attribute :cache_store, default: nil
+    class_attribute :logger
+
+    include ActiveModel::Model
+
+    attr_accessor :request, :context, :current_user, :view_context
+    attr_accessor :cache_store
+    attr_accessor :resource_manager
+    attr_accessor :dashboard_manager
+    attr_accessor :tool_manager
+    attr_accessor :error_manager
+
+    delegate :params, to: :request
+
+    class << self
+      def eager_load(entity)
+        paths = Avo::ENTITIES.fetch entity
+
+        return unless paths.present?
+
+        pathname = Rails.root.join(*paths)
+        if pathname.directory?
+          Rails.autoloaders.main.eager_load_dir(pathname.to_s)
+        end
+      end
+
+      def boot
+        init_logger
+        init_fields
+        init_cache_store
+      end
+
+      def init_cache_store
+        # The cache store should be set when the app boots up.
+        if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
+          self.cache_store ||= ActiveSupport::Cache::MemoryStore.new
+        else
+          self.cache_store = Rails.cache
+        end
+      end
+
+      def init_logger
+        file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
+
+        file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+        file_logger.formatter = proc do |severity, time, progname, msg|
+          "[Avo] #{time}: #{msg}\n".tap do |i|
+            puts i
+          end
+        end
+
+        self.logger = file_logger
+      end
+
+      def init_fields
+        self.field_manager = Avo::Fields::FieldManager.build
+      end
+
+      def fields
+        field_manager
+      end
+
+      def build(request:, context:, current_user:, view_context:)
+        @app || new(request: request, context: context, current_user: current_user, view_context: view_context)
+      end
+
+      def license
+        Current.license
+      end
+
+      def instance
+        Current.app
+      end
+
+      def resources
+        Current.app.resource_manager
+      end
+
+      def dashboards
+        Current.app.dashboard_manager
+      end
+
+      def tools
+        Current.app.tool_manager
+      end
+
+      def errors
+        Current.app.error_manager
+      end
+
+      # Renerate a dynamic root path using the URIService
+      def root_path(paths: [], query: {}, **args)
+        Avo::Services::URIService.parse(Avo::Current.view_context.avo.root_url.to_s)
+          .append_paths(paths)
+          .append_query(query)
+          .to_s
+      end
+
+      def mount_path
+        Avo::Engine.routes.find_script_name({})
+      end
+
+      def has_main_menu?
+        return false if Avo::App.license.lacks_with_trial(:menu_editor)
+        return false if Avo.configuration.main_menu.nil?
+
+        true
+      end
+
+      def has_profile_menu?
+        return false if Avo::App.license.lacks_with_trial(:menu_editor)
+        return false if Avo.configuration.profile_menu.nil?
+
+        true
+      end
+
+      def main_menu
+        return unless Avo.plugin_manager.installed?(:avo_menu)
+
+        # Return empty menu if the app doesn't have the profile menu configured
+        return AvoMenu::Builder.new.build unless has_main_menu?
+
+        AvoMenu::Builder.parse_menu(&Avo.configuration.main_menu)
+      end
+
+      def profile_menu
+        return unless Avo.plugin_manager.installed?(:avo_menu)
+
+        # Return empty menu if the app doesn't have the profile menu configured
+        return AvoMenu::Builder.new.build unless has_profile_menu?
+
+        AvoMenu::Builder.parse_menu(&Avo.configuration.profile_menu)
+      end
+    end
+
+    def init
+      self.error_manager = Avo::ErrorManager.build
+      self.resource_manager = Avo::Resources::ResourceManager.build
+      self.tool_manager = Avo::Tools::ToolManager.build
+    end
+
+    # Renerate a dynamic root path using the URIService
+    def root_path(paths: [], query: {}, **args)
+      Avo::Services::URIService.parse(view_context.avo.root_url.to_s)
+        .append_paths(paths)
+        .append_query(query)
+        .to_s
+    end
+
+    def mount_path
+      Avo::Engine.routes.find_script_name({})
+    end
+
+    def app_status
+      Current.license.valid?
+    end
+  end
+
+  def self.logger
+    Avo::App.logger
+  end
+end