avo 0.5.0.beta7 → 0.5.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ae6c7207084645f7a7a14a462ebc7161f94801e100054d53f48722f758f9c2
-  data.tar.gz: dcc5caabc807328ddd1c52c640d446d88d84c58f786b693d59455f1e7d251744
+  metadata.gz: 4f7f5a6a457f61e77abd2ac617061c042ead0eab1177a7d98b1ea3d3202db916
+  data.tar.gz: 0a999ae8588fea1973f91a601a00dda8c9eb6d3b4d05e34b55b39799d48659a3
 SHA512:
-  metadata.gz: '038536c5cc11eeae399c9cbb59d366868bb3affe39592075c8852d65df49f1a362917a9e96861c804e807a6ed0e2cb39932e5bb82cb04d54b9830301a44b7056'
-  data.tar.gz: b9d16aa4a175c5a43a0ec24059e4715febc755cea5b28be601b0b9fb22f9414881ec170b6ad9e1dbe2e51a77d6b8d5cae7e620d8d1d7dc95c4c01c988f9f09ca
+  metadata.gz: e64e3c0d8a17c6fab1b79d58fd6eb33e6d92cfc1c71a3aacf81892225a69451901c322d4770956e42bda36ada3de82f78a8cb5ee1e80a0996b1c9f86cda14143
+  data.tar.gz: db227187abcd8fd276d9e34152b725eb7b7ab2c4312bc305f3d2a09a56a79da654b0d80f31e55b67b2871ae29375c34094b0570b41a0147520e2c8398092c7c2

data/Gemfile

@@ -15,7 +15,7 @@ gemspec
 # gem 'byebug', group: [:development, :test]
 
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 5.x'
+gem 'webpacker', '6.0.0.beta.5'
 
 # SVGs
 gem 'inline_svg'
@@ -73,7 +73,7 @@ gem 'debase'
 #
 
 group :development do
-  gem 'rubocop'
+  gem 'standard'
 
   # Release helper
   gem 'bump', require: false
@@ -123,3 +123,5 @@ gem 'hotwire-rails'
 gem 'active_link_to'
 
 gem 'view_component', require: 'view_component/engine'
+
+gem 'addressable'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta7)
+    avo (0.5.0.beta8)
       active_link_to
+      addressable
       countries
       hotwire-rails
       httparty
@@ -78,7 +79,7 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
     bootsnap (1.4.8)
@@ -169,7 +170,9 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.0512)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
@@ -177,13 +180,13 @@ GEM
     msgpack (1.3.3)
     multi_xml (0.6.0)
     nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (3.10.0)
-    parallel (1.19.2)
-    parser (2.7.1.5)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     public_suffix (4.0.6)
@@ -254,17 +257,20 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.92.0)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.5.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-progressbar (1.10.1)
@@ -285,7 +291,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_range (2.3.1)
+    semantic_range (3.0.0)
     simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -303,6 +309,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    standard (1.0.4)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.1)
     stimulus-rails (0.2.3)
       rails (>= 6.0.0)
     test-prof (0.12.2)
@@ -313,9 +322,9 @@ GEM
       rails (>= 6.0.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
     unicode_utils (1.4.0)
-    view_component (2.24.0)
+    view_component (2.28.0)
       activesupport (>= 5.0.0, < 7.0)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -332,7 +341,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (5.2.1)
+    webpacker (6.0.0.beta.5)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -349,6 +358,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_link_to
+  addressable
   avo!
   bootsnap (>= 1.4.2)
   bump
@@ -377,7 +387,6 @@ DEPENDENCIES
   rails (~> 6.0.2, >= 6.0.2.2)
   rails-controller-testing
   rspec-rails (~> 4.0.0)
-  rubocop
   ruby-debug-ide
   sass-rails (>= 6)
   selenium-webdriver
@@ -385,13 +394,14 @@ DEPENDENCIES
   simplecov-cobertura
   spring
   spring-commands-rspec
+  standard
   test-prof
   tzinfo-data
   view_component
   web-console (>= 3.3.0)
   webdrivers
   webmock
-  webpacker (~> 5.x)
+  webpacker (= 6.0.0.beta.5)
   zeitwerk (~> 2.3)
 
 BUNDLED WITH

data/app/components/avo/common/badge_viewer_component.html.erb

@@ -17,7 +17,7 @@
     end
   end
 
-  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold text-black block text-center truncate '
+  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate '
 
   classes += "#{backgrounds[background]} text-white" if backgrounds[background].present?
 %>

data/app/components/avo/common/gravatar_viewer_component.html.erb

@@ -6,7 +6,7 @@
   options[:default] = @default if @default.present?
   options[:size] = @size if @size.present?
   query = options.map { |key, value| "#{key}=#{value}" }.join('&')
-  url = URI::HTTP.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
+  url = URI::HTTPS.build(host: "www.gravatar.com", path: "/avatar/#{@md5}", query: query)
   classes = @rounded ? 'min-w-10 rounded-full' : 'min-w-10'
 %>
-<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes), @link %>
+<%= link_to_if @link_to_resource.present?, image_tag(url.to_s, class: classes), @link, title: @title %>

data/app/components/avo/common/gravatar_viewer_component.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 class Avo::Common::GravatarViewerComponent < ViewComponent::Base
-  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false)
+  def initialize(md5: nil, link: nil, default: nil, size: nil, rounded: false, link_to_resource: false, title: nil)
     @md5 = md5
     @link = link
     @default = default
     @size = size
     @rounded = rounded
     @link_to_resource = link_to_resource
+    @title = title
   end
 end

data/app/components/avo/edit/fields/trix_field_component.html.erb

@@ -1,6 +1,6 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
   <% trix_id = "trix_#{@resource.name.underscore}_#{@field.id}" %>
-  <trix-editor input="<%= trix_id %>"></trix-editor>
+  <trix-editor input="<%= trix_id %>" value="<%= @field.id %>" placeholder="<%= @field.placeholder %>"></trix-editor>
   <%= @form.text_area @field.id,
     id: trix_id,
     class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),

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

@@ -1,4 +1,4 @@
-<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>">
+<td class="px-4 py-2 leading-tight whitespace-nowrap h-12 text-blue-gray-800 <%= @classes %>" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <% if @field.value.blank? && @dash_if_blank %>
     —
   <% else %>

data/app/components/avo/index/fields/belongs_to_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= index_field_wrapper field: @field do %>
+<%= index_field_wrapper field: @field, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/index/fields/gravatar_field_component.html.erb

@@ -5,7 +5,8 @@
     size: @field.size,
     rounded: @field.rounded,
     link_to_resource: @field.link_to_resource,
-    link: helpers.resource_path(@resource.model)
+    link: helpers.resource_path(@resource.model),
+    title: t('avo.view_item', { item: @resource.name}).humanize
   )
   %>
 <% end %>

data/app/components/avo/index/fields/has_one_field_component.html.erb

@@ -1,7 +1,3 @@
 <%= index_field_wrapper field: @field do %>
-  <% if @field.value.present? %>
-    <%= link_to @field.label, helpers.resource_path(@field.value) %>
-  <% else %>
-    –
-  <% end %>
+  <%= link_to @field.label, helpers.resource_path(@field.value) %>
 <% end %>

data/app/components/avo/index/fields/id_field_component.html.erb

@@ -6,5 +6,5 @@
       path = helpers.resource_path(@resource.model)
     end
   %>
-  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path %>
+  <% link_to_if (@field.link_to_resource or Avo.configuration.id_links_to_resource), @field.value, path, title: t('avo.view_item', { item: @resource.name}).humanize %>
 <% end %>

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

@@ -5,8 +5,8 @@
     <%== item_selector_input floating: true, size: :lg %>
 
     <% if cover.respond_to? :to_image %>
-        <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% elsif cover.type == 'file_field' %>
+      <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% elsif cover.type == 'file' %>
       <% if cover.value.attached? && cover.value.representable? %>
         <%= link_to_if cover.link_to_resource, image_tag(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>

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

@@ -12,14 +12,14 @@ class Avo::Index::GridItemComponent < ViewComponent::Base
 
   private
     def cover
-      @grid_fields[:cover].first
+      @grid_fields.cover_field
     end
 
     def title
-      @grid_fields[:title].first
+      @grid_fields.title_field
     end
 
     def body
-      @grid_fields[:body].first
+      @grid_fields.body_field
     end
 end

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

@@ -23,7 +23,9 @@
   <% end %>
 
   <% if can_detach? %>
-    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_detach_path(params[:resource_name], params[:id], params[:related_name], @resource.model.id), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash-sm', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.detach_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -34,12 +36,16 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%#= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:via_resource_class] %>
     <% end %>
   <% end %>
 
   <% if can_delete? %>
-    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {'data-turbo-frame': params[:turbo_frame]} do |form| %>
+    <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: {
+        'data-turbo-frame': params[:turbo_frame]
+      } do |form| %>
       <%= form.button helpers.svg('trash', class: 'text-gray-400 h-6 hover:text-gray-600'),
         title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
         type: :submit,
@@ -50,7 +56,9 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:via_resource_class] %>
+      <%= form.hidden_field :view_type, value: params[:view_type], id: "turbo_view_type_#{@resource.model.id}" if params[:view_type] %>
+      <%= form.hidden_field :turbo_frame, value: params[:turbo_frame], id: "turbo_frame_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= form.hidden_field :referrer, value: request.fullpath, id: "referrer_destroy_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 </div>

data/app/components/avo/show/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>">
+<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <div class="h-16 flex self-start items-center text-blue-gray-800">
     <div class="w-48 md:w-64 px-8" data-slot="label">
       <%= @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>

data/app/components/avo/show/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, index: @index do %>
+<%= show_field_wrapper field: @field, index: @index, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/show/fields/external_image_field_component.html.erb

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, field: @field do %>
+<%= show_field_wrapper field: @field do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>

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

@@ -18,8 +18,20 @@
             <% end %>
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
-              <%= a_link destroy_path, color: 'red', variant: 'outlined', method: :delete, data: {confirm: 'Are you sure?'} do %>
-                <%= svg 'trash' %> <%= t('avo.delete').capitalize %>
+              <%= form_with url: helpers.resource_path(@resource.model), method: :delete, html: { 'data-turbo-frame': params[:turbo_frame] } do |form| %>
+                <%= a_button title: t('avo.delete_item', { item: @resource.model.model_name.name.downcase }).capitalize,
+                  color: 'red',
+                  variant: 'outlined',
+                  type: :submit,
+                  data: {
+                    confirm: t('avo.are_you_sure', { item: @resource.model.model_name.name.downcase }),
+                    control: :destroy,
+                    'resource-id': @resource.model.id,
+                    'tippy': 'tooltip',
+                  } do
+                %>
+                  <%= svg 'trash' %> <%= t('avo.delete').capitalize %>
+                <% end %>
               <% end %>
             <% end %>
 

data/app/controllers/avo/actions_controller.rb

@@ -6,7 +6,9 @@ module Avo
     before_action :set_resource
     before_action :set_action, only: [:show, :handle]
 
-    def show; end
+    def show
+      @model = ActionModel.new @action.get_attributes_for_action
+    end
 
     def handle
       resource_ids = action_params[:fields][:resource_ids].split(',').map(&:to_i)
@@ -16,7 +18,7 @@ module Avo
         key != 'resource_ids'
       end
 
-      performed_action = @action.handle_action(request, models, fields)
+      performed_action = @action.handle_action(models: models, fields: fields)
 
       respond performed_action.response
     end
@@ -33,8 +35,7 @@ module Avo
           model = @resource.model_class.find params[:id]
         end
 
-        @action = action_class.new
-        @action.hydrate(model: model, resource: resource, user: _current_user)
+        @action = action_class.new(model: model, resource: resource, user: _current_user)
       end
 
       def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -11,7 +11,7 @@ module Avo
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
@@ -24,7 +24,7 @@ module Avo
       respond_to do |format|
         format.html { raise exception }
         format.json { render json: {
-          errors: exception.record.present? ? exception.record.errors : [],
+          errors: exception.respond_to?(:record) && exception.record.present? ? exception.record.errors : [],
           message: exception.message,
           traces: exception.backtrace,
         }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name) }
@@ -53,6 +53,22 @@ module Avo
       send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
     end
 
+    def related_resources_path(parent_model, model, keep_query_params: false, **args)
+      return if model.nil?
+
+      existing_params = {}
+
+      begin
+        if keep_query_params
+          existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
+        end
+      rescue;end
+
+      Addressable::Template.new("#{Avo.configuration.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
+        .expand({query: {**existing_params, **args}})
+        .to_str
+    end
+
     def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
       existing_params = {}