avo 1.19.1.pre.3 → 1.19.1.pre.4

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/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.19.1.pre.3"
+  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