avo 0.5.0.beta7 → 0.5.0.beta8

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
@@ -196,7 +193,7 @@ module Avo
         end
 
         @actions = @resource.get_actions.map do |action|
-          action.new.hydrate(model: model, resource: @resource)
+          action.new(model: model, resource: @resource)
         end
       end
 

data/app/controllers/avo/relations_controller.rb

@@ -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/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,6 +5,9 @@ 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'

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()
   }
 }

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/_boolean_filter.html.erb

@@ -19,6 +19,7 @@
           <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'