avo 2.5.2.pre.5 → 2.6.0

data/app/javascript/js/controllers/fields/tags_field_helpers.js

@@ -0,0 +1,47 @@
+export function tagTemplate(tagData) {
+  const suggestions = this.settings.whitelist || []
+
+  const possibleSuggestion = suggestions.find(
+    // eslint-disable-next-line eqeqeq
+    (item) => item.value == tagData.value,
+  )
+  const possibleLabel = possibleSuggestion
+    ? possibleSuggestion.label
+    : tagData.value
+
+  return `
+<tag title="${tagData.value}"
+  contenteditable='false'
+  spellcheck='false'
+  tabIndex="-1"
+  class="tagify__tag ${tagData.class ? tagData.class : ''}"
+  ${this.getAttributes(tagData)}
+>
+  <x title='' class='tagify__tag__removeBtn' role='button' aria-label='remove tag'></x>
+  <div>
+      <span class='tagify__tag-text'>${possibleLabel}</span>
+  </div>
+</tag>
+`
+}
+
+export function suggestionItemTemplate(tagData) {
+  return `
+<div ${this.getAttributes(tagData)}
+  class='tagify__dropdown__item flex items-center ${
+  tagData.class ? tagData.class : ''
+}'
+  tabindex="0"
+  role="option">
+  ${
+  tagData.avatar
+    ? `
+  <div class='rounded w-8 h-8 block mr-2'>
+      <img onerror="this.style.visibility='hidden'" class="w-full" src="${tagData.avatar}">
+  </div>`
+    : ''
+}
+  <span>${tagData.label}</span>
+</div>
+`
+}

data/app/javascript/js/controllers/menu_controller.js

@@ -54,12 +54,12 @@ export default class extends Controller {
   }
 
   markCollapsed() {
-    this.svgTarget.classList.add('rotate-180')
+    this.svgTarget.classList.add('rotate-90')
     this.itemsTarget.classList.add('hidden')
   }
 
   markExpanded() {
-    this.svgTarget.classList.remove('rotate-180')
+    this.svgTarget.classList.remove('rotate-90')
     this.itemsTarget.classList.remove('hidden')
   }
 }

data/app/javascript/js/controllers.js

@@ -24,6 +24,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'
@@ -48,6 +49,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/dashboards/_chartkick_card.html.erb

@@ -1,3 +1,3 @@
 <div class="relative flex flex-col <%= @card.chartkick_classes %>">
-  <%= send(@card.chart_type, @card.compute_result.result_data, **@card.chartkick_options) %>
+  <%= send(@card.chart_type, @card.result_data, **@card.chartkick_options) %>
 </div>

data/app/views/avo/dashboards/_metric_card.html.erb

@@ -1,5 +1,5 @@
 <div class="flex mt-4 items-end">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl"><%= @card.compute_result.result_data %></span>
+  <span class="text-5xl"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>

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

@@ -1,12 +1,12 @@
 <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="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 h-16 <%= '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">
+  <div class="flex items-center space-x-2 lg:space-x-0 w-32 sm:w-64 flex-shrink-0">
     <%= 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-1 flex items-center justify-between lg:justify-start space-x-2 sm: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>

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

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

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

@@ -25,7 +25,7 @@
         <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 py-4 lg:p-4 px-4 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
+            <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 %>

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_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/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/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, :disallowed
+        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 disallowed
+        return @disallowed if @disallowed.is_a? Array
+
+        if @disallowed.respond_to? :call
+          return Avo::Hosts::RecordHost.new(block: @disallowed, 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.5" unless const_defined?(:VERSION)
+  VERSION = "2.6.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/cards/chartkick_card.tt

@@ -3,7 +3,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart
 
-  query do
+  def query
     data = 3.times.map do |index|
       {
         name: "Batch #{index}",

data/lib/generators/avo/templates/cards/chartkick_card_sample.tt

@@ -9,7 +9,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   # self.chart_options = { library: { plugins: { legend: { display: true } } } }
   # self.flush = true
 
-  query do
+  def query
     points = 16
     i = Time.new.year.to_i - points
     base_data = Array.new(points).map do

data/lib/generators/avo/templates/cards/metric_card.tt

@@ -2,7 +2,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
 
-  query do
+  def query
     result 101
   end
 end

data/lib/generators/avo/templates/cards/metric_card_sample.tt

@@ -8,7 +8,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   # self.prefix = ""
   # self.suffix = ""
 
-  query do
+  def query
     # from = Date.today.midnight - 1.week
     # to = DateTime.current
 

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'

data/lib/tasks/avo_tasks.rake

@@ -5,11 +5,14 @@
 
 desc 'Installs Avo assets and bundles them for when you want to use the GitHub repo in your app'
 task 'avo:build-assets' do
+  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')
   enabled = true
 
   if enabled
     puts "Starting avo:build-assets"
-    path = locate_gem 'avo'
+    path = spec.full_gem_path
 
     Dir.chdir(path) do
       system 'yarn'
@@ -24,11 +27,12 @@ end
 
 # From
 # https://stackoverflow.com/questions/9322078/programmatically-determine-gems-path-using-bundler
-def locate_gem(name)
+def get_gem_spec(name)
   spec = Bundler.load.specs.find{|s| s.name == name }
   raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
   if spec.name == 'bundler'
     return File.expand_path('../../../', __FILE__)
   end
-  spec.full_gem_path
+
+  spec
 end