avo 0.5.0.beta7 → 0.5.0.beta8

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

@@ -3,6 +3,7 @@
     <%= a_button class: 'focus:outline-none',
       color: 'blue-gray',
       title: t('avo.click_to_reveal_filters'),
+      'data-button': 'resource-filters',
       'data-action': 'click->toggle-panel#togglePanel',
       'data-tippy': 'tooltip' do
     %>

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

@@ -11,6 +11,7 @@
     <%= select_tag filter.id, options_for_select(filter.options.invert, set_value),
       class: input_classes('w-full mb-0'),
       include_blank: '—',
+      id: "avo_filters_#{filter.id.parameterize.underscore}",
       'data-filter-class': filter.class,
       'data-select-filter-target': 'selector',
       'data-action': "change->select-filter#changeFilter"

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

@@ -1,6 +1,11 @@
 <%
-  # @todo: add avo styling to paginator
-  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, @index_params[:per_page].to_i].sort.uniq
+  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, @index_params[:per_page].to_i]
+
+  if @parent_resource.present?
+    per_page_options.prepend Avo.configuration.via_per_page
+  end
+
+  per_page_options = per_page_options.sort.uniq
 %>
 
 <div class="bg-white px-4 flex items-center justify-between aborder-t aborder-blue-gray-200 sm:px-6 rounded-xl">
@@ -11,11 +16,23 @@
 
         <div data-controller="per-page">
           <div class="flex items-center">
-            <%= select_tag 'per_page', options_for_select(per_page_options, @index_params[:per_page]), class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm', 'data-per-page-target': 'selector', 'data-action': 'change->per-page#reload' %> <%= t('avo.per_page').downcase %>
+            <%= select_tag 'per_page',
+              options_for_select(per_page_options, @index_params[:per_page]),
+              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm',
+              data: {
+                'turbo-frame': turbo_frame,
+                'per-page-target': 'selector',
+                action: 'change->per-page#reload'
+              }
+            %> <%= t('avo.per_page').downcase %>
           </div>
 
           <% per_page_options.each do |option| %>
-            <%= link_to "Change to #{option} items per page", resources_path(@resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% if @parent_resource.present? %>
+              <%= link_to "Change to #{option} items per page", related_resources_path(@parent_resource.model, @resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% else %>
+              <%= link_to "Change to #{option} items per page", resources_path(@resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% end %>
           <% end %>
         </div>
       </div>
@@ -24,7 +41,9 @@
   <div class="flex">
     <div class="flex-2 sm:flex sm:items-center sm:justify-between">
       <%# @todo: add first & last page. make the first and last buttons rounded %>
-      <%== pagy_nav @pagy %>
+      <% if @pagy.pages > 1 %>
+        <%== pagy_nav @pagy %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/avo/relations/new.html.erb

@@ -1,5 +1,9 @@
 <%= turbo_frame_tag 'attach_modal' do %>
-  <%= form_with scope: 'fields', url: "/avo/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/", data: {'turbo-frame': '_top'} do |form| %>
+  <%= form_with scope: 'fields',
+    url: "/avo/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    data: {
+      'turbo-frame': '_top'
+    } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.with :heading do %>
         <%= t('avo.choose_item', { item: params[:related_name].downcase }) %>

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

@@ -8,11 +8,6 @@
 
   <%= 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

@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'image_processing'
   spec.add_dependency 'view_component'
   spec.add_dependency 'hotwire-rails'
+  spec.add_dependency 'addressable'
 end

data/bin/rspec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError => e

data/bin/webpack

@@ -4,7 +4,8 @@ ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
 ENV['NODE_ENV']  ||= 'development'
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
 require 'rubygems'
 require 'bundler/setup'

data/config/webpack/aliases.js

@@ -3,7 +3,7 @@ const path = require('path')
 module.exports = {
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '..', '..', 'app/frontend'),
+      '@': path.resolve(__dirname, '..', '..', 'app/packs'),
       '~': path.resolve(__dirname, '..', '..', 'node_modules'),
     },
   },

data/config/webpack/base.js

@@ -0,0 +1,14 @@
+const { webpackConfig, merge } = require('@rails/webpacker')
+const aliases = require('./aliases')
+
+const customConfig = {
+  resolve: {
+    extensions: ['.css']
+  }
+}
+const config = merge(webpackConfig, aliases, customConfig)
+
+delete config.optimization
+console.log('config->', config)
+
+module.exports = config

data/config/webpack/development.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpack/production.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'production'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpack/test.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpacker.yml

@@ -1,66 +1,30 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/frontend
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_root_path: public
   cache_path: tmp/cache/webpacker
   check_yarn_integrity: false
   # use a different sub-folder name
   public_output_path: avo-packs
   webpack_compile_output: true
+  extract_css: true
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
+  additional_paths_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Extract and emit a css file
-  extract_css: true
-
-  static_assets_extensions:
-    - .jpg
-    - .jpeg
-    - .png
-    - .gif
-    - .tiff
-    - .ico
-    - .svg
-    - .eot
-    - .otf
-    - .ttf
-    - .woff
-    - .woff2
-
-  extensions:
-    - .ts
-    - .vue
-    - .mjs
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .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
 
   # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
+  compile: true
 
   # Cache manifest.json for performance
   cache_manifest: true
@@ -79,8 +43,5 @@ production:
   # 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

data/db/factories.rb

@@ -12,6 +12,7 @@ FactoryBot.define do
   factory :team do
     name { Faker::Company.name }
     description { Faker::Lorem.paragraph(sentence_count: 4) }
+    url { Faker::Internet.url }
   end
 
   factory :post do

data/lib/avo/action_model.rb

@@ -0,0 +1,20 @@
+module Avo
+  class ActionModel
+    include ActiveModel::Model
+
+    # This class augments a model the action form declaration.
+    def initialize(attributes = {})
+      set_attr_accessors attributes
+
+      super(attributes)
+    end
+
+    private
+
+    def set_attr_accessors(attributes)
+      attributes.each do |k, v|
+        self.class.class_eval { attr_accessor k }
+      end
+    end
+  end
+end

data/lib/avo/app.rb

@@ -10,23 +10,6 @@ module Avo
     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
 
@@ -77,31 +60,6 @@ module Avo
           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

data/lib/avo/base_action.rb

@@ -1,78 +1,81 @@
 module Avo
   class BaseAction
+    extend FieldsCollector
+    extend HasContext
+
     class_attribute :name, default: self.class.to_s.demodulize.underscore.humanize(keep_id_suffix: true)
     class_attribute :message
-    class_attribute :confirm_text
-    class_attribute :cancel_text
+    class_attribute :confirm_button_label
+    class_attribute :cancel_button_label
     class_attribute :no_confirmation, default: false
-    class_attribute :fields_loader
+    class_attribute :model
+    class_attribute :view
+    class_attribute :user
+    class_attribute :resource
+    class_attribute :fields
 
     attr_accessor :response
     attr_accessor :model
     attr_accessor :resource
     attr_accessor :user
+    attr_accessor :fields_loader
 
-    class << self
-      def fields(&block)
-        self.fields_loader ||= Avo::Loaders::FieldsLoader.new
-
-        yield(fields_loader)
-      end
-
-      def context
-        App.context
-      end
-    end
+    def initialize(model: nil, resource: nil, user: nil)
+      self.class.model = model if model.present?
+      self.class.resource = resource if resource.present?
+      self.class.user = user if user.present?
 
-    def initialize
       self.class.message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
-      self.class.confirm_text ||= I18n.t('avo.run')
-      self.class.cancel_text ||= I18n.t('avo.cancel')
+      self.class.confirm_button_label ||= I18n.t('avo.run')
+      self.class.cancel_button_label ||= I18n.t('avo.cancel')
 
       @response ||= {}
       @response[:message_type] ||= :notice
       @response[:message] ||= I18n.t('avo.action_ran_successfully')
     end
 
-    def get_fields(view_type: :table)
-      get_field_definitions.map do |field|
-        field.hydrate(action: self, model: @model)
-      end
-      .select do |field|
-        field.can_see.present? ? field.can_see.call : true
-      end
+    def context
+      self.class.context
     end
 
     def get_field_definitions
-      return [] if self.class.fields_loader.blank?
+      return [] if self.class.fields.blank?
 
-      self.class.fields_loader.bag.map do |field|
+      self.class.fields.map do |field|
         field.hydrate(action: self)
       end
     end
 
-    def hydrate(model: nil, resource: nil, user: nil)
-      @model = model if model.present?
-      @resource = resource if resource.present?
-      @user = user if user.present?
+    def get_fields
+      get_field_definitions.map do |field|
+        field.hydrate(action: self, model: @model)
+      end
+      .select do |field|
+        field.visible?
+      end
+    end
 
-      self
+    def get_attributes_for_action
+      get_fields.map do |field|
+        [field.id, field.value]
+      end
+      .to_h
     end
 
-    def handle_action(request, models, raw_fields)
+    def handle_action(models:, fields:)
       avo_fields = get_fields.map { |field| [field.id, field] }.to_h
 
-      if raw_fields.present?
-        fields = raw_fields.to_unsafe_h.map do |name, value|
+      if fields.present?
+        processed_fields = fields.to_unsafe_h.map do |name, value|
           [name, avo_fields[name.to_sym].resolve_attribute(value)]
         end
 
-        fields = fields.to_h
+        processed_fields = processed_fields.to_h
       else
-        fields = {}
+        processed_fields = {}
       end
 
-      result = self.handle request, models, fields
+      result = self.handle models: models, fields: processed_fields
 
       self
     end