avo 2.40.0 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2935789c3103001a7d5343604f30ff038dcf422fb19d43dce8920dc47e8d00ec
-  data.tar.gz: 7a85085fb748a296e03677cf52b640f029da373ed2763d8cff3e33c30db58608
+  metadata.gz: '0799a57f6727740259635d229244cc855fe5061c4df01ba3364e55dd8ae90b91'
+  data.tar.gz: b0ced097b17c2d00de2700b06918c5042d71b6e834b30462db56df2a4132fc91
 SHA512:
-  metadata.gz: 936d25a1817837a8192dca5db6a1b11b1a473023c367ea66ac5bcb48b47a715eb64d1e69ae499866b1364327abfb33dc04d7bd977d2bd6a7b6562890f1b51138
-  data.tar.gz: 90fd512c9a60ef5c58be02884a476dd3bbcc970837920e46cfd51fc7ae3f6db580296d71478f3bb39bd43d68fe3dc1917aa30733a5d98577d600c9176560a80c
+  metadata.gz: 17cd3153759eae7461997075ee027344ecc5a7dca2dfce976136a0a826c63016d6c8162fa7c3c790ddda335e69933f9199dbb17b920dd3d56a8cc7324ca3916d
+  data.tar.gz: edd52068c4f944febe1d4df905fed454929497264e156fbb2202bd0d7ac39ed33a6d723295e3c47734fd8de02e61c543e26cb19fde146e6653822ec3deea3286

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.40.0)
+    avo (2.42.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/README.md

@@ -17,7 +17,7 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
 ✨ **Website**: [avohq.io](https://avohq.io)\
 📚 **Documentation**: [docs.avohq.io](https://docs.avohq.io)\
 🗺 **Roadmap**: [GitHub Roadmap](https://github.com/orgs/avo-hq/projects/3)\
-🎸 **Demo app**: [Avodemo](https://avodemo.herokuapp.com/)\
+🎸 **Demo app**: [Avodemo](https://main.avodemo.com/)\
 🐤 **Twitter**: [avo_hq](https://twitter.com/avo_hq)\
 💬 **Community chat**: [discord](https://discord.gg/pkTF6y8)\
 🔧 **Issue tracker**: [GitHub issues](http://github.com/avo-hq/avo/issues)\

data/app/components/avo/fields/common/badge_viewer_component.html.erb

@@ -1,25 +1 @@
-<%
-  backgrounds = {
-    info: 'bg-blue-500',
-    success: 'bg-green-500',
-    danger: 'bg-red-500',
-    warning: 'bg-yellow-500',
-    secondary: 'bg-gray-500',
-  }
-
-  label = @value
-  background = :info
-
-  @options.invert.each do |values, type|
-    if [values].flatten.map { |value| value }.include? @value
-      label = @value
-      background = type.to_sym
-      next
-    end
-  end
-
-  classes = 'whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate '
-
-  classes += "#{backgrounds[background]} text-white" if backgrounds[background].present?
-%>
-<span class="<%= classes %>" style="max-width: 120px;"><%= label %></span>
+<span class="<%= classes %>" style="max-width: 120px;"><%= @value %></span>

data/app/components/avo/fields/common/badge_viewer_component.rb

@@ -4,5 +4,29 @@ class Avo::Fields::Common::BadgeViewerComponent < ViewComponent::Base
   def initialize(value:, options:)
     @value = value
     @options = options
+    @backgrounds = {
+      info: "bg-blue-500",
+      success: "bg-green-500",
+      danger: "bg-red-500",
+      warning: "bg-yellow-500",
+      neutral: "bg-gray-500"
+    }
+  end
+
+  def classes
+    background = :info
+
+    @options.invert.each do |values, type|
+      if [values].flatten.map { |value| value }.include? @value
+        background = type.to_sym
+        next
+      end
+    end
+
+    classes = "whitespace-nowrap rounded-md uppercase px-2 py-1 text-xs font-bold block text-center truncate "
+
+    classes += "#{@backgrounds[background]} text-white" if @backgrounds[background].present?
+
+    classes
   end
 end

data/app/components/avo/fields/common/files/list_viewer_component.rb

@@ -31,11 +31,11 @@ class Avo::Fields::Common::Files::ListViewerComponent < ViewComponent::Base
   end
 
   def view_type_component(file)
-    component = "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}Component".constantize
-    component.new(field: field, resource: resource, file: file)
+    component = "Avo::Fields::Common::Files::ViewType::#{view_type.to_s.capitalize}ItemComponent".constantize
+    component.new(field: field, resource: resource, file: file, extra_classes: "aspect-video")
   end
 
   def view_type
-    (resource.params.dig(:view_type) || field.view_type).to_sym
+    @view_type ||= (resource.params.dig(:view_type) || field.view_type).to_sym
   end
 end

data/app/components/avo/fields/common/files/view_type/{grid_component.html.erb → grid_item_component.html.erb}

@@ -1,8 +1,8 @@
 <div id="<%= dom_id file %>" class="relative min-h-full max-w-full flex-1 flex flex-col justify-between space-y-2">
   <% if file.present? %>
-    <div class="flex flex-col justify-between h-full">
+    <div class="flex h-full">
       <% if file.representable? && is_image? %>
-        <%= image_tag helpers.main_app.url_for(file), class: 'rounded-lg object-cover w-full aspect-video' %>
+        <%= image_tag helpers.main_app.url_for(file), class: "rounded-lg max-w-full #{@extra_classes}" %>
       <% elsif is_audio? %>
         <%= audio_tag(helpers.main_app.url_for(file), controls: true, preload: false, class: 'w-full') %>
       <% elsif is_video? %>

data/app/components/avo/fields/common/files/view_type/{grid_component.rb → grid_item_component.rb}

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::Files::ViewType::GridComponent < ViewComponent::Base
+class Avo::Fields::Common::Files::ViewType::GridItemComponent < ViewComponent::Base
   attr_reader :field, :resource
 
-  def initialize(field:, resource:, file: nil)
+  def initialize(field:, resource:, file: nil, extra_classes: nil)
     @file = file
     @field = field
     @resource = resource
+    @extra_classes = extra_classes
   end
 
   def id

data/app/components/avo/fields/common/files/view_type/{list_component.rb → list_item_component.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Avo::Fields::Common::Files::ViewType::ListComponent < Avo::Fields::Common::Files::ViewType::GridComponent
+class Avo::Fields::Common::Files::ViewType::ListItemComponent < Avo::Fields::Common::Files::ViewType::GridItemComponent
   def icon_for_file
     if is_image?
       "photo"

data/app/components/avo/fields/file_field/edit_component.html.erb

@@ -1,7 +1,7 @@
 <%= field_wrapper **field_wrapper_args do %>
   <% if @field.value.present? %>
     <div class="mb-2">
-      <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+      <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
     </div>
   <% end %>
 

data/app/components/avo/fields/file_field/show_component.html.erb

@@ -1,3 +1,3 @@
 <%= field_wrapper **field_wrapper_args do %>
-  <%= render Avo::Fields::Common::Files::ViewType::GridComponent.new resource: @resource, field: @field %>
+  <%= render Avo::Fields::Common::Files::ViewType::GridItemComponent.new resource: @resource, field: @field %>
 <% end %>

data/app/components/avo/sidebar/item_switcher_component.html.erb

@@ -2,7 +2,7 @@
   <%= render Avo::Sidebar::LinkComponent.new label: item.name, path: item.path, target: item.target, data: item.data, icon: item.icon %>
 <% end %>
 <% if item.is_a? Avo::Menu::Resource %>
-  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource), data: item.data, icon: item.icon %>
+  <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: helpers.resources_path(resource: resource, **item.fetch_params), data: item.data, icon: item.icon %>
 <% end %>
 <% if item.is_a? Avo::Menu::Dashboard %>
   <%= render Avo::Sidebar::LinkComponent.new label: item.navigation_label, path: dashboard.navigation_path, data: item.data, icon: item.icon %>

data/app/controllers/avo/search_controller.rb

@@ -51,14 +51,14 @@ module Avo
         scope: resource.class.scope
       ).handle
 
+      query = apply_scope(query) if should_apply_any_scope?
+
       # Get the count
       results_count = query.reselect(resource.model_class.primary_key).count
 
       # Get the results
       query = query.limit(8)
 
-      query = apply_scope(query) if should_apply_any_scope?
-
       results = apply_search_metadata(query, resource)
 
       header = resource.plural_name

data/lib/avo/app.rb

@@ -35,7 +35,7 @@ module Avo
       end
 
       # When not in production we'll just use the MemoryStore which is good enough.
-      # Wehn running in production we'll try to use memcached or redis if available.
+      # When running in production we'll try to use memcached or redis if available.
       # If not, we'll use the FileStore.
       # We decided against the MemoryStore in production because it will not be shared between multiple processes (when using Puma).
       def get_cache_store
@@ -53,7 +53,7 @@ module Avo
         end
       end
 
-      # Renerate a dynamic root path using the URIService
+      # Generate a dynamic root path using the URIService
       def root_path(paths: [], query: {}, **args)
         Avo::Services::URIService.parse(view_context.avo.root_url.to_s)
           .append_paths(paths)

data/lib/avo/concerns/fetches_things.rb

@@ -89,7 +89,12 @@ module Avo
         def get_available_resources(user = nil)
           valid_resources
             .select do |resource|
-              Services::AuthorizationService.authorize user, resource.model_class, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
+            resource.authorization.class.authorize(
+              user,
+              resource.model_class,
+              Avo.configuration.authorization_methods.stringify_keys["index"],
+              raise_exception: false
+            )
             end
             .sort_by { |r| r.name }
         end

data/lib/avo/fields/badge_field.rb

@@ -8,7 +8,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, secondary: :secondary}
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning, neutral: :neutral}
         @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/menu/resource.rb

@@ -3,12 +3,20 @@ class Avo::Menu::Resource < Avo::Menu::BaseItem
 
   option :resource
   option :label, optional: true
+  option :params, default: proc { {} }
 
   def parsed_resource
-    Avo::App.guess_resource resource.to_s
+    @parsed_resource ||= Avo::App.guess_resource resource.to_s
   end
 
   def entity_label
     parsed_resource.navigation_label
   end
+
+  def fetch_params
+    Avo::ExecutionContext.new(
+      target: params,
+      resource: parsed_resource
+    ).handle
+  end
 end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.40.0" unless const_defined?(:VERSION)
+  VERSION = "2.42.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -39,11 +39,19 @@ module Generators
           say "Adding the CSS asset to the partial"
           prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
 
+          tailwind_script = setup_tailwind_script
           say "Ensure you have the following script in your package.json file.", :yellow
-          say %("scripts": { "avo:tailwindcss": "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css --minify" }), :green
+          say %("scripts": { "avo:tailwindcss": "#{tailwind_script}" --minify }), :green
         end
 
         no_tasks do
+          def setup_tailwind_script
+            tailwind_config_path = tailwindcss_config_path()
+            tailwind_script = "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css"
+            tailwind_script += " -c #{tailwind_config_path}" if tailwind_config_path
+            tailwind_script
+          end  
+
           def template_path(filename)
             Pathname.new(__dir__).join("..", "templates", "tailwindcss", filename).to_s
           end
@@ -51,6 +59,12 @@ module Generators
           def tailwindcss_installed?
             Rails.root.join("config", "tailwind.config.js").exist? || Rails.root.join("tailwind.config.js").exist?
           end
+
+          def tailwindcss_config_path
+            if Rails.root.join("config", "tailwind.config.js").exist?
+              "./config/tailwind.config.js"
+            end
+          end
         end
       end
     end

data/public/avo-assets/avo.base.css

@@ -7997,10 +7997,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   text-transform:capitalize
 }
 
-.italic{
-  font-style:italic
-}
-
 .leading-6{
   line-height:1.5rem
 }
@@ -8199,16 +8195,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   color:rgb(22 163 74 / var(--tw-text-opacity))
 }
 
-.\!text-pink-600{
-  --tw-text-opacity:1 !important;
-  color:rgb(219 39 119 / var(--tw-text-opacity)) !important
-}
-
-.underline{
-  -webkit-text-decoration-line:underline;
-          text-decoration-line:underline
-}
-
 .no-underline{
   -webkit-text-decoration-line:none;
           text-decoration-line:none

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.42.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1381,10 +1381,10 @@ files:
 - app/components/avo/fields/common/files/controls_component.rb
 - app/components/avo/fields/common/files/list_viewer_component.html.erb
 - app/components/avo/fields/common/files/list_viewer_component.rb
-- app/components/avo/fields/common/files/view_type/grid_component.html.erb
-- app/components/avo/fields/common/files/view_type/grid_component.rb
-- app/components/avo/fields/common/files/view_type/list_component.html.erb
-- app/components/avo/fields/common/files/view_type/list_component.rb
+- app/components/avo/fields/common/files/view_type/grid_item_component.html.erb
+- app/components/avo/fields/common/files/view_type/grid_item_component.rb
+- app/components/avo/fields/common/files/view_type/list_item_component.html.erb
+- app/components/avo/fields/common/files/view_type/list_item_component.rb
 - app/components/avo/fields/common/gravatar_viewer_component.html.erb
 - app/components/avo/fields/common/gravatar_viewer_component.rb
 - app/components/avo/fields/common/heading_component.html.erb