avo 0.5.0.beta4 → 0.5.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274e5f99538c656daae6caef5484cd7f9864b4cdd8ca39a616084d73f0c66d29
-  data.tar.gz: 3fca117d0c913546ba43493b3e80afa6584004fc1bd91d8452e2fd57160e2802
+  metadata.gz: e9ed4bc1c98f78365b9b2a50dda9ed809b6c598c2d0b745e6f706f3456974532
+  data.tar.gz: 71cf2d32d71b19316e36cc2e4a7688d2581f668044ac2975a786c3ce753b11a9
 SHA512:
-  metadata.gz: 5a600bc88614730df27fd05a8a459ee70c8513a8c7a05df55f22e8679e151e857e866c07e9c35f16ae9d65c2843a21114d730622588e7375bebac9b1d49c8a9d
-  data.tar.gz: b192141926944fd2f987f962eb073c01892bedde487a74d62818cf00fe1ae7aa2b6760de2843c01ddcd47f38015a1b42063ca3437d040f2a48088a6a2b8b13b2
+  metadata.gz: 19ecbf7fb7b632eb4e00d17c88eff0f613ed03051f9b527313515b953c31c847f6328a4faa58ae6a2eb87ceab94ab62cf4be3c0d89efd6f74669fa403bb73b74
+  data.tar.gz: 61d6eef278896616b12cc4b3d3b996de8068ba93e7017a06885871f7d8a15b365621762360c2577ec5691cd37ab643a8e34318efc7be3ee99429e38ce6947dc8

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'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta4)
+    avo (0.5.0.beta5)
       active_link_to
       countries
       hotwire-rails

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_table_component.html.erb

@@ -1,7 +1,7 @@
 <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.cache_hash(@parent_model) do %>

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

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?
 
@@ -221,7 +224,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
@@ -216,7 +214,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/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/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

data/lib/avo.rb

@@ -1,20 +1,9 @@
-require_relative 'avo/configuration'
+require 'zeitwerk'
 require_relative 'avo/version'
+require_relative 'avo/engine' if defined?(Rails)
 
-require_relative 'avo/app/fields/field'
-
-require_relative 'avo/app/action'
-
-require_relative 'avo/app/filter'
-require_relative 'avo/app/filters/boolean_filter'
-require_relative 'avo/app/filters/select_filter'
-
-require_relative 'avo/app/fields_loader'
-require_relative 'avo/app/actions_loader'
-# require_relative 'avo/app/fields_loader_helper'
-require_relative 'avo/app/resource'
-
-require_relative 'avo/app/licensing/license_manager'
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 module Avo
   ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
@@ -31,4 +20,4 @@ module Avo
   end
 end
 
-require_relative 'avo/engine' if defined?(Rails)
+loader.eager_load

data/lib/avo/app.rb

@@ -0,0 +1,190 @@
+module Avo
+  class App
+    class_attribute :app, default: {
+      resources: [],
+      cache_store: nil
+    }
+    class_attribute :fields, default: []
+    class_attribute :request, default: nil
+    class_attribute :context, default: nil
+    class_attribute :license, default: nil
+
+    class << self
+  #     def load_controllers
+  #       BaseResource.descendants.each do |resource|
+  #         controller_name = "#{resource.to_s.gsub('Resource', '').pluralize}Controller"
+  #         puts controller_name.inspect
+  # #           eval <<DYNAMIC
+  # #   class #{controller_name} < Avo::ResourcesController
+  # #     # title :Person
+  # #     # attribute :name, String
+  # #     # ...or substitute other stuff in here.
+  # #   end
+  # # DYNAMIC
+
+  #         Avo.const_set(controller_name.to_sym, Class.new(Avo::ResourcesController))
+  #         # puts controller_name.inspect
+  #       end
+  #     end
+
+      def boot
+        init_fields
+
+        I18n.locale = Avo.configuration.language_code
+
+        if Rails.cache.class == ActiveSupport::Cache::NullStore
+          self.app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+        else
+          self.app[:cache_store] = Rails.cache
+        end
+      end
+
+      def init(request:, context:)
+        self.request = request
+        self.context = context
+
+        # Set the current host for ActiveStorage
+        ActiveStorage::Current.host = request.base_url
+
+        init_resources
+
+        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+      end
+
+      def cache_store
+        self.app[:cache_store]
+      end
+
+      # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
+      # so later we can instantiate them on our resources.
+      #
+      # If the field has their `def_method` set up it will follow that convention, if not it will snake_case the name:
+      #
+      # Avo::Fields::TextField -> text
+      # Avo::Fields::DateTimeField -> date_time
+      def init_fields
+        Avo::Fields::BaseField.descendants.each do |class_name|
+          next if class_name.to_s == 'BaseField'
+
+          if class_name.to_s.end_with? 'Field'
+            load_field class_name.get_field_name, class_name
+          end
+        end
+      end
+
+      def load_field(method_name, klass)
+        self.fields.push(
+          name: method_name,
+          class: klass,
+        )
+
+        # Avo::Loaders::FieldsLoader.define_method method_name.to_sym do |*args, &block|
+        #   puts ['Avo::Loaders::FieldsLoader.define_method->', args, block.present?].inspect
+
+        #   if block.present?
+        #     puts '111->'.inspect
+        #     field = klass.new(args[0], **args[1] || {}, &block)
+        #   else
+        #     puts '222->'.inspect
+        #     field = klass.new(args[0], **args[1] || {})
+        #   end
+
+        #   puts field.inspect
+
+        #   self.bag.push field
+
+        #   # field
+        #   # if block.present?
+        #   #   field_class = klass::new(args[0], **args[1] || {}, &block)
+        #   # else
+        #   #   field_class = klass::new(args[0], **args[1] || {})
+        #   # end
+
+        #   # klass_entity.add_field(self, field_class)
+        # end
+      end
+
+      def init_resources
+        self.app[:resources] = BaseResource.descendants
+          .select do |resource|
+            resource != BaseResource
+          end
+          .map do |resource|
+            if resource.is_a? Class
+              resource.new
+            end
+          end
+      end
+
+      def get_resources
+        self.app[:resources]
+      end
+
+      # Returns the Avo resource by camelized name
+      #
+      # get_resource_by_name('User') => Avo::Resources::User
+      def get_resource(resource)
+        self.app[:resources].find do |available_resource|
+          "#{resource}Resource".safe_constantize == available_resource.class
+        end
+      end
+
+      # Returns the Avo resource by singular snake_cased name
+      #
+      # get_resource_by_name('user') => Avo::Resources::User
+      def get_resource_by_name(name)
+        self.get_resource name.singularize.camelize
+      end
+
+      # Returns the Avo resource by singular snake_cased name
+      #
+      # get_resource_by_name('User') => Avo::Resources::User
+      # get_resource_by_name(User) => Avo::Resources::User
+      def get_resource_by_model_name(name)
+        get_resources.find do |resource|
+          resource.model_class.model_name.name == name.to_s
+        end
+      end
+
+      # Returns the Rails model class by singular snake_cased name
+      #
+      # get_model_class_by_name('user') => User
+      def get_model_class_by_name(name)
+        name.to_s.camelize.singularize
+      end
+
+      def get_available_resources(user = nil)
+        App.get_resources
+          .select do |resource|
+            Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'], raise_exception: false
+          end
+          .sort_by { |r| r.name }
+      end
+
+      def get_navigation_items(user = nil)
+        get_available_resources(user).select do |resource|
+          resource.model_class.present?
+        end
+      end
+
+      def draw_routes
+        # We should eager load all the classes so we find all descendants
+        Rails.application.eager_load!
+
+        Proc.new do
+          BaseResource.descendants
+            .select do |resource|
+              resource != :Resource
+            end
+            .map do |resource|
+              if resource.is_a? Class
+                route_key = resource.to_s.underscore.gsub('_resource', '').downcase.pluralize.to_sym
+
+                resources route_key
+              end
+            end
+        end
+      end
+    end
+  end
+end