avo 2.46.0 → 3.0.2

data/lib/generators/avo/templates/filters/text_filter.tt

@@ -1,4 +1,4 @@
-class <%= class_name.camelize %> < Avo::Filters::TextFilter
+class Avo::Filters::<%= class_name.camelize %> < Avo::Filters::TextFilter
   self.name = "<%= name.underscore.humanize %>"
   self.button_label = 'Filter by <%= class_name.underscore.humanize.downcase.gsub(' filter', '') %>'
   # self.visible = -> do

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

@@ -1,15 +1,19 @@
 # For more information regarding these settings check out our docs https://docs.avohq.io
+# The values disaplayed here are the default ones. Uncomment and change them to fit your needs.
 Avo.configure do |config|
   ## == Routing ==
   config.root_path = '/<%= options[:path] %>'
   # used only when you have custom `map` configuration in your config.ru
   # config.prefix_path = "/internal"
 
+  # Sometimes you migth want to mount Avo's engines yourself.
+  # https://docs.avohq.io/3.0/routing.html
+  # config.mount_avo_engines = true
+
   # Where should the user be redirected when visting the `/<%= options[:path] %>` url
   # config.home_path = nil
 
   ## == Licensing ==
-  config.license = 'community' # change this to 'pro' when you add the license key
   # config.license_key = ENV['AVO_LICENSE_KEY']
 
   ## == Set the context ==
@@ -58,7 +62,7 @@ Avo.configure do |config|
   ## permanent enable or disable cache_resource_filters, default value is false
   # config.cache_resource_filters = false
   ## provide a lambda to enable or disable cache_resource_filters per user/resource.
-  # config.cache_resource_filters = ->(current_user:, resource:) { current_user.cache_resource_filters?}
+  # config.cache_resource_filters = -> { current_user.cache_resource_filters? }
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
@@ -71,9 +75,9 @@ Avo.configure do |config|
   # config.view_component_path = "app/components"
   # config.display_license_request_timeout_error = true
   # config.disabled_features = []
-  # config.tabs_style = :tabs # can be :tabs or :pills
   # config.buttons_on_form_footers = true
   # config.field_wrapper_layout = true
+  # config.resource_parent_controller = "Avo::ResourcesController"
 
   ## == Branding ==
   # config.branding = {

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

@@ -23,6 +23,7 @@ ar:
     create_new_item: إنشاء %{item} جديد
     dashboard: لوحة القيادة
     dashboards: لوحات القيادة
+    default_scope: الجميع
     delete: حذف
     delete_file: حذف الملف
     delete_item: حذف %{item}

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

@@ -23,6 +23,7 @@ en:
     create_new_item: Create new %{item}
     dashboard: Dashboard
     dashboards: Dashboards
+    default_scope: All
     delete: delete
     delete_file: Delete file
     delete_item: Delete %{item}
@@ -43,9 +44,9 @@ en:
         other: files
         zero: files
       people:
-        one: peep
-        other: peeps
-        zero: peeps
+        one: person
+        other: people
+        zero: people
     filter_by: Filter by
     filters: Filters
     go_back: Go back

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

@@ -23,6 +23,7 @@ es:
     create_new_item: Crear nuevo/a %{item}
     dashboard: Panel
     dashboards: Paneles
+    default_scope: Todos
     delete: eliminar
     delete_file: Eliminar fichero
     delete_item: Eliminar %{item}

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

@@ -23,6 +23,7 @@ fr:
     create_new_item: Créer un nouveau %{item}
     dashboard: Tableau de bord
     dashboards: Tableaux de bord
+    default_scope: Tout
     delete: supprimer
     delete_file: Supprimer le fichier
     delete_item: Supprimer %{item}

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

@@ -23,6 +23,7 @@ nb:
     create_new_item: Lag ny %{item}
     dashboard: Dashboard
     dashboards: Dashboards
+    default_scope: Alle
     delete: slett
     delete_file: Slett fil
     delete_item: Slett %{item}

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

@@ -23,6 +23,7 @@ nn:
     create_new_item: Lag ny %{item}
     dashboard: Dashboard
     dashboards: Dashboards
+    default_scope: Alle
     delete: slett
     delete_file: Slett fil
     delete_item: Slett %{item}

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -23,6 +23,7 @@ pt-BR:
     create_new_item: Criar novo %{item}
     dashboard: Painel
     dashboards: Painéis
+    default_scope: Todos
     delete: deletar
     delete_file: Deletar arquivo
     delete_item: Deletar %{item}

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

@@ -23,6 +23,7 @@ pt:
     create_new_item: Criar novo %{item}
     dashboard: Painel
     dashboards: Painéis
+    default_scope: Todos
     delete: apagar
     delete_file: Apagar arquivo
     delete_item: Apagar %{item}

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

@@ -23,6 +23,7 @@ ro:
     create_new_item: Creează %{item}
     dashboard: Panou de control
     dashboards: Panouri de control
+    default_scope: Tot
     delete: șterge
     delete_file: Șterge fișierul
     delete_item: Șterge %{item}
@@ -43,9 +44,9 @@ ro:
         other: fișiere
         zero: fișiere
       people:
-        one: peep
-        other: peeps
-        zero: peeps
+        one: persoana
+        other: persoane
+        zero: persoane
     filter_by: Filtează după
     filters: Filtre
     go_back: Înapoi
@@ -62,7 +63,7 @@ ro:
     more: Mai multe
     new: nou
     next_page: Pagina următoare
-    no_cards_present: Niciun card disponibil
+    no_cards_present: Nici un card găsit
     no_item_found: Nici un articol găsit
     no_options_available: Nicio opțiune disponibilă
     no_related_item_found: Nici un articol asociat găsit
@@ -90,7 +91,7 @@ ro:
         one: utilizator
         other: utilizatori
         zero: utilizatori
-    resource_updated: Resursă actualizata
+    resource_updated: Resursă actualizată
     resources: Resurse
     run: Rulează
     save: Salvează

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

@@ -23,6 +23,7 @@ tr:
     create_new_item: Yeni bir %{item} oluşturun
     dashboard: Yönetim Paneli
     dashboards: Yönetim Panelleri
+    default_scope: Herşey
     delete: sil
     delete_file: Dosyayı sil
     delete_item: "%{item} öğresini sil"

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

@@ -1,4 +1,4 @@
 # This controller has been generated to enable Rails' resource routes.
 # More information on https://docs.avohq.io/2.0/controllers.html
-class <%= controller_class %> < Avo::ResourcesController
+class <%= controller_class %> < <%= parent_controller %>
 end

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

@@ -1,10 +1,10 @@
-class <%= resource_class %> < Avo::BaseResource
-  self.title = :id
+class Avo::Resources::<%= resource_class %> < Avo::BaseResource
   self.includes = []<%= model_class_from_args %>
-  # self.search_query = -> do
-  #   scope.ransack(id_eq: params[:q], m: "or").result(distinct: false)
-  # end
+  # self.search = {
+  #   query: -> { query.ransack(id_eq: params[:q], m: "or").result(distinct: false) }
+  # }
 
-  field :id, as: :id<%= generate_fields %>
-  # add fields here
+  def fields
+    field :id, as: :id<%= generate_fields %>
+  end
 end

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

@@ -23,9 +23,9 @@
             # In this partial you have access to the following variables:
             # tool
             # @resource
-            # @resource.model
+            # @resource.record
             # params
-            # Avo::App.context
+            # Avo::Current.context
             # current_user
           %>
         </div>

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

@@ -1,4 +1,4 @@
-class <%= class_name %> < Avo::BaseResourceTool
+class Avo::ResourceTools::<%= class_name %> < Avo::BaseResourceTool
   self.name = "<%= human_name %>"
   # self.partial = "avo/resource_tools/<%= file_name %>"
 end

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

@@ -0,0 +1,6 @@
+class Avo::Scopes::<%= class_name.camelize %> < Avo::Pro::Scopes::BaseScope
+  self.name = "<%= name.underscore.humanize %>"
+  self.description = "<%= name.underscore.humanize %>"
+  self.scope = -> { query.all }
+  self.visible = -> { true }
+end

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,6 +1,8 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss/base';
+/* 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/tailwindcss/tailwind.config.js

@@ -0,0 +1,11 @@
+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',
+  ]
+}

data/lib/tasks/avo_tasks.rake

@@ -1,7 +1,7 @@
-# desc 'Explaining what the task does'
-# task :avo do
-#   # Task goes here
-# end
+desc "Runs the update command for all Avo gems."
+task "avo:update" do
+  system "bundle update avo avo-pro avo-advanced avo-dashboards avo_filters avo-menu avo_upgrade"
+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
@@ -16,6 +16,7 @@ task "avo:build-assets" do
 
     Dir.chdir(path) do
       system "yarn"
+      system "bundle exec rails avo:sym_link"
       system "yarn prod:build"
     end
 
@@ -36,3 +37,70 @@ def get_gem_spec(name)
 
   spec
 end
+
+desc "Finds all Avo gems and outputs theyr paths"
+task "avo:gem_paths" do
+  config = YAML.load_file("../support/gems.yml")
+
+  existing_gems = config["gems"].keys
+    .map do |gem|
+      path = `bundle show #{gem} 2> /dev/null`.chomp
+
+      unless path.empty?
+        "#{gem}:#{path}"
+      end
+    end
+    .reject(&:nil?)
+  result = existing_gems.join(",")
+
+  # Outputs a CSV "hash-like" string in this format
+  #
+  # GEM_NAME:GEM_PATH,SECOND_GEM_NAME:SECOND_GEM_PATH
+  # avo:/Users/adrian/work/avocado/avo-3,avo_filters:/Users/adrian/work/avocado/advanced/avo_filters
+  puts result
+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", "")
+  packages_path = "#{base_path}/packages"
+  if Dir.exist?(packages_path)
+    `rm -rf #{packages_path}/*`
+  else
+    `mkdir -p #{packages_path}`
+    `touch #{packages_path}/.keep`
+  end
+
+  ["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)
+    if path.empty?
+      next if !Dir.exist?("../#{gem}")
+
+      path = File.expand_path("../#{gem}")
+    end
+
+    puts "[Avo->] Linking #{gem} to #{path}"
+    `ln -s #{path} #{packages_path}/#{gem}`
+  end
+
+  base_css_path = Avo::Engine.root.join("app", "assets", "builds", "avo.base.css")
+  dest_css_path = "#{base_path}/base.css"
+  `rm #{dest_css_path}` if File.exist?("#{dest_css_path}")
+  puts "[Avo->] Linking avo.base.css to #{base_css_path}"
+  `ln -s #{base_css_path} #{dest_css_path}`
+
+  base_preset_path = Avo::Engine.root.join("tailwind.preset.js")
+  dest_preset_path = "#{base_path}/tailwind.preset.js"
+  `rm #{dest_preset_path}` if File.exist?("#{dest_preset_path}")
+  puts "[Avo->] Linking tailwind.preset.js to #{base_preset_path}"
+  `ln -s #{base_preset_path} #{dest_preset_path}`
+end
+
+desc "Installs yarn dependencies for Avo"
+task "avo:yarn_install" do
+  # tailwind.preset.js needs this dependencies in order to be required
+  puts "[Avo->] Adding yarn dependencies"
+  `yarn add tailwindcss @tailwindcss/forms @tailwindcss/typography --cwd #{Avo::Engine.root}`
+end