avo 1.19.0 → 1.19.1.pre.4

data/app/{packs/entrypoints/application.js → javascript/avo.js}

@@ -4,15 +4,14 @@ import 'core-js/stable'
 import 'regenerator-runtime/runtime'
 import * as ActiveStorage from '@rails/activestorage'
 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/active-storage'
-import '../js/toastr'
+import './js/active-storage'
+import './js/controllers'
+import './js/toastr'
 
 Rails.start()
 
@@ -33,15 +32,8 @@ function initTippy() {
 }
 window.initTippy = initTippy
 
-const application = Application.start()
 ActiveStorage.start()
 
-const context = require.context('./../js/controllers', true, /\.js$/)
-application.load(definitionsFromContext(context))
-
-const fieldsContext = require.context('./../js/controllers/fields', true, /\.js$/)
-application.load(definitionsFromContext(fieldsContext))
-
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
   initTippy()
@@ -58,10 +50,3 @@ document.addEventListener('turbo:submit-start', () => document.body.classList.ad
 document.addEventListener('turbo:before-cache', () => {
   document.querySelectorAll('[data-turbo-remove-before-cache]').forEach((element) => element.remove())
 })
-
-// Uncomment to copy all static images under ../images to the output folder and reference
-// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
-// or the `imagePath` JavaScript helper below.
-//
-const images = require.context('../images', true)
-const imagePath = (name) => images(name, true)

data/app/javascript/js/application.js

@@ -0,0 +1,9 @@
+import { Application } from 'stimulus'
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus = application
+
+export { application }

data/app/{packs → javascript}/js/controllers/action_controller.js

@@ -1,5 +1,5 @@
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['controllerDiv', 'resourceIds', 'form']

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

@@ -15,9 +15,10 @@ import 'codemirror/mode/xml/xml'
 import 'codemirror/mode/yaml/yaml'
 
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
 import CodeMirror from 'codemirror'
 
+import { castBoolean } from '../../helpers/cast_boolean'
+
 export default class extends Controller {
   static targets = ['element']
 

data/app/{packs → javascript}/js/controllers/fields/date_field_controller.js

@@ -1,6 +1,6 @@
 import { Controller } from 'stimulus'
 import { DateTime } from 'luxon'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 import flatpickr from 'flatpickr'
 
 export default class extends Controller {

data/app/{packs → javascript}/js/controllers/fields/key_value_controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-len */
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['input', 'controller', 'rows']

data/app/{packs → javascript}/js/controllers/fields/trix_field_controller.js

@@ -1,6 +1,6 @@
 import 'trix'
 import { Controller } from 'stimulus'
-import { castBoolean } from '@/js/helpers/cast_boolean'
+import { castBoolean } from '../../helpers/cast_boolean'
 
 export default class extends Controller {
   static targets = ['editor', 'controller']

data/app/{packs → javascript}/js/controllers/search_controller.js

@@ -3,7 +3,7 @@ import * as Mousetrap from 'mousetrap'
 import { Controller } from 'stimulus'
 import { Turbo } from '@hotwired/turbo-rails'
 import { autocomplete } from '@algolia/autocomplete-js'
-import debouncePromise from '@/js/helpers/debounce_promise'
+import debouncePromise from '../helpers/debounce_promise'
 
 export default class extends Controller {
   static targets = ['autocomplete', 'button']

data/app/javascript/js/controllers.js

@@ -0,0 +1,53 @@
+import { application } from './application'
+
+import ActionController from './controllers/action_controller'
+import ActionsPickerController from './controllers/actions_picker_controller'
+import AlertsController from './controllers/alerts_controller'
+import AttachmentsController from './controllers/attachments_controller'
+import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
+import BooleanFilterController from './controllers/boolean_filter_controller'
+import CodeFieldController from './controllers/fields/code_field_controller'
+import DateFieldController from './controllers/fields/date_field_controller'
+import FilterController from './controllers/filter_controller'
+import HiddenInputController from './controllers/hidden_input_controller'
+import ItemSelectAllController from './controllers/item_select_all_controller'
+import ItemSelectorController from './controllers/item_selector_controller'
+import KeyValueController from './controllers/fields/key_value_controller'
+import LoadingButtonController from './controllers/loading_button_controller'
+import ModalController from './controllers/modal_controller'
+import MultipleSelectFilterController from './controllers/multiple_select_filter_controller'
+import PerPageController from './controllers/per_page_controller'
+import SearchController from './controllers/search_controller'
+import SelectFilterController from './controllers/select_filter_controller'
+import SimpleMdeController from './controllers/fields/simple_mde_controller'
+import TextFilterController from './controllers/text_filter_controller'
+import TippyController from './controllers/tippy_controller'
+import TogglePanelController from './controllers/toggle_panel_controller'
+import TrixFieldController from './controllers/fields/trix_field_controller'
+
+application.register('action', ActionController)
+application.register('actions-picker', ActionsPickerController)
+application.register('alerts', AlertsController)
+application.register('attachments', AttachmentsController)
+application.register('boolean-filter', BooleanFilterController)
+application.register('filter', FilterController)
+application.register('hidden-input', HiddenInputController)
+application.register('item-select-all', ItemSelectAllController)
+application.register('item-selector', ItemSelectorController)
+application.register('loading-button', LoadingButtonController)
+application.register('modal', ModalController)
+application.register('multiple-select-filter', MultipleSelectFilterController)
+application.register('per-page', PerPageController)
+application.register('search', SearchController)
+application.register('select-filter', SelectFilterController)
+application.register('text-filter', TextFilterController)
+application.register('tippy', TippyController)
+application.register('toggle-panel', TogglePanelController)
+
+// Field controllers
+application.register('belongs-to-field', BelongsToFieldController)
+application.register('code-field', CodeFieldController)
+application.register('date-field', DateFieldController)
+application.register('key-value', KeyValueController)
+application.register('simple-mde', SimpleMdeController)
+application.register('trix-field', TrixFieldController)

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

@@ -1 +1 @@
-<%= image_manifest_tag 'logo.png', class: 'h-full', title: 'Avo' %>
+<%= image_tag 'avo/logo.png', class: 'h-full', title: 'Avo' %>

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

@@ -9,8 +9,13 @@
   <%= render partial: 'avo/partials/javascript' %>
   <%= render partial: 'avo/partials/head' %>
 
-  <%= javascript_manifest_tag 'application' %>
-  <%= stylesheet_manifest_tag 'application', media: 'all' %>
+  <% if Avo::PACKED %>
+    <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+  <% else %>
+    <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+  <% end %>
 </head>
 <body class="bg-blue-gray-200">
 

data/avo.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
       "public gem pushes."
   end
 
-  spec.post_install_message = "Thank you for using Avo! Docs are available at https://docs.avohq.io"
+  spec.post_install_message = "Thank you for using Avo 💪  Docs are available at https://docs.avohq.io"
 
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
@@ -44,5 +44,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
-  spec.add_dependency "manifester"
 end

data/bin/dev

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if ! command -v foreman &> /dev/null
+then
+  echo "Installing foreman..."
+  gem install foreman
+fi
+
+foreman start -f Procfile.dev

data/bin/test

@@ -11,7 +11,8 @@ fi;
 
 # Run system tests
 if [[ -z "$1" ]] || [[ "$1" == "system" ]]; then
-  bin/webpack
+  yarn build
+  yarn build:css
   bundle exec rspec ./spec --tag type:system
 fi;
 

data/lib/avo/base_resource.rb

@@ -343,8 +343,9 @@ module Avo
 
             reflection = @model._reflections[@params[:via_relation]]
 
-            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params["via_relation_class"])
-              value = @params["via_relation_class"].safe_constantize.find(@params[:via_resource_id])
+            if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params[:via_relation_class])
+              # set the value to the actual record
+              value = @params[:via_relation_class].safe_constantize.find(@params[:via_resource_id])
             elsif reflection.present? && reflection.foreign_key.present? && field.id.to_s == @params[:via_relation].to_s
               value = @params[:via_resource_id]
             end
@@ -441,7 +442,7 @@ module Avo
     end
 
     def form_scope
-      model.class.base_class.to_s.downcase
+      model.class.base_class.to_s.underscore.downcase
     end
   end
 end

data/lib/avo/engine.rb

@@ -55,28 +55,14 @@ module Avo
       end
     end
 
-    initializer "webpacker.proxy" do |app|
+    initializer "debug_exception_response_format" do |app|
       app.config.debug_exception_response_format = :api
       # app.config.logger = ::Logger.new(STDOUT)
-
-      insert_middleware = begin
-        Avo.webpacker.config.dev_server.present?
-      rescue
-        nil
-      end
-
-      if insert_middleware
-        app.middleware.insert_before(
-          0, Webpacker::DevServerProxy,
-          ssl_verify_none: true,
-          webpacker: Avo.webpacker
-        )
-      end
     end
 
     config.app_middleware.use(
       Rack::Static,
-      urls: ["/avo-packs"],
+      urls: ["/avo-assets"],
       root: Avo::Engine.root.join("public")
     )
 

data/lib/avo/fields/base_field.rb

@@ -19,7 +19,6 @@ module Avo
       attr_reader :nullable
       attr_reader :null_values
       attr_reader :format_using
-      attr_reader :placeholder
       attr_reader :help
       attr_reader :default
       attr_reader :visible
@@ -57,7 +56,7 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
-        @placeholder = args[:placeholder] || id.to_s.humanize(keep_id_suffix: true)
+        @placeholder = args[:placeholder]
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible] || true
@@ -103,6 +102,12 @@ module Avo
         @id.to_s.humanize(keep_id_suffix: true)
       end
 
+      def placeholder
+        return @placeholder if @placeholder.present?
+
+        name
+      end
+
       def visible?
         if visible.present? && visible.respond_to?(:call)
           visible.call resource: @resource

data/lib/avo/fields/key_value_field.rb

@@ -15,10 +15,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : "Key"
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : "Value"
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : "Add row"
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : "Delete row"
+        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
+        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
+        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
+        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.19.0"
+  VERSION = "1.19.1.pre.4"
 end

data/lib/avo.rb

@@ -13,24 +13,6 @@ module Avo
   class LicenseVerificationTemperedError < StandardError; end
 
   class LicenseInvalidError < StandardError; end
-
-  class << self
-    def webpacker
-      @webpacker ||= ::Webpacker::Instance.new(
-        root_path: ROOT_PATH,
-        config_path: ROOT_PATH.join("config/webpacker.yml")
-      )
-    end
-
-    def manifester
-      @manifester ||= ::Manifester::Instance.new(
-        root_path: ROOT_PATH,
-        public_output_dir: "avo-packs",
-        cache_manifest: Rails.env.production?,
-        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT }
-      )
-    end
-  end
 end
 
 loader.eager_load

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -8,7 +8,7 @@ en:
     run: 'Run'
     cancel: 'Cancel'
     action_ran_successfully: 'Action ran successfully!'
-    resource_details: "%{item} details: %{title}"
+    resource_details: '%{item} details: %{title}'
     update_item: 'update %{item}: %{title}'
     unauthorized: 'Unauthorized'
     attachment_class_attached: '%{attachment_class} attached.'
@@ -16,8 +16,8 @@ en:
     resource_updated: 'Resource updated'
     resource_created: 'Resource created'
     resource_destroyed: 'Resource destroyed'
-    switch_to_view: "Switch to %{view_type} view"
-    click_to_reveal_filters: "Click to reveal filters"
+    switch_to_view: 'Switch to %{view_type} view'
+    click_to_reveal_filters: 'Click to reveal filters'
     attachment_destroyed: 'Attachment destroyed'
     failed_to_find_attachment: 'Failed to find attachment'
     you_missed_something_check_form: 'You might have missed something. Please check the form.'
@@ -86,3 +86,10 @@ en:
     sign_out: 'Sign out'
     failed: 'Failed'
     failed_to_load: 'Failed to load'
+    key_value_field:
+      key: 'Key'
+      value: 'Value'
+      add_row: 'Add row'
+      delete_row: 'Delete row'
+    was_successfully_created: 'was successfully created'
+    was_successfully_updated: 'was successfully updated'

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -71,3 +71,10 @@ ro:
       placeholder: 'Cauta'
       cancel_button: 'Anulare'
     sign_out: 'Delogare'
+    key_value_field:
+      key: 'Cheie'
+      value: 'Valoare'
+      add_row: 'Adauga rand'
+      delete_row: 'Sterge rand'
+    was_successfully_created: 'a fost creat'
+    was_successfully_updated: 'a fost actualizat'