avo 0.5.0.beta5 → 0.5.0.beta10

data/app/mailers/avo/application_mailer.rb

@@ -1,6 +1,6 @@
 module Avo
   class ApplicationMailer < ::ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 end

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,17 +1,23 @@
-import '@/css/application.css'
-
+// eslint-disable-next-line import/no-extraneous-dependencies
+import 'core-js/stable'
+// eslint-disable-next-line import/no-extraneous-dependencies
 import 'regenerator-runtime/runtime'
 import 'trix'
 import * as Mousetrap from 'mousetrap'
 import { Application } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { definitionsFromContext } from 'stimulus/webpack-helpers'
+import Rails from '@rails/ujs'
 import tippy from 'tippy.js'
 
 // Toastr alerts
 import '../js/toastr'
 
-Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: "replace" }))
+Rails.start()
+
+window.Turbolinks = Turbo
+
+Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
 const application = Application.start()
 

data/app/{frontend → packs}/js/controllers/fields/code_field_controller.js

@@ -1,20 +1,20 @@
+import 'codemirror/mode/css/css'
+
+import 'codemirror/mode/dockerfile/dockerfile'
+import 'codemirror/mode/htmlmixed/htmlmixed'
+import 'codemirror/mode/javascript/javascript'
+import 'codemirror/mode/markdown/markdown'
+import 'codemirror/mode/nginx/nginx'
+import 'codemirror/mode/php/php'
+import 'codemirror/mode/ruby/ruby'
+import 'codemirror/mode/sass/sass'
+import 'codemirror/mode/shell/shell'
+import 'codemirror/mode/sql/sql'
+import 'codemirror/mode/vue/vue'
+import 'codemirror/mode/xml/xml'
 import { Controller } from 'stimulus'
 import { castBoolean } from '@/js/helpers/cast_boolean'
 import CodeMirror from 'codemirror'
-import 'codemirror/mode/css/css.js'
-import 'codemirror/mode/css/css.js'
-import 'codemirror/mode/dockerfile/dockerfile.js'
-import 'codemirror/mode/htmlmixed/htmlmixed.js'
-import 'codemirror/mode/javascript/javascript.js'
-import 'codemirror/mode/markdown/markdown.js'
-import 'codemirror/mode/nginx/nginx.js'
-import 'codemirror/mode/php/php.js'
-import 'codemirror/mode/ruby/ruby.js'
-import 'codemirror/mode/sass/sass.js'
-import 'codemirror/mode/shell/shell.js'
-import 'codemirror/mode/sql/sql.js'
-import 'codemirror/mode/vue/vue.js'
-import 'codemirror/mode/xml/xml.js'
 
 export default class extends Controller {
   static targets = ['element']

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,31 @@ 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/{frontend → packs}/js/toastr.js

@@ -4,6 +4,7 @@ toastr.options.showDuration = 400
 toastr.options.hideDuration = 400
 toastr.options.closeButton = true
 toastr.options.positionClass = 'toast-bottom-right'
+// eslint-disable-next-line max-len
 toastr.options.closeHtml = '<button class="mt-2 mr-1"><svg class="w-4 h-4 text-gray-700" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" /></svg></button>'
 
 window.toastr = toastr

data/app/packs/stylesheets/components/code.css

@@ -0,0 +1,11 @@
+@import 'codemirror/lib/codemirror.css';
+
+/* themes */
+@import 'codemirror/theme/dracula.css';
+@import 'codemirror/theme/eclipse.css';
+@import 'codemirror/theme/material-darker.css';
+
+.CodeMirror {
+  height: var(--height) !important;
+  min-height: auto;
+}

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 %>