avo 1.4.0.pre.1 → 1.4.4.pre.1

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

@@ -0,0 +1,10 @@
+<div data-controller="search" class="resource-search flex items-center h-full w-full" data-turbo-remove-before-cache>
+  <div class="w-full"
+    data-search-target="autocomplete"
+    data-search-resource="<%= resource %>"
+    data-translation-keys='{"no_item_found": "<%= I18n.translate 'avo.no_item_found' %>"}'
+    data-debounce-timeout='<%= Avo.configuration.search_debounce %>'
+  >
+  </div>
+  <div class="relative inline-flex text-gray-400 text-sm border border-gray-300 rounded-full cursor-pointer" data-search-target="button"></div>
+</div>

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

@@ -19,14 +19,15 @@
     <%= render partial: 'avo/sidebar/sidebar' %>
 
     <div class="flex-1 flex flex-col h-full overflow-auto">
-      <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50" v-if="layout !== 'blank'">
-        <div class="ml-6">
+      <div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50 px-6" v-if="layout !== 'blank'">
+        <div>
           <%= render partial: "avo/partials/header" %>
         </div>
-        <div class="flex-1 flex justify-center">
-          <div class="w-64">
-            <%# <resources-search :global="true"> %>
-          </div>
+        <div class="flex-1 flex ml-4 pl-4">
+          <%= render partial: "avo/partials/global_search" if ::Avo::App.license.has_with_trial(:global_search) %>
+        </div>
+        <div class="align-end">
+          <%= render partial: "avo/partials/profile_dropdown" %>
         </div>
       </div>
 

data/avo.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
   spec.add_dependency "rails", ">= 6.0"
-  spec.add_dependency "pagy", ">= 3.1.3", "< 4.0"
+  spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"
@@ -45,4 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
   spec.add_dependency "manifester"
+  spec.add_dependency "ransack"
 end

data/config/routes.rb

@@ -4,6 +4,8 @@ Avo::Engine.routes.draw do
   get "resources", to: redirect("/avo")
 
   scope "avo_api", as: "avo_api" do
+    get "/search", to: "search#index"
+    get "/:resource_name/search", to: "search#show"
     post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
   end
 
@@ -27,10 +29,4 @@ Avo::Engine.routes.draw do
     post "/:resource_name/:id/:related_name", to: "relations#create"
     delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
   end
-
-  # get '/avo-api/search',                  to: 'search#index'
-  # get '/avo-api/:resource_name/search',   to: 'search#resource'
-
-  # Tools
-  # get '/avo-tools/resource-overview', to: 'resource_overview#index'
 end

data/db/factories.rb

@@ -13,6 +13,7 @@ FactoryBot.define do
     name { Faker::Company.name }
     description { Faker::Lorem.paragraph(sentence_count: 4) }
     url { Faker::Internet.url }
+    color { Faker::Color.hex_color }
   end
 
   factory :post do
@@ -24,6 +25,7 @@ FactoryBot.define do
         Time.now - rand(10...365).days
       end
     end
+    status { 0 }
   end
 
   factory :project do
@@ -36,5 +38,6 @@ FactoryBot.define do
     users_required { Faker::Number.between(from: 10, to: 100) }
     started_at { Time.now - rand(10...365).days }
     meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
+    progress { Faker::Number.between(from: 0, to: 100) }
   end
 end

data/db/migrate/20210421064037_add_color_to_teams.rb

@@ -0,0 +1,5 @@
+class AddColorToTeams < ActiveRecord::Migration[6.0]
+  def change
+    add_column :teams, :color, :string
+  end
+end

data/db/migrate/20210423075924_add_progress_to_projects.rb

@@ -0,0 +1,5 @@
+class AddProgressToProjects < ActiveRecord::Migration[6.0]
+  def change
+    add_column :projects, :progress, :integer
+  end
+end

data/lib/avo/app.rb

@@ -1,13 +1,12 @@
 module Avo
   class App
-    class_attribute :app, default: {
-      resources: [],
-      cache_store: nil
-    }
+    class_attribute :resources, default: []
+    class_attribute :cache_store, default: nil
     class_attribute :fields, default: []
     class_attribute :request, default: nil
     class_attribute :context, default: nil
     class_attribute :license, default: nil
+    class_attribute :current_user, default: nil
 
     class << self
       def boot
@@ -16,15 +15,16 @@ module Avo
         I18n.locale = Avo.configuration.language_code
 
         if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
-          app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+          self.cache_store ||= ActiveSupport::Cache::MemoryStore.new
         else
-          app[:cache_store] = Rails.cache
+          self.cache_store = Rails.cache
         end
       end
 
-      def init(request:, context:)
+      def init(request:, context:, current_user:)
         self.request = request
         self.context = context
+        self.current_user = current_user
 
         self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
 
@@ -38,10 +38,6 @@ module Avo
         init_resources
       end
 
-      def cache_store
-        app[:cache_store]
-      end
-
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
       # so later we can instantiate them on our resources.
       #
@@ -67,7 +63,7 @@ module Avo
       end
 
       def init_resources
-        app[:resources] = BaseResource.descendants
+        self.resources = BaseResource.descendants
           .select do |resource|
             resource != BaseResource
           end
@@ -78,15 +74,11 @@ module Avo
           end
       end
 
-      def get_resources
-        app[:resources]
-      end
-
       # Returns the Avo resource by camelized name
       #
       # get_resource_by_name('User') => UserResource
       def get_resource(resource)
-        app[:resources].find do |available_resource|
+        resources.find do |available_resource|
           "#{resource}Resource".safe_constantize == available_resource.class
         end
       end
@@ -103,7 +95,7 @@ module Avo
       # get_resource_by_name('User') => UserResource
       # get_resource_by_name(User) => UserResource
       def get_resource_by_model_name(name)
-        get_resources.find do |resource|
+        resources.find do |resource|
           resource.model_class.model_name.name == name.to_s
         end
       end
@@ -113,7 +105,7 @@ module Avo
       # get_resource_by_controller_name('delayed_backend_active_record_jobs') => DelayedJobResource
       # get_resource_by_controller_name('users') => UserResource
       def get_resource_by_controller_name(name)
-        get_resources.find do |resource|
+        resources.find do |resource|
           resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
         end
       end
@@ -126,8 +118,7 @@ module Avo
       end
 
       def get_available_resources(user = nil)
-        App.get_resources
-          .select do |resource|
+        resources.select do |resource|
             Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
           end
           .sort_by { |r| r.name }

data/lib/avo/base_resource.rb

@@ -11,7 +11,7 @@ module Avo
 
     class_attribute :id, default: :id
     class_attribute :title, default: :id
-    class_attribute :search, default: [:id]
+    class_attribute :search_query, default: nil
     class_attribute :includes, default: []
     class_attribute :model_class
     class_attribute :translation_key
@@ -42,6 +42,18 @@ module Avo
 
         self.filters_loader.use filter_class
       end
+
+      def scope
+        authorization.apply_policy model_class
+      end
+
+      def authorization
+        Avo::Services::AuthorizationService.new Avo::App.current_user
+      end
+    end
+
+    def initialize
+      self.class.model_class = model_class
     end
 
     def hydrate(model: nil, view: nil, user: nil, params: nil)
@@ -61,9 +73,17 @@ module Avo
     def get_field_definitions
       return [] if self.class.fields.blank?
 
-      self.class.fields.map do |field|
+      fields = self.class.fields.map do |field|
         field.hydrate(resource: self, panel_name: default_panel_name, user: user)
       end
+
+      if Avo::App.license.has_with_trial(:custom_fields)
+        fields = fields.reject do |field|
+          field.custom?
+        end
+      end
+
+      fields
     end
 
     def get_fields(panel: nil, reflection: nil)
@@ -88,9 +108,9 @@ module Avo
         end
       end
 
-      fields.map do |field|
-        field.hydrate(model: @model, view: @view, resource: self)
-      end
+      hydrate_fields(model: @model, view: @view)
+
+      fields
     end
 
     def get_grid_fields
@@ -111,8 +131,16 @@ module Avo
       self.class.actions_loader.bag
     end
 
+    def hydrate_fields(model: nil, view: nil)
+      fields.map do |field|
+        field.hydrate(model: @model, view: @view, resource: self)
+      end
+
+      self
+    end
+
     def default_panel_name
-      return @params[:related_name].capitalize if @params[:related_name].present?
+      return @params[:related_name].capitalize if @params.present? && @params[:related_name].present?
 
       case @view
       when :show
@@ -218,7 +246,11 @@ module Avo
 
     def fill_model(model, params)
       # Map the received params to their actual fields
-      fields_by_database_id = get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
+      fields_by_database_id = get_field_definitions
+        .reject do |field|
+          field.computed
+        end
+        .map { |field| [field.database_id(model).to_s, field] }.to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
@@ -293,5 +325,57 @@ module Avo
         end
       end
     end
+
+    def avo_path
+      "#{Avo.configuration.root_path}/resources/#{model_class.model_name.route_key}/#{model.id}"
+    end
+
+    def label_field
+      get_field_definitions.find do |field|
+        field.as_label.present?
+      end
+    rescue
+      nil
+    end
+
+    def label
+      label_field.value || model_title
+    rescue
+      model_title
+    end
+
+    def avatar_field
+      get_field_definitions.find do |field|
+        field.as_avatar.present?
+      end
+    rescue
+      nil
+    end
+
+    def avatar
+      avatar_field.to_image
+    rescue
+      nil
+    end
+
+    def avatar_type
+      avatar_field.as_avatar
+    rescue
+      nil
+    end
+
+    def description_field
+      get_field_definitions.find do |field|
+        field.as_description.present?
+      end
+    rescue
+      nil
+    end
+
+    def description
+      description_field.value
+    rescue
+      nil
+    end
   end
 end

data/lib/avo/configuration.rb

@@ -22,6 +22,7 @@ module Avo
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
     attr_accessor :home_path
+    attr_accessor :search_debounce
 
     def initialize
       @root_path = "/avo"
@@ -35,7 +36,7 @@ module Avo
       @default_view_type = :table
       @license = "community"
       @license_key = nil
-      @current_user = proc {}
+      @current_user = proc { current_user }
       @authenticate = proc {}
       @authorization_methods = {
         index: "index?",
@@ -56,6 +57,7 @@ module Avo
       }
       @display_breadcrumbs = true
       @home_path = nil
+      @search_debounce = 300
     end
 
     def locale_tag

data/lib/avo/engine.rb

@@ -15,6 +15,7 @@ module Avo
 
     initializer "avo.autoload", before: :set_autoload_paths do |app|
       [
+        ["app", "avo", "fields"],
         ["app", "avo", "filters"],
         ["app", "avo", "actions"],
         ["app", "avo", "resources"]

data/lib/avo/fields/badge_field.rb

@@ -1,17 +1,15 @@
 module Avo
   module Fields
     class BadgeField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "badge-field"
-        }
+      attr_reader :options
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on [:edit, :new]
 
         default_options = {info: :info, success: :success, danger: :danger, warning: :warning}
-        @meta[:options] = args[:options].present? ? default_options.merge(args[:options]) : default_options
+        @options = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end
   end

data/lib/avo/fields/base_field.rb

@@ -5,91 +5,71 @@ module Avo
       extend Avo::Fields::FieldExtensions::HasFieldName
       include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
-      attr_accessor :id
-      attr_accessor :name
-      attr_accessor :translation_key
-      attr_accessor :partial_name
-      attr_accessor :partial_path
-      attr_accessor :updatable
-      attr_accessor :sortable
-      attr_accessor :required
-      attr_accessor :readonly
-      attr_accessor :nullable
-      attr_accessor :null_values
-      attr_accessor :format_using
-      attr_accessor :computed # if block is present
-      attr_accessor :computable # if allowed to be computable
-      attr_accessor :computed_value # the value after computation
-      attr_accessor :block
-      attr_accessor :placeholder
-      attr_accessor :help
-      attr_accessor :default
-      attr_accessor :visible
-      attr_accessor :model
-      attr_accessor :resource
-      attr_accessor :view
-      attr_accessor :user
-      attr_accessor :action
-      attr_accessor :meta
-      attr_accessor :panel_name
-      attr_accessor :link_to_resource
-      attr_accessor :options
+      attr_reader :id
+      attr_reader :name
+      attr_reader :translation_key
+      attr_reader :block
+      attr_reader :required
+      attr_reader :readonly
+      attr_reader :sortable
+      attr_reader :nullable
+      attr_reader :null_values
+      attr_reader :format_using
+      attr_reader :placeholder
+      attr_reader :help
+      attr_reader :default
+      attr_reader :visible
+      attr_reader :as_label
+      attr_reader :as_avatar
+      attr_reader :as_description
+
+      # Private options
+      attr_reader :updatable
+      attr_reader :computable # if allowed to be computable
+      attr_reader :computed # if block is present
+      attr_reader :computed_value # the value after computation
+
+      # Hydrated payload
+      attr_reader :model
+      attr_reader :view
+      attr_reader :resource
+      attr_reader :action
+      attr_reader :user
+      attr_reader :panel_name
 
       class_attribute :field_name_attribute
 
-      @meta = {}
-
-      def initialize(id, **args, &block)
+      def initialize(id, _options: {}, **args, &block)
         super(id, **args, &block)
-        @defaults ||= {}
-
-        args = @defaults.merge(args).symbolize_keys
-
-        null_values = [nil, "", *args[:null_values]]
-        # The field properties as a hash {property: default_value}
-        @field_properties = {
-          id: id,
-          name: id.to_s.humanize(keep_id_suffix: true),
-          translation_key: nil,
-          block: block,
-          partial_name: "field",
-          required: false,
-          readonly: false,
-          updatable: true,
-          sortable: false,
-          nullable: false,
-          null_values: null_values,
-          computable: true,
-          computed: block.present?,
-          computed_value: false,
-          format_using: false,
-          placeholder: id.to_s.humanize,
-          help: nil,
-          default: nil,
-          visible: true,
-          meta: {},
-          panel_name: nil,
-          options: {}
-        }
-
-        # Set the values in the following order
-        # - app defaults
-        # - field defaults
-        # - field option
-        @field_properties.each do |name, default_value|
-          final_value = args[name.to_sym]
-          send("#{name}=", name != "null_values" && (final_value.nil? || !defined?(final_value)) ? default_value : final_value)
-        end
+
+        @id = id
+        @name = args[:name] || id.to_s.humanize(keep_id_suffix: true)
+        @translation_key = args[:translation_key]
+        @block = block
+        @required = args[:required] || false
+        @readonly = args[:readonly] || false
+        @sortable = args[:sortable] || false
+        @nullable = args[:nullable] || false
+        @null_values = args[:null_values] || [nil, ""]
+        @format_using = args[:format_using] || nil
+        @placeholder = args[:placeholder] || id.to_s.humanize(keep_id_suffix: true)
+        @help = args[:help] || nil
+        @default = args[:default] || nil
+        @visible = args[:visible] || true
+        @as_label = args[:as_label] || false
+        @as_avatar = args[:as_avatar] || false
+        @as_description = args[:as_description] || false
+
+        @updatable = true
+        @computable = true
+        @computed = block.present?
+        @computed_value = nil
 
         # Set the visibility
         show_on args[:show_on] if args[:show_on].present?
         hide_on args[:hide_on] if args[:hide_on].present?
         only_on args[:only_on] if args[:only_on].present?
         except_on args[:except_on] if args[:except_on].present?
-
-        if args[:use_partials].present?
-          @custom_partials = args[:use_partials]
-        end
       end
 
       def hydrate(model: nil, resource: nil, action: nil, view: nil, panel_name: nil, user: nil)
@@ -142,12 +122,6 @@ module Avo
         model
       end
 
-      def partial_path_for(view)
-        return @custom_partials[view] if @custom_partials.present? && @custom_partials[view].present?
-
-        "avo/fields/#{view}/#{partial_name}"
-      end
-
       # Try to see if the field has a different database ID than it's name
       def database_id(model)
         foreign_key
@@ -167,8 +141,13 @@ module Avo
         id.to_sym
       end
 
-      def component_name(view = :index)
-        "Avo::#{view.to_s.classify}::Fields::#{partial_name.gsub("-field", "").underscore.camelize}FieldComponent"
+      def view_component_name
+        "#{type.classify}Field"
+      end
+
+      def component_for_view(view = :index)
+        # puts ['component_for_view->', "Avo::Fields::#{type.classify}Field::#{view.to_s.classify}Component"].inspect
+        "Avo::Fields::#{view_component_name}::#{view.to_s.classify}Component".safe_constantize
       end
 
       def model_errors
@@ -181,6 +160,12 @@ module Avo
         self.class.name.demodulize.to_s.underscore.gsub("_field", "")
       end
 
+      def custom?
+        !method(:initialize).source_location.first.include?("lib/avo/field")
+      rescue
+        true
+      end
+
       private
 
       def model_or_class(model)