avo 3.0.0.pre8 → 3.0.0.pre9

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/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,21 @@ module Avo
       def boot
         init_logger
         init_fields
-        init_cache_store
+        self.cache_store = get_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
+      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")

data/lib/avo/base_resource.rb

@@ -64,6 +64,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
@@ -335,6 +336,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/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/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.pre9" unless const_defined?(:VERSION)
 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