avo 2.30.2 → 2.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6bc41d1c4845492b9ee785b1ccd4895d0369ec54d2b307c67835a112059923
-  data.tar.gz: a04214b31f49e408ecf64166c126dd8a114543f4c3ad01383f33ba1d7216c88d
+  metadata.gz: 7bde773a8062f76d29ce0655fd0948bf963f1a0627b02d3d9df706225049fab6
+  data.tar.gz: 6503ea6bde6130648c2f2613e097ee9cc8db3e58d07702fea4d47a94b62a5118
 SHA512:
-  metadata.gz: e36a294bc70cd7568ea15c7e5d4323b1d261bfeaf7295ae2439cf581bef67ea0efcebe9995d23bfb416904e89810342df73d20591aa6790d128593ffceca7a16
-  data.tar.gz: d2eac35c9568ed230c05155823be7f52add0e4a86fa0f43ec85dbe2c69e84e5cb6188b7799714c739922269ba16b4919e3a0e7e7eb5f8d79cd4220669e0671ba
+  metadata.gz: c17065eb96f4b82a8f0d33f50627e635462e737c3fae582ab371c10a7976594df137fa8db3bb77252fcbc5d4c873ec4eb3db24c8ddedd201c6d830574be5687d
+  data.tar.gz: 762e69b4a753622e1a6ad3eef2038e27acf05b36356bbe31a1cb7798ba1491f65306fb867d4eea41f0ffe8870c959c66df8f5a55768620119d7158ef56a6e05a

data/Gemfile

@@ -75,7 +75,7 @@ group :development do
 
   gem "htmlbeautifier"
 
-  gem "hotwire-livereload", "~> 1.1"
+  gem "hotwire-livereload", "~> 1.2"
 
   gem "brakeman"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.30.2)
+    avo (2.32.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -13,7 +13,7 @@ PATH
       meta-tags
       pagy
       turbo-rails
-      view_component
+      view_component (>= 2.54.0)
       zeitwerk (>= 2.6.2)
 
 GEM
@@ -196,7 +196,7 @@ GEM
     highline (2.1.0)
     hightop (0.3.0)
       activesupport (>= 5.2)
-    hotwire-livereload (1.2.2)
+    hotwire-livereload (1.2.3)
       listen (>= 3.0.0)
       rails (>= 6.0.0)
     html_tokenizer (0.0.7)
@@ -233,10 +233,10 @@ GEM
     json (2.6.2)
     launchy (2.5.2)
       addressable (~> 2.8)
-    listen (3.7.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.20.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.8.1)
@@ -268,14 +268,14 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (6.0.3)
+    pagy (6.0.4)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
@@ -331,7 +331,7 @@ GEM
       activerecord (>= 6.0.4)
       activesupport (>= 6.0.4)
       i18n
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.8.1)
@@ -421,7 +421,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.0)
-    view_component (2.82.0)
+    view_component (3.0.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -483,7 +483,7 @@ DEPENDENCIES
   gem-release
   groupdate
   hightop
-  hotwire-livereload (~> 1.1)
+  hotwire-livereload (~> 1.2)
   htmlbeautifier
   httparty
   i18n-tasks (~> 1.0.12)

data/app/assets/stylesheets/avo.base.css

@@ -71,7 +71,6 @@ body {
   @apply opacity-0 translate-y-1;
 }
 
-
 .turbo-progress-bar {
   @apply bg-primary-400;
 }

data/app/assets/svgs/map-empty-state.svg

@@ -0,0 +1,35 @@
+<svg width="248" height="287" viewBox="0 0 248 287" fill="none" xmlns="http://www.w3.org/2000/svg" data-target="grid-empty-state-svg">
+<path d="M124 270.227C192.483 270.227 248 214.71 248 146.227C248 77.7433 192.483 22.2266 124 22.2266C55.5167 22.2266 0 77.7433 0 146.227C0 214.71 55.5167 270.227 124 270.227Z" fill="rgb(var(--color-primary-100))"/>
+<g filter="rgb(var(--color-primary-100))">
+<path d="M195.093 93.3198H52.9068C48.3412 93.3198 44.6401 97.0209 44.6401 101.586V275.186C44.6401 279.752 48.3412 283.453 52.9068 283.453H195.093C199.659 283.453 203.36 279.752 203.36 275.186V101.586C203.36 97.0209 199.659 93.3198 195.093 93.3198Z" fill="white"/>
+</g>
+<path d="M107.467 118.12H64.48C61.7407 118.12 59.52 120.34 59.52 123.08C59.52 125.819 61.7407 128.04 64.48 128.04H107.467C110.206 128.04 112.427 125.819 112.427 123.08C112.427 120.34 110.206 118.12 107.467 118.12Z" fill="rgb(var(--color-primary-100))"/>
+<path d="M137.227 139.613H64.48C61.7407 139.613 59.52 141.834 59.52 144.573C59.52 147.312 61.7407 149.533 64.48 149.533H137.227C139.966 149.533 142.187 147.312 142.187 144.573C142.187 141.834 139.966 139.613 137.227 139.613Z" fill="rgb(var(--color-primary-100))" opacity="0.6"/>
+<path d="M107.467 162.76H64.48C61.7407 162.76 59.52 164.981 59.52 167.72C59.52 170.459 61.7407 172.68 64.48 172.68H107.467C110.206 172.68 112.427 170.459 112.427 167.72C112.427 164.981 110.206 162.76 107.467 162.76Z" fill="rgb(var(--color-primary-100))"/>
+<path d="M137.227 184.253H64.48C61.7407 184.253 59.52 186.474 59.52 189.213C59.52 191.953 61.7407 194.173 64.48 194.173H137.227C139.966 194.173 142.187 191.953 142.187 189.213C142.187 186.474 139.966 184.253 137.227 184.253Z" fill="rgb(var(--color-primary-100))" opacity="0.6"/>
+<path d="M107.467 207.4H64.48C61.7407 207.4 59.52 209.621 59.52 212.36C59.52 215.099 61.7407 217.32 64.48 217.32H107.467C110.206 217.32 112.427 215.099 112.427 212.36C112.427 209.621 110.206 207.4 107.467 207.4Z" fill="rgb(var(--color-primary-100))"/>
+<path d="M137.227 228.893H64.48C61.7407 228.893 59.52 231.114 59.52 233.853C59.52 236.592 61.7407 238.813 64.48 238.813H137.227C139.966 238.813 142.187 236.592 142.187 233.853C142.187 231.114 139.966 228.893 137.227 228.893Z" fill="rgb(var(--color-primary-100))" opacity="0.6"/>
+<g filter="url(#filter1_d_577_1090)">
+<path d="M195.093 9H52.9068C48.3412 9 44.6401 12.7011 44.6401 17.2667V66.8667C44.6401 71.4322 48.3412 75.1333 52.9068 75.1333H195.093C199.659 75.1333 203.36 71.4322 203.36 66.8667V17.2667C203.36 12.7011 199.659 9 195.093 9Z" fill="rgb(var(--color-primary-500))"/>
+</g>
+<path d="M107.467 27.1865H64.48C61.7407 27.1865 59.52 29.4072 59.52 32.1465C59.52 34.8859 61.7407 37.1065 64.48 37.1065H107.467C110.206 37.1065 112.427 34.8859 112.427 32.1465C112.427 29.4072 110.206 27.1865 107.467 27.1865Z" fill="rgb(var(--color-primary-100))"/>
+<path d="M137.227 48.6799H64.48C61.7407 48.6799 59.52 50.9006 59.52 53.6399C59.52 56.3793 61.7407 58.5999 64.48 58.5999H137.227C139.966 58.5999 142.187 56.3793 142.187 53.6399C142.187 50.9006 139.966 48.6799 137.227 48.6799Z" fill="white"/>
+<defs>
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-3"/>
+<feGaussianBlur stdDeviation="3"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.788235 0 0 0 0 0.803922 0 0 0 0 0.85098 0 0 0 0.349 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_577_1090"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_577_1090" result="shape"/>
+<filter id="filter1_d_577_1090" x="38.6401" y="0" width="170.72" height="78.1333" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-3"/>
+<feGaussianBlur stdDeviation="3"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.788235 0 0 0 0 0.803922 0 0 0 0 0.85098 0 0 0 0.349 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_577_1090"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_577_1090" result="shape"/>
+</filter>
+</defs>
+</svg>

data/app/assets/svgs/map-view-type.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
+  <path stroke-linecap="round" stroke-linejoin="round" d="M9 6.75V15m6-6v8.25m.503 3.498l4.875-2.437c.381-.19.622-.58.622-1.006V4.82c0-.836-.88-1.38-1.628-1.006l-3.869 1.934c-.317.159-.69.159-1.006 0L9.503 3.252a1.125 1.125 0 00-1.006 0L3.622 5.689C3.24 5.88 3 6.27 3 6.695V19.18c0 .836.88 1.38 1.628 1.006l3.869-1.934c.317-.159.69-.159 1.006 0l4.994 2.497c.317.158.69.158 1.006 0z"/>
+</svg>

data/app/components/avo/actions_component.rb

@@ -11,7 +11,7 @@ class Avo::ActionsComponent < ViewComponent::Base
     @exclude = exclude
     @color = color
     @style = style
-    @label = label || t("avo.actions")
+    @label = label || I18n.t("avo.actions")
   end
 
   def render?

data/app/components/avo/fields/area_field/edit_component.html.erb

@@ -0,0 +1,7 @@
+<%= field_wrapper **field_wrapper_args do %>
+  <%= @form.text_field @field.id,
+    class: classes("w-full"),
+    value: field.value.to_s,
+    placeholder: @field.placeholder,
+    disabled: disabled? %>
+<% end %>

data/app/components/avo/fields/area_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::AreaField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/area_field/show_component.html.erb

@@ -0,0 +1,8 @@
+<%= field_wrapper **field_wrapper_args do %>
+  <% if field.value.present? %>
+    <%= area_map field.map_data, **field.mapkick_options %>
+  <% else %>
+    —
+  <% end %>
+<% end %>
+

data/app/components/avo/fields/area_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::AreaField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/fields/country_field/edit_component.html.erb

@@ -10,6 +10,7 @@
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
-    placeholder: @field.include_blank.present? ? nil : @field.placeholder
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder,
+    autocomplete: @field.autocomplete
   %>
 <% end %>

data/app/components/avo/fields/has_many_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <turbo-frame id="<%= @field.turbo_frame %>" src="<%= @field.frame_url %>" target="_top" class="block">
-  <%= render(Avo::LoadingComponent.new(title: @field.name)) %>
+  <%= render(Avo::LoadingComponent.new(title: @field.plural_name)) %>
 </turbo-frame>

data/app/components/avo/fields/has_one_field/show_component.html.erb

@@ -4,7 +4,7 @@
   </turbo-frame>
 <% else %>
   <%= render Avo::PanelComponent.new(name: @field.name) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if !@field.is_readonly? && !@field.is_disabled? && can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
@@ -25,7 +25,7 @@
       <% end %>
     <% end %>
 
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="py-8 flex justify-center items-center">
         <%= empty_state by_association: params[:related_name].present? %>
       </div>

data/app/components/avo/fields/location_field/show_component.html.erb

@@ -1,6 +1,6 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if field.value_present? %>
-    <%= js_map [{latitude: field.value[0], longitude: field.value[1]}] %>
+    <%= js_map [{latitude: field.value[0], longitude: field.value[1]}], id: "location-map" %>
   <% else %>
     —
   <% end %>

data/app/components/avo/fields/number_field/edit_component.html.erb

@@ -7,6 +7,7 @@
     min: @field.min,
     placeholder: @field.placeholder,
     step: @field.step,
-    style: @field.get_html(:style, view: view, element: :input)
+    style: @field.get_html(:style, view: view, element: :input),
+    autocomplete: @field.autocomplete
   %>
 <% end %>

data/app/components/avo/fields/password_field/edit_component.html.erb

@@ -4,6 +4,7 @@
     data: @field.get_html(:data, view: view, element: :input),
     disabled: disabled?,
     placeholder: @field.placeholder,
-    style: @field.get_html(:style, view: view, element: :input)
+    style: @field.get_html(:style, view: view, element: :input),
+    autocomplete: @field.autocomplete
     %>
 <% end %>

data/app/components/avo/fields/select_field/edit_component.html.erb

@@ -10,6 +10,7 @@
     disabled: disabled?,
     style: @field.get_html(:style, view: view, element: :input),
     value: @field.model.present? ? @field.model[@field.id] : @field.value,
-    placeholder: @field.include_blank.present? ? nil : @field.placeholder
+    placeholder: @field.include_blank.present? ? nil : @field.placeholder,
+    autocomplete: @field.autocomplete
   %>
 <% end %>

data/app/components/avo/fields/text_field/edit_component.html.erb

@@ -6,6 +6,7 @@
     placeholder: @field.placeholder,
     style: @field.get_html(:style, view: view, element: :input),
     # value: @field.value,
-    multiple: multiple
+    multiple: multiple,
+    autocomplete: @field.autocomplete
   %>
 <% end %>

data/app/components/avo/index/resource_map_component.html.erb

@@ -0,0 +1,16 @@
+<% if @resources.present? %>
+  <div class="map-view-container grid <%= grid_layout_classes %>">
+    <div class="map-component min-h-full <%= map_component_order_class %>">
+      <%= js_map(resource_location_markers, **resource_mapkick_options) %>
+    </div>
+    <% if render_table? %>
+      <div class="overflow-auto<%= table_component_order_class %>">
+        <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, parent_resource: @parent_resource, pagy: @pagy, query: @query)) %>
+      </div>
+    <% end %>
+  </div>
+<% else %>
+  <div class="bg-white rounded shadow-panel">
+    <%= helpers.empty_state by_association: params[:related_name].present?, view_type: :map %>
+  </div>
+<% end %>

data/app/components/avo/index/resource_map_component.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module Avo
+  module Index
+    # Render a map view for a list of resources, where each resource is
+    # expected to have an attribute/attribute set representing its location.
+    class ResourceMapComponent < ViewComponent::Base
+      attr_reader :resources
+
+      def initialize(resources: nil, resource: nil, reflection: nil, parent_model: nil, parent_resource: nil, pagy: nil, query: nil)
+        super
+        @resources = resources
+        @resource = resource
+        @reflection = reflection
+        @parent_model = parent_model
+        @parent_resource = parent_resource
+        @pagy = pagy
+        @query = query
+      end
+
+      def grid_layout_classes
+        return unless render_table?
+
+        if table_positioned_horizontally
+          "grid-flow-row sm:grid-flow-col grid-rows-1 auto-cols-fr"
+        elsif table_positioned_vertically
+          "grid-flow-row grid-cols-1"
+        end
+      end
+
+      def table_positioned_horizontally
+        %i[left right].include?(map_view_table_layout)
+      end
+
+      def table_positioned_vertically
+        %i[bottom top].include?(map_view_table_layout)
+      end
+
+      def map_component_order_class
+        if render_table? && table_positioned_at_the_start
+          "order-last"
+        else
+          "order-first"
+        end
+      end
+
+      def table_component_order_class
+        if table_positioned_at_the_start
+          "order-first"
+        else
+          "order-last"
+        end
+      end
+
+      def table_positioned_at_the_start
+        %i[left top].include?(map_view_table_layout)
+      end
+
+      def map_view_table_layout
+        map_options.dig(:table, :layout)
+      end
+
+      def resource_location_markers
+        # If we have no proc and no default location method, don't try to create markers
+        return [] unless resource_mappable?
+
+        resources
+          .map do |resource|
+            Avo::Hosts::ResourceRecordHost.new(block: marker_proc, resource: resource, record: resource.record).handle
+          end
+          .compact
+          .filter do |coordinates|
+            coordinates[:latitude].present? && coordinates[:longitude].present?
+          end
+      end
+
+      def resource_mapkick_options
+        map_options[:mapkick_options] || {}
+      end
+
+      def render_table?
+        map_options.dig(:table, :visible)
+      end
+
+      private
+
+      def default_record_marker_proc
+        lambda {
+          {
+            latitude: record.coordinates.first,
+            longitude: record.coordinates.last
+          }
+        }
+      end
+
+      def map_options
+        @resource.map_view || {}
+      end
+
+      def marker_proc
+        map_options[:record_marker] || default_record_marker_proc
+      end
+
+      def resource_mappable?
+        map_options[:record_marker].present? || @resources.first.record.respond_to?(:coordinates)
+      end
+    end
+  end
+end

data/app/components/avo/item_switcher_component.html.erb

@@ -4,7 +4,7 @@
   <% end %>
 <% elsif item.is_panel? %>
   <%= render Avo::PanelComponent.new(name: item.name, description: item.description, index: index) do |c| %>
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="divide-y">
         <% item.visible_items.each_with_index do |field, index| %>
           <%= render field

data/app/components/avo/resource_component.rb

@@ -119,7 +119,7 @@ class Avo::ResourceComponent < Avo::BaseComponent
     end
 
     if filtered_fields.present?
-      filtered_fields.find { |f| f.id == @reflection.name }.readonly
+      filtered_fields.find { |f| f.id == @reflection.name }.is_readonly?
     else
       false
     end

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

@@ -19,7 +19,7 @@
     <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
     <%= content_tag :div, class: 'space-y-12' do %>
       <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-        <% c.tools do %>
+        <% c.with_tools do %>
           <%= a_link back_path,
             style: :text,
             icon: 'arrow-left' do %>
@@ -56,7 +56,7 @@
         <%# Extract the main panel and display the fields here. %>
         <%# This way we'll be able to render the footer buttons under the main fields. %>
         <% if main_panel.present? %>
-          <% c.body do %>
+          <% c.with_body do %>
             <div class="divide-y">
               <% main_panel.items.each_with_index do |field, index| %>
                 <%= render field
@@ -69,12 +69,12 @@
           <% end %>
         <% end %>
         <% if sidebar.present? %>
-          <% c.sidebar do %>
+          <% c.with_sidebar do %>
             <%= render sidebar_component form: form %>
           <% end %>
         <% end %>
         <% if Avo.configuration.buttons_on_form_footers %>
-          <% c.footer_tools do %>
+          <% c.with_footer_tools do %>
             <div class="mt-4">
               <%= a_link back_path,
               style: :text,

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

@@ -5,7 +5,7 @@
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if can_attach? %>
         <%= a_link attach_path,
           icon: 'heroicons/outline/link',
@@ -29,7 +29,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% c.body do %>
+    <% c.with_body do %>
       <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4 <%= 'hidden' if @resource.search_query.nil? && @filters.empty? && available_view_types.count <= 1 %>">
         <% if show_search_input %>
           <div class="flex items-center px-4 w-64">
@@ -46,6 +46,15 @@
           </div>
         <% end %>
       </div>
+      <% if view_type.to_sym == :map %>
+        <% if @resources.present? %>
+          <div>
+            <%= render(Avo::Index::ResourceMapComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model, 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 %>
         <% if @resources.present? %>
           <div class="w-full relative flex-1 flex mt-0">
@@ -56,7 +65,7 @@
         <% end %>
       <% end %>
     <% end %>
-    <% c.bare_content do %>
+    <% c.with_bare_content do %>
       <% if view_type.to_sym == :table %>
         <% if @models.present? %>
           <div class="mt-4">

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

@@ -8,7 +8,7 @@
     **@resource.stimulus_data_attributes
   } do %>
   <%= render Avo::PanelComponent.new(name: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: 0, data: { panel_id: "main" }) do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
       <% if @resource.has_show_controls? %>
         <% @resource.render_show_controls.each do |control| %>
           <% if control.back_button? %>
@@ -155,7 +155,7 @@
       <% end %>
     <% end %>
     <% if main_panel.present? %>
-      <% c.body do %>
+      <% c.with_body do %>
         <%# the overflow helps with long values %>
         <div class="divide-y overflow-auto">
           <% main_panel.items.each_with_index do |field, index| %>
@@ -169,7 +169,7 @@
       <% end %>
     <% end %>
     <% if sidebar.present? %>
-      <% c.sidebar do %>
+      <% c.with_sidebar do %>
         <%= render sidebar_component %>
       <% end %>
     <% end %>

data/app/controllers/avo/application_controller.rb

@@ -155,6 +155,10 @@ module Avo
     def set_model_to_fill
       @model_to_fill = @resource.model_class.new if @view == :create
       @model_to_fill = @model if @view == :update
+
+      # If resource.model is nil, most likely the user is creating a new record.
+      # In that case, to access resource.model in visible and readonly blocks we hydrate the resource with a new model.
+      @resource.hydrate(model: @model_to_fill) if @resource.model.nil?
     end
 
     def fill_model

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

@@ -14,7 +14,7 @@
       data: @action.class.form_data_attributes do |form|
     %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.heading do %>
+      <% c.with_heading do %>
         <%= @action.action_name %>
       <% end %>
       <div class="flex-1 flex">
@@ -33,7 +33,7 @@
           <% end %>
         </div>
       <% end %>
-      <% c.controls do %>
+      <% c.with_controls do %>
         <%= a_button type: :button,
           data: { action: 'click->modal#close' },
           size: :sm,

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

@@ -11,7 +11,7 @@
       'turbo-frame': '_top'
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
-      <% c.heading do %>
+      <% c.with_heading do %>
         <%= t 'avo.choose_item', item: @related_resource.name.downcase %>
       <% end %>
 
@@ -39,7 +39,7 @@
         <% end %>
       </div>
 
-      <% c.controls do %>
+      <% c.with_controls do %>
         <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :gray do %>
           <%= t('avo.cancel') %>
         <% end %>

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

@@ -1,5 +1,5 @@
 <%= render Avo::PanelComponent.new(name: @dashboard.name, description: @dashboard.description) do |c| %>
-  <% c.bare_content do %>
+  <% c.with_bare_content do %>
     <% if @dashboard.items.present? %>
       <div class="min-h-24">
         <%= content_tag(:div, class: "grid gap-4 grid-cols-1 #{@dashboard.classes}") do %>
@@ -23,7 +23,7 @@
       <div class="w-full h-full">
         <% if Rails.env.development? %>
           <%= render Avo::PanelComponent.new do |c| %>
-            <% c.body do %>
+            <% c.with_body do %>
               <div class="p-6">
                 <%= t 'avo.empty_dashboard_message' %>. <%= link_to 'Docs', 'https://docs.avohq.io/2.0/dashboards.html', target: '_blank' %>
               </div>

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

@@ -15,9 +15,9 @@
 %>
 <div class="flex flex-col">
   <%= render Avo::PanelComponent.new(name: 'Debug Avo', description: 'Use this page to debug the Avo license.') do |c| %>
-    <% c.tools do %>
+    <% c.with_tools do %>
     <% end %>
-    <% c.bare_content do %>
+    <% 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">

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.body do %>
+    <% c.with_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/_view_toggle_button.html.erb

@@ -15,6 +15,11 @@
         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.tools do %>
+    <% c.with_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.body do %>
+    <% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <%= render 'links_and_buttons' %>
       </div>

data/avo.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "zeitwerk", ">= 2.6.2"
   spec.add_dependency "httparty"
   spec.add_dependency "active_link_to"
-  spec.add_dependency "view_component"
+  spec.add_dependency "view_component", ">= 2.54.0"
   spec.add_dependency "turbo-rails"
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"

data/db/factories.rb

@@ -112,6 +112,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

@@ -31,10 +31,25 @@ module Avo
       def boot
         init_fields
 
-        if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
-          self.cache_store ||= ActiveSupport::Cache::MemoryStore.new
+        self.cache_store = get_cache_store
+      end
+
+      # When not in production we'll just use the MemoryStore which is good enough.
+      # Wehn running in production we'll try to use memcached or redis if available.
+      # If not, we'll use the FileStore.
+      # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
+      def get_cache_store
+        if Rails.env.production?
+          case Rails.cache.class
+          when ActiveSupport::Cache::MemCacheStore, ActiveSupport::Cache::RedisCacheStore
+            Rails.cache
+          else
+            ActiveSupport::Cache::FileStore.new
+          end
+        elsif Rails.env.test?
+          Rails.cache
         else
-          self.cache_store = Rails.cache
+          ActiveSupport::Cache::MemoryStore.new
         end
       end
 
@@ -63,7 +78,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/lib/avo/base_action.rb

@@ -58,10 +58,10 @@ module Avo
     end
 
     def initialize(model: nil, resource: nil, user: nil, view: nil, arguments: {})
-      self.class.model = model if model.present?
-      self.class.resource = resource if resource.present?
-      self.class.user = user if user.present?
-      self.class.view = view if view.present?
+      self.class.model = model
+      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

@@ -55,6 +55,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
 
     class << self
       delegate :t, to: ::I18n
@@ -295,6 +296,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/fetches_things.rb

@@ -24,9 +24,7 @@ module Avo
 
         # Filters out the resources that are missing the model_class
         def valid_resources
-          resources.select do |resource|
-            resource.model_class.present?
-          end
+          resources.select { |resource| resource.model_class.present? }.sort_by(&:name)
         end
 
         # Returns the Avo resource by camelized name

data/lib/avo/concerns/policy_helpers.rb

@@ -0,0 +1,31 @@
+module Avo
+  module Concerns
+    module PolicyHelpers
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def inherit_association_from_policy(association_name, policy_class)
+          [:create, :edit, :update, :destroy, :show, :reorder, :act_on].each do |method_action|
+            define_policy_method(method_action, association_name, policy_class)
+          end
+
+          define_policy_method("view", association_name, policy_class, "index")
+        end
+
+        private
+
+        # Define a method for the given action and association name.
+        # Call the policy class with the given action passing the user and record.
+        # Example:
+        #  def create_team_members?
+        #   TeamMemberPolicy.new(user, record).create?
+        #  end
+        def define_policy_method(method_action, association_name, policy_class, policy_action = method_action)
+          define_method "#{method_action}_#{association_name}?" do
+            policy_class.new(user, record).send "#{policy_action}?"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/engine.rb

@@ -14,11 +14,6 @@ Gem.loaded_specs["avo"].dependencies.each do |d|
   end
 end
 
-# In development we should load the engine so we get the autoload for components
-if ENV["RAILS_ENV"] === "development"
-  require "view_component/engine"
-end
-
 module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo

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

@@ -30,6 +30,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 :visible
@@ -70,6 +71,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]
@@ -85,7 +87,6 @@ module Avo
 
         @args = args
 
-        @updatable = !readonly
         @computable = true
         @computed = block.present?
         @computed_value = nil
@@ -257,7 +258,7 @@ module Avo
       end
 
       def updatable
-        @updatable && visible?
+        !is_readonly? && visible?
       end
 
       private

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/licensing/h_q.rb

@@ -106,6 +106,7 @@ module Avo
           **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

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.30.2" unless const_defined?(:VERSION)
+  VERSION = "2.32.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/resource_tools/partial.tt

@@ -1,12 +1,12 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col p-4 min-h-24">
         <div class="space-y-4">
           <h3>🪧 This partial is waiting to be updated</h3>

data/lib/generators/avo/templates/tool/view.tt

@@ -1,10 +1,10 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: '<%= human_name %>', display_breadcrumbs: true) do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <div class="text-sm italic">This is the panels tools section.</div>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
           <h3>What a nice new tool 👋</h3>

data/public/avo-assets/avo.base.css

@@ -6374,6 +6374,14 @@ trix-toolbar .trix-button-group:not(:first-child){
   z-index:30
 }
 
+.order-last{
+  order:9999
+}
+
+.order-first{
+  order:-9999
+}
+
 .col-span-1{
   grid-column:span 1 / span 1
 }
@@ -6922,6 +6930,14 @@ trix-toolbar .trix-button-group:not(:first-child){
           appearance:none
 }
 
+.auto-cols-fr{
+  grid-auto-columns:minmax(0, 1fr)
+}
+
+.grid-flow-row{
+  grid-auto-flow:row
+}
+
 .grid-cols-1{
   grid-template-columns:repeat(1, minmax(0, 1fr))
 }
@@ -6930,6 +6946,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   grid-template-columns:repeat(6, minmax(0, 1fr))
 }
 
+.grid-rows-1{
+  grid-template-rows:repeat(1, minmax(0, 1fr))
+}
+
 .flex-row{
   flex-direction:row
 }
@@ -9502,6 +9522,10 @@ trix-editor {
     max-width:42rem
   }
 
+  .sm\:grid-flow-col{
+    grid-auto-flow:column
+  }
+
   .sm\:grid-cols-3{
     grid-template-columns:repeat(3, minmax(0, 1fr))
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.30.2
+  version: 2.32.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.54.0
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1292,6 +1292,8 @@ files:
 - app/assets/svgs/information-circle.svg
 - app/assets/svgs/library.svg
 - app/assets/svgs/logout.svg
+- app/assets/svgs/map-empty-state.svg
+- app/assets/svgs/map-view-type.svg
 - app/assets/svgs/menu-back.svg
 - app/assets/svgs/menu.svg
 - app/assets/svgs/photograph.svg
@@ -1337,6 +1339,10 @@ files:
 - app/components/avo/empty_state_component.rb
 - app/components/avo/field_wrapper_component.html.erb
 - app/components/avo/field_wrapper_component.rb
+- app/components/avo/fields/area_field/edit_component.html.erb
+- app/components/avo/fields/area_field/edit_component.rb
+- app/components/avo/fields/area_field/show_component.html.erb
+- app/components/avo/fields/area_field/show_component.rb
 - app/components/avo/fields/badge_field/index_component.html.erb
 - app/components/avo/fields/badge_field/index_component.rb
 - app/components/avo/fields/badge_field/show_component.html.erb
@@ -1536,6 +1542,8 @@ files:
 - app/components/avo/index/resource_controls_component.rb
 - app/components/avo/index/resource_grid_component.html.erb
 - app/components/avo/index/resource_grid_component.rb
+- app/components/avo/index/resource_map_component.html.erb
+- app/components/avo/index/resource_map_component.rb
 - app/components/avo/index/resource_table_component.html.erb
 - app/components/avo/index/resource_table_component.rb
 - app/components/avo/index/table_row_component.html.erb
@@ -1726,6 +1734,7 @@ files:
 - lib/avo/concerns/has_stimulus_controllers.rb
 - lib/avo/concerns/is_resource_item.rb
 - lib/avo/concerns/model_class_constantized.rb
+- lib/avo/concerns/policy_helpers.rb
 - lib/avo/concerns/visible_in_dashboard.rb
 - lib/avo/concerns/visible_items.rb
 - lib/avo/configuration.rb
@@ -1740,6 +1749,7 @@ files:
 - lib/avo/dsl/field_parser.rb
 - lib/avo/dynamic_router.rb
 - lib/avo/engine.rb
+- lib/avo/fields/area_field.rb
 - lib/avo/fields/badge_field.rb
 - lib/avo/fields/base_field.rb
 - lib/avo/fields/belongs_to_field.rb