avo 3.0.0.pre8 → 3.0.0.pre11

data/app/components/avo/views/resource_index_component.html.erb

@@ -14,8 +14,8 @@
     <% c.with_body do %>
       <div class="flex flex-col">
         <%= render scopes_list if can_render_scopes? %>
-        <div class="flex flex-col py-4 gap-4">
-          <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 <%= 'hidden' unless header_visible? %>">
+        <div class="flex flex-col">
+          <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' unless header_visible? %>">
             <div class="flex items-center px-4 w-64">
               <% if show_search_input %>
                 <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_key, via_reflection: via_reflection} %>
@@ -34,7 +34,7 @@
             </div>
           </div>
           <% if Avo.avo_filters_installed? && resource.has_filters? %>
-            <%= render AvoFilters::FiltersComponent.new resource: resource %>
+            <%= render AvoFilters::FiltersComponent.new resource: resource, turbo_frame: turbo_frame %>
           <% end %>
         </div>
       </div>
@@ -49,7 +49,16 @@
       <% end %>
     <% end %>
     <% c.with_bare_content do %>
-      <% if view_type.to_sym == :table %>
+     <% if view_type.to_sym == :map %>
+        <% if @resources.present? %>
+          <div>
+            <%= render(Avo::Index::ResourceMapComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_record: @parent_record, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+          </div>
+        <% else %>
+          <%= helpers.empty_state by_association: params[:related_name].present?, view_type: view_type, add_background: true %>
+        <% end %>
+      <% end %>
+      <% if view_type.to_sym == :table || view_type.to_sym == :map %>
         <% if @records.present? %>
           <div class="mt-4">
             <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_record: parent_record, discreet_pagination: field&.discreet_pagination %>

data/app/controllers/avo/actions_controller.rb

@@ -61,11 +61,8 @@ module Avo
     end
 
     def action_class
-      klass_name = params[:action_id].gsub("avo_actions_", "").camelize
-      klass_name = "Avo::Actions::#{klass_name}"
-
       Avo::BaseAction.descendants.find do |action|
-        action.to_s == klass_name
+        action.to_s == params[:action_id]
       end
     end
 

data/app/controllers/avo/application_controller.rb

@@ -107,14 +107,32 @@ module Avo
     def set_record_to_fill
       @record_to_fill = @resource.model_class.new if @view == :create
       @record_to_fill = @record if @view == :update
+
+      # If resource.record is nil, most likely the user is creating a new record.
+      # In that case, to access resource.record in visible and readonly blocks we hydrate the resource with a new record.
+      @resource.hydrate(record: @record_to_fill) if @resource.record.nil?
     end
 
     def fill_record
       # We have to skip filling the the record if this is an attach action
-      is_attach_action = params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+      return if is_attach_action?
+
+      @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
+      assign_default_value_to_disabled_fields if @view == :create
+    end
+
+    def is_attach_action?
+      params[model_param_key].blank? && params[:related_name].present? && params[:fields].present?
+    end
 
-      unless is_attach_action
-        @record = @resource.fill_record(@record_to_fill, cast_nullable(model_params), extra_params: extra_params)
+    def assign_default_value_to_disabled_fields
+      @resource.get_field_definitions.select do |field|
+        field.is_disabled? && field.visible? && !field.computed
+      end.each do |field|
+        # Get the default value from the field default definition
+        # If there is no default value specified on the resource, get the value from the record (DB, Callbacks, etc.)
+        default_value = field.default || @record.send(field.id)
+        field.fill_field @record, field.id, default_value, params
       end
     end
 
@@ -285,7 +303,7 @@ module Avo
         if Rails::VERSION::MAJOR === 6
           ActiveStorage::Current.host = request.base_url
         elsif Rails::VERSION::MAJOR === 7
-          ActiveStorage::Current.url_options = request.base_url
+          ActiveStorage::Current.url_options = {protocol: request.protocol, host: request.host, port: request.port}
         end
       end
     rescue => exception

data/app/controllers/avo/attachments_controller.rb

@@ -23,17 +23,24 @@ module Avo
     end
 
     def destroy
-      raise Avo::NotAuthorizedError.new unless authorized_to :delete
+      if authorized_to :delete
+        attachment = ActiveStorage::Attachment.find(params[:attachment_id])
 
-      attachment = ActiveStorage::Attachment.find(params[:attachment_id])
-      path = resource_path(record: @record, resource: @resource)
+        flash[:notice] = if attachment.present?
+          @destroyed = attachment.destroy
 
-      if attachment.present?
-        attachment.destroy
-
-        redirect_to params[:referrer] || path, notice: t("avo.attachment_destroyed")
+          t("avo.attachment_destroyed")
+        else
+          t("avo.failed_to_find_attachment")
+        end
       else
-        redirect_back fallback_location: path, notice: t("avo.failed_to_find_attachment")
+        flash[:notice] = t("avo.not_authorized")
+      end
+
+      respond_to do |format|
+        format.turbo_stream do
+          render "destroy"
+        end
       end
     end
 

data/app/controllers/avo/base_controller.rb

@@ -29,11 +29,6 @@ module Avo
         @query = @resource.class.query_scope
       end
 
-      # Remove default_scope for index view if no parent_resource present
-      if @resource.unscoped_queries_on_index && @parent_resource.blank?
-        @query = @query.unscoped
-      end
-
       # Eager load the associations
       if @resource.includes.present?
         @query = @query.includes(*@resource.includes)

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

@@ -9,7 +9,7 @@
   >
     <%= form_with model: @record,
       scope: 'fields',
-      url: "#{@resource.records_path}/actions/#{@action.param_id}",
+      url: "#{@resource.records_path}/actions",
       local: true,
       data: @action.class.form_data_attributes do |form|
     %>
@@ -20,6 +20,7 @@
       <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' %>
       <% if @action.get_fields.present? %>

data/app/views/avo/attachments/destroy.turbo_stream.erb

@@ -0,0 +1,7 @@
+<%= turbo_stream.remove dom_id(@destroyed) if @destroyed.present? %>
+
+<turbo-stream action="append" target="alerts">
+  <template>
+    <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+  </template>
+</turbo-stream>

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

@@ -74,8 +74,9 @@
           <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 %></li>
+                  <li><%= plugin.klass.to_s.split("::").first %> <%= plugin.klass.version %></li>
                 <% end %>
               </ul>
             </div>

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

@@ -11,6 +11,15 @@
         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/config/routes.rb

@@ -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,6 +48,20 @@ 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 }
@@ -104,6 +118,7 @@ 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

@@ -28,15 +28,22 @@ module Avo
       def boot
         init_logger
         init_fields
-        init_cache_store
+        self.cache_store = get_cache_store
+        ::Avo.plugin_manager.boot_plugins
       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
+      def get_cache_store
+        if Rails.env.production?
+          case Rails.cache.class.to_s
+          when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore"
+            Rails.cache
+          else
+            ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
+          end
+        elsif Rails.env.test?
+          Rails.cache
         else
-          self.cache_store = Rails.cache
+          ActiveSupport::Cache.lookup_store(:memory_store)
         end
       end
 

data/lib/avo/base_action.rb

@@ -59,10 +59,10 @@ module Avo
     end
 
     def initialize(record: nil, resource: nil, user: nil, view: nil, arguments: {})
-      self.class.record = record if record.present?
-      self.class.resource = resource if resource.present?
-      self.class.user = user if user.present?
-      self.class.view = view if view.present?
+      self.class.record = record
+      self.class.resource = resource
+      self.class.user = user
+      self.class.view = view
       @arguments = arguments
 
       self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
@@ -149,7 +149,7 @@ module Avo
     end
 
     def param_id
-      self.class.to_s.demodulize.underscore.tr "/", "_"
+      self.class.to_s
     end
 
     def succeed(text)

data/lib/avo/base_resource.rb

@@ -52,8 +52,9 @@ module Avo
     class_attribute :filters_loader
     class_attribute :grid_loader
     class_attribute :visible_on_sidebar, default: true
-    class_attribute :unscoped_queries_on_index, default: false
-    class_attribute :index_query
+    class_attribute :index_query, default: -> {
+      query
+    }
     class_attribute :find_record_method, default: -> {
       query.find id
     }
@@ -64,6 +65,7 @@ module Avo
     class_attribute :keep_filters_panel_open, default: false
     class_attribute :extra_params
     class_attribute :link_to_child_resource, default: false
+    class_attribute :map_view
 
     # EXTRACT:
     class_attribute :ordering
@@ -109,13 +111,10 @@ module Avo
 
       # This resolves the scope when doing "where" queries (not find queries)
       def query_scope
-        final_scope = if index_query.present?
-          Avo::ExecutionContext.new(target: index_query, query: model_class).handle
-        else
-          model_class
-        end
-
-        authorization.apply_policy final_scope
+        authorization.apply_policy Avo::ExecutionContext.new(
+          target: index_query,
+          query: model_class
+        ).handle
       end
 
       # This resolves the scope when finding records (not "where" queries)
@@ -335,6 +334,7 @@ module Avo
       view_types = [:table]
 
       view_types << :grid if get_grid_fields.present?
+      view_types << :map if map_view.present?
 
       view_types
     end

data/lib/avo/concerns/has_items.rb

@@ -6,7 +6,7 @@ module Avo
       class_methods do
         def deprecated_dsl_api(name = nil)
           message = "This API was deprecated. Please use the `#{name}` method inside the `fields` method."
-          raise DeprecatedAPI.new message
+          raise DeprecatedAPIError.new message
         end
 
         # DSL methods

data/lib/avo/engine.rb

@@ -24,7 +24,6 @@ module Avo
 
       # Boot Avo
       ::Avo::App.boot
-      ::Avo.plugin_manager.boot_plugins
 
       # After deploy we want to make sure the license response is being cleared.
       # We need a fresh license response.

data/lib/avo/fields/area_field.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Avo
+  module Fields
+    class AreaField < BaseField
+      attr_reader :mapkick_options
+      attr_reader :datapoint_options
+
+      def initialize(id, **args, &block)
+        hide_on :index
+
+        super(id, **args, &block)
+
+        @geometry = args[:geometry].presence || :polygon # Accepts: `:polygon` or `:multi_polygon`
+        @mapkick_options = args[:mapkick_options].presence || {}
+        @datapoint_options = args[:datapoint_options].presence || {}
+      end
+
+      def map_data
+        data_source = {
+          geometry: {
+            type: @geometry.to_s.classify,
+            coordinates: value
+          }
+        }
+
+        [data_source.merge(datapoint_options)]
+      end
+
+      def coordinates
+        value.present? ? JSON.parse(value) : []
+      end
+
+      def geometry
+        @geometry.to_s.classify
+      end
+    end
+  end
+end

data/lib/avo/fields/base_field.rb

@@ -33,6 +33,7 @@ module Avo
       attr_reader :nullable
       attr_reader :null_values
       attr_reader :format_using
+      attr_reader :autocomplete
       attr_reader :help
       attr_reader :default
       attr_reader :as_label
@@ -42,7 +43,6 @@ module Avo
       attr_reader :for_presentation_only
 
       # Private options
-      attr_reader :updatable
       attr_reader :computable # if allowed to be computable
       attr_reader :computed # if block is present
       attr_reader :computed_value # the value after computation
@@ -68,6 +68,7 @@ module Avo
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
         @placeholder = args[:placeholder]
+        @autocomplete = args[:autocomplete] || nil
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible]
@@ -83,7 +84,6 @@ module Avo
 
         @args = args
 
-        @updatable = !disabled
         @computable = true
         @computed = block.present?
         @computed_value = nil
@@ -264,6 +264,10 @@ module Avo
         options
       end
 
+      def updatable
+        !is_disabled? && visible?
+      end
+
       private
 
       def model_or_class(model)

data/lib/avo/fields/files_field.rb

@@ -6,6 +6,8 @@ module Avo
       attr_accessor :direct_upload
       attr_accessor :accept
       attr_reader :display_filename
+      attr_reader :view_type
+      attr_reader :hide_view_type_switcher
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -15,6 +17,8 @@ module Avo
         @direct_upload = args[:direct_upload].present? ? args[:direct_upload] : false
         @accept = args[:accept].present? ? args[:accept] : nil
         @display_filename = args[:display_filename].nil? ? true : args[:display_filename]
+        @view_type = args[:view_type] || :grid
+        @hide_view_type_switcher = args[:hide_view_type_switcher]
       end
 
       def view_component_name

data/lib/avo/fields/location_field.rb

@@ -7,7 +7,6 @@ module Avo
 
       def initialize(id, **args, &block)
         hide_on :index
-
         super(id, **args, &block)
 
         @stored_as = args[:stored_as].present? ? args[:stored_as] : nil # You can pass it an array of db columns [:latitude, :longitude]

data/lib/avo/plugin.rb

@@ -2,5 +2,15 @@ module Avo
   class Plugin
     def initialize(*, **, &block)
     end
+
+    class << self
+      def version
+        "#{namespace}::VERSION".safe_constantize
+      end
+
+      def namespace
+        to_s.split("::").first
+      end
+    end
   end
 end

data/lib/avo/resources/resource_manager.rb

@@ -90,16 +90,12 @@ module Avo
 
       # Filters out the resources that are missing the model_class
       def valid_resources
-        resources
-          .select do |resource|
-            resource.model_class.present?
-          end
-          .sort_by(&:to_s)
+        resources.select { |resource| resource.model_class.present? }.sort_by(&:name)
       end
 
       # Returns the Avo resource by camelized name
       #
-      # get_resource_by_name('User') => Avo::Resources::User
+      # get_resource_by_name('User') => instance of Avo::Resources::User
       def get_resource(resource)
         resource = "Avo::Resources::#{resource}" unless resource.to_s.starts_with?("Avo::Resources::")
 
@@ -110,7 +106,7 @@ module Avo
 
       # Returns the Avo resource by singular snake_cased name
       #
-      # get_resource_by_name('user') => Avo::Resources::User
+      # get_resource_by_name('user') => instance of Avo::Resources::User
       def get_resource_by_name(name)
         get_resource name.singularize.camelize
       end
@@ -118,8 +114,8 @@ module Avo
       # Returns the Avo resource by singular snake_cased name
       # From all the resources that use the same model_class, it will fetch the first one in alphabetical order
       #
-      # get_resource_by_name('User') => Avo::Resources::User
-      # get_resource_by_name(User) => Avo::Resources::User
+      # get_resource_by_name('User') => instance of Avo::Resources::User
+      # get_resource_by_name(User) => instance of Avo::Resources::User
 
       def get_resource_by_model_class(klass)
         # Fetch the mappings imposed by the user.
@@ -135,8 +131,8 @@ module Avo
 
       # Returns the Avo resource by singular snake_cased name
       #
-      # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
-      # get_resource_by_controller_name('users') => Avo::Resources::User
+      # get_resource_by_controller_name('delayed_backend_active_record_jobs') => instance of Avo::Resources::DelayedJob
+      # get_resource_by_controller_name('users') => instance of Avo::Resources::User
       def get_resource_by_controller_name(name)
         valid_resources
           .find do |resource|

data/lib/avo/services/debug_service.rb

@@ -59,6 +59,7 @@ class Avo::Services::DebugService
         **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,
+        cache_store: Avo::App.cache_store&.class&.to_s,
         **config_metadata
       }
     # rescue => error

data/lib/avo/services/telemetry_service.rb

@@ -51,6 +51,7 @@ class Avo::Services::TelemetryService
         **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,
+        cache_store: Avo::App.cache_store&.class&.to_s,
         **config_metadata
       }
     # rescue => error

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre8" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre11" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -61,7 +61,7 @@ module Avo
 
   class MissingGemError < StandardError; end
 
-  class DeprecatedAPI < StandardError; end
+  class DeprecatedAPIError < StandardError; end
 
   class << self
     def avo_filters_installed?

data/lib/generators/avo/install_generator.rb

@@ -14,6 +14,17 @@ module Generators
 
         template "initializer/avo.tt", "config/initializers/avo.rb"
         directory File.join(__dir__, "templates", "locales"), "config/locales"
+        create_resources
+      end
+
+      def create_resources
+        if defined?(User).present?
+          Rails::Generators.invoke("avo:resource", ["user", "-q"], {destination_root: Rails.root })
+        end
+
+        if defined?(Account).present?
+          Rails::Generators.invoke("avo:resource", ["account", "-q"], {destination_root: Rails.root })
+        end
       end
     end
   end

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -21,7 +21,7 @@ module Generators
           end
 
           if Rails.root.join("Procfile.dev").exist?
-            append_to_file "Procfile.dev", "avo_css: bin/rails avo:tailwindcss:watch\n"
+            append_to_file "Procfile.dev", "avo_css: yarn avo:tailwindcss --watch\n"
           else
             say "Add default Procfile.dev"
             copy_file template_path("Procfile.dev"), "Procfile.dev"
@@ -38,6 +38,9 @@ module Generators
 
           say "Adding the CSS asset to the partial"
           prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+
+          say "Ensure you have the following script in your package.json file.", :yellow
+          say %("scripts": { "avo:tailwindcss": "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css --minify" }), :green
         end
 
         no_tasks do

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -p 3000
-avo_css: bin/rails avo:tailwindcss:watch
+avo_css: yarn avo:tailwindcss --watch

data/lib/tasks/avo_tasks.rake

@@ -3,6 +3,11 @@
 #   # Task goes here
 # end
 
+desc "Runs the update command for all Avo gems."
+task "avo:update" do
+  system "bundle update avo avo_pro avo_advanced avo_dashboards avo_filters avo_menu avo_upgrade"
+end
+
 desc "Installs Avo assets and bundles them for when you want to use the GitHub repo in your app"
 task "avo:build-assets" do
   spec = get_gem_spec "avo"