avo 1.24.2 → 2.1.0

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

@@ -1,58 +1,67 @@
 <div>
-  <%= render Avo::PanelComponent.new(title: title, description: description, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
+  <%= render Avo::PanelComponent.new(title: title, description: description, data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
     <% c.tools do %>
       <% if can_see_the_actions_button? %>
-        <%= render 'actions' %>
+        <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
       <% end %>
-
       <% if can_see_the_create_button? %>
-        <%= a_link create_path, 'data-target': 'create' do %>
-          <%= svg 'plus' %> <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
+        <%= a_link create_path, icon: 'heroicons/outline/plus', 'data-target': 'create', color: :primary do %>
+          <%= t('avo.create_new_item', item: singular_resource_name.downcase ) %>
         <% end %>
       <% end %>
-
       <% if can_attach? %>
-        <%= a_link attach_path, color: 'indigo', 'data-turbo-frame': 'attach_modal', 'data-target': 'attach' do %>
-          <%= svg 'view-grid-add' %> <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
+        <%= a_link attach_path, icon: 'heroicons/outline/link', color: :primary, 'data-turbo-frame': 'attach_modal', 'data-target': 'attach' do %>
+          <%= t('avo.attach_item', item: singular_resource_name).capitalize %>
         <% end %>
       <% end %>
     <% end %>
-
     <% c.body do %>
-      <div class="flex justify-between pt-2 pb-2 min-h-16"
-        data-selected-resources-name="<%= @resource.model_key %>"
-        data-selected-resources="[]"
-      >
-        <div class="flex items-center px-6 w-64">
-          <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} if @resource.search_query.present? %>
-        </div>
-        <div class="flex justify-end items-center px-6 space-x-3">
-          <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if @models.present? %>
-          <%= render 'filters' if @filters.present? %>
-        </div>
-      </div>
-
-      <% if view_type.to_sym == :table %>
-        <div class="w-full overflow-auto flex flex-col mt-4">
-          <div class="relative flex-1 flex">
-            <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
-          </div>
-
-          <% if @models.present? %>
-            <div class="py-4">
-              <%= render partial: 'avo/partials/paginator', locals: { pagy: @pagy, turbo_frame: @turbo_frame || 'none' } %>
+      <% if @resource.search_query.present? || @filters.present? || available_view_types.count > 1 %>
+        <div class="flex flex-col xs:flex-row xs:justify-between space-y-2 xs:space-y-0 py-4"
+          data-selected-resources-name="<%= @resource.model_key %>"
+          data-selected-resources="[]"
+        >
+          <% if @resource.search_query.present? %>
+            <div class="flex items-center px-4 w-64">
+              <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.model_key} %>
+            </div>
+          <% else %>
+            <%# Offset for the space-y-2 property when the serach is missing %>
+            <div class="-mb-2"></div>
+          <% end %>
+          <% if @filters.present? || available_view_types.count > 1 %>
+            <div class="justify-self-end flex justify-start xs:justify-end items-center px-4 space-x-3">
+              <%= render Avo::FiltersComponent.new filters: @filters, resource: @resource %>
+              <%= render partial: 'avo/partials/view_toggle_button', locals: { available_view_types: available_view_types, view_type: view_type, turbo_frame: @turbo_frame } if available_view_types.count > 1 %>
             </div>
           <% end %>
         </div>
       <% end %>
+      <% if view_type.to_sym == :table %>
+        <% if @resources.present? %>
+          <div class="w-full overflow-auto flex flex-col mt-0">
+            <div class="relative flex-1 flex">
+              <%= render(Avo::Index::ResourceTableComponent.new(resources: @resources, resource: @resource, reflection: @reflection, parent_model: @parent_model)) %>
+            </div>
+          </div>
+        <% else %>
+          <%= helpers.empty_state resource_name: @resource.name.downcase.pluralize, related_name: params[:related_name], view_type: view_type, add_background: true %>
+        <% end %>
+      <% end %>
     <% end %>
-
     <% c.bare_content do %>
+      <% if view_type.to_sym == :table %>
+        <% if @models.present? %>
+          <div class="mt-8">
+            <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_resource: @parent_resource %>
+          </div>
+        <% end %>
+      <% end %>
+
       <% if view_type.to_sym == :grid %>
         <%= 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 || 'none' } %>
+        <div class="mt-14">
+          <%= render Avo::PaginatorComponent.new pagy: @pagy, turbo_frame: @turbo_frame || 'none', index_params: @index_params, resource: @resource, parent_resource: @parent_resource %>
         </div>
       <% end %>
     <% end %>

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

@@ -1,33 +1,48 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
     <%= form_with model: @resource.model,
-                  scope: @resource.form_scope,
-                  url: helpers.resources_path(resource: @resource,
-                                              via_relation_class: params[:via_relation_class],
-                                              via_relation: params[:via_relation],
-                                              via_resource_id: params[:via_resource_id]),
-                  local: true,
-                  multipart: true do |form| %>
+      scope: @resource.form_scope,
+      url: helpers.resources_path(
+        resource: @resource,
+        via_relation_class: params[:via_relation_class],
+        via_relation: params[:via_relation],
+        via_resource_id: params[:via_resource_id]
+      ),
+      local: true,
+      multipart: true do |form| %>
+      <%= render Avo::ReferrerParamsComponent.new back_path: back_path %>
       <%= render Avo::PanelComponent.new(title: resource_panel[:name], description: @resource.resource_description, display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
-            <%= a_link back_path do %>
-              <%= svg 'arrow-left' %> <%= t('avo.cancel').capitalize %>
+            <%= a_link back_path, icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
             <% end %>
-
             <% if can_see_the_save_button? %>
-              <%= a_button color: 'green', spinner: true, type: :submit do %>
-                <%= svg 'save' %> <%= t('avo.save').capitalize %>
+              <%= a_button color: 'green', spinner: true, type: :submit, icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
               <% end %>
             <% end %>
           </div>
         <% end %>
-
-        <% c.body do %>
-          <% @resource.get_fields.each_with_index do |field, index| %>
-            <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
+        <% if Avo.configuration.buttons_on_form_footers %>
+          <% c.footer_tools do %>
+            <%= a_link back_path, icon: 'arrow-left' do %>
+              <%= t('avo.cancel').capitalize %>
+            <% end %>
+            <% if can_see_the_save_button? %>
+              <%= a_button color: :green, spinner: true, type: :submit, icon: 'save' do %>
+                <%= t('avo.save').capitalize %>
+              <% end %>
+            <% end %>
           <% end %>
         <% end %>
+        <% c.body do %>
+          <div class="divide-y">
+            <% @resource.get_fields.each_with_index do |field, index| %>
+              <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
+            <% end %>
+          </div>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -1,80 +1,83 @@
 <div data-model-id="<%= @resource.model.id %>"
   data-selected-resources-name="<%= @resource.model_key %>"
   data-selected-resources='["<%= @resource.model.id %>"]'
+  class="space-y-8"
 >
   <% @resource.panels.each_with_index do |resource_panel, index| %>
     <%= render Avo::PanelComponent.new(title: title, description: @resource.resource_description, display_breadcrumbs: @reflection.blank?, index: index) do |c| %>
       <% c.tools do %>
         <% if resource_panel[:name] == @resource.default_panel_name %>
-          <%= render 'actions' %>
-
           <% if @reflection.present? && @resource.model.present? %>
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
             <% if can_detach? %>
-              <%= a_link detach_path, color: 'indigo', method: :delete, data: { confirm: "Are you sure you want to detach this #{@reflection.name.to_s}." } do %>
-                <%= svg 'trash' %> <%= t('avo.detach_item', item: @reflection.name.to_s).capitalize %>
+              <%= a_button url: detach_path,
+                icon: 'detach',
+                method: :delete,
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                data: {
+                  confirm: "Are you sure you want to detach this #{@reflection.name.to_s}."
+                } do %>
+                <%= t('avo.detach_item', item: @reflection.name.to_s).capitalize %>
               <% end %>
             <% end %>
             <% if can_see_the_edit_button? %>
-              <%= a_link edit_path, color: 'indigo' do %>
-                <%= svg 'edit' %> <%= t('avo.edit').capitalize %>
+              <%= a_link edit_path, color: :primary, icon: 'edit' do %>
+                <%= t('avo.edit').capitalize %>
               <% end %>
             <% end %>
           <% else %>
-            <%= a_link back_path do %>
-              <%= svg 'arrow-left' %> <%= t('avo.go_back') %>
+            <%= a_link back_path, icon: 'arrow-left' do %>
+              <%= t('avo.go_back') %>
             <% end %>
-
+            <%= render Avo::ActionsComponent.new actions: @actions, resource: @resource %>
             <% if can_see_the_destroy_button? %>
-              <%= form_with url: helpers.resource_path(model: @resource.model, resource: @resource), 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,
-                  spinner: true,
-                  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 %>
+              <%= a_button url: helpers.resource_path(model: @resource.model, resource: @resource),
+                method: :delete,
+                local: true,
+                title: t('avo.delete_item', item: @resource.model.model_name.name.downcase).capitalize,
+                spinner: true,
+                color: :red,
+                icon: 'trash',
+                form_class: 'flex flex-col sm:flex-row sm:inline-flex',
+                data: {
+                  confirm: t('avo.are_you_sure', item: @resource.model.model_name.name.downcase),
+                  control: :destroy,
+                  'resource-id': @resource.model.id,
+                  'tippy': 'tooltip',
+                } do %>
+                <%= t('avo.delete').capitalize %>
               <% end %>
             <% end %>
-
             <% if @resource.authorization.authorize_action(:edit, raise_exception: false) %>
-              <%= a_link edit_path, color: 'indigo' do %>
-                <%= svg 'edit' %> <%= t('avo.edit').capitalize %>
+              <%= a_link edit_path, color: :primary, icon: 'edit' do %>
+                <%= t('avo.edit').capitalize %>
               <% end %>
             <% end %>
           <% end %>
         <% end %>
       <% end %>
-
       <% c.body do %>
         <% if fields_by_panel[resource_panel[:name]].present? %>
-          <% fields_by_panel[resource_panel[:name]].each_with_index do |field, index| %>
-            <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
-          <% end %>
+          <div class="divide-y">
+            <% fields_by_panel[resource_panel[:name]].each_with_index do |field, index| %>
+              <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
+            <% end %>
+          </div>
         <% end %>
       <% end %>
     <% end %>
   <% end %>
-
   <% if @reflection.blank? %>
     <% if has_one_panels.present? %>
       <% has_one_panels.each_with_index do |field, index| %>
         <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
-
     <% if has_many_panels.present? %>
       <% has_many_panels.each_with_index do |field, index| %>
         <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
-
     <% if has_as_belongs_to_many_panels.present? %>
       <% has_as_belongs_to_many_panels.each_with_index do |field, index| %>
         <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>

data/app/components/avo/views/resource_show_component.rb

@@ -6,18 +6,17 @@ class Avo::Views::ResourceShowComponent < Avo::ResourceComponent
 
   attr_reader :fields_by_panel, :has_one_panels, :has_many_panels, :has_as_belongs_to_many_panels
 
-  def initialize(resource: nil, reflection: nil, parent_model: nil, resource_panel: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil, resource_panel: nil, actions: [])
     @resource = resource
     @reflection = reflection
     @resource_panel = resource_panel
+    @actions = actions
 
     split_panel_fields
   end
 
   def title
     if @reflection.present?
-      return field.name if field.present?
-
       reflection_resource.name
     else
       @resource.panels.first[:name]

data/app/controllers/avo/application_controller.rb

@@ -28,7 +28,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user, view_context: view_context
+      Avo::App.init request: request, context: context, root_path: avo.root_path.delete_suffix("/"), current_user: _current_user, view_context: view_context, params: params
 
       @license = Avo::App.license
     end
@@ -53,20 +53,38 @@ module Avo
         raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:index).source_location.first.match?(/.*\/app\/controllers\/avo\/search_controller\.rb/)
       end
 
+      if params[:controller] == "avo/dashboards" && params[:action] == "show"
+        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:show).source_location.first.match?(/.*\/app\/controllers\/avo\/dashboards_controller\.rb/)
+      end
+
+      if params[:controller] == "avo/dashboards" && params[:action] == "card"
+        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:card).source_location.first.match?(/.*\/app\/controllers\/avo\/dashboards_controller\.rb/)
+      end
+
       super(*args)
     end
 
     def check_avo_license
-      # Check to see if the path is on a custom tool
-      unless on_root_path || on_resources_path || on_api_path
-        # Display alert on custom tool page if in development.
+      # Check to see if the path is a custom tool
+      if on_custom_tool_page
         if @license.lacks(:custom_tools) || @license.invalid?
-          if Rails.env.development? || Rails.env.test?
-            @custom_tools_alert_visible = true
-          elsif @license.lacks_with_trial(:custom_tools)
-            # Raise error in non-development environments.
-            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
-          end
+          message = "Your license is invalid or doesn't support custom tools."
+        end
+      end
+
+      # Check to see if the path is a dashboard
+      if on_dashboards_path
+        if @license.lacks(:dashboards) || @license.invalid?
+          message = "Your license is invalid or doesn't support dashboards."
+        end
+      end
+
+      if message.present?
+        if Rails.env.development? || Rails.env.test?
+          @custom_tools_alert_visible = message
+        elsif @license.lacks_with_trial(:custom_tools)
+          # Raise error in non-development environments.
+          raise Avo::LicenseInvalidError, message
         end
       end
     end
@@ -210,7 +228,7 @@ module Avo
 
     def render_unauthorized(exception)
       if !exception.is_a? Pundit::NotDefinedError
-        flash[:notice] = t "avo.not_authorized"
+        flash.now[:notice] = t "avo.not_authorized"
 
         redirect_url = if request.referrer.blank? || (request.referrer == request.url)
           root_url
@@ -227,8 +245,13 @@ module Avo
     end
 
     def set_container_classes
-      contain = !Avo.configuration.full_width_container
-      contain = false if Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController"
+      contain = true
+
+      if Avo.configuration.full_width_container
+        contain = false
+      elsif Avo.configuration.full_width_index_view && action_name.to_sym == :index && self.class.superclass.to_s == "Avo::ResourcesController"
+        contain = false
+      end
 
       @container_classes = contain ? "2xl:container 2xl:mx-auto" : ""
     end
@@ -249,6 +272,14 @@ module Avo
       request.original_url.match?(/.*#{Avo::App.root_path}\/avo_api\/.*/)
     end
 
+    def on_dashboards_path
+      request.original_url.match?(/.*#{Avo::App.root_path}\/dashboards\/.*/)
+    end
+
+    def on_custom_tool_page
+      !(on_root_path || on_resources_path || on_api_path || on_dashboards_path)
+    end
+
     def model_param_key
       @resource.form_scope
     end

data/app/controllers/avo/{relations_controller.rb → associations_controller.rb}

@@ -1,7 +1,7 @@
 require_dependency "avo/base_controller"
 
 module Avo
-  class RelationsController < BaseController
+  class AssociationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
@@ -34,10 +34,20 @@ module Avo
     end
 
     def new
-      query = @authorization.apply_policy @attachment_class
+      @resource.hydrate(model: @model)
 
-      @options = query.all.map do |model|
-        [model.send(@attachment_resource.class.title), model.id]
+      begin
+        @field = @resource.get_field_definitions.find { |f| f.id == @related_resource_name.to_sym }
+        @field.hydrate(resource: @resource, model: @model, view: :new)
+      rescue
+      end
+
+      if @field.present? && !@field.searchable
+        query = @authorization.apply_policy @attachment_class
+
+        @options = query.all.map do |model|
+          [model.send(@attachment_resource.class.title), model.id]
+        end
       end
     end
 
@@ -50,11 +60,9 @@ module Avo
 
       respond_to do |format|
         if @model.save
-          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @attachment_class) }
-          format.json { render :show, status: :created, location: resource_path(model: @model, resource: @resource) }
+          format.html { redirect_to resource_path(model: @model, resource: @resource), notice: t("avo.attachment_class_attached", attachment_class: @related_resource.name) }
         else
           format.html { render :new }
-          format.json { render json: @model.errors, status: :unprocessable_entity }
         end
       end
     end

data/app/controllers/avo/attachments_controller.rb

@@ -17,12 +17,8 @@ module Avo
       }
     end
 
-    def show
-    end
-
     def destroy
-      blob = ActiveStorage::Blob.find(params[:signed_attachment_id])
-      attachment = blob.attachments.find_by record_id: params[:id], record_type: @model.class.to_s
+      attachment = ActiveStorage::Attachment.find(params[:attachment_id])
       path = resource_path(model: @model, resource: @resource)
 
       if attachment.present?