avo 0.5.0.beta10 → 0.5.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc5163742282b121c065a97fc808446b8d7e1dfe05ff3a85eb46c86bc0e5794
-  data.tar.gz: 5ee2eba0895df8227d2ab6630e50759f177c291efe672b79a1dedf143e5ad25d
+  metadata.gz: 2a48bc5ad159fe15a95e73adda76e1dbbbce2438ad1e7a0a40a5216874b67458
+  data.tar.gz: 8cb8b516feafe9d6efb788a6adb0ba046c1bf677975998607584bed1c4602d59
 SHA512:
-  metadata.gz: 3bfbe17a6b34aa4fd206ca6688fdca752e0fdebf6fcfcc38945af4b0e9cbe48a468b6643124cd0d65f9a7cfe0f2376f4a00271eeb8bcbf7346a0c6b12f5ccce4
-  data.tar.gz: 17dd64588f184560a367f54f29b40a802ab1dc530fb8ccae5785be415a1fd8ff10ea1a37aac3597690cb525eac78c28f2c86d9103dacb786197057b9b12a3716
+  metadata.gz: 406bf2c13f50b26005ef1f205584d0477bd444ab026f593eb121cc8a7ed0425f742bc9e905fd1a9c682c8a868e1d391b75a7de8c2d0d8006a9026066d54d26ed
+  data.tar.gz: 41e9b649b69a77d1ef2d58d9d78fa5de006804472091bf4c8906e94558ea9fc3b1e848a50ce9dee0820837a1dc55965910860b7ec00c5593eb2b57e0e57fc317

data/Gemfile

@@ -17,9 +17,6 @@ gemspec
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
 gem "webpacker", "6.0.0.beta.6"
 
-# SVGs
-gem "inline_svg"
-
 gem "countries"
 
 # Authorization

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    avo (0.5.0.beta10)
+    avo (0.5.0.beta15)
       active_link_to
       addressable
       countries
       hotwire-rails
       httparty
       image_processing
-      inline_svg
       pagy
       pundit
       rails (>= 6.0)
@@ -148,9 +147,6 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    inline_svg (1.7.2)
-      activesupport (>= 3.0)
-      nokogiri (>= 1.6)
     iso (0.3.0)
       i18n
     jbuilder (2.10.1)
@@ -376,7 +372,6 @@ DEPENDENCIES
   hotwire-rails
   httparty
   image_processing (~> 1.2)
-  inline_svg
   iso
   jbuilder (~> 2.7)
   listen (>= 3.0.5, < 3.2)

data/avo.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   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"

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/lib/avo/base_resource.rb

@@ -222,7 +222,7 @@ module Avo
       params.each do |key, value|
         field = fields_by_database_id[key]
 
-        next unless field
+        next unless field.present?
 
         model = field.fill_field model, key, value
       end
@@ -238,13 +238,13 @@ module Avo
       content_to_be_hashed = ""
 
       # resource file hash
-      resource_path = Rails.root.join("app", "avo", "resources", "#{name.underscore}.rb").to_s
+      resource_path = Rails.root.join("app", "avo", "resources", "#{self.class.name.underscore}.rb").to_s
       if File.file? resource_path
         content_to_be_hashed += File.read(resource_path)
       end
 
       # policy file hash
-      policy_path = Rails.root.join("app", "policies", "#{name.underscore}_policy.rb").to_s
+      policy_path = Rails.root.join("app", "policies", "#{self.class.name.underscore.gsub("_resource", "")}_policy.rb").to_s
       if File.file? policy_path
         content_to_be_hashed += File.read(policy_path)
       end

data/lib/avo/engine.rb

@@ -14,9 +14,17 @@ module Avo
     end
 
     initializer "avo.autoload", before: :set_autoload_paths do |app|
-      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "filters"))
-      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "actions"))
-      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "resources"))
+      [
+        ["app", "avo", "filters"],
+        ["app", "avo", "actions"],
+        ["app", "avo", "resources"]
+      ].each do |path_params|
+        path = Rails.root.join(*path_params)
+
+        if File.directory? path.to_s
+          Rails.autoloaders.main.push_dir path
+        end
+      end
     end
 
     initializer "avo.init_fields" do |app|

data/lib/avo/fields/base_field.rb

@@ -103,7 +103,7 @@ module Avo
 
       def visible?
         if visible.present? && visible.respond_to?(:call)
-          visible.call
+          visible.call resource: resource
         else
           visible
         end

data/lib/avo/fields/date_time_field.rb

@@ -25,6 +25,12 @@ module Avo
       end
 
       def fill_field(model, key, value)
+        if value.nil?
+          model[id] = nil
+
+          return model
+        end
+
         return model if value.blank?
 
         model[id] = value.to_time.in_time_zone(Rails.application.config.time_zone)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "0.5.0.beta10"
+  VERSION = "0.5.0.beta15"
 end

data/lib/generators/avo/install_generator.rb

@@ -12,7 +12,7 @@ module Generators
       def create_initializer_file
         route "mount Avo::Engine => Avo.configuration.root_path"
 
-        template "initializer/avo.rb", "config/initializers/avo.rb"
+        template "initializer/avo.tt", "config/initializers/avo.rb"
         template "locales/avo.en.yml", "config/locales/avo.en.yml"
       end
     end

data/lib/generators/avo/templates/action.tt

@@ -8,10 +8,6 @@ module Avo
           # Do something with your models.
         end
       end
-
-      fields do |fields|
-        # Add fields here.
-      end
     end
   end
 end

data/lib/generators/avo/templates/resource/resource.tt

@@ -1,17 +1,7 @@
 class <%= resource_class %> < Avo::BaseResource
   self.title = :id
-  self.includes = [:posts, :post]
+  self.includes = []
 
-  fields do |field|
-    field.id
-    # add fields here
-  end
-
-  actions do |action|
-    # add actions here
-  end
-
-  filters do |filter|
-    # add filters here
-  end
+  field :id, as: :id
+  # add fields here
 end

data/lib/tasks/avo_tasks.rake

@@ -2,62 +2,3 @@
 # task :avo do
 #   # Task goes here
 # end
-
-# def ensure_log_goes_to_stdout
-#   old_logger = Webpacker.logger
-#   Webpacker.logger = ActiveSupport::Logger.new($stdout)
-#   yield
-# ensure
-#   Webpacker.logger = old_logger
-# end
-
-# namespace :avo do
-#   namespace :webpacker do
-#     desc "Install deps with yarn"
-#     task :yarn_install do
-#       Dir.chdir(File.join(__dir__, "../..")) do
-#         system "yarn install --no-progress --production"
-#       end
-#     end
-
-#     desc "Compile JavaScript packs using webpack for production with digests"
-#     task compile: [:yarn_install, :environment] do
-#       Webpacker.with_node_env("production") do
-#         ensure_log_goes_to_stdout do
-#           if Avo.webpacker.commands.compile
-#             # Successful compilation!
-#           else
-#             # Failed compilation
-#             exit!
-#           end
-#         end
-#       end
-#     end
-#   end
-# end
-
-# def yarn_install_available?
-#   rails_major = Rails::VERSION::MAJOR
-#   rails_minor = Rails::VERSION::MINOR
-
-#   rails_major > 5 || (rails_major == 5 && rails_minor >= 1)
-# end
-
-# def enhance_assets_precompile
-#   # yarn:install was added in Rails 5.1
-#   deps = yarn_install_available? ? [] : ["avo:webpacker:yarn_install"]
-#   Rake::Task["assets:precompile"].enhance(deps) do
-#     Rake::Task["avo:webpacker:compile"].invoke
-#   end
-# end
-
-# # Compile packs after we've compiled all other assets during precompilation
-# skip_webpacker_precompile = %w[no false n f].include?(ENV["WEBPACKER_PRECOMPILE"])
-
-# unless skip_webpacker_precompile
-#   if Rake::Task.task_defined?("assets:precompile")
-#     enhance_assets_precompile
-#   else
-#     Rake::Task.define_task("assets:precompile" => "avo:webpacker:compile")
-#   end
-# end

data/public/avo-packs/css/{application-4e16d6a6.css → application-9d115b7e.css}

@@ -2116,111 +2116,56 @@ select {
 	border-color: rgba(190, 24, 93, var(--tw-border-opacity));
 }
 
-.hover\:border-pink-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(219, 39, 119, var(--tw-border-opacity));
-}
-
 .hover\:border-purple-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(109, 40, 217, var(--tw-border-opacity));
 }
 
-.hover\:border-purple-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(124, 58, 237, var(--tw-border-opacity));
-}
-
 .hover\:border-indigo-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(67, 56, 202, var(--tw-border-opacity));
 }
 
-.hover\:border-indigo-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(79, 70, 229, var(--tw-border-opacity));
-}
-
 .hover\:border-blue-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(29, 78, 216, var(--tw-border-opacity));
 }
 
-.hover\:border-blue-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(37, 99, 235, var(--tw-border-opacity));
-}
-
 .hover\:border-light-blue-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(3, 105, 161, var(--tw-border-opacity));
 }
 
-.hover\:border-light-blue-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(2, 132, 199, var(--tw-border-opacity));
-}
-
 .hover\:border-teal-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(15, 118, 110, var(--tw-border-opacity));
 }
 
-.hover\:border-teal-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(13, 148, 136, var(--tw-border-opacity));
-}
-
 .hover\:border-green-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(4, 120, 87, var(--tw-border-opacity));
 }
 
-.hover\:border-green-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(5, 150, 105, var(--tw-border-opacity));
-}
-
 .hover\:border-yellow-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(180, 83, 9, var(--tw-border-opacity));
 }
 
-.hover\:border-yellow-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(217, 119, 6, var(--tw-border-opacity));
-}
-
 .hover\:border-red-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(185, 28, 28, var(--tw-border-opacity));
 }
 
-.hover\:border-red-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(220, 38, 38, var(--tw-border-opacity));
-}
-
 .hover\:border-gray-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(55, 65, 81, var(--tw-border-opacity));
 }
 
-.hover\:border-gray-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(75, 85, 99, var(--tw-border-opacity));
-}
-
 .hover\:border-blue-gray-700:hover {
 	--tw-border-opacity: 1;
 	border-color: rgba(51, 65, 85, var(--tw-border-opacity));
 }
 
-.hover\:border-blue-gray-600:hover {
-	--tw-border-opacity: 1;
-	border-color: rgba(71, 85, 105, var(--tw-border-opacity));
-}
-
 .hover\:bg-pink-600:hover {
 	--tw-bg-opacity: 1;
 	background-color: rgba(219, 39, 119, var(--tw-bg-opacity));
@@ -4158,90 +4103,46 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(190, 24, 93, var(--tw-border-opacity));
 }
-.hover\:border-pink-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(219, 39, 119, var(--tw-border-opacity));
-}
 .hover\:border-purple-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(109, 40, 217, var(--tw-border-opacity));
 }
-.hover\:border-purple-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(124, 58, 237, var(--tw-border-opacity));
-}
 .hover\:border-indigo-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(67, 56, 202, var(--tw-border-opacity));
 }
-.hover\:border-indigo-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(79, 70, 229, var(--tw-border-opacity));
-}
 .hover\:border-blue-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(29, 78, 216, var(--tw-border-opacity));
 }
-.hover\:border-blue-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(37, 99, 235, var(--tw-border-opacity));
-}
 .hover\:border-light-blue-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(3, 105, 161, var(--tw-border-opacity));
 }
-.hover\:border-light-blue-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(2, 132, 199, var(--tw-border-opacity));
-}
 .hover\:border-teal-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(15, 118, 110, var(--tw-border-opacity));
 }
-.hover\:border-teal-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(13, 148, 136, var(--tw-border-opacity));
-}
 .hover\:border-green-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(4, 120, 87, var(--tw-border-opacity));
 }
-.hover\:border-green-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(5, 150, 105, var(--tw-border-opacity));
-}
 .hover\:border-yellow-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(180, 83, 9, var(--tw-border-opacity));
 }
-.hover\:border-yellow-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(217, 119, 6, var(--tw-border-opacity));
-}
 .hover\:border-red-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(185, 28, 28, var(--tw-border-opacity));
 }
-.hover\:border-red-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(220, 38, 38, var(--tw-border-opacity));
-}
 .hover\:border-gray-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(55, 65, 81, var(--tw-border-opacity));
 }
-.hover\:border-gray-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(75, 85, 99, var(--tw-border-opacity));
-}
 .hover\:border-blue-gray-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(51, 65, 85, var(--tw-border-opacity));
 }
-.hover\:border-blue-gray-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(71, 85, 105, var(--tw-border-opacity));
-}
 .hover\:bg-pink-600:hover {
     --tw-bg-opacity: 1;
     background-color: rgba(219, 39, 119, var(--tw-bg-opacity));
@@ -5079,10 +4980,50 @@ span.CodeMirror-selectedtext { background: none; }
 .border-r {
     border-right-width: 1px
 }
+.border-pink-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(219, 39, 119, var(--tw-border-opacity))
+}
+.border-purple-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(124, 58, 237, var(--tw-border-opacity))
+}
+.border-indigo-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(79, 70, 229, var(--tw-border-opacity))
+}
+.border-blue-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(37, 99, 235, var(--tw-border-opacity))
+}
+.border-light-blue-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(2, 132, 199, var(--tw-border-opacity))
+}
+.border-teal-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(13, 148, 136, var(--tw-border-opacity))
+}
+.border-green-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(5, 150, 105, var(--tw-border-opacity))
+}
+.border-yellow-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(217, 119, 6, var(--tw-border-opacity))
+}
 .border-red-600 {
     --tw-border-opacity: 1;
     border-color: rgba(220, 38, 38, var(--tw-border-opacity))
 }
+.border-gray-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(75, 85, 99, var(--tw-border-opacity))
+}
+.border-blue-gray-600 {
+    --tw-border-opacity: 1;
+    border-color: rgba(71, 85, 105, var(--tw-border-opacity))
+}
 .border-blue-gray-300 {
     --tw-border-opacity: 1;
     border-color: rgba(203, 213, 225, var(--tw-border-opacity))
@@ -5467,90 +5408,46 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(190, 24, 93, var(--tw-border-opacity))
 }
-.hover\:border-pink-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(219, 39, 119, var(--tw-border-opacity))
-}
 .hover\:border-purple-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(109, 40, 217, var(--tw-border-opacity))
 }
-.hover\:border-purple-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(124, 58, 237, var(--tw-border-opacity))
-}
 .hover\:border-indigo-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(67, 56, 202, var(--tw-border-opacity))
 }
-.hover\:border-indigo-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(79, 70, 229, var(--tw-border-opacity))
-}
 .hover\:border-blue-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(29, 78, 216, var(--tw-border-opacity))
 }
-.hover\:border-blue-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(37, 99, 235, var(--tw-border-opacity))
-}
 .hover\:border-light-blue-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(3, 105, 161, var(--tw-border-opacity))
 }
-.hover\:border-light-blue-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(2, 132, 199, var(--tw-border-opacity))
-}
 .hover\:border-teal-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(15, 118, 110, var(--tw-border-opacity))
 }
-.hover\:border-teal-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(13, 148, 136, var(--tw-border-opacity))
-}
 .hover\:border-green-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(4, 120, 87, var(--tw-border-opacity))
 }
-.hover\:border-green-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(5, 150, 105, var(--tw-border-opacity))
-}
 .hover\:border-yellow-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(180, 83, 9, var(--tw-border-opacity))
 }
-.hover\:border-yellow-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(217, 119, 6, var(--tw-border-opacity))
-}
 .hover\:border-red-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(185, 28, 28, var(--tw-border-opacity))
 }
-.hover\:border-red-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(220, 38, 38, var(--tw-border-opacity))
-}
 .hover\:border-gray-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(55, 65, 81, var(--tw-border-opacity))
 }
-.hover\:border-gray-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(75, 85, 99, var(--tw-border-opacity))
-}
 .hover\:border-blue-gray-700:hover {
     --tw-border-opacity: 1;
     border-color: rgba(51, 65, 85, var(--tw-border-opacity))
 }
-.hover\:border-blue-gray-600:hover {
-    --tw-border-opacity: 1;
-    border-color: rgba(71, 85, 105, var(--tw-border-opacity))
-}
 .hover\:bg-pink-600:hover {
     --tw-bg-opacity: 1;
     background-color: rgba(219, 39, 119, var(--tw-bg-opacity))
@@ -5972,4 +5869,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-4e16d6a6.css.map*/
+/*# sourceMappingURL=application-9d115b7e.css.map*/