avo 0.5.0.beta2 → 0.5.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714d80a0c55444d87252f30e9233fe5db432136e9cd4ba0ad9851a57fd73b37e
-  data.tar.gz: 184d84ab6338864f1b0479c344278544422cb3967acff3dd6063148a446211fc
+  metadata.gz: 48ae6c7207084645f7a7a14a462ebc7161f94801e100054d53f48722f758f9c2
+  data.tar.gz: dcc5caabc807328ddd1c52c640d446d88d84c58f786b693d59455f1e7d251744
 SHA512:
-  metadata.gz: bc03e6bcd02b5f628e063f94188cf3293f747ee0f53bfcae46cf198bd1074c5da9304c94024e7a3fbcada4a6ee7342f0f20e9c9659dd57e2a6cd8d4d3bd686c2
-  data.tar.gz: b7a1c8fdf844e0064eef6df2449b501a75e0ed4f06499c6f74187654f16b02f316690076c00f3bafe98641a651b05c722cabd1c81f080eac0ffab03302754ac3
+  metadata.gz: '038536c5cc11eeae399c9cbb59d366868bb3affe39592075c8852d65df49f1a362917a9e96861c804e807a6ed0e2cb39932e5bb82cb04d54b9830301a44b7056'
+  data.tar.gz: b9d16aa4a175c5a43a0ec24059e4715febc755cea5b28be601b0b9fb22f9414881ec170b6ad9e1dbe2e51a77d6b8d5cae7e620d8d1d7dc95c4c01c988f9f09ca

data/Gemfile

@@ -78,7 +78,6 @@ group :development do
   # Release helper
   gem 'bump', require: false
   gem 'gem-release', require: false
-  gem 'faker', require: false
 
   # gem 'rack-mini-profiler'
   # gem 'memory_profiler'
@@ -89,6 +88,10 @@ group :development do
   # gem 'pry-rails'
 end
 
+group :development, :test do
+  gem 'faker', require: false
+end
+
 group :test do
   gem 'rspec-rails', '~> 4.0.0'
   gem 'rails-controller-testing'
@@ -97,7 +100,6 @@ group :test do
   gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'
-  gem 'faker'
   gem 'fuubar'
   gem 'simplecov', require: false
   gem 'simplecov-cobertura'
@@ -116,8 +118,6 @@ gem 'httparty'
 
 gem 'iso'
 
-gem 'i18n-js'
-
 gem 'hotwire-rails'
 
 gem 'active_link_to'

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta2)
+    avo (0.5.0.beta7)
       active_link_to
       countries
       hotwire-rails
       httparty
-      i18n-js
       image_processing
       inline_svg
       pagy
@@ -144,8 +143,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.8.0)
-      i18n (>= 0.6.6)
     i18n_data (0.10.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -368,7 +365,6 @@ DEPENDENCIES
   gem-release
   hotwire-rails
   httparty
-  i18n-js
   image_processing (~> 1.2)
   inline_svg
   iso

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

@@ -4,19 +4,19 @@
   <div class="relative w-full pb-3/4 rounded-t-xl overflow-hidden">
     <%== item_selector_input floating: true, size: :lg %>
 
-    <% if preview.respond_to? :to_image %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
-    <% elsif preview.type == 'file_field' %>
-      <% if preview.value.attached? && preview.value.representable? %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% if cover.respond_to? :to_image %>
+        <%= link_to_if cover.link_to_resource, image_tag(cover.to_image, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+    <% elsif cover.type == 'file_field' %>
+      <% if cover.value.attached? && cover.value.representable? %>
+        <%= link_to_if cover.link_to_resource, image_tag(cover.variant(resize_to_limit: [480, 480]), class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
         </div>
       <% end %>
     <% else %>
-      <% if preview.value.present? %>
-        <%= link_to_if preview.link_to_resource, image_tag(preview.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
+      <% if cover.value.present? %>
+        <%= link_to_if cover.link_to_resource, image_tag(cover.value, class: 'absolute h-full w-full object-cover'), helpers.resource_path(@resource.model), class: 'absolute h-full w-full object-cover', title: title.value %>
       <% else %>
         <div class="absolute bg-gray-100 w-full h-full">
           <%= helpers.svg 'avocado', class: 'relative transform -translate-x-1/2 -translate-y-1/2 h-20 text-gray-400 inset-auto top-1/2 left-1/2' %>
@@ -27,7 +27,7 @@
   <div class="grid grid-cols-1 place-content-between p-4 h-full">
     <div class="mb-4">
       <div class="grid font-semibold leading-tight text-lg mb-2">
-        <%= link_to_if preview.link_to_resource, title.value, helpers.resource_path(@resource.model) if title.present? %>
+        <%= link_to_if title.link_to_resource, title.value, helpers.resource_path(@resource.model) if title.present? %>
       </div>
       <div class="text-sm break-words">
         <%= body.value if body.present? %>

data/app/components/avo/index/grid_item_component.rb

@@ -3,29 +3,23 @@
 class Avo::Index::GridItemComponent < ViewComponent::Base
   include Avo::ResourcesHelper
 
-  def initialize(resource: resource, reflection: reflection, parent_model: nil)
+  def initialize(resource: nil, reflection: nil, parent_model: nil)
     @resource = resource
     @reflection = reflection
-    @grid_fields = resource.get_fields(view_type: :grid)
+    @grid_fields = resource.get_grid_fields
     @parent_model = parent_model
   end
 
   private
-    def preview
-      @grid_fields.detect do |field|
-        field.grid_position == :preview
-      end
+    def cover
+      @grid_fields[:cover].first
     end
 
     def title
-      @grid_fields.detect do |field|
-        field.grid_position == :title
-      end
+      @grid_fields[:title].first
     end
 
     def body
-      @grid_fields.detect do |field|
-        field.grid_position == :body
-      end
+      @grid_fields[:body].first
     end
 end

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

@@ -1,7 +1,7 @@
 <% if @resources.present?%>
   <div class="w-full grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 2xl:grid-cols-6 gap-6">
     <% @resources.each_with_index do |resource, index| %>
-      <% cache_if Avo::PACKED, [resource.model, resource.file_hash] do %>
+      <% cache_if Avo.configuration.cache_resources_on_index_view, resource.cache_hash(@parent_model) do %>
         <%= render(Avo::Index::GridItemComponent.new(resource: resource, reflection: @reflection, parent_model: @parent_model)) %>
       <% end %>
     <% end %>

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::PACKED, [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/controllers/avo/actions_controller.rb

@@ -27,17 +27,14 @@ 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 = action_class.new
         @action.hydrate(model: model, resource: resource, user: _current_user)
-        @action.boot_fields request
       end
 
       def respond(response)

data/app/controllers/avo/application_controller.rb

@@ -15,8 +15,7 @@ module Avo
     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
@@ -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?
 
@@ -152,7 +155,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 +229,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

@@ -186,8 +186,6 @@ module Avo
         @filters = @resource.get_filters.map do |filter_class|
           filter = filter_class.new
 
-          filter.configure
-
           filter
         end
       end
@@ -198,12 +196,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.hydrate(model: model, resource: @resource)
         end
       end
 
@@ -216,7 +209,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

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/frontend/packs/application.js

@@ -11,7 +11,7 @@ import tippy from 'tippy.js'
 // 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/views/avo/base/_actions.html.erb

@@ -14,12 +14,6 @@
     >
       <%
         @actions.each_with_index do |action, index|
-          case action.class.superclass.to_s
-          when Avo::Filters::SelectFilter.to_s
-            template = 'select_action'
-          when Avo::Filters::BooleanFilter.to_s
-            template = 'boolean_action'
-          end
           path = action_name == 'show' ?
             "/avo/resources/#{@resource.model_class.model_name.route_key}/#{@model.id}/actions/#{action.param_id}" :
             "/avo/resources/#{@resource.model_class.model_name.route_key}/actions/#{action.param_id}"

data/app/views/avo/base/_boolean_filter.html.erb

@@ -12,7 +12,7 @@
   set_value = {} if set_value.nil?
 %>
 <div data-controller="boolean-filter">
-  <%= filter_wrapper name: filter.name, index: index do %>
+  <%= filter_wrapper name: filter.name do %>
     <div class="flex items-center">
       <div class="space-y-2">
         <% filter.options.each do |value, label| %>

data/app/views/avo/base/_filters.html.erb

@@ -10,19 +10,11 @@
     <% end %>
 
     <div
-      class="absolute block inset-auto right-0 top-full bg-white min-w-300px mt-2 z-20 shadow-context rounded-xl hidden"
+      class="absolute block inset-auto right-0 top-full bg-white min-w-300px mt-2 z-20 shadow-context rounded-xl hidden divide-y divide-gray-300"
       data-toggle-panel-target="panel"
     >
-      <%
-        @filters.each_with_index do |filter, index|
-          case filter.class.superclass.to_s
-          when Avo::Filters::SelectFilter.to_s
-            template = 'avo/base/select_filter'
-          when Avo::Filters::BooleanFilter.to_s
-            template = 'avo/base/boolean_filter'
-          end
-      %>
-        <%= render partial: template, locals: {filter: filter, index: index} %>
+      <% @filters.each do |filter| %>
+        <%= render partial: filter.class.template, locals: {filter: filter} %>
       <% end %>
 
       <div class="p-4 border-gray-300 border-t">

data/app/views/avo/base/_select_filter.html.erb

@@ -7,7 +7,7 @@
   end
 %>
 <div data-controller="select-filter">
-  <%= filter_wrapper name: filter.name, index: index do %>
+  <%= filter_wrapper name: filter.name do %>
     <%= select_tag filter.id, options_for_select(filter.options.invert, set_value),
       class: input_classes('w-full mb-0'),
       include_blank: '—',

data/app/views/avo/home/_resources.html.erb

@@ -1,5 +1,4 @@
 <%
-  Rails.application.eager_load!
   models = ApplicationRecord.descendants
 %>
 <div>

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

@@ -30,7 +30,7 @@
       end
       classes = "text-blue-gray-600 tracking-tight leading-tight text-xs font-semibold"
   %>
-    <th class="text-left uppercase px-3 py-2 ">
+    <th class="text-left uppercase px-3 py-2 whitespace-nowrap">
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
           <%= field.name %>

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

@@ -1,4 +1,4 @@
-<div class="border-gray-300 <%= 'border-t' if index != 0 %>">
+<div>
   <div class="p-4 pb-0 text-sm font-bold text-gray-600">
     <%= name %>
   </div>

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

@@ -8,6 +8,11 @@
 
   <%= render partial: 'avo/partials/javascript' %>
 
+  <%# if Avo::PACKED %>
+    <%#= stylesheet_link_tag 'application', media: 'all', "data-turbo-track": "reload" %>
+    <%#= javascript_include_tag 'avo-packs/application', "data-turbo-track": "reload" %>
+  <%# else %>
+  <%# end %>
   <%= javascript_pack_tag 'application' %>
   <%= stylesheet_pack_tag 'application', media: 'all' %>
 </head>

data/avo.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'countries'
   spec.add_dependency 'pundit'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'i18n-js'
   spec.add_dependency 'active_link_to'
   spec.add_dependency 'image_processing'
   spec.add_dependency 'view_component'

data/config/webpacker.yml

@@ -51,32 +51,19 @@ default: &default
     - .jpeg
     - .jpg
 
+# 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
-  compile: true
 
-  # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
-  check_yarn_integrity: true
-
-  # Reference: https://webpack.js.org/configuration/dev-server/
-  dev_server:
-    https: false
-    host: localhost
-    port: 3039
-    public: localhost:3039
-    hmr: true
-    # Inline should be set to true if using HMR
-    inline: true
-    overlay: true
-    compress: true
-    disable_host_check: true
-    use_local_ip: false
-    quiet: false
-    headers:
-      'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
-    env_prefix: "AVO_WEBPACKER_DEV_SERVER"
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true
 
 test:
   <<: *default