avo 2.5.2.pre.6 → 2.5.2.pre.7

data/app/javascript/js/controllers/filter_controller.js

@@ -84,12 +84,9 @@ export default class extends Controller {
 
     if (this.keepFiltersPanelOpenValue) {
       // eslint-disable-next-line camelcase
-      query.keep_filters_panel_open = this.keepFiltersPanelOpenValue ? 1 : null
+      query.keep_filters_panel_open = this.keepFiltersPanelOpenValue
     }
 
-    // force to go to the first page if the filters changed
-    query.page = 1
-
     if (encodedFilters) {
       query.filters = encodedFilters
     } else {

data/app/javascript/js/controllers.js

@@ -2,6 +2,7 @@ import { application } from './application'
 
 import ActionController from './controllers/action_controller'
 import ActionsPickerController from './controllers/actions_picker_controller'
+import AlertsController from './controllers/alerts_controller'
 import AttachmentsController from './controllers/attachments_controller'
 import BelongsToFieldController from './controllers/fields/belongs_to_field_controller'
 import BooleanFilterController from './controllers/boolean_filter_controller'
@@ -24,6 +25,7 @@ import SearchController from './controllers/search_controller'
 import SelectController from './controllers/select_controller'
 import SelectFilterController from './controllers/select_filter_controller'
 import SimpleMdeController from './controllers/fields/simple_mde_controller'
+import TagsFieldController from './controllers/fields/tags_field_controller'
 import TextFilterController from './controllers/text_filter_controller'
 import TippyController from './controllers/tippy_controller'
 import TogglePanelController from './controllers/toggle_panel_controller'
@@ -31,6 +33,7 @@ import TrixFieldController from './controllers/fields/trix_field_controller'
 
 application.register('action', ActionController)
 application.register('actions-picker', ActionsPickerController)
+application.register('alerts', AlertsController)
 application.register('attachments', AttachmentsController)
 application.register('boolean-filter', BooleanFilterController)
 application.register('copy-to-clipboard', CopyToClipboardController)
@@ -48,6 +51,7 @@ application.register('per-page', PerPageController)
 application.register('search', SearchController)
 application.register('select', SelectController)
 application.register('select-filter', SelectFilterController)
+application.register('tags-field', TagsFieldController)
 application.register('text-filter', TextFilterController)
 application.register('tippy', TippyController)
 application.register('toggle-panel', TogglePanelController)

data/app/views/avo/actions/show.html.erb

@@ -29,14 +29,11 @@
         </div>
       <% end %>
       <% c.controls do %>
-        <%= a_button data: { action: 'click->modal#close' },
-          size: :sm,
-          color: :primary do %>
+        <%= a_button data: { action: 'click->modal#close' }, size: :sm do %>
           <%= @action.cancel_button_label %>
         <% end %>
         <%= a_button type: :submit,
-            color: :primary,
-            style: :primary,
+            color: :green,
             size: :sm,
             data: @action.class.submit_button_data_attributes do %>
           <%= @action.confirm_button_label %>

data/app/views/avo/partials/_logo.html.erb

@@ -1,3 +1,3 @@
-<%= link_to root_path, class: 'logo-placeholder h-10 bg-white flex justify-start' do %>
+<%= link_to root_path, class: 'logo-placeholder h-20 bg-white p-4 flex justify-start' do %>
   <%= image_tag '/avo-assets/logo.png', class: 'h-full', title: 'Avo' %>
 <% end %>

data/app/views/avo/partials/_navbar.html.erb

@@ -1,17 +1,14 @@
 <div
-  class="fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-4 border-b space-x-4 lg:space-x-0 min-h-[4rem] <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
+  class="relative bg-white p-2 w-full flex flex-shrink-0 items-center z-50 px-4 lg:px-8 border-b space-x-4 lg:space-x-0 min-h-[4rem] <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
   v-if="layout !== 'blank'"
 >
-  <div class="flex items-center space-x-2 lg:space-x-0 w-64">
-    <%= a_button class: 'lg:hidden', icon: 'menu', size: :xs, compact: true, style: :text, data: { action: 'click->mobile#toggleSidebar' } %>
-    <%= render partial: "avo/partials/logo" %>
-  </div>
-  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8 lg:pl-4">
-    <div class="flex">
-      <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
-    </div>
+  <%= a_button class: 'lg:hidden', icon: 'menu', data: { action: 'click->mobile#toggleSidebar' } %>
+  <div class="flex-1 flex items-center justify-between lg:justify-start space-x-8">
     <div class="m-0">
       <%= render partial: "avo/partials/header" %>
     </div>
+    <div class="flex">
+      <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) && ::Avo.configuration.feature_enabled?(:global_search) %>
+    </div>
   </div>
 </div>

data/app/views/avo/partials/_table_header.html.erb

@@ -29,9 +29,8 @@
         sort_by = field.id
         sort_direction = 'desc'
       end
-      classes = "text-gray-500 tracking-tight leading-tight text-xs font-semibold"
-    %>
-    <th class="text-left uppercase px-3 py-2 whitespace-nowrap rounded-l">
+      classes = "text-gray-500 tracking-tight leading-tight text-sm font-semibold" %>
+    <th class="text-left uppercase px-3 py-4 whitespace-nowrap rounded-l">
       <% if field.sortable %>
         <%= link_to params.permit!.merge(sort_by: sort_by, sort_direction: sort_direction), class: "flex items-center #{classes} #{'cursor-pointer' if field.sortable}", 'data-turbo-frame': params[:turbo_frame] do %>
           <%= field.name %>

data/app/views/avo/private/_links_and_buttons.html.erb

@@ -1,7 +1,7 @@
 <%
   entities = [:button, :link]
-  sizes = [:xl, :lg, :md, :sm, :xs].reverse
-  styles = [:primary, :outline, :text]
+  sizes = [:lg, :md, :sm, :xs]
+  styles = [:primary, :outline]
   colors = [:primary, :gray, :red, :orange, :green]
   states = [:regular, :hover, :disabled, :active]
 %>

data/app/views/layouts/avo/application.html.erb

@@ -1,57 +1,60 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-    <%= render partial: 'avo/partials/javascript' %>
-    <%= render partial: 'avo/partials/head' %>
-    <% if Avo::PACKED %>
-      <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
-    <% else %>
-      <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
-      <% if Rails.env.development? %>
-        <%= javascript_include_tag "hotwire-livereload", defer: true %>
-      <% end %>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <%= display_meta_tags site: Avo.configuration.app_name, reverse: true, separator: "—" %>
+
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%= render partial: 'avo/partials/javascript' %>
+  <%= render partial: 'avo/partials/head' %>
+
+  <% if Avo::PACKED %>
+    <%= javascript_include_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+  <% else %>
+    <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
+    <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+    <% if Rails.env.development? %>
+      <%= javascript_include_tag "hotwire-livereload", defer: true %>
     <% end %>
-  </head>
-  <body class="bg-gray-25 os-mac">
-    <div class="relative flex flex-1 w-full min-h-full" data-controller="mobile">
-      <div class="flex-1 flex flex-col max-w-full">
-        <%= render partial: "avo/partials/navbar" %>
-        <div class="flex-1 flex pt-16 relative">
-          <%= render Avo::SidebarComponent.new %>
-          <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
-            <div class="content p-4 lg:p-6 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
-              <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
-              <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
-                <%= yield %>
-                <%= render partial: "avo/partials/footer" %>
-              </div>
-            </div>
-          </div>
-        </div>
+  <% end %>
+</head>
+<body class="bg-application os-mac">
+<div class="relative flex flex-1 w-full min-h-full" data-controller="mobile">
+  <%= render Avo::SidebarComponent.new %>
+
+  <div class="lg:pl-64 flex-1 flex flex-col min-h-full max-w-full">
+    <%= render partial: "avo/partials/navbar" %>
+
+    <div class="content py-4 lg:py-8 px-4 lg:px-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
+      <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
+
+      <div class="flex flex-1 flex-col justify-between items-stretch space-y-8">
+        <%= yield %>
+        <%= render partial: "avo/partials/footer" %>
       </div>
     </div>
-    <%= turbo_frame_tag 'actions_show' %>
-    <%= turbo_frame_tag 'attach_modal' %>
-    <%= turbo_frame_tag 'destroy_attachment_form' %>
-    <%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
-      <%= render Avo::FlashAlertsComponent.new flashes: flash %>
-      <% # In case we have other general error messages %>
-      <% if @errors.present? %>
-        <% @errors.each do |message| %>
-          <%= render Avo::AlertComponent.new :error, message %>
-        <% end %>
-      <% end %>
+  </div>
+</div>
+
+<%= turbo_frame_tag 'actions_show' %>
+<%= turbo_frame_tag 'attach_modal' %>
+<%= turbo_frame_tag 'destroy_attachment_form' %>
+
+<%= turbo_frame_tag 'alerts', class: "fixed inset-0 bottom-0 flex flex-col space-y-4 items-end justify-right px-4 py-6 sm:p-6 justify-end z-50 pointer-events-none" do %>
+  <%= render Avo::FlashAlertsComponent.new flashes: flash %>
+
+  <% # In case we have other general error messages %>
+  <% if @errors.present? %>
+    <% @errors.each do |message| %>
+      <%= render Avo::AlertComponent.new :error, message %>
     <% end %>
-    <%= render partial: "avo/partials/scripts" %>
-    <!-- Avo version: <%= Avo::VERSION %> -->
-    <!-- Environment: <%= Rails.env %> -->
-    <!-- License ID: <%= Avo::App.license.id %> -->
-    <!-- License valid?: <%= Avo::App.license.valid ? "valid" : "invalid" %>  -->
-  </body>
+  <% end %>
+<% end %>
+
+<%= render partial: "avo/partials/scripts" %>
+<!-- Avo version: <%= Avo::VERSION %> -->
+</body>
 </html>

data/db/factories.rb

@@ -25,6 +25,7 @@ FactoryBot.define do
         Time.now - rand(10...365).days
       end
     end
+    tag_list { ["1", "2", "five", "seven"].shuffle }
     status { ::Post.statuses.keys.sample }
   end
 
@@ -64,6 +65,7 @@ FactoryBot.define do
 
   factory :course do
     name { Faker::Educator.unique.course_name }
+    skills { [Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject, Faker::Educator.subject] }
     country { Course.countries.sample }
     city { Course.cities.stringify_keys[country].sample }
   end

data/lib/avo/base_action.rb

@@ -61,7 +61,8 @@ module Avo
       self.class.cancel_button_label ||= I18n.t("avo.cancel")
 
       @response ||= {}
-      @response[:messages] = []
+      @response[:message_type] ||= :notice
+      @response[:message] ||= I18n.t("avo.action_ran_successfully")
     end
 
     def context
@@ -130,25 +131,15 @@ module Avo
     end
 
     def succeed(text)
-      add_message text, :success
+      response[:message_type] = :notice
+      response[:message] = text
 
       self
     end
 
     def fail(text)
-      add_message text, :error
-
-      self
-    end
-
-    def inform(text)
-      add_message text, :info
-
-      self
-    end
-
-    def warn(text)
-      add_message text, :warning
+      response[:message_type] = :alert
+      response[:message] = text
 
       self
     end
@@ -177,14 +168,5 @@ module Avo
 
       self
     end
-
-    private
-
-    def add_message(body, type = :info)
-      response[:messages] << {
-        type: type,
-        body: body
-      }
-    end
   end
 end

data/lib/avo/base_resource.rb

@@ -136,6 +136,12 @@ module Avo
         end
       end
 
+      if Avo::App.license.lacks_with_trial(:advanced_fields)
+        fields = fields.reject do |field|
+          field.type == 'tags'
+        end
+      end
+
       fields
     end
 

data/lib/avo/concerns/handles_field_args.rb

@@ -0,0 +1,36 @@
+module Avo
+  module Concerns
+    module HandlesFieldArgs
+      extend ActiveSupport::Concern
+
+      private
+
+      # Add an instance variable from args
+      # That may be a string, boolean, or array
+      # Each args should also have a default value
+      def add_prop_from_args(args = {}, name: nil, type: :string, default: nil)
+        value = default
+
+        if type == :boolean
+          value = args[name.to_sym] == true
+        else
+          value = args[name.to_sym] unless args.dig(name.to_sym).nil?
+        end
+
+        instance_variable_set(:"@#{name}", value)
+      end
+
+      def add_boolean_prop(args, name, default = false)
+        add_prop_from_args args, name: name, default: default, type: :boolean
+      end
+
+      def add_array_prop(args, name, default = [])
+        add_prop_from_args args, name: name, default: default, type: :array
+      end
+
+      def add_string_prop(args, name, default = [])
+        add_prop_from_args args, name: name, default: default, type: :string
+      end
+    end
+  end
+end

data/lib/avo/engine.rb

@@ -31,7 +31,7 @@ module Avo
         path = Rails.root.join(*path_params)
 
         if File.directory? path.to_s
-          Rails.autoloaders.main.push_dir path.to_s
+          Rails.autoloaders.main.push_dir path
         end
       end
     end

data/lib/avo/fields/base_field.rb

@@ -4,8 +4,9 @@ module Avo
       extend ActiveSupport::DescendantsTracker
       extend Avo::Fields::FieldExtensions::HasFieldName
 
-      include ActionView::Helpers::UrlHelper
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
+      include Avo::Concerns::HandlesFieldArgs
+      include ActionView::Helpers::UrlHelper
 
       delegate :view_context, to: "Avo::App"
       delegate :main_app, to: :view_context

data/lib/avo/fields/belongs_to_field.rb

@@ -62,7 +62,7 @@ module Avo
       attr_reader :relation_method
       attr_reader :types # for Polymorphic associations
       attr_reader :allow_via_detaching
-      attr_reader :attach_scope
+      attr_reader :scope
       attr_reader :polymorphic_help
 
       def initialize(id, **args, &block)
@@ -75,7 +75,7 @@ module Avo
         @types = args[:types]
         @relation_method = id.to_s.parameterize.underscore
         @allow_via_detaching = args[:allow_via_detaching] == true
-        @attach_scope = args[:attach_scope]
+        @scope = args[:scope]
         @polymorphic_help = args[:polymorphic_help]
       end
 
@@ -117,8 +117,8 @@ module Avo
 
         query = Avo::Services::AuthorizationService.apply_policy(user, resource.class.query_scope)
 
-        if attach_scope.present?
-          query = Avo::Hosts::AssociationScopeHost.new(block: attach_scope, query: query, parent: get_model).handle
+        if scope.present?
+          query = Avo::Hosts::AssociationScopeHost.new(block: scope, query: query, parent: get_model).handle
         end
 
         query.all.map do |model|

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -4,10 +4,10 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
+        super(id, **args, &block)
+
         hide_on :all
         show_on :show
-
-        super(id, **args, &block)
       end
 
       def view_component_name

data/lib/avo/fields/has_base_field.rb

@@ -3,14 +3,12 @@ module Avo
     class HasBaseField < BaseField
       attr_accessor :display
       attr_accessor :scope
-      attr_accessor :attach_scope
       attr_accessor :description
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
         @scope = args[:scope].present? ? args[:scope] : nil
-        @attach_scope = args[:attach_scope].present? ? args[:attach_scope] : nil
         @display = args[:display].present? ? args[:display] : :show
         @searchable = args[:searchable] == true
         @description = args[:description]

data/lib/avo/fields/has_many_field.rb

@@ -4,10 +4,10 @@ module Avo
       def initialize(id, **args, &block)
         args[:updatable] = false
 
+        super(id, **args, &block)
+
         hide_on :all
         show_on :show
-
-        super(id, **args, &block)
       end
     end
   end

data/lib/avo/fields/has_one_field.rb

@@ -4,10 +4,10 @@ module Avo
       attr_accessor :relation_method
 
       def initialize(id, **args, &block)
-        hide_on :new, :edit
-
         super(id, **args, &block)
 
+        hide_on :new, :edit
+
         @placeholder ||= I18n.t "avo.choose_an_option"
 
         @relation_method = name.to_s.parameterize.underscore

data/lib/avo/fields/tags_field.rb

@@ -0,0 +1,82 @@
+module Avo
+  module Fields
+    class TagsField < BaseField
+      attr_reader :acts_as_taggable_on
+      attr_reader :close_on_select
+      attr_reader :delimiters
+      attr_reader :enforce_suggestions
+
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
+
+        add_boolean_prop args, :close_on_select
+        add_boolean_prop args, :enforce_suggestions
+        add_string_prop args, :acts_as_taggable_on
+        add_array_prop args, :blacklist
+        add_array_prop args, :delimiters, [","]
+        add_array_prop args, :suggestions
+      end
+
+      def field_value
+        return json_value if acts_as_taggable_on.present?
+
+        value || []
+      end
+
+      def json_value
+        value.map do |item|
+          {
+            value: item.name
+          }
+        end.as_json
+      end
+
+      def fill_field(model, key, value, params)
+        if acts_as_taggable_on.present?
+          model.send(act_as_taggable_attribute(key), parsed_value(value))
+        else
+          model.send("#{key}=", parsed_value(value))
+        end
+
+        model
+      end
+
+      def suggestions
+        return @suggestions if @suggestions.is_a? Array
+
+        if @suggestions.respond_to? :call
+          return Avo::Hosts::RecordHost.new(block: @suggestions, record: model).handle
+        end
+
+        []
+      end
+
+      def blacklist
+        return @blacklist if @blacklist.is_a? Array
+
+        if @blacklist.respond_to? :call
+          return Avo::Hosts::RecordHost.new(block: @blacklist, record: model).handle
+        end
+
+        []
+      end
+
+      private
+
+      def act_as_taggable_attribute(key)
+        "#{key.singularize}_list="
+      end
+
+      def parsed_value(value)
+        JSON.parse(value).pluck("value")
+      rescue
+        []
+      end
+
+      private
+
+      def parse_suggestions_from_args(args)
+      end
+    end
+  end
+end

data/lib/avo/hosts/record_host.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Hosts
+    class RecordHost < BaseHost
+      option :record
+    end
+  end
+end

data/lib/avo/licensing/pro_license.rb

@@ -12,7 +12,8 @@ module Avo
           :searchable_associations,
           :resource_ordering,
           :dashboards,
-          :menu_editor
+          :menu_editor,
+          :advanced_fields
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.5.2.pre.6" unless const_defined?(:VERSION)
+  VERSION = "2.5.2.pre.7" unless const_defined?(:VERSION)
 end

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

@@ -39,6 +39,10 @@ en:
       zero: 'no %{item}'
       one: 'one %{item}'
       other: '%{count} %{item}'
+    x_items_more:
+      zero: 'no more items'
+      one: 'one more item'
+      other: '%{count} more items'
     are_you_sure: 'Are you sure?'
     filters: 'Filters'
     per_page: 'Per page'