avo 3.0.1.beta16 → 3.0.1.beta18

data/lib/avo/base_resource.rb

@@ -320,7 +320,7 @@ module Avo
     def default_panel_name
       return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
 
-      case @view
+      case @view.to_sym
       when :show
         record_title
       when :edit

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta16" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta18" unless const_defined?(:VERSION)
 end

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

@@ -32,8 +32,9 @@ module Generators
             copy_file template_path("avo.tailwind.css"), path
           end
 
+          script_name = "avo:tailwind:css"
           if Rails.root.join("Procfile.dev").exist?
-            say "Add #{cmd = "avo_css: yarn avo:tailwindcss --watch"} to Procfile.dev"
+            say "Add #{cmd = "avo_css: yarn #{script_name} --watch"} to Procfile.dev"
             append_to_file "Procfile.dev", "#{cmd}\n"
           else
             say "Add default Procfile.dev"
@@ -43,7 +44,6 @@ module Generators
             run "gem install foreman"
           end
 
-          script_name = "avo:tailwindcss"
           script_command = "tailwindcss -i ./app/assets/stylesheets/avo/tailwind.css -o ./app/assets/builds/avo.tailwind.css -c ./config/avo/tailwind.config.js --minify"
           pretty_script_command = "\"#{script_name}\": \"#{script_command}\""
 
@@ -66,7 +66,17 @@ module Generators
 
           rake_enhance = <<~RUBY
 
+            # When running `rake assets:precompile` this is the order of events:
+            # 1 - Task `avo:yarn_install`
+            # 2 - Task `avo:sym_link`
+            # 3 - Cmd  `yarn avo:tailwind:css`
+            # 4 - Task `assets:precompile`
             Rake::Task["assets:precompile"].enhance(["avo:sym_link"])
+            Rake::Task["avo:sym_link"].enhance(["avo:yarn_install"])
+            Rake::Task["avo:sym_link"].enhance do
+              `yarn avo:tailwind:css`
+            end
+
           RUBY
 
           if (path = Rails.root.join("Rakefile")).exist?
@@ -78,12 +88,14 @@ module Generators
             say rake_enhance, :green
           end
 
-          say "Make sure you run \"bundle exec rake avo:sym_link\" before compiling the assets with the \"#{script_name}\" task.", :green
+          say "Make sure you run \"bundle exec rake avo:sym_link\" and \"bundle exec rake avo:yarn_install\" before compiling the assets with the \"#{script_name}\" task.", :green
           if (path = Rails.root.join("bin", "dev")).exist?
             lines = File.read(path).lines
 
             # Insert the task after the shebang line (the first line)
-            lines.insert(1, "bundle exec rake avo:sym_link")
+            shebang = lines.first
+            lines[0] = "#{shebang}\nbundle exec rake avo:sym_link\nbundle exec rake avo:yarn_install\n"
+
 
             File.write(path, lines.join)
           end

data/lib/generators/avo/templates/resource_tools/partial.tt

@@ -1,12 +1,12 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col p-4 min-h-24">
         <div class="space-y-4">
           <h3>🪧 This partial is waiting to be updated</h3>

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -p 3000
-avo_css: yarn avo:tailwindcss --watch
+avo_css: yarn avo:tailwind:css --watch

data/lib/generators/avo/templates/tailwindcss/avo.tailwind.css

@@ -1,5 +1,5 @@
 @import 'tailwindcss/base';
-# Have all of Avo's custom and plugins styles available.
+/* Have all of Avo's custom and plugins styles available. */
 @import '../../../../tmp/avo/base.css';
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';

data/lib/generators/avo/templates/tool/view.tt

@@ -1,10 +1,10 @@
 <div class="flex flex-col">
   <%%= render Avo::PanelComponent.new(name: '<%= human_name %>', display_breadcrumbs: true) do |c| %>
-    <%% c.tools do %>
+    <%% c.with_tools do %>
       <div class="text-sm italic">This is the panels tools section.</div>
     <%% end %>
 
-    <%% c.body do %>
+    <%% c.with_body do %>
       <div class="flex flex-col justify-between py-6 min-h-24">
         <div class="px-6 space-y-4">
           <h3>What a nice new tool 👋</h3>

data/lib/tasks/avo_tasks.rake

@@ -71,7 +71,7 @@ task "avo:sym_link" do
     `touch #{packages_path}/.keep`
   end
 
-  ["avo", "avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu"].each do |gem|
+  ["avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu"].each do |gem|
     path = `bundle show #{gem} 2> /dev/null`.chomp
 
     # If path is emty we check if package is defined outside of root (on release process it is)

data/tailwind.preset.js

@@ -4,17 +4,24 @@ const defaultTheme = require('tailwindcss/defaultTheme')
 
 const { primary, blue, gray } = require('./tailwind.custom')
 
+function contentPaths(basePath) {
+  return [
+    `${basePath}/safelist.txt`,
+    `${basePath}/lib/avo/**/*.rb`,
+    `${basePath}/app/helpers/**/*.rb`,
+    `${basePath}/app/views/**/*.erb`,
+    `${basePath}/app/javascript/**/*.js`,
+    `${basePath}/app/components/**/*.{html.erb,rb}`,
+    `${basePath}/app/controllers/**/*.rb`,
+    `${basePath}/lib/**/*.rb`,
+    `${basePath}/public/**/*.{js,css}`,
+  ]
+}
+
 module.exports = {
   content: [
-    './tmp/avo/packages/*/safelist.txt',
-    './tmp/avo/packages/*/lib/avo/**/*.rb',
-    './tmp/avo/packages/*/app/helpers/**/*.rb',
-    './tmp/avo/packages/*/app/views/**/*.erb',
-    './tmp/avo/packages/*/app/javascript/**/*.js',
-    './tmp/avo/packages/*/app/components/**/*.{html.erb,rb}',
-    './tmp/avo/packages/*/app/controllers/**/*.rb',
-    './tmp/avo/packages/*/lib/**/*.rb',
-    './tmp/avo/packages/*/public/**/*.{js,css}',
+    ...contentPaths('./tmp/avo/packages/*'),
+    ...contentPaths('.'),
   ],
   theme: {
     extend: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.1.beta16
+  version: 3.0.1.beta18
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord