avo 1.3.5.pre.1 → 1.4.2

data/app/packs/svgs/check-circle-sm.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+</svg>

data/app/packs/svgs/x-circle-sm.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd" />
+</svg>

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

@@ -21,7 +21,7 @@
 
         <% if @action.get_fields.present? %>
           <% @action.get_fields.each_with_index do |field, index| %>
-            <%= edit_field field, index, nil, form, displayed_in_modal: true %>
+            <%= render field.component_for_view(:edit).new field: field, resource: @resource, index: index, form: form, displayed_in_modal: true %>
           <% end %>
         <% end %>
 

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

@@ -0,0 +1,19 @@
+<div data-controller="toggle-panel">
+  <a href="javascript:void(0);" class="flex items-center cursor-pointer font-semibold text-gray-700" data-action="click->toggle-panel#togglePanel">
+    <% if _current_user.respond_to? 'avatar' %>
+      <%= image_tag _current_user.avatar, class: "h-12 rounded-full border-4 border-white mr-1" if _current_user.avatar.present? %>
+    <% end %>
+    <% if _current_user.name.present? %>
+      <%= _current_user.name %>
+    <% elsif _current_user.email.present? %>
+      <%= _current_user.email %>
+    <% else %>
+      Avo user
+    <% end %>
+    <%= svg 'chevron-down', class: "ml-1 h-4" %>
+  </a>
+
+  <div class="hidden absolute inset-auto inset-auto right-0 mr-6 mt-0 py-4 bg-white rounded-xl min-w-[200px] shadow-context" data-toggle-panel-target="panel">
+    <%= button_to "Sign out", main_app.destroy_user_session_path, method: :delete, form: { "data-turbo" => "false" }, class: "appearance-none bg-white text-left cursor-pointer text-green-600 font-semibold hover:text-white hover:bg-green-500 block px-4 py-1 w-full" %>
+  </div>
+</div>

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

@@ -19,15 +19,18 @@
     <%= 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">
+          <div class="w-64 flex">
             <%# <resources-search :global="true"> %>
           </div>
         </div>
+        <div class="align-end">
+          <%= render partial: "avo/partials/profile_dropdown" %>
+        </div>
       </div>
 
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">

data/config/webpacker.yml

@@ -35,8 +35,8 @@ development:
   dev_server:
     https: false
     host: localhost
-    port: 3039
-    public: localhost:3039
+    port: 7299
+    public: localhost:7299
     # Inject browserside javascript that required by both HMR and Live(full) reload
     inject_client: true
     # Hot Module Replacement updates modules while the application is running without a full reload

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.rb

@@ -27,7 +27,7 @@ module Avo
         root_path: ROOT_PATH,
         public_output_dir: "avo-packs",
         cache_manifest: Rails.env.production?,
-        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test? }
+        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT }
       )
     end
   end

data/lib/avo/app.rb

@@ -1,9 +1,7 @@
 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
@@ -16,9 +14,9 @@ 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
 
@@ -38,10 +36,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 +61,7 @@ module Avo
       end
 
       def init_resources
-        app[:resources] = BaseResource.descendants
+        self.resources = BaseResource.descendants
           .select do |resource|
             resource != BaseResource
           end
@@ -78,15 +72,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 +93,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 +103,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 +116,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

@@ -61,9 +61,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.invalid? || Avo::App.license.lacks(:custom_fields)
+        fields = fields.reject do |field|
+          field.custom?
+        end
+      end
+
+      fields
     end
 
     def get_fields(panel: nil, reflection: nil)

data/lib/avo/configuration.rb

@@ -35,7 +35,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?",

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,65 @@ 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
+
+      # 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
+
+        @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 +116,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 +135,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 +154,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)