avo 2.29.1 → 2.30.1.pre1.pr1683

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d8214e93c30dd465007288d2ca82334dc8f2ffd30059f0c04402b4aca22c1b
-  data.tar.gz: 6075d940fb8afcfff6d4c82f856b41c6545717f3847665ad962b225bd836218d
+  metadata.gz: c3c650833493f18162beff6fcb0244af4a5a2a6d91041a9be0b0103cb027f85b
+  data.tar.gz: af1f9219ac03dc7bfe05812010d025e26d5f26fec0b59feb56519045ae6385d3
 SHA512:
-  metadata.gz: 4d6889479a700d4e9f574c0b036e23539512f771d5df2258f2449caf5f7221610839beb56dd7591ff0f476938edf0e7ea86b769c14d1f8e65fb81d523e7bab9e
-  data.tar.gz: 2301b54dfaeab3b9c077ade8b59112e011b42622f1b72ad1f3ed8593bb8c93d1f425616f737d6b898d288fe8885d8fae67b83fe19979800dec32ca1f46b051ba
+  metadata.gz: 2a5b5b6e180b2d66d218b5e3d3f9f32622cacbb44104ac4a2d0e5ab6e0725d8e469ea0c5c830d04c0a489f9265bd6f2483ad92a2ec3c343d86a379bce63a8914
+  data.tar.gz: fd0a75e4c866d6a8562045ac0626378528a0751260788a9c9c3cf80183a4a698a0ac188396bba5c19e370b40a9831b1ce9d1d56e17bebc4638b0e8dbe7bffaec

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.1.pre1.pr1683)
       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)
@@ -268,13 +269,13 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.8)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.14.3-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/files/controls_component.html.erb

@@ -0,0 +1,29 @@
+<div class="flex">
+  <% if can_download_file? %>
+    <%= a_link Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true, disposition: :attachment),
+      icon: 'heroicons/outline/download',
+      color: :primary,
+      download: true,
+      class: 'text-center',
+      title: t('avo.download_file'),
+      data: { tippy: :tooltip },
+      compact: true,
+      size: :xs %>
+  <% end %>
+</div>
+<div>
+  <% if can_delete_file? %>
+    <%= a_link destroy_path,
+      icon: 'heroicons/outline/trash',
+      color: :red,
+      compact: true,
+      size: :xs,
+      class: 'text-center',
+      title: t('avo.delete_file', item: file.filename),
+      data: {
+        turbo_method: :delete,
+        turbo_confirm: t('avo.are_you_sure'),
+        tippy: :tooltip
+      } %>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/controls_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ControlsComponent < ViewComponent::Base
+  include Avo::ApplicationHelper
+  include Avo::Fields::Concerns::FileAuthorization
+
+  attr_reader :file, :field, :resource
+  delegate :id, to: :field
+
+  def initialize(field:, file:, resource:)
+    @field = field
+    @file = file
+    @resource = resource
+  end
+
+  def destroy_path
+    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
+  end
+end

data/app/components/avo/fields/common/files/list_viewer_component.html.erb

@@ -0,0 +1,14 @@
+<div class="-mt-9">
+  <%= turbo_frame_tag @field.id do %>
+    <% unless @field.hide_view_type_changer %>
+      <div class="justify-self-end flex justify-end items-center space-x-3">
+        <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: @field.view_type, turbo_frame: @field.id } %>
+      </div>
+    <% end %>
+    <div class="<%= classes %>">
+      <% @field.value.attachments.each do |file| %>
+        <%= render @field.viewer_component.new field: @field, resource: @resource, file: file %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
+  include Turbo::FramesHelper
+
+  def initialize(field:, resource:)
+    @field = field
+    @resource = resource
+  end
+
+  def classes
+    base_classes = "py-4 rounded-xl"
+
+    view_type_classes = if @field.view_type == :list
+      "flex flex-col space-y-2"
+    else
+      "relative grid xs:grid-cols-2 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-6 gap-6"
+    end
+
+    "#{base_classes} #{view_type_classes}"
+  end
+
+  def available_view_types
+    [:list, :grid]
+  end
+end

data/app/components/avo/fields/common/files/view_type/grid_component.html.erb

@@ -0,0 +1,27 @@
+<div class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
+  <% if file.present? %>
+    <div class="flex flex-col justify-between h-full">
+      <% if file.representable? && is_image? %>
+        <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover w-full aspect-video' %>
+      <% elsif is_audio? %>
+        <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% elsif is_video? %>
+        <%= video_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
+      <% else %>
+        <div class="relative flex flex-col justify-evenly items-center px-2 rounded-lg border bg-white border-gray-500 min-h-24">
+          <div class="flex flex-col justify-center items-center w-full">
+            <%= helpers.svg 'document-text', class: 'h-10 text-gray-600 mb-2' %>
+          </div>
+        </div>
+      <% end %>
+      <% if field.display_filename %>
+        <span class="text-gray-500 mt-1 text-sm truncate" title="<%= file.filename %>"><%= file.filename %></span>
+      <% end %>
+    </div>
+    <div class="flex space-x-2">
+      <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/{single_file_viewer_component.rb → files/view_type/grid_component.rb}

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
-  include Avo::ApplicationHelper
-  include Avo::Fields::Concerns::FileAuthorization
+class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
+  attr_reader :field, :resource
 
   def initialize(field:, resource:, file: nil)
     @file = file
@@ -10,34 +9,30 @@ class Avo::Fields::Common::SingleFileViewerComponent < ViewComponent::Base
     @resource = resource
   end
 
-  def destroy_path
-    Avo::Services::URIService.parse(@resource.record_path).append_paths("active_storage_attachments", id, file.id).to_s
-  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/common/files/view_type/list_component.html.erb

@@ -0,0 +1,22 @@
+<div class="relative min-h-full max-w-full flex-1 flex">
+  <% if file.present? %>
+    <div class="flex gap-2 items-center max-w-full w-full">
+      <div class="flex-1 flex flex-row col-span-7 items-center text-gray-700 truncate">
+        <div class="rounded-full bg-slate-100 border border-gray-500 p-1.5 flex items-center justify-center">
+          <%= helpers.svg icon_for_file, class: "h-5 text-gray-600" %>
+        </div>
+        <p class="overflow-x-scroll items-center h-full p-2 whitespace-nowrap">
+          <%= file.filename %>
+        </p>
+      </div>
+      <div class="col-span-4 text-gray-700 flex-shrink-0 text-sm">
+        <%= helpers.number_to_human_size(file.byte_size) %>
+      </div>
+      <div class="flex space-x-2 justify-end col-span-1 flex-shrink-0">
+        <%= render Avo::Fields::Common::Files::ControlsComponent.new(field: field, file: file, resource: resource) %>
+      </div>
+    </div>
+  <% else %>
+    –
+  <% end %>
+</div>

data/app/components/avo/fields/common/files/view_type/list_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Avo::Fields::Common::Files::ViewType::ListComponent < Avo::Fields::Common::Files::ViewType::GridComponent
+  def icon_for_file
+    if is_image?
+      "photo"
+    elsif is_audio?
+      "speaker-wave"
+    elsif is_video?
+      "video-camera"
+    else
+      "document"
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 

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

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::SingleFileViewerComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
 <% end %>

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

@@ -1,5 +1,5 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+<%= field_wrapper **field_wrapper_args, stacked: true do %>
+  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 
   <% if can_upload_file? %>
     <div class="mt-2">

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

@@ -1,3 +1,3 @@
-<%= field_wrapper **field_wrapper_args, full_width: true do %>
-  <%= render Avo::Fields::Common::FilesListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
+<%= field_wrapper **field_wrapper_args, stacked: true do %>
+  <%= render Avo::Fields::Common::Files::ListViewerComponent.new(field: @field, resource: @resource) if @field.value.present? %>
 <% 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/app/views/avo/partials/_view_toggle_button.html.erb

@@ -11,6 +11,10 @@
         new_icon: 'grid-view-type',
         translation_key: 'avo.grid_view',
       },
+      list: {
+        new_view_type: 'list',
+        new_icon: 'queue-list',
+      },
     }
   %>
   <div class="flex">

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

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/base_field.rb

@@ -73,7 +73,7 @@ module Avo
         @placeholder = args[:placeholder]
         @help = args[:help] || nil
         @default = args[:default] || nil
-        @visible = args[:visible] || true
+        @visible = args[:visible]
         @as_label = args[:as_label] || false
         @as_avatar = args[:as_avatar] || false
         @as_description = args[:as_description] || false
@@ -156,7 +156,9 @@ module Avo
       end
 
       def visible?
-        if visible.present? && visible.respond_to?(:call)
+        return true if visible.nil?
+
+        if visible.respond_to?(:call)
           visible.call resource: @resource
         else
           visible

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,8 @@ module Avo
       attr_accessor :is_image
       attr_accessor :direct_upload
       attr_accessor :accept
+      attr_reader :display_filename
+      attr_reader :hide_view_type_changer
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
@@ -13,6 +15,9 @@ 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]
+        @view_type = args[:view_type] || :grid
+        @hide_view_type_changer = args[:hide_view_type_changer]
       end
 
       def view_component_name
@@ -35,6 +40,14 @@ module Avo
 
         model
       end
+
+      def viewer_component
+        "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
+      end
+
+      def view_type
+        (@resource.params.dig(:view_type) || @view_type).to_sym
+      end
     end
   end
 end

data/lib/avo/fields/id_field.rb

@@ -5,12 +5,13 @@ module Avo
 
       def initialize(id, **args, &block)
         args[:readonly] = true
-        args[:sortable] = true
 
         hide_on [:edit, :new]
 
         super(id, **args, &block)
 
+        add_boolean_prop args, :sortable, true
+
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
     end

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.1.pre1.pr1683" 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