avo 2.9.2.pre1 → 2.10.3.pre.1

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

@@ -14,7 +14,7 @@
   hq_payload = Avo::Licensing::HQ.new(request).payload
 %>
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new title: 'Debug Avo', description: 'Use this page to debug the Avo license.' do |c| %>
+  <%= render Avo::PanelComponent.new(title: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
     <% c.tools do %>
     <% end %>
     <% c.bare_content do %>

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

@@ -11,6 +11,6 @@
       </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>
+    <a href="https://docs.avohq.io/2.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/_dashboards.html.erb

@@ -0,0 +1,19 @@
+<div>
+  <h3>Dashboards</h3>
+
+  <div>There comes the point in your app's life when you need to display the data in an aggregated form like a metric or chart. That's what Avo's Dashboards are all about.</div>
+
+  <div>Generate a dashboard using the command below 👇👇</div>
+
+
+  <div class="mt-2">
+    <div class="mt-1">
+      <code class="p-1 rounded bg-sky-500 text-white">bin/rails generate avo:dashboard dashy</code>
+    </div>
+  </div>
+
+  <p>
+    <a href="https://docs.avohq.io/2.0/dashboards.html" target="_blank" title="Avo Dashboards documentation">Docs</a>
+  </p>
+</div>
+

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

@@ -11,6 +11,6 @@
       </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>
+    <a href="https://docs.avohq.io/2.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

@@ -35,7 +35,7 @@
   <% end %>
 
   <p>
-    <a href="https://docs.avohq.io/1.0/resources.html" target="_blank" title="Avo Resources documentation">Docs</a>
+    <a href="https://docs.avohq.io/2.0/resources.html" target="_blank" title="Avo Resources documentation">Docs</a>
   </p>
 </div>
 

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

@@ -1,4 +1,4 @@
-<%= turbo_frame_wrap(params[:turbo_frame]) do %>
+<%= render Avo::TurboFrameWrapperComponent.new(params[:turbo_frame]) do %>
   <%
   classes = 'absolute inset-auto left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2'
   label = t 'avo.failed_to_load'

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

@@ -1,5 +1,5 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.' do |c| %>
+  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
@@ -23,10 +23,20 @@
               <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> Resource 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> Menu editor</li>
               <li><span class="mr-2">👍</span> Search</li>
-              <li><span class="mr-2">🕐</span> Dashboards</li>
+              <li><span class="mr-2">👍</span> Dashboards</li>
+              <li><span class="mr-2">👍</span> Responsive design</li>
+              <li><span class="mr-2">👍</span> Menu editor</li>
+              <li><span class="mr-2">👍</span> Stimulus JS integration</li>
+              <li><span class="mr-2">👍</span> Tabs and panels</li>
+              <li><span class="mr-2">🕐</span> Resource cards</li>
+              <li><span class="mr-2">🕐</span> Track resource changes</li>
+              <li><span class="mr-2">🕐</span> Smart resource generation</li>
+              <li><span class="mr-2">🕐</span> Records preview</li>
               <li><span class="mr-2">🕐</span> Themes</li>
             </ul>
           </p>
@@ -37,6 +47,8 @@
           <div class="space">
             <%= render partial: 'resources' %>
             <hr class="my-6">
+            <%= render partial: 'dashboards' %>
+            <hr class="my-6">
             <%= render partial: 'filters' %>
             <hr class="my-6">
             <%= render partial: 'actions' %>

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

@@ -1,6 +1,6 @@
 <%= javascript_tag nonce: true do %>
   window.Avo = window.Avo || { configuration: {} }
   Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
-  Avo.configuration.root_path = '<%= Avo::App.root_path %>'
+  Avo.configuration.root_path = '<%= root_path_without_url %>'
   Avo.configuration.search_debounce = '<%= Avo.configuration.search_debounce %>'
 <% end %>

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

@@ -0,0 +1,20 @@
+<div class="flex">
+  <div class="button-group">
+    <% tabs.each do |tab| %>
+      <% is_active_view = tab.name.to_s == active_tab_name.to_s %>
+      <%= a_link resource_path(resource: @resource, model: @resource.model, keep_query_params: true, active_tab_name: tab.name, tab_turbo_frame: group.turbo_frame_id),
+          color: is_active_view ? :gray : :primary,
+          rounded: false,
+          size: :sm,
+          class: is_active_view ? ' bg-gray-100 border-gray-300' : ' z-20',
+          title: tab.description || tab.name,
+          data: {
+            tippy: 'tooltip',
+            'turbo-frame': group.turbo_frame_id,
+            control: "view-type-toggle-#{tab}"
+          } do %>
+        <%= tab.name %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="flex flex-col">
-  <%= render Avo::PanelComponent.new title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.' do |c| %>
+  <%= render Avo::PanelComponent.new(title: 'Welcome to Avo', description: 'This page is visible only in development. It will be hidden in other environments.') do |c| %>
     <% c.tools do %>
       <%= a_link('/admin', icon: 'arrow-left', style: :primary, is_link: true) do %>
         Primary

data/config/routes.rb

@@ -16,16 +16,17 @@ 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
     # Attachments
     delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:attachment_id", to: "attachments#destroy"
 
-    # Ordering
-    patch "/:resource_name/:id/order", to: "resources#order"
-    patch "/:resource_name/:id/:related_name/:related_id/order", to: "associations#order", as: "associations_order"
-
     # Actions
     get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
     post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"

data/db/factories.rb

@@ -44,6 +44,7 @@ FactoryBot.define do
 
   factory :comment do
     body { Faker::Lorem.paragraphs(number: rand(4...10)).join(" ") }
+    posted_at { Time.now - rand(10...365).days }
   end
 
   factory :review do

data/lib/avo/app.rb

@@ -20,8 +20,6 @@ module Avo
       def boot
         init_fields
 
-        I18n.locale = Avo.configuration.language_code
-
         if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
           self.cache_store ||= ActiveSupport::Cache::MemoryStore.new
         else
@@ -29,14 +27,21 @@ module Avo
         end
       end
 
-      def init(request:, context:, current_user:, root_path:, view_context:, params:)
+      # 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 init(request:, context:, current_user:, view_context:, params:)
         self.error_messages = []
-        self.request = request
         self.context = context
         self.current_user = current_user
-        self.root_path = root_path
-        self.view_context = view_context
         self.params = params
+        self.request = request
+        self.view_context = view_context
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
         self.translation_enabled = license.has(:localization)
@@ -165,7 +170,7 @@ module Avo
         payload[:license_abilities] = Avo::App&.license&.abilities
         payload[:cache_store] = self.cache_store&.class&.to_s
         payload[:avo_metadata] = hq&.avo_metadata
-        payload[:app_timezone] = Time.now.zone
+        payload[:app_timezone] = Time.current.zone
         payload[:cache_key] = Avo::Licensing::HQ.cache_key
         payload[:cache_key_contents] = hq&.cached_response
 

data/lib/avo/base_action.rb

@@ -13,7 +13,6 @@ module Avo
     class_attribute :view
     class_attribute :user
     class_attribute :resource
-    class_attribute :invalid_fields
     class_attribute :standalone, default: false
     class_attribute :visible
     class_attribute :may_download_file, default: false
@@ -22,7 +21,8 @@ module Avo
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
-    attr_accessor :fields_loader
+
+    delegate :view, to: :class
 
     class << self
       def form_data_attributes
@@ -68,23 +68,6 @@ module Avo
       self.class.context
     end
 
-    def get_field_definitions
-      return [] if self.class.fields.blank?
-
-      self.class.fields.map do |field|
-        field.hydrate(action: self)
-      end
-    end
-
-    def get_fields
-      get_field_definitions.map do |field|
-        field.hydrate(action: self, model: @model)
-      end
-        .select do |field|
-        field.visible?
-      end
-    end
-
     def get_attributes_for_action
       get_fields.map do |field|
         [field.id, field.value]

data/lib/avo/base_card.rb

@@ -59,13 +59,7 @@ module Avo
     def frame_url(enforced_range: nil, params: {})
       enforced_range ||= initial_range || ranges.first
 
-      # append the parent params to the card request
-      begin
-        other_params = "&#{params.permit!.to_h.map { |k, v| "#{k}=#{v}" }.join("&")}"
-      rescue
-      end
-
-      "#{Avo::App.root_path}/dashboards/#{dashboard.id}/cards/#{id}?turbo_frame=#{turbo_frame}&index=#{index}&range=#{enforced_range}#{other_params}"
+      Avo::App.view_context.avo.dashboard_card_path(dashboard.id, id, turbo_frame: turbo_frame, index: index, range: enforced_range, **params.permit!)
     end
 
     def card_classes

data/lib/avo/base_resource.rb

@@ -4,12 +4,14 @@ module Avo
     extend HasContext
 
     include ActionView::Helpers::UrlHelper
-    include Avo::Concerns::HasTools
     include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
     include Avo::Concerns::HasStimulusControllers
+    include Avo::Concerns::ModelClassConstantized
 
     delegate :view_context, to: ::Avo::App
+    delegate :current_user, to: ::Avo::App
+    delegate :params, to: ::Avo::App
     delegate :simple_format, :content_tag, to: :view_context
     delegate :main_app, to: :view_context
     delegate :avo, to: :view_context
@@ -29,7 +31,6 @@ module Avo
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
     class_attribute :includes, default: []
-    class_attribute :model_class
     class_attribute :translation_key
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
@@ -44,7 +45,6 @@ module Avo
     class_attribute :hide_from_global_search, default: false
     class_attribute :after_create_path, default: :show
     class_attribute :after_update_path, default: :show
-    class_attribute :invalid_fields
     class_attribute :record_selector, default: true
     class_attribute :keep_filters_panel_open, default: false
 
@@ -103,7 +103,7 @@ module Avo
 
     def initialize
       unless self.class.model_class.present?
-        if model_class.present?
+        if model_class.present? && model_class.respond_to?(:base_class)
           self.class.model_class = model_class.base_class
         end
       end
@@ -123,80 +123,6 @@ module Avo
       self
     end
 
-    def get_field_definitions
-      return [] if self.class.fields.blank?
-
-      fields = self.class.fields.map do |field|
-        field.hydrate(resource: self, panel_name: default_panel_name, user: user)
-      end
-
-      if Avo::App.license.lacks_with_trial(:custom_fields)
-        fields = fields.reject do |field|
-          field.custom?
-        end
-      end
-
-      if Avo::App.license.lacks_with_trial(:advanced_fields)
-        fields = fields.reject do |field|
-          field.type == "tags"
-        end
-      end
-
-      fields
-    end
-
-    def get_fields(panel: nil, reflection: nil)
-      fields = get_field_definitions
-        .select do |field|
-          field.send("show_on_#{@view}")
-        end
-        .select do |field|
-          field.visible?
-        end
-        .select do |field|
-          is_valid = true
-
-          # Strip out the reflection field in index queries with a parent association.
-          if reflection.present?
-            # regular non-polymorphic association
-            # we're matching the reflection inverse_of foriegn key with the field's foreign_key
-            if field.is_a?(Avo::Fields::BelongsToField)
-              if field.respond_to?(:foreign_key) &&
-                  reflection.inverse_of.present? &&
-                  reflection.inverse_of.foreign_key == field.foreign_key
-                is_valid = false
-              end
-
-              # polymorphic association
-              if field.respond_to?(:foreign_key) &&
-                  field.is_polymorphic? &&
-                  reflection.respond_to?(:polymorphic?) &&
-                  reflection.inverse_of.foreign_key == field.reflection.foreign_key
-                is_valid = false
-              end
-            end
-          end
-
-          is_valid
-        end
-
-      if panel.present?
-        fields = fields.select do |field|
-          field.panel_name == panel
-        end
-      end
-
-      hydrate_fields(model: @model, view: @view)
-
-      fields
-    end
-
-    def get_field(id)
-      get_field_definitions.find do |f|
-        f.id == id.to_sym
-      end
-    end
-
     def get_grid_fields
       return if self.class.grid_loader.blank?
 
@@ -215,14 +141,6 @@ module Avo
       self.class.actions_loader.bag
     end
 
-    def hydrate_fields(model: nil, view: nil)
-      fields.map do |field|
-        field.hydrate(model: @model, view: @view, resource: self)
-      end
-
-      self
-    end
-
     def default_panel_name
       return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
 
@@ -236,18 +154,8 @@ module Avo
       end
     end
 
-    def panels
-      [
-        {
-          name: default_panel_name,
-          type: :fields,
-          in_panel: true
-        }
-      ]
-    end
-
     def class_name_without_resource
-      self.class.name.demodulize.chomp("Resource")
+      self.class.name.demodulize.delete_suffix("Resource")
     end
 
     def model_class
@@ -293,7 +201,7 @@ module Avo
     end
 
     def name
-      default = class_name_without_resource.titlecase
+      default = class_name_without_resource.to_s.gsub('::', ' ').underscore.humanize
 
       return @name if @name.present?
 

data/lib/avo/base_resource_tool.rb

@@ -1,9 +1,11 @@
 module Avo
   class BaseResourceTool
+    include Avo::Concerns::IsResourceItem
     include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
     class_attribute :name
     class_attribute :partial
+    class_attribute :item_type, default: :tool
 
     attr_accessor :params
     attr_accessor :resource
@@ -20,7 +22,7 @@ module Avo
     end
 
     def hydrate(view: nil)
-      @view = view
+      @view = view if view.present?
 
       self
     end