avo 2.29.1 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d8214e93c30dd465007288d2ca82334dc8f2ffd30059f0c04402b4aca22c1b
-  data.tar.gz: 6075d940fb8afcfff6d4c82f856b41c6545717f3847665ad962b225bd836218d
+  metadata.gz: 47a6931f5fd184bfb437e0541849e04f4452764059b23582ca000a977f805bc8
+  data.tar.gz: ba1137efa1e302b64bb86635b7c6327cd145d0fa68b787f8540bd5089a9e8bd9
 SHA512:
-  metadata.gz: 4d6889479a700d4e9f574c0b036e23539512f771d5df2258f2449caf5f7221610839beb56dd7591ff0f476938edf0e7ea86b769c14d1f8e65fb81d523e7bab9e
-  data.tar.gz: 2301b54dfaeab3b9c077ade8b59112e011b42622f1b72ad1f3ed8593bb8c93d1f425616f737d6b898d288fe8885d8fae67b83fe19979800dec32ca1f46b051ba
+  metadata.gz: d0a68869c9647f57f3d3ffe1699e7e6fd1a2c0cc4fcbceadb127b1312893cf53eb8d2a89df9c160a058a824846bd128ed9e681eecbe06dd90c61bd91641a5132
+  data.tar.gz: e92694271216d763281657edc6b128f05dd8ff104b7228eabeca8570bb86dad6c91a2712410655a744f600db466fea2a25f349182881ab32fecceef3d1763669

data/Gemfile

@@ -165,3 +165,5 @@ gem "sprockets-rails"
 gem "image_processing", "~> 1.12"
 
 gem "prefixed_ids"
+
+gem "mapkick-rb", "~> 0.1.4"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.29.1)
+    avo (2.30.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)
@@ -247,6 +247,7 @@ GEM
     manifester (0.1.8)
       rails (>= 6.0)
       zeitwerk
+    mapkick-rb (0.1.4)
     marcel (1.0.2)
     matrix (0.4.2)
     meta-tags (2.18.0)
@@ -274,7 +275,7 @@ GEM
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (6.0.2)
+    pagy (6.0.3)
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
@@ -492,6 +493,7 @@ DEPENDENCIES
   launchy
   listen (>= 3.5.1)
   manifester
+  mapkick-rb (~> 0.1.4)
   meta-tags
   net-smtp
   pg (>= 0.18, < 2.0)

data/app/components/avo/fields/common/single_file_viewer_component.html.erb

@@ -16,7 +16,9 @@
           </div>
         </div>
       <% end %>
-      <span class="text-gray-500 mt-2 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+      <% if field.display_filename %>
+        <span class="text-gray-500 mt-2 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+      <% end %>
     </div>
     <div class="flex space-x-2">
       <div class="flex">

data/app/components/avo/fields/common/single_file_viewer_component.rb

@@ -4,6 +4,8 @@ class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
   include Avo::ApplicationHelper
   include Avo::Fields::Concerns::FileAuthorization
 
+  attr_reader :field
+
   def initialize(field:, resource:, file: nil)
     @file = file
     @field = field
@@ -15,29 +17,29 @@ class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
   end
 
   def id
-    @field.id
+    field.id
   end
 
   def file
-    @file || @field.value.attachment
+    @file || field.value.attachment
   rescue
     nil
   end
 
   def is_image?
-    file.image? || @field.is_image
+    file.image? || field.is_image
   rescue
     false
   end
 
   def is_audio?
-    file.audio? || @field.is_audio
+    file.audio? || field.is_audio
   rescue
     false
   end
 
   def is_video?
-    file.video? || @field.is_video
+    file.video? || field.is_video
   rescue
     false
   end

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

@@ -0,0 +1,22 @@
+<%= field_wrapper **field_wrapper_args do %>
+  <% if field.value_as_array? %>
+    <div class="flex gap-4">
+      <%= @form.text_field @field.as_lat_long_field_id(:lat),
+        value: @field.as_lat_long_value(:lat),
+        class: classes("w-full"),
+        placeholder: @field.as_lat_long_placeholder(:lat)
+      %>
+      <%= @form.text_field @field.as_lat_long_field_id(:long),
+        value: @field.as_lat_long_value(:long),
+        class: classes("w-full"),
+        placeholder: @field.as_lat_long_placeholder(:long)
+      %>
+    </div>
+  <% else %>
+    <%= @form.text_field @field.id,
+      value: @field.value,
+      class: classes("w-full"),
+      placeholder: @field.placeholder
+    %>
+  <% end %>
+<% end %>

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

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

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

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

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

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

data/app/javascript/js/application.js

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

data/db/factories.rb

@@ -90,6 +90,7 @@ FactoryBot.define do
   factory :city do
     name { Faker::Address.city }
     population { rand(10000..999000) }
+    coordinates { [Faker::Address.latitude, Faker::Address.longitude] }
     is_capital { [true, false].sample }
     features { Faker::Address.community }
     metadata { Faker::Address.community }

data/lib/avo/fields/file_field.rb

@@ -7,6 +7,7 @@ module Avo
       attr_accessor :is_audio
       attr_accessor :direct_upload
       attr_accessor :accept
+      attr_reader :display_filename
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -17,6 +18,7 @@ module Avo
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false
         @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]
       end
 
       def path

data/lib/avo/fields/files_field.rb

@@ -5,6 +5,7 @@ module Avo
       attr_accessor :is_image
       attr_accessor :direct_upload
       attr_accessor :accept
+      attr_reader :display_filename
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -13,6 +14,7 @@ module Avo
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @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]
       end
 
       def view_component_name

data/lib/avo/fields/location_field.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Avo
+  module Fields
+    class LocationField < BaseField
+      attr_reader :stored_as
+
+      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]
+      end
+
+      def value_as_array?
+        stored_as.is_a?(Array) && stored_as.count == 2
+      end
+
+      def as_lat_long_field_id(get)
+        if get == :lat
+          "#{id}[#{stored_as.first}]"
+        elsif get == :long
+          "#{id}[#{stored_as.last}]"
+        end
+      end
+
+      def as_lat_long_placeholder(get)
+        if get == :lat
+          "Enter #{stored_as.first}"
+        elsif get == :long
+          "Enter #{stored_as.last}"
+        end
+      end
+
+      def as_lat_long_value(get)
+        if get == :lat
+          model.send(stored_as.first)
+        elsif get == :long
+          model.send(stored_as.last)
+        end
+      end
+
+      def fill_field(model, key, value, params)
+        if value_as_array?
+          latitude_field, longitude_field = stored_as
+          model.send("#{latitude_field}=", value[latitude_field])
+          model.send("#{longitude_field}=", value[longitude_field])
+          model
+        else
+          super(model, key, value.split(","), params)
+        end
+      end
+
+      def to_permitted_param
+        if value_as_array?
+          [:"#{id}", "#{id}": {}]
+        else
+          super
+        end
+      end
+
+      def value_present?
+        return value.first.present? && value.second.present? if value.is_a?(Array) && value.count == 2
+
+        value.present?
+      end
+    end
+  end
+end

data/lib/avo/version.rb

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

data/lib/generators/avo/resource_generator.rb

@@ -216,7 +216,7 @@ module Generators
           fields[enum] = {
             field: "select",
             options: {
-              enum: "::#{model_class.capitalize}.#{enum.pluralize}"
+              enum: "::#{model_class.classify}.#{enum.pluralize}"
             }
           }
         end