avo 0.5.0.beta9 → 0.5.0.beta14

data/app/helpers/avo/resources_helper.rb

@@ -1,16 +1,16 @@
 module Avo
   module ResourcesHelper
     def resource_table(resources, resource)
-      render partial: 'avo/partials/resource_table', locals: {
+      render partial: "avo/partials/resource_table", locals: {
         resources: resources,
-        resource: resource,
+        resource: resource
       }
     end
 
     def resource_grid(resources, resource)
-      render partial: 'avo/partials/resource_grid', locals: {
+      render partial: "avo/partials/resource_grid", locals: {
         resources: resources,
-        resource: resource,
+        resource: resource
       }
     end
 
@@ -23,7 +23,7 @@ module Avo
         render partial: field.partial_path_for(:index), locals: {
           field: field,
           index: index,
-          resource: resource,
+          resource: resource
         }
       end
     end
@@ -37,7 +37,7 @@ module Avo
         render partial: field.partial_path_for(:show), locals: {
           field: field,
           index: index,
-          resource: resource,
+          resource: resource
         }
       end
     end
@@ -53,7 +53,7 @@ module Avo
           index: index,
           resource: resource,
           form: form,
-          displayed_in_modal: displayed_in_modal,
+          displayed_in_modal: displayed_in_modal
         }
       end
     end
@@ -77,9 +77,9 @@ module Avo
     end
 
     def filter_wrapper(name: nil, index: nil, **args, &block)
-      render layout: 'layouts/avo/filter_wrapper', locals: {
+      render layout: "layouts/avo/filter_wrapper", locals: {
         name: name,
-        index: index,
+        index: index
       } do
         capture(&block)
       end
@@ -91,9 +91,9 @@ module Avo
 
     def item_selector_input(floating: false, size: :md)
       "<input type='checkbox'
-        class='mx-3 #{'absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block' if floating} #{size.to_sym == :lg ? 'w-5 h-5' : 'w-4 h-4'}'
+        class='mx-3 #{"absolute inset-auto left-0 mt-2 z-10 hidden group-hover:block checked:block" if floating} #{size.to_sym == :lg ? "w-5 h-5" : "w-4 h-4"}'
         data-action='input->item-selector#toggle'
-        title='#{t 'avo.select_item' }'
+        title='#{t "avo.select_item"}'
         data-tippy='tooltip'
       />"
     end

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/packs/entrypoints/application.js

@@ -1,21 +1,23 @@
-import 'regenerator-runtime/runtime'
+// 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'
-import Rails from '@rails/ujs';
-
-Rails.start();
-
-window.Turbolinks = Turbo
 
 // 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/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/packs/js/controllers/filter_controller.js

@@ -36,13 +36,14 @@ export default class extends Controller {
     filters[filterClass] = value
 
     const filtered = Object.keys(filters)
-    .filter(key => filters[key] !== '')
-    .reduce((obj, key) => {
-      obj[key] = filters[key];
-      return obj;
-    }, {});
+      .filter((key) => filters[key] !== '')
+      .reduce((obj, key) => {
+        obj[key] = filters[key]
 
-    let encodedFilters;
+        return obj
+      }, {})
+
+    let encodedFilters
 
     if (filtered && Object.keys(filtered).length > 0) {
       encodedFilters = btoa(JSON.stringify(filtered))
@@ -55,9 +56,9 @@ export default class extends Controller {
     }
 
     if (encodedFilters) {
-      query['filters'] = encodedFilters
+      query.filters = encodedFilters
     } else {
-      delete query['filters']
+      delete query.filters
     }
 
     url.query(query)

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

@@ -1,47 +1,46 @@
-$:.push File.expand_path('lib', __dir__)
+$:.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
-require 'avo/version'
+require "avo/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
-  spec.name        = 'avo'
-  spec.version     = Avo::VERSION
-  spec.authors     = ['Adrian Marin', 'Mihai Marin']
-  spec.email       = ['avo@avohq.io']
-  spec.homepage    = 'https://avohq.io'
-  spec.summary     = 'Configuration-based, no-maintenance, extendable Ruby on Rails admin.'
-  spec.description = 'Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow.'
-  spec.license     = 'Commercial'
+  spec.name = "avo"
+  spec.version = Avo::VERSION
+  spec.authors = ["Adrian Marin", "Mihai Marin"]
+  spec.email = ["avo@avohq.io"]
+  spec.homepage = "https://avohq.io"
+  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin."
+  spec.description = "Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow."
+  spec.license = "Commercial"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['bug_tracker_uri'] = 'https://github.com/avo-hq/avo/issues'
-    spec.metadata['changelog_uri'] = 'https://avohq.io/releases'
-    spec.metadata['documentation_uri'] = 'https://docs.avohq.io'
-    spec.metadata['homepage_uri'] = 'https://avohq.io'
-    spec.metadata['source_code_uri'] = 'https://github.com/avo-hq/avo'
+    spec.metadata["bug_tracker_uri"] = "https://github.com/avo-hq/avo/issues"
+    spec.metadata["changelog_uri"] = "https://avohq.io/releases"
+    spec.metadata["documentation_uri"] = "https://docs.avohq.io"
+    spec.metadata["homepage_uri"] = "https://avohq.io"
+    spec.metadata["source_code_uri"] = "https://github.com/avo-hq/avo"
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   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']
+  spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
-  spec.add_dependency 'rails', '>= 6.0'
-  spec.add_dependency 'pagy'
-  spec.add_dependency 'zeitwerk'
-  spec.add_dependency 'inline_svg'
-  spec.add_dependency 'webpacker'
-  spec.add_dependency 'countries'
-  spec.add_dependency 'pundit'
-  spec.add_dependency 'httparty'
-  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'
+  spec.add_dependency "rails", ">= 6.0"
+  spec.add_dependency "pagy"
+  spec.add_dependency "zeitwerk"
+  spec.add_dependency "webpacker"
+  spec.add_dependency "countries"
+  spec.add_dependency "pundit"
+  spec.add_dependency "httparty"
+  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/config/initializers/pagy.rb

@@ -1 +1 @@
-require 'pagy/extras/trim'
+require "pagy/extras/trim"

data/config/routes.rb

@@ -1,27 +1,27 @@
 Avo::Engine.routes.draw do
-  root 'home#index'
+  root "home#index"
 
-  get 'resources', to: redirect('/avo')
+  get "resources", to: redirect("/avo")
 
-  scope 'resources', as: 'resources' do
+  scope "resources", as: "resources" do
     # Attachments
-    get    '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#show'
-    delete '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#destroy'
+    get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"
+    delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#destroy"
 
     # Actions
-    get  '/:resource_name(/:id)/actions/:action_id', to: 'actions#show'
-    post '/:resource_name(/:id)/actions/:action_id', to: 'actions#handle'
+    get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
+    post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"
 
     # Generate resource routes as below:
     # resources :posts
     instance_eval(&Avo::App.draw_routes)
 
     # Relations
-    get    '/:resource_name/:id/:related_name/new',         to: 'relations#new'
-    get    '/:resource_name/:id/:related_name/',            to: 'relations#index'
-    get    '/:resource_name/:id/:related_name/:related_id', to: 'relations#show'
-    post   '/:resource_name/:id/:related_name',             to: 'relations#create'
-    delete '/:resource_name/:id/:related_name/:related_id', to: 'relations#destroy'
+    get "/:resource_name/:id/:related_name/new", to: "relations#new"
+    get "/:resource_name/:id/:related_name/", to: "relations#index"
+    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show"
+    post "/:resource_name/:id/:related_name", to: "relations#create"
+    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
   end
 
   # get '/avo-api/search',                  to: 'search#index'

data/config/spring.rb

@@ -1,7 +1,7 @@
-Spring.application_root = './spec/dummy'
+Spring.application_root = "./spec/dummy"
 Spring.watch(
-  '.ruby-version',
-  '.rbenv-vars',
-  'tmp/restart.txt',
-  'tmp/caching-dev.txt'
+  ".ruby-version",
+  ".rbenv-vars",
+  "tmp/restart.txt",
+  "tmp/caching-dev.txt"
 )

data/config/webpack/base.js

@@ -3,8 +3,8 @@ const aliases = require('./aliases')
 
 const customConfig = {
   resolve: {
-    extensions: ['.css']
-  }
+    extensions: ['.css'],
+  },
 }
 
 const config = merge(webpackConfig, aliases, customConfig)

data/config/webpacker.yml

@@ -29,6 +29,38 @@ development:
   # Cache manifest.json for performance
   cache_manifest: true
 
+  # Even though Avo does not use the dev_server when packed we still need to add the info here.
+  # The packed version of Avo will pick up the parent's app information.
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3039
+    public: localhost:3039
+    # Inject browserside javascript that required by both HMR and Live(full) reload
+    inject_client: true
+    # Hot Module Replacement updates modules while the application is running without a full reload
+    hmr: true
+    # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
+    inline: true
+    # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
+    overlay: true
+    # Should we use gzip compression?
+    compress: true
+    # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
+    disable_host_check: true
+    # This option lets the browser open with your local IP
+    use_local_ip: false
+    # When enabled, nothing except the initial startup information will be written to the console.
+    # This also means that errors or warnings from webpack are not visible.
+    quiet: false
+    pretty: true
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: '**/node_modules/**'
+    env_prefix: "AVO_WEBPACKER_DEV_SERVER"
+
 test:
   <<: *default
   compile: true

data/db/factories.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
     last_name { Faker::Name.last_name }
     email { Faker::Internet.email }
     password { Faker::Internet.password }
-    roles { { admin: false, manager: [true, false].sample, writer: [true, false].sample } }
+    roles { {admin: false, manager: [true, false].sample, writer: [true, false].sample} }
     birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
     custom_css { ".header {\n  color: red;\n}" }
   end
@@ -22,8 +22,6 @@ FactoryBot.define do
     published_at do
       if [false, true].sample
         Time.now - rand(10...365).days
-      else
-        nil
       end
     end
   end
@@ -31,12 +29,12 @@ FactoryBot.define do
   factory :project do
     name { Faker::App.name }
     status { [:closed, :rejected, :failed, :loading, :running, :waiting].sample }
-    stage { ['Discovery', 'Idea', 'Done', 'On hold', 'Cancelled'].sample }
+    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
     description { Faker::Markdown.sandwich(sentences: 5) }
     users_required { Faker::Number.between(from: 10, to: 100) }
     started_at { Time.now - rand(10...365).days }
-    meta { [{ foo: 'bar', hey: 'hi' }, { bar: 'baz' }, { hoho: 'hohoho' }].sample }
+    meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
   end
 end

data/lib/avo.rb

@@ -1,20 +1,20 @@
-require 'zeitwerk'
-require_relative 'avo/version'
-require_relative 'avo/engine' if defined?(Rails)
+require "zeitwerk"
+require_relative "avo/version"
+require_relative "avo/engine" if defined?(Rails)
 
 loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module Avo
-  ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
-  IN_DEVELOPMENT = ENV['AVO_IN_DEVELOPMENT'] == '1'
+  ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
+  IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
 
   class << self
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(
         root_path: ROOT_PATH,
-        config_path: ROOT_PATH.join('config/webpacker.yml')
+        config_path: ROOT_PATH.join("config/webpacker.yml")
       )
     end
   end

data/lib/avo/app.rb

@@ -15,10 +15,10 @@ module Avo
 
         I18n.locale = Avo.configuration.language_code
 
-        if Rails.cache.class == ActiveSupport::Cache::NullStore
-          self.app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+        if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
+          app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
         else
-          self.app[:cache_store] = Rails.cache
+          app[:cache_store] = Rails.cache
         end
       end
 
@@ -35,7 +35,7 @@ module Avo
       end
 
       def cache_store
-        self.app[:cache_store]
+        app[:cache_store]
       end
 
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
@@ -47,23 +47,23 @@ module Avo
       # Avo::Fields::DateTimeField -> date_time
       def init_fields
         Avo::Fields::BaseField.descendants.each do |class_name|
-          next if class_name.to_s == 'BaseField'
+          next if class_name.to_s == "BaseField"
 
-          if class_name.to_s.end_with? 'Field'
+          if class_name.to_s.end_with? "Field"
             load_field class_name.get_field_name, class_name
           end
         end
       end
 
       def load_field(method_name, klass)
-        self.fields.push(
+        fields.push(
           name: method_name,
-          class: klass,
+          class: klass
         )
       end
 
       def init_resources
-        self.app[:resources] = BaseResource.descendants
+        app[:resources] = BaseResource.descendants
           .select do |resource|
             resource != BaseResource
           end
@@ -75,14 +75,14 @@ module Avo
       end
 
       def get_resources
-        self.app[:resources]
+        app[:resources]
       end
 
       # Returns the Avo resource by camelized name
       #
       # get_resource_by_name('User') => UserResource
       def get_resource(resource)
-        self.app[:resources].find do |available_resource|
+        app[:resources].find do |available_resource|
           "#{resource}Resource".safe_constantize == available_resource.class
         end
       end
@@ -91,7 +91,7 @@ module Avo
       #
       # get_resource_by_name('user') => UserResource
       def get_resource_by_name(name)
-        self.get_resource name.singularize.camelize
+        get_resource name.singularize.camelize
       end
 
       # Returns the Avo resource by singular snake_cased name
@@ -110,7 +110,7 @@ module Avo
       # get_resource_by_controller_name('users') => UserResource
       def get_resource_by_controller_name(name)
         get_resources.find do |resource|
-          resource.model_class.to_s.pluralize.underscore.gsub('/', '_') == name.to_s
+          resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
         end
       end
 
@@ -124,7 +124,7 @@ module Avo
       def get_available_resources(user = nil)
         App.get_resources
           .select do |resource|
-            Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'], raise_exception: false
+            Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
           end
           .sort_by { |r| r.name }
       end
@@ -139,17 +139,17 @@ module Avo
         # We should eager load all the classes so we find all descendants
         Rails.application.eager_load!
 
-        Proc.new do
+        proc do
           BaseResource.descendants
             .select do |resource|
               resource != :BaseResource
             end
             .map do |resource|
               if resource.is_a? Class
-                if resource.model_class.present?
-                  route_key = resource.model_class.model_name.route_key
+                route_key = if resource.model_class.present?
+                  resource.model_class.model_name.route_key
                 else
-                  route_key = resource.to_s.underscore.gsub('_resource', '').downcase.pluralize.to_sym
+                  resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
                 end
 
                 resources route_key