avo 3.30.4 → 4.0.0.beta.2

data/lib/generators/avo/templates/locales/avo.zh.yml

@@ -27,6 +27,7 @@ zh:
     confirm: 确认
     copy: 复制
     create_new_item: 创建新的 %{item}
+    created_at: 创建于
     created_at_timestamp: 创建于%{created_at}
     dashboard: 仪表盘
     dashboards: 仪表盘
@@ -51,6 +52,23 @@ zh:
       other: 文件
     filter_by: 按...筛选
     filters: 筛选器
+    global_search:
+      empty_state:
+        no_results_for_query: 我们找不到与 "%{query}" 匹配的任何内容
+        no_results_found: 未找到结果
+        start_typing: 开始输入以搜索
+        start_typing_with_resource_list: 您可以在 %{resources} 上搜索
+        start_typing_with_resources: 您可以在 %{resources} %{other_resources} 上搜索
+        try_adjusting_search: 尝试调整您的搜索词或检查拼写错误
+      go_to: 前往
+      keyboard_hints:
+        close: 关闭
+        navigate: 导航
+        press: 按
+        select: 选择
+      results:
+        count_of_total: "%{count} / %{total}"
+      show_all_results_for: 显示所有结果
     go_back: 返回
     grid_view: 网格视图
     hide_content: 隐藏内容
@@ -84,15 +102,19 @@ zh:
       other: "%{count} 个 %{item}"
       zero: 没有 %{item}
     oops_nothing_found: 哎呀！什么都没找到...
+    open_in_new_tab: 在新标签页中打开
+    open_in_your_editor: 在您的编辑器中打开
     order:
       higher: 将记录上移
       lower: 将记录下移
       reorder_record: 重新排序记录
       to_bottom: 将记录移至底部
       to_top: 将记录移至顶部
+    pages: 页面
     per_page: 每页显示
     prev_page: 上一页
     records_selected_from_all_pages_html: 所有页面中选中的记录
+    reload: 重新加载
     remove_selection: 清除选择
     reset: 重置
     reset_filters: 重置筛选器
@@ -100,6 +122,7 @@ zh:
     resource_destroyed: 记录已删除
     resource_updated: 记录已更新
     resources: 资源
+    reupload_file: Reupload %{item}
     run: 运行
     save: 保存
     search:
@@ -110,6 +133,7 @@ zh:
     select_item: 选择项目
     show_content: 显示内容
     sign_out: 登出
+    skip_to_content: 跳转至内容
     sort_asc: 升序排序
     sort_desc: 降序排序
     sort_reset: 重置排序
@@ -121,6 +145,7 @@ zh:
     type_to_search: 输入以搜索。
     unauthorized: 未经授权
     undo: 撤销
+    updated_at: 更新于
     updated_at_timestamp: 更新于%{updated_at}
     view: 查看
     view_item: 查看 %{item}

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

@@ -37,6 +37,14 @@ class Avo::Resources::<%= resource_class %> < <%= parent_resource %><% if option
 
   # self.find_record_method = -> { query.find Base64.decode64(id) }
 <% else %>
+<% if icon_for_resource -%>
+  self.icon = "<%= icon_for_resource %>"
+<% else -%>
+  # self.icon = "tabler/outline/users"
+<% end -%>
+  # self.avatar = {
+  #   source: :avatar
+  # }
   # self.includes = []
   # self.attachments = []<%= model_class_from_args %>
   # self.search = {
@@ -52,6 +60,7 @@ class Avo::Resources::<%= resource_class %> < <%= parent_resource %><% if option
     # field :display_name
   end<% else %>
   def fields
-    field :id, as: :id<%= generate_fields %>
+    field :id, as: :id
+    # field :avatar, as: :avatar<%= generate_fields %>
   end<% end %>
 end

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

@@ -1,34 +1,32 @@
 <div class="flex flex-col">
-  <%%= render Avo::PanelComponent.new(name: "<%= human_name %>") do |c| %>
-    <%% c.with_tools do %>
+  <%%= render ui.panel(title: "<%= human_name %>") do |panel| %>
+    <%% panel.with_controls do %>
       <%%= a_link('/avo', icon: 'heroicons/solid/academic-cap', color: :primary, style: :primary) do %>
         Dummy link
       <%% end %>
     <%% end %>
 
-    <%% 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>
+    <%% panel.with_card(title: "New resource tool") do %>
+      <div class="flex flex-col p-4 min-h-24 space-y-4">
+        <h3>🪧 This partial is waiting to be updated</h3>
 
-          <p>
-            You can edit this file here <%= in_code "app/views/avo/resource_tools/#{file_name}.html.erb" %>.
-          </p>
+        <p>
+          You can edit this file here <%= in_code "app/views/avo/resource_tools/#{file_name}.html.erb" %>.
+        </p>
 
-          <p>
-            The resource tool configuration file should be here <%= in_code "app/avo/resource_tools/#{file_name}.rb" %>.
-          </p>
+        <p>
+          The resource tool configuration file should be here <%= in_code "app/avo/resource_tools/#{file_name}.rb" %>.
+        </p>
 
-          <%%
-            # In this partial you have access to the following variables:
-            # tool
-            # @resource
-            # @resource.record
-            # params
-            # Avo::Current.context
-            # current_user
-          %>
-        </div>
+        <%%
+          # In this partial you have access to the following variables:
+          # tool
+          # @resource
+          # @resource.record
+          # params
+          # Avo::Current.context
+          # current_user
+        %>
       </div>
     <%% end %>
   <%% end %>

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

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

data/lib/generators/avo/templates/tailwindcss/tailwind.config.js

@@ -2,11 +2,4 @@ const avoPreset = require('../../tmp/avo/tailwind.preset.js')
 
 module.exports = {
   presets: [avoPreset],
-  content: [
-    ...avoPreset.content,
-    './app/views/**/*.html.erb',
-    './app/helpers/**/*.rb',
-    './app/javascript/**/*.js',
-    './app/components/avo/**/*.html.erb',
-  ],
 }

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

@@ -1,26 +1,24 @@
 <div class="flex flex-col">
-  <%%= render Avo::PanelComponent.new(name: '<%= human_name %>', display_breadcrumbs: true) do |c| %>
-    <%% c.with_tools do %>
+  <%%= render ui.panel(title: '<%= human_name %>') do |panel| %>
+    <%% panel.with_controls do %>
       <div class="text-sm italic">This is the panels tools section.</div>
     <%% end %>
 
-    <%% 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>
+    <%% panel.with_card(title: "New tool") do %>
+      <div class="flex flex-col justify-between py-6 min-h-24 px-6 space-y-4">
+        <h3>What a nice new tool 👋</h3>
 
-          <p>
-            You can edit this file here <%= in_code "app/views/avo/tools/#{file_name}.html.erb" %>.
-          </p>
+        <p>
+          You can edit this file here <%= in_code "app/views/avo/tools/#{file_name}.html.erb" %>.
+        </p>
 
-          <p>
-            For this tool we created the <%= in_code file_name %> method in the <%= in_code "Avo::ToolsController" %>. You may delete it or move it to your own controller.
-          </p>
+        <p>
+          For this tool we created the <%= in_code file_name %> method in the <%= in_code "Avo::ToolsController" %>. You may delete it or move it to your own controller.
+        </p>
 
-          <p>
-            A new <%= in_code human_name %> item should have been added to the sidebar. Edit it in <%= in_code "app/views/avo/sidebar/items/_#{file_name}.html.erb" %>
-          </p>
-        </div>
+        <p>
+          A new <%= in_code human_name %> item should have been added to the sidebar. Edit it in <%= in_code "app/views/avo/sidebar/items/_#{file_name}.html.erb" %>
+        </p>
       </div>
     <%% end %>
   <%% end %>

data/lib/generators/avo/tool_generator.rb

@@ -25,7 +25,7 @@ module Generators
           <<-METHOD
   def #{file_name}
     @page_title = "#{human_name}"
-    add_breadcrumb "#{human_name}"
+    add_breadcrumb title: "#{human_name}"
   end
           METHOD
         end
@@ -41,7 +41,7 @@ module Generators
         #   will generate the avo.lolo_path helper
         # THe fact that it will always generate the definded? and Avo::Engine.routes.draw wraps is unfortunate. We'd love a PR to fix that.
         route_contents = <<~ROUTE
-          
+
           if defined? ::Avo
             Avo::Engine.routes.draw do
               # This route is not protected, secure it with authentication if needed.
@@ -69,7 +69,7 @@ module Generators
         end
 
         def in_code(text)
-          "<code class='p-1 rounded bg-gray-500 text-white text-sm'>#{text}</code>"
+          "<code class='p-1 rounded-sm bg-gray-500 text-white text-sm'>#{text}</code>"
         end
       end
     end

data/lib/generators/avo/version_generator.rb

@@ -7,7 +7,7 @@ module Generators
 
       def handle
         if defined? ::Avo::Engine
-          output "Avo #{::Avo.configuration.license} #{::Avo::VERSION}"
+          output "Avo #{::Avo::VERSION}"
         else
           output "Avo not installed."
         end

data/lib/tasks/avo_tasks.rake

@@ -11,8 +11,14 @@ task "avo:update" do
   end
 end
 
+desc "Builds Avo (just assets for now)"
+task "avo:build" do
+  Rake::Task["avo:build-assets"].invoke
+end
+
 desc "Installs Avo assets and bundles them for when you want to use the GitHub repo in your app"
 task "avo:build-assets" do
+  puts "Building Avo assets"
   spec = get_gem_spec "avo"
   # Uncomment to enable only when the source is github.com
   # enabled = spec.source.to_s.include?('https://github.com/avo-hq/avo')
@@ -23,9 +29,14 @@ task "avo:build-assets" do
     path = spec.full_gem_path
 
     Dir.chdir(path) do
+      puts "Running `yarn install`"
       system "yarn"
+
+      puts "Running `bundle exec rails avo:sym_link`"
       system "bundle exec rails avo:sym_link"
-      system "yarn prod:build"
+
+      puts "Running `yarn build`"
+      system "yarn build"
     end
 
     puts "Done"
@@ -70,8 +81,13 @@ end
 
 desc "Symlinks all Avo gems to tmp/avo/packages"
 task "avo:sym_link" do
-  base_path = Rails.root.join("tmp", "avo").to_s.gsub("/spec/dummy", "")
+  puts "Running avo:sym_link"
+  base_path = Rails.root.join("tmp", "avo", "build-assets").to_s.gsub("/spec/dummy", "")
+
+  remove_directory_if_exists base_path
+
   packages_path = "#{base_path}/packages"
+
   if Dir.exist?(packages_path)
     `rm -rf #{packages_path}/*`
   else
@@ -80,8 +96,7 @@ task "avo:sym_link" do
   end
 
   gem_paths = `bundle list --paths 2>/dev/null`.split("\n")
-
-  ["avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu", "avo-kanban"].each do |gem|
+  ["avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu", "avo-kanban", "avo-forms"].each do |gem|
     path = gem_paths.find { |gem_path| gem_path.include?("/#{gem}-") }
 
     # If path is nil we check if package is defined outside of root (on release process it is)
@@ -95,35 +110,24 @@ task "avo:sym_link" do
     symlink_path path, "#{packages_path}/#{gem}"
   end
 
-  builds_css_path = Avo::Engine.root.join("app", "assets", "builds", "avo.base.css")
-  public_css_path = Avo::Engine.root.join("public", "avo-assets", "avo.base.css")
+  application_css_path = Avo::Engine.root.join("app", "assets", "stylesheets", "application.css")
+  raise "[Avo->] Failed to find #{application_css_path}." unless File.exist?(application_css_path.to_s)
 
-  base_css_path = if File.exist?(builds_css_path.to_s)
-    builds_css_path
-  elsif File.exist?(public_css_path.to_s)
-    public_css_path
-  else
-    raise "[Avo->] Failed to find avo.base.css."
-  end
-
-  dest_css_path = "#{base_path}/avo.base.css"
+  dest_css_path = "#{base_path}/application.css"
   remove_file_if_exists dest_css_path
 
-  puts "[Avo->] Linking avo.base.css to #{base_css_path}"
-  symlink_path base_css_path, dest_css_path
-
-  base_preset_path = Avo::Engine.root.join("tailwind.preset.js")
-  dest_preset_path = "#{base_path}/tailwind.preset.js"
-  remove_file_if_exists dest_preset_path
-
-  puts "[Avo->] Linking tailwind.preset.js to #{base_preset_path}"
-  symlink_path base_preset_path, dest_preset_path
+  puts "[Avo->] Linking application.css to #{application_css_path}"
+  symlink_path application_css_path, dest_css_path
 end
 
 def remove_file_if_exists(path)
   `rm #{path}` if File.exist?(path) || File.symlink?(path)
 end
 
+def remove_directory_if_exists(path)
+  `rm -rf #{path}` if Dir.exist?(path) || File.symlink?(path)
+end
+
 def symlink_path(from, to)
   remove_file_if_exists to
 
@@ -135,5 +139,5 @@ task "avo:yarn_install" do
   # tailwind.preset.js needs this dependencies in order to be required
   # Ensure that versions remain updated and synchronized with those specified in package.json.
   puts "[Avo->] Adding yarn dependencies"
-  `yarn add tailwindcss@^3.4.17 @tailwindcss/forms@^0.5.10 @tailwindcss/typography@^0.5.16 @tailwindcss/container-queries@^0.1.1 --cwd #{Avo::Engine.root}`
+  `yarn add tailwindcss@^4.0.0 @tailwindcss/typography@^0.5.16 @tailwindcss/container-queries@^0.1.1 --cwd #{Avo::Engine.root}`
 end