avo 0.5.0.beta3 → 0.5.0.beta8

data/app/views/avo/actions/show.html.erb

@@ -7,7 +7,7 @@
     data-resource-id="<%= params[:id] %>"
     class="hidden text-blue-gray-800"
   >
-    <%= form_with scope: 'fields', url: "/avo/resources/#{@resource.model_class.model_name.route_key}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
+    <%= form_with model: @model, scope: 'fields', url: "/avo/resources/#{@resource.model_class.model_name.route_key}/actions/#{@action.param_id}", data: {'turbo-frame': '_top', 'action-target': 'form'} do |form| %>
       <%= render Avo::ModalComponent.new do |c| %>
         <% c.with :heading do %>
           <%= @action.name %>
@@ -26,46 +26,10 @@
         <% end %>
 
         <% c.with :controls do %>
-          <%= a_button @action.cancel_text, 'data-action': 'click->modal#close', size: :sm %>
-          <%= a_button @action.confirm_text, type: :submit, color: :green, size: :sm %>
+          <%= a_button @action.cancel_button_label, 'data-action': 'click->modal#close', size: :sm %>
+          <%= a_button @action.confirm_button_label, type: :submit, color: :green, size: :sm %>
         <% end %>
       <% end %>
     <% end %>
   </div>
 <% end %>
-
-<%#
-      <div v-if="hasFields">
-        <component
-          v-for="(field, index) in fields"
-          :key="uniqueKey(field, index)"
-          :index="index"
-          :is="`edit-${field.component}`"
-          :field="field"
-          :errors="errors"
-          :resource-name="resourceName"
-          :field-id="field.id"
-          :via-resource-name="viaResourceName"
-          :via-resource-id="viaResourceId"
-          :field-component="field.component"
-          displayed-in="modal"
-        />
-      </div>
-      <div class="flex-1 flex items-center justify-center px-8 text-lg mt-8 mb-12" v-else>
-        {{ action.message }}
-      </div>
-      <div class="flex justify-end items-baseline space-x-4 p-4 bg-gray-200">
-        <a-button
-          size="sm"
-          @click="$emit('close')"
-          v-text="action.cancel_text"
-        />
-        <a-button
-          ref="confirm-button"
-          :color="buttonColor"
-          size="sm"
-          @click="handle"
-          v-text="action.confirm_text"
-        />
-    </div>
-      </div> %>

data/app/views/avo/attachments/show.html.erb

@@ -1,6 +1,13 @@
 <%= turbo_frame_tag 'destroy_attachment_form' do %>
   <%= form_with url: "/avo/resources/#{params[:resource_name]}/#{params[:id]
-    }/active_storage_attachments/#{params[:attachment_name]}/#{params[:signed_attachment_id]}", method: :delete, html: {'data-turbo-frame': 'destroy_attachment_form', 'data-controller': 'attachments', 'data-attachments-target': 'form', class: 'hidden' } do |form| %>
+    }/active_storage_attachments/#{params[:attachment_name]}/#{params[:signed_attachment_id]}",
+    method: :delete,
+    html: {
+      'data-turbo-frame': 'destroy_attachment_form',
+      'data-controller': 'attachments',
+      'data-attachments-target': 'form',
+      class: 'hidden'
+    } do |form| %>
     <%= form.button 'destroy', type: :submit %>
     <%= form.hidden_field :referrer, value: request.referer, id: "referrer_destroy_attachment_#{params[:signed_attachment_id]}" %>
   <% end %>

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,13 +12,14 @@
   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| %>
           <label class="flex items-center text-gray-700 text-sm">
             <%= check_box_tag filter.id, value, set_value[value.to_s],
               class: 'mr-2 text-lg h-4 w-4',
+              id: "avo_filters_#{filter.id.parameterize.underscore}",
               'data-filter-class': filter.class,
               'data-boolean-filter-target': 'option',
               'data-action': 'input->boolean-filter#changeFilter'

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
     %>
@@ -10,19 +11,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,10 +7,11 @@
   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: '—',
+      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/home/_resources.html.erb

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

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/_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/avo.gemspec

@@ -39,9 +39,9 @@ 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'
   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