avo 0.5.0.beta3 → 0.5.0.beta8

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

@@ -1,10 +1,10 @@
 <div class="w-full">
   <% if @resources.present?%>
     <table class="w-full px-4 overflow-hidden">
-      <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(view_type: :table, reflection: @reflection)} %>
+      <%= render partial: 'avo/partials/table_header', locals: {fields: @resource.get_fields(reflection: @reflection)} %>
       <tbody>
         <% @resources.each_with_index do |resource, index| %>
-          <% cache_if Avo.configuration.cache_resources_on_index_view, [resource.model, resource.file_hash] do %>
+          <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
             <%= render Avo::Index::TableRowComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model) %>
           <% end %>
         <% end %>

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

@@ -7,7 +7,7 @@
       <%== item_selector_input floating: false %>
     </div>
   </td>
-  <% @resource.get_fields(view_type: :table, reflection: @reflection).each_with_index do |field, index| %>
+  <% @resource.get_fields(reflection: @reflection).each_with_index do |field, index| %>
     <%= index_field field, index, @resource %>
   <% end %>
   <td class="text-right whitespace-nowrap px-2">

data/app/components/avo/show/field_wrapper_component.html.erb

@@ -1,4 +1,4 @@
-<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>">
+<div class="flex items-start leading-tight <%= @classes %> min-h-16" data-field-id="<%= @field.id %>" data-field-type="<%= @field.type %>">
   <div class="h-16 flex self-start items-center text-blue-gray-800">
     <div class="w-48 md:w-64 px-8" data-slot="label">
       <%= @field.name %> <% if @field.required %> <span class="text-red-600">*</span> <% end %>

data/app/components/avo/show/fields/boolean_group_field_component.html.erb

@@ -1,3 +1,3 @@
-<%= show_field_wrapper field: @field, index: @index do %>
+<%= show_field_wrapper field: @field, index: @index, dash_if_blank: false do %>
   <%= render Avo::Common::BooleanGroupComponent.new options: @field.options, value: @field.value %>
 <% end %>

data/app/components/avo/show/fields/external_image_field_component.html.erb

@@ -1,4 +1,4 @@
-<%= show_field_wrapper field: @field, field: @field do %>
+<%= show_field_wrapper field: @field do %>
   <% if @field.value.present? %>
     <%= image_tag @field.value, style: 'max-width: 340px;' %>
   <% end %>

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

@@ -18,8 +18,20 @@
             <% end %>
 
             <% if @resource.authorization.authorize_action(:destroy, raise_exception: false) %>
-              <%= a_link destroy_path, color: 'red', variant: 'outlined', method: :delete, data: {confirm: 'Are you sure?'} do %>
-                <%= svg 'trash' %> <%= t('avo.delete').capitalize %>
+              <%= 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,
+                  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 %>
               <% end %>
             <% end %>
 

data/app/controllers/avo/actions_controller.rb

@@ -6,7 +6,9 @@ module Avo
     before_action :set_resource
     before_action :set_action, only: [:show, :handle]
 
-    def show; end
+    def show
+      @model = ActionModel.new @action.get_attributes_for_action
+    end
 
     def handle
       resource_ids = action_params[:fields][:resource_ids].split(',').map(&:to_i)
@@ -16,7 +18,7 @@ module Avo
         key != 'resource_ids'
       end
 
-      performed_action = @action.handle_action(request, models, fields)
+      performed_action = @action.handle_action(models: models, fields: fields)
 
       respond performed_action.response
     end
@@ -27,17 +29,13 @@ module Avo
       end
 
       def set_action
-        action_class = params[:action_id].gsub('avo_actions_', '').classify
-        action_name = "Avo::Actions::#{action_class}"
+        action_class = params[:action_id].gsub('avo_actions_', '').classify.safe_constantize
 
         if params[:id].present?
           model = @resource.model_class.find params[:id]
         end
 
-        @action = action_name.safe_constantize.new
-        @action.configure
-        @action.hydrate(model: model, resource: resource, user: _current_user)
-        @action.boot_fields request
+        @action = action_class.new(model: model, resource: resource, user: _current_user)
       end
 
       def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -11,12 +11,11 @@ module Avo
     rescue_from Pundit::NotAuthorizedError, with: :render_unauthorized
     rescue_from ActiveRecord::RecordInvalid, with: :exception_logger
 
-    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path
+    helper_method :_current_user, :resources_path, :resource_path, :new_resource_path, :edit_resource_path, :resource_attach_path, :resource_detach_path, :related_resources_path
     add_flash_types :info, :warning, :success, :error
 
     def init_app
-      Avo::App.boot if Avo::IN_DEVELOPMENT
-      Avo::App.init request
+      Avo::App.init request: request, context: context
 
       @license = Avo::App.license
     end
@@ -25,7 +24,7 @@ module Avo
       respond_to do |format|
         format.html { raise exception }
         format.json { render json: {
-          errors: exception.record.present? ? exception.record.errors : [],
+          errors: exception.respond_to?(:record) && exception.record.present? ? exception.record.errors : [],
           message: exception.message,
           traces: exception.backtrace,
         }, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name) }
@@ -36,6 +35,10 @@ module Avo
       instance_eval(&Avo.configuration.current_user)
     end
 
+    def context
+      instance_eval(&Avo.configuration.context)
+    end
+
     def resources_path(model, keep_query_params: false, **args)
       return if model.nil?
 
@@ -50,6 +53,22 @@ module 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)
+      return if model.nil?
+
+      existing_params = {}
+
+      begin
+        if keep_query_params
+          existing_params = Addressable::URI.parse(request.fullpath).query_values.symbolize_keys
+        end
+      rescue;end
+
+      Addressable::Template.new("#{Avo.configuration.root_path}/resources/#{@parent_resource.model.model_name.route_key}/#{@parent_resource.model.id}/#{@resource.route_key}{?query*}")
+        .expand({query: {**existing_params, **args}})
+        .to_str
+    end
+
     def resource_path(model = nil, resource_id: nil, keep_query_params: false, **args)
       existing_params = {}
 
@@ -152,7 +171,12 @@ module Avo
       # Gets the Avo resource for this request based on the request from the `resource_name` "param"
       # Ex: Avo::Resources::Project, Avo::Resources::Team, Avo::Resources::User
       def resource
-        App.get_resource @resource_name.to_s.camelize.singularize
+
+        resource = App.get_resource @resource_name.to_s.camelize.singularize
+
+        return resource if resource.present?
+
+        App.get_resource_by_controller_name @resource_name
       end
 
       def related_resource
@@ -221,7 +245,7 @@ module Avo
       end
 
       def set_authorization
-        @authorization = AuthorizationService.new _current_user
+        @authorization = Services::AuthorizationService.new _current_user
       end
 
       def set_container_classes

data/app/controllers/avo/base_controller.rb

@@ -103,7 +103,7 @@ module Avo
       @model.destroy!
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model), notice: t('avo.resource_destroyed', attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resources_path(@model, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t('avo.resource_destroyed', attachment_class: @attachment_class) }
         format.json { head :no_content }
       end
     end
@@ -161,18 +161,15 @@ module Avo
           @index_params[:per_page] = cookies[:per_page]
         end
 
-        if params[:per_page].present?
-          @index_params[:per_page] = params[:per_page]
+        if @parent_model.present?
+          @index_params[:per_page] = Avo.configuration.via_per_page
         end
 
         if params[:per_page].present?
+          @index_params[:per_page] = params[:per_page]
           cookies[:per_page] = params[:per_page]
         end
 
-        if @parent_model.present?
-          @index_params[:per_page] = Avo.configuration.via_per_page
-        end
-
         # Sorting
         @index_params[:sort_by] = params[:sort_by] || :created_at
         @index_params[:sort_direction] = params[:sort_direction] || :desc
@@ -186,8 +183,6 @@ module Avo
         @filters = @resource.get_filters.map do |filter_class|
           filter = filter_class.new
 
-          filter.configure
-
           filter
         end
       end
@@ -198,12 +193,7 @@ module Avo
         end
 
         @actions = @resource.get_actions.map do |action|
-          action = action.new
-
-          action.hydrate(model: model, resource: @resource)
-          action.boot_fields request
-
-          action
+          action.new(model: model, resource: @resource)
         end
       end
 
@@ -216,7 +206,6 @@ module Avo
 
         @resource.get_filters.each do |filter_class|
           filter = filter_class.new
-          filter.configure
 
           if filter.default.present?
             filter_defaults[filter_class.to_s] = filter.default

data/app/controllers/avo/relations_controller.rb

@@ -35,7 +35,7 @@ module Avo
       @options = query.all.map do |model|
         {
           value: model.id,
-          label: model.send(@attachment_resource.title)
+          label: model.send(@attachment_resource.class.title)
         }
       end
     end
@@ -66,7 +66,7 @@ module Avo
       end
 
       respond_to do |format|
-        format.html { redirect_to params[:referrer] || resources_path(@model), notice: t('avo.attachment_class_detached', attachment_class: @attachment_class) }
+        format.html { redirect_to params[:referrer] || resource_path(@model), notice: t('avo.attachment_class_detached', attachment_class: @attachment_class) }
       end
     end
 

data/app/controllers/avo/search_controller.rb

@@ -35,7 +35,7 @@ module Avo
         resources.map do |model|
           {
             id: model.id,
-            search_label: model.send(avo_resource.title),
+            search_label: model.send(avo_resource.class.title),
             link: "/resources/#{model.class.to_s.singularize.underscore}/#{model.id}",
           }
         end

data/app/helpers/avo/application_helper.rb

@@ -130,7 +130,7 @@ module Avo
       options[:class] += args[:extra_class].present? ? " #{args[:extra_class]}" : ''
 
       # Create the path to the svgs directory
-      file_path = "#{Avo::Engine.root}/app/frontend/svgs/#{file_name}"
+      file_path = "#{Avo::Engine.root}/app/packs/svgs/#{file_name}"
       file_path = "#{file_path}.svg" unless file_path.end_with? '.svg'
 
       # Create a cache hash

data/app/{frontend/css → packs/entrypoints}/application.css

@@ -5,20 +5,21 @@
 @import './../../../node_modules/trix/dist/trix.css';
 @import './../../../node_modules/flatpickr/dist/flatpickr.css';
 
-@import './tailwindcss/base.css';
-@import './tailwindcss/components.css';
 
-@import './fonts.css';
-@import './typography.css';
-@import './tooltips.css';
-@import './alerts.css';
-@import './loader.css';
-@import './pagination.css';
+@import './../stylesheets/tailwindcss/base.css';
 
-@import './components/status.css';
-@import './components/code.css';
+@import './../stylesheets/fonts.css';
+@import './../stylesheets/typography.css';
+@import './../stylesheets/tooltips.css';
+@import './../stylesheets/alerts.css';
+@import './../stylesheets/loader.css';
+@import './../stylesheets/pagination.css';
 
-@import './tailwindcss/utilities.css';
+@import './../stylesheets/components/status.css';
+@import './../stylesheets/components/code.css';
+@import './../stylesheets/tailwindcss/components.css';
+
+@import './../stylesheets/tailwindcss/utilities.css';
 
 html,
 body {

data/app/{frontend/packs → packs/entrypoints}/application.js

@@ -1,5 +1,3 @@
-import '@/css/application.css'
-
 import 'regenerator-runtime/runtime'
 import 'trix'
 import * as Mousetrap from 'mousetrap'
@@ -7,11 +5,14 @@ import { Application } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { definitionsFromContext } from 'stimulus/webpack-helpers'
 import tippy from 'tippy.js'
+import Rails from '@rails/ujs';
+
+Rails.start();
 
 // Toastr alerts
 import '../js/toastr'
 
-Mousetrap.bind('r r r', () => Turbo.visit(window.location.href))
+Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: "replace" }))
 
 const application = Application.start()
 

data/app/{frontend → packs}/js/controllers/filter_controller.js

@@ -1,5 +1,4 @@
 import { Controller } from 'stimulus'
-import { Turbo } from '@hotwired/turbo-rails'
 import URI from 'urijs'
 
 export default class extends Controller {
@@ -35,13 +34,30 @@ export default class extends Controller {
     }
 
     filters[filterClass] = value
-    const encodedFilters = btoa(JSON.stringify(filters))
+
+    const filtered = Object.keys(filters)
+    .filter(key => filters[key] !== '')
+    .reduce((obj, key) => {
+      obj[key] = filters[key];
+      return obj;
+    }, {});
+
+    let encodedFilters;
+
+    if (filtered && Object.keys(filtered).length > 0) {
+      encodedFilters = btoa(JSON.stringify(filtered))
+    }
 
     const url = new URI(this.urlRedirectTarget.href)
 
     const query = {
       ...url.query(true),
-      filters: encodedFilters,
+    }
+
+    if (encodedFilters) {
+      query['filters'] = encodedFilters
+    } else {
+      delete query['filters']
     }
 
     url.query(query)

data/app/{frontend → packs}/js/controllers/per_page_controller.js

@@ -3,7 +3,11 @@ import { Controller } from 'stimulus'
 export default class extends Controller {
   static targets = ['selector']
 
+  get turboFrame() {
+    return this.selectorTarget.dataset.turboFrame
+  }
+
   reload() {
-    document.querySelector(`[data-per-page-option="${this.selectorTarget.value}"]`).click()
+    document.querySelector(`[data-per-page-option="${this.selectorTarget.value}"][data-turbo-frame="${this.turboFrame}"]`).click()
   }
 }