avo 1.4.0.pre.1 → 1.4.4.pre.1

data/app/components/avo/fields/select_field/index_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::SelectField::IndexComponent < Avo::Fields::IndexComponent
+end

data/app/components/avo/fields/select_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::SelectField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/{show/fields/field_component.rb → fields/show_component.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Show::Fields::FieldComponent < ViewComponent::Base
+class Avo::Fields::ShowComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
   def initialize(field: nil, resource: nil, index: 0)

data/app/components/avo/fields/status_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::StatusField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/status_field/index_component.html.erb

@@ -0,0 +1,3 @@
+<%= index_field_wrapper field: @field do %>
+  <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
+<% end %>

data/app/components/avo/fields/status_field/index_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::StatusField::IndexComponent < Avo::Fields::IndexComponent
+end

data/app/components/avo/fields/status_field/show_component.html.erb

@@ -0,0 +1,3 @@
+<%= show_field_wrapper field: @field, index: @index do %>
+  <%= render Avo::Fields::Common::StatusViewerComponent.new label: @field.value, status: @field.status %>
+<% end %>

data/app/components/avo/fields/status_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::StatusField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/fields/text_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/text_field/index_component.html.erb

@@ -0,0 +1,3 @@
+<%= index_field_wrapper field: @field do %>
+  <%= link_to_if @field.link_to_resource, @field.value, resource_path %>
+<% end %>

data/app/components/avo/fields/text_field/index_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::IndexComponent < Avo::Fields::IndexComponent
+end

data/app/components/avo/fields/text_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/{edit/fields/textarea_field_component.html.erb → fields/textarea_field/edit_component.html.erb}

@@ -3,5 +3,5 @@
     class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
     placeholder: @field.placeholder,
     disabled: @field.readonly,
-    rows: @field.meta[:rows] %>
+    rows: @field.rows %>
 <% end %>

data/app/components/avo/fields/textarea_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextareaField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/textarea_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TextareaField::ShowComponent < Avo::Fields::ShowComponent
+end

data/app/components/avo/{edit/fields/trix_field_component.html.erb → fields/trix_field/edit_component.html.erb}

@@ -13,8 +13,7 @@
       id: trix_id,
       class: helpers.input_classes('w-full hidden', has_error: (@resource.model.present? and @resource.model.errors.include?(@field.id))),
       placeholder: @field.placeholder,
-      disabled: @field.readonly,
-      rows: @field.meta[:rows]
+      disabled: @field.readonly
     %>
   </div>
 <% end %>

data/app/components/avo/fields/trix_field/edit_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TrixField::EditComponent < Avo::Fields::EditComponent
+end

data/app/components/avo/fields/trix_field/show_component.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::TrixField::ShowComponent < Avo::Fields::ShowComponent
+end

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

@@ -36,9 +36,8 @@
           'tippy': 'tooltip',
         }
       %>
-      <%= 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] %>
+      <%= hidden_field_tag :turbo_frame, params[:turbo_frame], id: "turbo_frame_detach_#{@resource.model.id}" if params[:turbo_frame] %>
+      <%= hidden_field_tag :referrer, request.fullpath, id: "referrer_detach_#{@resource.model.id}" if params[:turbo_frame] %>
     <% end %>
   <% end %>
 

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

@@ -8,7 +8,7 @@
     </div>
   </td>
   <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
-    <%= index_field field, index, @resource %>
+    <%= render field.component_for_view(:index).new(field: field, resource: @resource, index: index, parent_model: @parent_model) %>
   <% end %>
   <td class="text-right whitespace-nowrap px-2">
     <div class="flex items-center justify-end flex-grow-0 h-full w-full">

data/app/components/avo/panel_component.html.erb

@@ -1,7 +1,7 @@
 <div <%== data_attributes %>>
   <div class="mb-6">
     <div>
-      <% if show_breadcrumbs? %>
+      <% if display_breadcrumbs? %>
         <div class="breadcrumbs">
           <%= helpers.render_breadcrumbs(separator: helpers.svg('chevron-right', class: 'inline-block h-3 stroke-current relative top-[-1px] ml-1' )) if Avo.configuration.display_breadcrumbs %>
         </div>

data/app/components/avo/panel_component.rb

@@ -6,11 +6,11 @@ class Avo::PanelComponent < ViewComponent::Base
   renders_one :bare_content
   renders_one :footer
 
-  def initialize(title: nil, body_classes: nil, data: {}, show_breadcrumbs: true)
+  def initialize(title: nil, body_classes: nil, data: {}, display_breadcrumbs: false)
     @title = title
     @body_classes = body_classes
     @data = data
-    @show_breadcrumbs = show_breadcrumbs
+    @display_breadcrumbs = display_breadcrumbs
   end
 
   private
@@ -23,7 +23,7 @@ class Avo::PanelComponent < ViewComponent::Base
     end.join
   end
 
-  def show_breadcrumbs?
-    @show_breadcrumbs
+  def display_breadcrumbs?
+    @display_breadcrumbs
   end
 end

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

@@ -3,7 +3,7 @@
     <%= form_with model: @resource.model, url: helpers.resource_path(@resource.model), method: :put, multipart: true do |form| %>
       <%= hidden_field_tag :referrer, back_path if params[:via_resource_class] %>
 
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name]) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
             <%= a_link back_path do %>
@@ -20,7 +20,7 @@
 
         <% c.body do %>
           <% @resource.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, @resource, form unless field.computed %>
+            <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -1,4 +1,4 @@
-<%= render Avo::PanelComponent.new title: title, body_classes: 'py-4', data: { component: 'resources-index' }, show_breadcrumbs: @reflection.blank? do |c| %>
+<%= render Avo::PanelComponent.new(title: title, body_classes: 'py-4', data: { component: 'resources-index' }, display_breadcrumbs: @reflection.blank?) do |c| %>
   <% c.tools do %>
     <%= render 'actions' if @actions.present? %>
 
@@ -22,12 +22,12 @@
   <% end %>
 
   <% c.body do %>
-    <div class="flex justify-between py-6 min-h-24"
+    <div class="flex justify-between pt-2 pb-2 min-h-16"
       data-selected-resources-name="<%= @resource.plural_name.downcase %>"
       data-selected-resources="[]"
     >
       <div class="flex items-center px-6 w-64">
-        <%# search %>
+        <%= render partial: 'avo/partials/resource_search', locals: {resource: @resource.route_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? %>
@@ -36,7 +36,7 @@
     </div>
 
     <% if view_type.to_sym == :table %>
-      <div class="w-full overflow-auto flex flex-col">
+      <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>
@@ -50,8 +50,8 @@
     <% end %>
   <% end %>
 
-  <% if view_type.to_sym == :grid %>
-    <% c.bare_content do %>
+  <% c.bare_content do %>
+    <% 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">

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

@@ -1,7 +1,7 @@
 <div>
   <% @resource.panels.each do |resource_panel| %>
     <%= form_with model: @resource.model, url: helpers.resources_path(@resource.model, via_relation_class: params[:via_relation_class], via_resource_id: params[:via_resource_id]), local: true, multipart: true do |form| %>
-      <%= render Avo::PanelComponent.new(title: resource_panel[:name]) do |c| %>
+      <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: true) do |c| %>
         <% c.tools do %>
           <div class="flex justify-end space-x-2">
             <%= a_link back_path do %>
@@ -16,7 +16,7 @@
 
         <% c.body do %>
           <% @resource.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, @resource, form unless field.computed %>
+            <%= render field.component_for_view(:edit).new(field: field, resource: @resource, index: index, form: form) unless field.computed %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -3,7 +3,7 @@
   data-selected-resources="[<%= @resource.model.id %>]"
 >
   <% @resource.panels.each do |resource_panel| %>
-    <%= render Avo::PanelComponent.new(title: resource_panel[:name], show_breadcrumbs: @reflection.blank?) do |c| %>
+    <%= render Avo::PanelComponent.new(title: resource_panel[:name], display_breadcrumbs: @reflection.blank?) do |c| %>
       <% c.tools do %>
         <% if resource_panel[:name] == @resource.default_panel_name %>
           <%= render 'actions' %>
@@ -47,7 +47,7 @@
       <% c.body do %>
         <% if fields_by_panel[resource_panel[:name]].present? %>
           <% fields_by_panel[resource_panel[:name]].each_with_index do |field, index| %>
-            <%= show_field field, index, @resource %>
+            <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
           <% end %>
         <% end %>
       <% end %>
@@ -57,19 +57,19 @@
   <% if @reflection.blank? %>
     <% if has_one_panels.present? %>
       <% has_one_panels.each_with_index do |field, index| %>
-        <%= show_field field, index, @resource %>
+        <%= 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| %>
-        <%= show_field field, index, @resource %>
+        <%= 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| %>
-        <%= show_field field, index, @resource %>
+        <%= render field.component_for_view(:show).new(field: field, resource: @resource, index: index) %>
       <% end %>
     <% end %>
   <% end %>

data/app/controllers/avo/application_controller.rb

@@ -17,7 +17,7 @@ module Avo
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.init request: request, context: context
+      Avo::App.init request: request, context: context, current_user: _current_user
 
       @license = Avo::App.license
     end
@@ -38,18 +38,25 @@ module Avo
     def render(*args)
       raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:check_avo_license).source_location.first.match?(/.*\/app\/controllers\/avo\/application_controller\.rb/)
 
+      if params[:controller] == "avo/search" && params[:action] == "index"
+        raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:index).source_location.first.match?(/.*\/app\/controllers\/avo\/search_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
-        if @license.invalid? || @license.lacks(:custom_tools)
-          if Rails.env.development?
+        # Display alert on custom tool page if in development.
+        if @license.lacks(:custom_tools) || @license.invalid?
+          if Rails.env.development? || Rails.env.test?
             @custom_tools_alert_visible = true
-          else
-            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
           end
         end
+
+        # Raise error in non-development environments.
+        raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools." if @license.lacks_with_trial(:custom_tools)
       end
     end
 
@@ -157,9 +164,9 @@ module Avo
 
     def authorize_action
       if @model.present?
-        @authorization.set_record(@model).authorize_action :index
+        @authorization.set_record(@model).authorize_action action_name.to_sym
       else
-        @authorization.set_record(@resource.model_class).authorize_action :index
+        @authorization.set_record(@resource.model_class).authorize_action action_name.to_sym
       end
     end
 

data/app/controllers/avo/base_controller.rb

@@ -53,7 +53,19 @@ module Avo
       @resource = @resource.hydrate(model: @model, view: :show, user: _current_user, params: params)
 
       @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+
+      # 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.model_class.find params[:via_resource_id]
+        via_resource.hydrate model: via_model
+
+        add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
+        add_breadcrumb via_resource.model_title, resource_path(via_model)
+      else
+        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+      end
+
       add_breadcrumb @resource.model_title
     end
 
@@ -70,7 +82,19 @@ module Avo
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
 
       @page_title = @resource.default_panel_name
-      add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+
+      # 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.model_class.find params[:via_resource_id]
+        via_resource.hydrate model: via_model
+
+        add_breadcrumb via_resource.plural_name, resources_path(via_resource.model_class)
+        add_breadcrumb via_resource.model_title, resource_path(via_model)
+      else
+        add_breadcrumb resource_name.humanize, resources_path(@resource.model_class)
+      end
+
       add_breadcrumb @resource.model_title, resource_path(@resource.model)
       add_breadcrumb t("avo.edit").humanize
     end

data/app/controllers/avo/home_controller.rb

@@ -7,7 +7,7 @@ module Avo
         redirect_to Avo.configuration.home_path
       elsif !Rails.env.development?
         @page_title = "Get started"
-        redirect_to resources_path Avo::App.get_resources.min_by { |resource| resource.route_key }.model_class
+        redirect_to resources_path Avo::App.resources.min_by { |resource| resource.route_key }.model_class
       end
     end
   end

data/app/controllers/avo/relations_controller.rb

@@ -17,7 +17,7 @@ module Avo
       @resource = @related_resource
       @parent_model = @parent_resource.model_class.find(params[:id])
       @parent_resource.hydrate(model: @parent_model)
-      @query = @parent_model.public_send(params[:related_name])
+      @query = @authorization.apply_policy @parent_model.public_send(params[:related_name])
 
       super
     end

data/app/controllers/avo/search_controller.rb

@@ -2,56 +2,71 @@ require_dependency "avo/application_controller"
 
 module Avo
   class SearchController < ApplicationController
-    # before_action :authorize_user
+    before_action :set_resource_name, only: [:show]
+    before_action :set_resource, only: [:show]
 
     def index
-      @authorization.set_record(resource_model).authorize_action :index
-      resources = []
-
-      App.get_resources
-        .select { |resource| resource.search.present? }
-        .select { |resource| AuthorizationService.authorize_action _current_user, resource.model, "index" }
-        .each do |resource_model|
-          found_resources = add_link_to_search_results(search_resource(resource_model), resource_model)
-          resources.push({
-            label: resource_model.name,
-            resources: found_resources
-          })
-        end
+      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: {
-        resources: resources
-      }
+      render json: search_resources(Avo::App.resources)
     end
 
-    def resource
-      render json: {
-        resources: add_link_to_search_results(search_resource(avo_resource), avo_resource)
-      }
+    def show
+      render json: search_resources([resource])
     end
 
     private
 
-    def add_link_to_search_results(resources, avo_resource)
-      resources.map do |model|
-        {
-          id: model.id,
-          search_label: model.send(avo_resource.class.title),
-          link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}"
-        }
+    def search_resources(resources)
+      resources.map do |resource|
+        # Apply authorization
+        next unless @authorization.set_record(resource.model_class).authorize_action(:index, raise_exception: false)
+        # Filter out the models without a search_query
+        next if resource.search_query.nil?
+
+        search_resource resource
       end
+        .select do |payload|
+          payload.present?
+        end
+        .sort do |payload|
+          payload.last[:count]
+        end
+        .reverse
+        .to_h
     end
 
-    def search_resource(avo_resource)
-      avo_resource.query_search(query: params[:q], via_resource_name: params[:via_resource_name], via_resource_id: params[:via_resource_id], user: _current_user)
+    def search_resource(resource)
+      results = apply_search_metadata(resource.search_query.call(params: params).limit(8), resource)
+
+      result_object = {
+        header: resource.name.pluralize,
+        results: results,
+        count: results.length
+      }
+
+      [resource.name.pluralize.downcase, result_object]
     end
 
-    # def authorize_user
-    #   return if params[:action] == 'index'
+    def apply_search_metadata(models, avo_resource)
+      models.map do |model|
+        resource = avo_resource.dup.hydrate(model: model).hydrate_fields(model: model)
 
-    #   action = params[:action] == 'resource' ? :index : params[:action]
+        result = {
+          _id: model.id,
+          _label: resource.label,
+          _url: resource.avo_path,
+          model: model
+        }
 
-    #   return render_unauthorized unless AuthorizationService::authorize_action _current_user, avo_resource.model, action
-    # end
+        if App.license.has_with_trial(:enhanced_search_results)
+          result[:_description] = resource.description
+          result[:_avatar] = resource.avatar
+          result[:_avatar_type] = resource.avatar_type
+        end
+
+        result
+      end
+    end
   end
 end