avo 1.25.0 → 2.1.1

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]
@@ -61,10 +61,8 @@ 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: @related_resource.name) }
-          format.json { render :show, status: :created, location: resource_path(model: @model, resource: @resource) }
         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?

data/app/controllers/avo/base_controller.rb

@@ -7,20 +7,21 @@ module Avo
     before_action :hydrate_resource
     before_action :set_model, only: [:show, :edit, :destroy, :update, :order]
     before_action :set_model_to_fill
+    before_action :set_edit_title_and_breadcrumbs, only: [:edit, :update]
     before_action :fill_model, only: [:create, :update]
     before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
 
     def index
-      @page_title = resource_name.humanize
-      add_breadcrumb resource_name.humanize
+      @page_title = @resource.plural_name.humanize
+      add_breadcrumb @resource.plural_name.humanize
 
       set_index_params
       set_filters
       set_actions
 
-      # If we don't get a query object predefined from a child controller like relations, just spin one up
+      # If we don't get a query object predefined from a child controller like associations, just spin one up
       unless defined? @query
         @query = @resource.class.query_scope
       end
@@ -30,7 +31,7 @@ module Avo
         @query = @query.unscoped
       end
 
-      # Eager load the relations
+      # Eager load the associations
       if @resource.includes.present?
         @query = @query.includes(*@resource.includes)
       end
@@ -62,9 +63,9 @@ module Avo
     def show
       set_actions
 
-      @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
+      @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
 
-      @page_title = @resource.default_panel_name
+      @page_title = @resource.default_panel_name.to_s
 
       # If we're accessing this resource via another resource add the parent to the breadcrumbs.
       if params[:via_resource_class].present? && params[:via_resource_id].present?
@@ -75,45 +76,25 @@ module Avo
         add_breadcrumb via_resource.plural_name, resources_path(resource: via_resource)
         add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
       else
-        add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
+        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       end
 
       add_breadcrumb @resource.model_title
+      add_breadcrumb I18n.t("avo.details").upcase_first
     end
 
     def new
       @model = @resource.model_class.new
       @resource = @resource.hydrate(model: @model, view: :new, user: _current_user)
 
-      @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
+      @page_title = @resource.default_panel_name.to_s
+      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
       add_breadcrumb t("avo.new").humanize
     end
 
-    def edit
-      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
-
-      @page_title = @resource.default_panel_name
-
-      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
-      if params[:via_resource_class].present? && params[:via_resource_id].present?
-        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
-        via_model = via_resource.class.find_scope.find params[:via_resource_id]
-        via_resource.hydrate model: via_model
-
-        add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
-        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
-      else
-        add_breadcrumb resource_name.humanize, resources_path(resource: @resource)
-      end
-
-      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
-      add_breadcrumb t("avo.edit").humanize
-    end
-
     def create
       # model gets instantiated and filled in the fill_model method
-      saved = @model.save
+      saved = save_model
       @resource.hydrate(model: @model, view: :new, user: _current_user)
 
       # This means that the record has been created through another parent record and we need to attach it somehow.
@@ -155,38 +136,40 @@ module Avo
           end
 
           format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
-          format.json { render :show, status: :created, location: @model }
         else
-          flash[:error] = t "avo.you_missed_something_check_form"
+          flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :new, status: :unprocessable_entity }
-          format.json { render json: @model.errors, status: :unprocessable_entity }
         end
       end
     end
 
+    def edit
+    end
+
     def update
       # model gets instantiated and filled in the fill_model method
-      saved = @model.save
+      saved = save_model
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       respond_to do |format|
         if saved
           format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
-          format.json { render :show, status: :ok, location: @model }
         else
-          flash[:error] = t "avo.you_missed_something_check_form"
+          flash.now[:error] = t "avo.you_missed_something_check_form"
           format.html { render :edit, status: :unprocessable_entity }
-          format.json { render json: @model.errors, status: :unprocessable_entity }
         end
       end
     end
 
     def destroy
-      @model.destroy!
-
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
-        format.json { head :no_content }
+        if destroy_model
+          format.html { redirect_to params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
+        else
+          error_message = @errors.present? ? @errors.first : t("avo.failed")
+
+          format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: error_message }
+        end
       end
     end
 
@@ -207,6 +190,31 @@ module Avo
 
     private
 
+    def save_model
+      perform_action_and_record_errors do
+        @model.save!
+      end
+    end
+
+    def destroy_model
+      perform_action_and_record_errors do
+        @model.destroy!
+      end
+    end
+
+    def perform_action_and_record_errors(&block)
+      begin
+        succeeded = block.call
+      rescue => exception
+        # In case there's an error somewhere else than the model
+        # Example: When you save a license that should create a user for it and creating that user throws and error.
+        # Example: When you Try to delete a record and has a foreign key constraint.
+        @errors = Array.wrap(exception.message)
+      end
+
+      succeeded
+    end
+
     def model_params
       request_params = params.require(model_param_key).permit(permitted_params)
 
@@ -291,13 +299,12 @@ module Avo
         model = @resource.class.find_scope.find params[:resource_id]
       end
 
-      @actions =
-        @resource
-          .get_actions
-          .map do |action|
-            action.new(model: model, resource: @resource, view: @view)
-          end
-          .select { |action| action.visible_in_view }
+      @actions = @resource
+        .get_actions
+        .map do |action|
+          action.new(model: model, resource: @resource, view: @view)
+        end
+        .select { |action| action.visible_in_view }
     end
 
     def applied_filters
@@ -331,5 +338,24 @@ module Avo
     def applied_filters_cache_key
       "avo.base_controller.#{@resource.model_key}.applied_filters"
     end
+
+    def set_edit_title_and_breadcrumbs
+      @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      @page_title = @resource.default_panel_name.to_s
+      # If we're accessing this resource via another resource add the parent to the breadcrumbs.
+      if params[:via_resource_class].present? && params[:via_resource_id].present?
+        via_resource = Avo::App.get_resource_by_model_name params[:via_resource_class]
+        via_model = via_resource.class.find_scope.find params[:via_resource_id]
+        via_resource.hydrate model: via_model
+
+        add_breadcrumb via_resource.plural_name, resources_path(resource: @resource)
+        add_breadcrumb via_resource.model_title, resource_path(model: via_model, resource: via_resource)
+      else
+        add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+      end
+
+      add_breadcrumb @resource.model_title, resource_path(model: @resource.model, resource: @resource)
+      add_breadcrumb t("avo.edit").humanize
+    end
   end
 end

data/app/controllers/avo/dashboards_controller.rb

@@ -0,0 +1,28 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class DashboardsController < ApplicationController
+    before_action :set_dashboard
+
+    def show
+    end
+
+    def card
+      @card = @dashboard.items.find do |item|
+        next unless item.is_card?
+
+        item.id.to_s == params[:card_id]
+      end.tap do |card|
+        card.hydrate(dashboard: @dashboard, params: params)
+      end
+    end
+
+    private
+
+    def set_dashboard
+      @dashboard = Avo::App.get_dashboard_by_id params[:dashboard_id]
+
+      raise ActionController::RoutingError.new("Not Found") if @dashboard.nil? || @dashboard.is_hidden?
+    end
+  end
+end

data/app/controllers/avo/private_controller.rb

@@ -0,0 +1,8 @@
+require_dependency "avo/application_controller"
+
+module Avo
+  class PrivateController < ApplicationController
+    def design
+    end
+  end
+end

data/app/controllers/avo/search_controller.rb

@@ -10,7 +10,11 @@ module Avo
     def index
       raise ActionController::BadRequest.new("This feature requires the pro license https://avohq.io/purchase/pro") if App.license.lacks_with_trial(:global_search)
 
-      render json: search_resources(Avo::App.resources)
+      resources = Avo::App.resources.reject do |resource|
+        resource.class.hide_from_global_search
+      end
+
+      render json: search_resources(resources)
     end
 
     def show