avo 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fdcf5553b07360ef48d362721aabb8ee87e9e1d4289e30a8f141851445ebde3
-  data.tar.gz: c3121bdfbbeeeca0f06d059824ed9d6405dfca16f71b443433e697dea7a8d5ff
+  metadata.gz: 1535b91dc05b50bd35b9842c10c5ed266edaec91eced513b8102776637f21fd2
+  data.tar.gz: b1ed85745075ff3aac0f32170c39323a6b070b38649d43470222cc56d554cff9
 SHA512:
-  metadata.gz: 8bcd1bea917df6700908215c57766c1c071ce1398e75681cdaef9f751feefbe3941fba5539ff4d52bdacd964993dd2579d1d63920cf8a6dbee4f9ffeb28fbab8
-  data.tar.gz: 1d3ee22e3f143294bc477b7a8c0e0070f63f5846a707272bd14d71cbad5722c3f3c3e24b917b8564e3585ad684a1aed702ba687d88463d2908c351d1731cf99b
+  metadata.gz: 14461575f33ab286f132e5b1965c2b504f30edec5ec97cb8695333f63ba93ee08ac9dcb91b1a54fc5cf4421e850018b5298cc76d79586674b5eca722fd1fa30b
+  data.tar.gz: c845a9413d258f181a40ea7b0ec816ce2c267c1e0c2d369d131c610e4d65085169945482cd3746de0cc5bb85d7eade7f9ef05cd28a75f2e183a9b938e09c7c36

data/Gemfile

@@ -106,9 +106,6 @@ end
 
 gem "zeitwerk", "~> 2.3"
 
-# Pagination
-gem "pagy"
-
 gem "httparty"
 
 gem "iso"
@@ -120,3 +117,5 @@ gem "active_link_to"
 gem "view_component", require: "view_component/engine"
 
 gem "addressable"
+
+gem "appraisal"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.0.1)
+    avo (1.1.0)
       active_link_to
       addressable
       countries
@@ -18,38 +18,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.5)
-      actionpack (= 6.0.3.5)
+    actioncable (6.0.3.6)
+      actionpack (= 6.0.3.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionmailbox (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      actionview (= 6.0.3.5)
-      activejob (= 6.0.3.5)
+    actionmailer (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.5)
-      actionview (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionpack (6.0.3.6)
+      actionview (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actiontext (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    actionview (6.0.3.6)
+      activesupport (= 6.0.3.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -57,20 +57,20 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.0.3.5)
-      activesupport (= 6.0.3.5)
+    activejob (6.0.3.6)
+      activesupport (= 6.0.3.6)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activerecord (6.0.3.5)
-      activemodel (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
-    activestorage (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.5)
+    activemodel (6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activerecord (6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activestorage (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -78,6 +78,10 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.4.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     ast (2.4.2)
     bcrypt (3.1.16)
     bindex (0.8.1)
@@ -96,8 +100,8 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     concurrent-ruby (1.1.8)
-    countries (3.0.1)
-      i18n_data (~> 0.10.0)
+    countries (3.1.0)
+      i18n_data (~> 0.11.0)
       sixarm_ruby_unaccent (~> 1.1)
       unicode_utils (~> 1.4)
     crack (0.4.4)
@@ -123,7 +127,7 @@ GEM
       railties (>= 5.0.0)
     faker (2.14.0)
       i18n (>= 1.6, < 2)
-    ffi (1.13.1)
+    ffi (1.15.0)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -138,9 +142,9 @@ GEM
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.10.0)
+    i18n_data (0.11.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
@@ -156,27 +160,25 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
+    mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
-    mini_mime (1.0.2)
+    mini_mime (1.0.3)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     msgpack (1.3.3)
     multi_xml (0.6.0)
-    nio4r (2.5.5)
+    nio4r (2.5.7)
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (3.10.0)
+    pagy (3.12.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -192,20 +194,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.5)
-      actioncable (= 6.0.3.5)
-      actionmailbox (= 6.0.3.5)
-      actionmailer (= 6.0.3.5)
-      actionpack (= 6.0.3.5)
-      actiontext (= 6.0.3.5)
-      actionview (= 6.0.3.5)
-      activejob (= 6.0.3.5)
-      activemodel (= 6.0.3.5)
-      activerecord (= 6.0.3.5)
-      activestorage (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    rails (6.0.3.6)
+      actioncable (= 6.0.3.6)
+      actionmailbox (= 6.0.3.6)
+      actionmailer (= 6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actiontext (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.5)
+      railties (= 6.0.3.6)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -216,9 +218,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.5)
-      actionpack (= 6.0.3.5)
-      activesupport (= 6.0.3.5)
+    railties (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -266,8 +268,8 @@ GEM
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-progressbar (1.10.1)
-    ruby-vips (2.0.17)
-      ffi (~> 1.9)
+    ruby-vips (2.1.0)
+      ffi (~> 1.12)
     rubyzip (2.3.0)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -346,10 +348,12 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   active_link_to
   addressable
+  appraisal
   avo!
   bootsnap (>= 1.4.2)
   bump
@@ -369,7 +373,6 @@ DEPENDENCIES
   iso
   jbuilder (~> 2.7)
   listen (>= 3.3.0)
-  pagy
   pg (>= 0.18, < 2.0)
   puma (~> 4.3.5)
   pundit
@@ -394,4 +397,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.15
+   2.2.5

data/README.md

@@ -15,10 +15,12 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
 **Documentation**: [docs.avohq.io](https://docs.avohq.io)\
 **Twitter**: [avo_hq](https://twitter.com/avo_hq)\
 **Community chat**: [discord](https://discord.gg/pkTF6y8)\
-**Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)
+**Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)\
+**Discussions and feature requests**: [GitHub issues](http://github.com/avo-hq/avo/discussions)
 
 ## Features
 
+  - **Powered by Hotwire** - Rails ❤️  Hotwire
   - **Code driven configuration** - Configure your Rails dashboard entirely by writing Ruby code.
   - **Resource Management** - Create a CRUD interface for Active Record from one command. No more copy-pasting view and controller files around.
   - **Active Storage support** - Amazingly easy, **one-line**, single or multi-file integration with **ActiveStorage**.

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

@@ -1,5 +1,4 @@
 <%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
-  <% disabled = @field.readonly || params[:via_resource_id] %>
   <%= @form.select @field.foreign_key, @field.options.map { |o| [o[:label], o[:value]] },
     {
       include_blank: @field.placeholder,

data/app/components/avo/edit/fields/belongs_to_field_component.rb

@@ -1,4 +1,11 @@
 # frozen_string_literal: true
 
 class Avo::Edit::Fields::BelongsToFieldComponent < Avo::Edit::Fields::FieldComponent
+  def disabled
+    return true if @field.readonly
+    return true if @field.target_resource.model_class.name == params[:via_resource_class]
+    return true if @field.id.to_s == params[:via_relation].to_s
+
+    false
+  end
 end

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

@@ -43,7 +43,7 @@
 
         <% if @models.present? %>
           <div class="py-4">
-            <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame } %>
+            <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
           </div>
         <% end %>
       </div>
@@ -55,7 +55,7 @@
       <%= render Avo::Index::ResourceGridComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model) %>
 
       <div class="bg-white rounded-xl shadow-xl mt-8 py-6">
-        <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame } %>
+        <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
       </div>
     <% end %>
   <% end %>

data/app/controllers/avo/application_controller.rb

@@ -51,7 +51,7 @@ module Avo
           existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
         end
       rescue; end
-      send :"resources_#{model.model_name.route_key}_path", **existing_params, **args
+      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)
@@ -70,9 +70,9 @@ module Avo
     end
 
     def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
-      return send :"resources_#{model.model_name.route_key.singularize}_path", resource_id, **args if resource_id.present?
+      return avo.send :"resources_#{model.model_name.route_key.singularize}_path", resource_id, **args if resource_id.present?
 
-      send :"resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"resources_#{model.model_name.route_key.singularize}_path", model, **args
     end
 
     def resource_attach_path(model_name, model_id, related_name, related_id = nil)
@@ -92,11 +92,11 @@ module Avo
     end
 
     def new_resource_path(model, **args)
-      send :"new_resources_#{model.model_name.route_key.singularize}_path", **args
+      avo.send :"new_resources_#{model.model_name.route_key.singularize}_path", **args
     end
 
     def edit_resource_path(model, **args)
-      send :"edit_resources_#{model.model_name.route_key.singularize}_path", model, **args
+      avo.send :"edit_resources_#{model.model_name.route_key.singularize}_path", model, **args
     end
 
     private
@@ -110,6 +110,8 @@ module Avo
     end
 
     def set_resource
+      raise ActionController::RoutingError.new "No route matches" if resource.nil?
+
       @resource = resource.hydrate(params: params)
     end
 
@@ -182,8 +184,6 @@ module Avo
     def eager_load_files(resource, query)
       if resource.attached_file_fields.present?
         resource.attached_file_fields.map do |field|
-          # abort "#{field.pluralize}".inspect
-          # abort field.class.inspect
           attachment = case field.class.to_s
           when "Avo::Fields::FileField"
             "attachment"
@@ -194,7 +194,6 @@ module Avo
           end
 
           return query.eager_load "#{field.id}_#{attachment}": :blob
-          # return query.send :"with_attached_#{field}"
         end
       end
 

data/app/helpers/avo/application_helper.rb

@@ -7,30 +7,6 @@ module Avo
       Avo.webpacker
     end
 
-    def render_logo
-      render partial: "vendor/avo/partials/logo"
-    rescue
-      render partial: "avo/partials/logo"
-    end
-
-    def render_header
-      render partial: "vendor/avo/partials/header"
-    rescue
-      render partial: "avo/partials/header"
-    end
-
-    def render_footer
-      render partial: "vendor/avo/partials/footer"
-    rescue
-      render partial: "avo/partials/footer"
-    end
-
-    def render_scripts
-      render partial: "vendor/avo/partials/scripts"
-    rescue
-      ""
-    end
-
     def render_license_warnings
       render partial: "avo/sidebar/license_warnings", locals: {
         license: Avo::App.license.properties

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -1,7 +1,7 @@
 <div class="application-sidebar flex h-full bg-white text-white w-56 z-50 border-r border-gray-300">
   <div class="flex flex-col w-full">
     <%= link_to root_path, class: 'logo-placeholder h-16 bg-white p-2 flex justify-center' do %>
-      <%= render_logo %>
+      <%= render partial: "avo/partials/logo" %>
     <% end %>
 
     <div class="flex-1 flex flex-col justify-between">
@@ -10,9 +10,18 @@
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">
-          <% Avo::App.get_navigation_items(_current_user).each do |resource| %>
+          <% Avo::App.resources_navigation(_current_user).each do |resource| %>
             <%= render Avo::NavigationLinkComponent.new label: resource.name.pluralize.humanize, path: resources_path(resource.model_class) %>
           <% end %>
+
+          <% sidebar_partials = Avo::App.get_sidebar_partials %>
+          <% if sidebar_partials.present? %>
+            <%= render Avo::NavigationHeadingComponent.new label: t('avo.tools') %>
+
+            <% sidebar_partials.each do |partial| %>
+              <%= render partial: "/avo/sidebar/items/#{partial}" %>
+            <% end %>
+          <% end %>
         </div>
 
       </div>