avo 1.0.0 → 1.1.0.pre.1

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

@@ -4,19 +4,19 @@
 
     <% if can_create? %>
       <%= a_link create_path do %>
-        <%= svg 'plus' %> <%= t('avo.create_new_item', { item: @resource.model_class.model_name.human.downcase }) %>
+        <%= svg 'plus' %> <%= t('avo.create_new_item', item: @resource.model_class.model_name.human.downcase ) %>
       <% end %>
     <% end %>
 
     <% if can_detach? %>
       <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-        <%= svg 'trash' %> <%= t('avo.detach_item', { item: @resource.singular_name }).capitalize %>
+        <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
       <% end %>
     <% end %>
 
     <% if can_attach? %>
       <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal' do %>
-        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', { item: @resource.singular_name }).capitalize %>
+        <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: @resource.singular_name).capitalize %>
       <% end %>
     <% end %>
   <% end %>
@@ -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/components/avo/views/resource_show_component.html.erb

@@ -10,7 +10,7 @@
 
           <% if @reflection.present? && @resource.model.present? %>
             <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@resource.singular_name}." } do %>
-              <%= svg 'trash' %> <%= t('avo.detach_item', { item: @resource.singular_name }).capitalize %>
+              <%= svg 'trash' %> <%= t('avo.detach_item', item: @resource.singular_name).capitalize %>
             <% end %>
           <% else %>
             <%= a_link back_path do %>
@@ -19,12 +19,12 @@
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
               <%= 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,
+                <%= 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 }),
+                    confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
                     control: :destroy,
                     'resource-id': @resource.model.id,
                     'tippy': 'tooltip',

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/partials/_empty_state.html.erb

@@ -1,7 +1,7 @@
 <%
   classes = 'absolute inset-auto left-1/2 top-1/2 transform -translate-x-1/2 -translate-y-1/2'
   translation_tag = params[:related_name].present? ? 'avo.no_related_item_found' : 'avo.no_item_found'
-  label = t translation_tag, { item: resource_name }
+  label = t translation_tag, item: resource_name
 %>
 <div class="relative flex-1 py-12">
   <div class="relative block text-gray-300 h-64 w-full">

data/app/views/avo/partials/_view_toggle_button.html.erb

@@ -11,7 +11,7 @@
       translation_key = 'avo.table_view'
     end
 %>
-  <%= a_link params.permit!.merge(view_type: new_view_type), color: :blue, 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', { view_type: new_view_type }), 'data-tippy': 'tooltip' do %>
-    <%= svg new_icon %> <%= t(translation_key, { item: @resource.model_class.model_name.human.downcase }) %>
+  <%= a_link params.permit!.merge(view_type: new_view_type), color: :blue, 'data-turbo-frame': turbo_frame, title: t('avo.switch_to_view', view_type: new_view_type), 'data-tippy': 'tooltip' do %>
+    <%= svg new_icon %> <%= t translation_key, item: @resource.model_class.model_name.human.downcase %>
   <% end %>
 <% end %>

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

@@ -6,7 +6,7 @@
     } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.with :heading do %>
-        <%= t('avo.choose_item', { item: params[:related_name].downcase }) %>
+        <%= t 'avo.choose_item', item: params[:related_name].downcase %>
       <% end %>
 
       <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12">

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>

data/app/views/layouts/avo/application.html.erb

@@ -20,7 +20,7 @@
     <div class="flex-1 flex flex-col h-full overflow-auto">
       <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50" v-if="layout !== 'blank'">
         <div class="ml-6">
-          <%= render_header %>
+          <%= render partial: "avo/partials/header" %>
         </div>
         <div class="flex-1 flex justify-center">
           <div class="w-64">
@@ -31,7 +31,7 @@
 
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
         <%= yield %>
-        <%= render_footer %>
+        <%= render partial: "avo/partials/footer" %>
       </div>
     </div>
   </div>
@@ -44,6 +44,6 @@
   <% end %>
 </div>
 
-<%= render_scripts %>
+<%= render partial: "avo/partials/footer" %>
 </body>
 </html>

data/config/webpacker.yml

@@ -5,21 +5,32 @@ default: &default
   source_entry_path: entrypoints
   public_root_path: public
   cache_path: tmp/cache/webpacker
+  check_yarn_integrity: false
   # use a different sub-folder name
   public_output_path: avo-packs
   webpack_compile_output: true
+  extract_css: true
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths: []
+  additional_paths_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
+# We override the development env. when packed.
+# Avo needs to be packed and compiled for when the dev uses it in his development env.
 development:
   <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
   compile: true
 
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Even though Avo does not use the dev_server when packed we still need to add the info here.
+  # The packed version of Avo will pick up the parent's app information.
   # Reference: https://webpack.js.org/configuration/dev-server/
   dev_server:
     https: false

data/lib/avo/app.rb

@@ -129,12 +129,25 @@ module Avo
           .sort_by { |r| r.name }
       end
 
-      def get_navigation_items(user = nil)
+      def resources_navigation(user = nil)
         get_available_resources(user).select do |resource|
           resource.model_class.present?
         end
       end
 
+      # Insert any partials that we find in app/views/avo/sidebar/items.
+      def get_sidebar_partials
+        Dir.glob(Rails.root.join("app", "views", "avo", "sidebar", "items", "*.html.erb"))
+          .map do |path|
+            File.basename path
+          end
+          .map do |filename|
+            # remove the leading underscore (_)
+            filename[0] = ""
+            filename
+          end
+      end
+
       def draw_routes
         # We should eager load all the classes so we find all descendants
         Rails.application.eager_load!

data/lib/avo/base_resource.rb

@@ -260,28 +260,27 @@ module Avo
       end
     end
 
-    # For :new views we're hydrating the model with the values from the resource's default attribute.
     # We will not overwrite any attributes that come pre-filled in the model.
     def hydrate_model_with_default_values
       default_values = get_fields.select do |field|
         !field.computed
       end
         .map do |field|
-                         id = field.id
-                         value = field.value
+          id = field.id
+          value = field.value
 
-                         if field.respond_to? :foreign_key
-                           id = field.foreign_key.to_sym
+          if field.respond_to? :foreign_key
+            id = field.foreign_key.to_sym
 
-                           reflection = @model._reflections[@params[:via_relation]]
+            reflection = @model._reflections[@params[:via_relation]]
 
-                           if reflection.present? && reflection.foreign_key.present?
-                             value = @params[:via_resource_id]
-                           end
-                         end
+            if reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
+              value = @params[:via_resource_id]
+            end
+          end
 
-                         [id, value]
-                       end
+          [id, value]
+        end
         .to_h
         .select do |id, value|
         value.present?

data/lib/avo/fields/belongs_to_field.rb

@@ -50,8 +50,6 @@ module Avo
         foreign_key.to_sym
       end
 
-      private
-
       def target_resource
         if @model._reflections[id.to_s].klass.present?
           App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.0.0"
+  VERSION = "1.1.0.pre.1"
 end

data/lib/generators/avo/eject_generator.rb

@@ -0,0 +1,55 @@
+require "rails/generators"
+require "fileutils"
+
+module Generators
+  module Avo
+    class EjectGenerator < ::Rails::Generators::Base
+      argument :filename, type: :string, required: true
+
+      source_root ::Avo::Engine.root
+
+      namespace "avo:eject"
+
+      TEMPLATES = {
+        sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
+        logo: "app/views/avo/partials/logo.html.erb",
+        header: "app/views/avo/partials/header.html.erb",
+        footer: "app/views/avo/partials/footer.html.erb",
+        scripts: "app/views/avo/partials/scripts.html.erb"
+      }
+
+      def handle
+        if @filename.starts_with?(":")
+          template_id = path_to_sym @filename
+          template_path = TEMPLATES[template_id]
+
+          if path_exists? template_path
+            eject template_path
+          else
+            say("Failed to find the `#{template_id.to_sym}` template.", :yellow)
+          end
+        elsif path_exists? @filename
+          eject @filename
+        else
+          say("Failed to find the `#{@filename}` template.", :yellow)
+        end
+      end
+
+      no_tasks do
+        def path_to_sym(filename)
+          template_id = filename.dup
+          template_id[0] = ""
+          template_id.to_sym
+        end
+
+        def path_exists?(path)
+          path.present? && File.file?(::Avo::Engine.root.join(path))
+        end
+
+        def eject(path)
+          copy_file ::Avo::Engine.root.join(path), ::Rails.root.join(path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,2 @@
+class Avo::ToolsController < Avo::ApplicationController
+end

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

@@ -0,0 +1 @@
+<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: '/avo/<%= file_name %>' %>

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

@@ -0,0 +1,27 @@
+<div class="flex flex-col">
+  <%%= panel title: '<%= human_name %>' do |c| %>
+    <%% c.with :tools do %>
+      <div class="text-sm italic">This is the panels tools section.</div>
+    <%% end %>
+
+    <%% 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>
+
+          <p>
+            You can edit this file here <%= in_code "app/views/avo/tools/#{file_name}.html.erb" %>.
+          </p>
+
+          <p>
+            For this tool we created the <%= in_code file_name %> method in the <%= in_code "Avo::ToolsController" %>. You may delete it or move it to your own controller.
+          </p>
+
+          <p>
+            A new <%= in_code human_name %> item should have been added to the sidebar. Edit it in <%= in_code "app/views/avo/sidebar/items/_#{file_name}.html.erb" %>
+          </p>
+        </div>
+      </div>
+    <%% end %>
+  <%% end %>
+</div>