avo 1.4.0.pre.1 → 1.4.4

data/lib/avo/fields/password_field.rb

@@ -1,14 +1,10 @@
 module Avo
   module Fields
     class PasswordField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "password-field"
-        }
-
+      def initialize(id, **args, &block)
         show_on :forms
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
         hide_on [:index, :show]
       end

data/lib/avo/fields/progress_bar_field.rb

@@ -0,0 +1,19 @@
+module Avo
+  module Fields
+    class ProgressBarField < BaseField
+      attr_reader :max
+      attr_reader :step
+      attr_reader :display_value
+      attr_reader :value_suffix
+
+      def initialize(name, **args, &block)
+        super(name, **args, &block)
+
+        @max = args[:max] || 100
+        @step = args[:step] || 1
+        @display_value = args[:display_value] || false
+        @value_suffix = args[:value_suffix] || nil
+      end
+    end
+  end
+end

data/lib/avo/fields/select_field.rb

@@ -5,18 +5,15 @@ module Avo
       attr_reader :enum
       attr_reader :display_value
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "select-field"
-        }
+      def initialize(id, **args, &block)
+        args[:placeholder] ||= I18n.t("avo.choose_an_option")
 
-        super(name, **args, &block)
+        super(id, **args, &block)
 
-        @options = args[:options].present? ? args[:options] : args[:enum]
-        @options = ActiveSupport::HashWithIndifferentAccess.new @options
+        options = args[:options].present? ? args[:options] : args[:enum]
+        @options = ActiveSupport::HashWithIndifferentAccess.new options
         @enum = args[:enum].present? ? args[:enum] : nil
         @display_value = args[:display_value].present? ? args[:display_value] : false
-        @placeholder = args[:placeholder].present? ? args[:placeholder].to_s : I18n.t("avo.choose_an_option")
       end
 
       def options_for_select
@@ -34,12 +31,16 @@ module Avo
       end
 
       def label
-        if display_value
+        if enum.present?
+          if display_value
+            options[value]
+          else
+            value
+          end
+        elsif display_value
           value
-        elsif enum.present?
-          options[value]
         else
-          options.invert[value]
+          options.invert.stringify_keys[value]
         end
       end
     end

data/lib/avo/fields/status_field.rb

@@ -1,12 +1,8 @@
 module Avo
   module Fields
     class StatusField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "status-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten : [:waiting, :running]
         @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten : [:failed]

data/lib/avo/fields/text_field.rb

@@ -1,13 +1,10 @@
 module Avo
   module Fields
     class TextField < BaseField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "text-field",
-          computable: true
-        }.merge(@defaults || {})
+      attr_reader :link_to_resource
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end

data/lib/avo/fields/textarea_field.rb

@@ -1,17 +1,14 @@
 module Avo
   module Fields
     class TextareaField < TextField
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "textarea-field",
-          computable: true
-        }
+      attr_reader :rows
 
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 
-        @meta[:rows] = args[:rows].present? ? args[:rows].to_i : 5
+        @rows = args[:rows].present? ? args[:rows].to_i : 5
       end
     end
   end

data/lib/avo/fields/trix_field.rb

@@ -5,18 +5,14 @@ module Avo
       attr_reader :attachments_disabled
       attr_reader :attachment_key
 
-      def initialize(name, **args, &block)
-        @defaults = {
-          partial_name: "trix-field"
-        }
-
-        super(name, **args, &block)
+      def initialize(id, **args, &block)
+        super(id, **args, &block)
 
         hide_on :index
 
-        @always_show = args[:always_show].present? ? args[:always_show] : false
-        @attachments_disabled = args[:attachments_disabled].present? ? args[:attachments_disabled] : false
-        @attachment_key = args[:attachment_key].present? ? args[:attachment_key] : nil
+        @always_show = args[:always_show] || false
+        @attachments_disabled = args[:attachments_disabled] || false
+        @attachment_key = args[:attachment_key]
       end
     end
   end

data/lib/avo/fields_collector.rb

@@ -1,30 +1,66 @@
+# require "active_support/inflector"
+
 module Avo
   module FieldsCollector
     def field(field_name, as:, **args, &block)
       self.fields ||= []
 
-      self.fields << parse_field(field_name, as: as, **args, &block)
-    end
+      field_instance = parse_field(field_name, as: as, **args, &block)
 
-    def parse_field(field_name, as:, **args, &block)
-      matched_field = Avo::App.fields.find do |field|
-        field[:name].to_s == as.to_s
+      if field_instance.present?
+        self.fields << field_instance
+      else
+        message = "[Avo] The #{field_name} field, as: #{as} from #{self.name} has an invalid configuration."
+        ::Rails.logger.warn message
       end
+    end
 
-      if matched_field.present? && matched_field[:class].present?
-        klass = matched_field[:class]
+    def parse_field(field_name, as:, **args, &block)
+      # The field is passed as a symbol eg: :text, :color_picker, :trix
+      if as.is_a? Symbol
+        field_class = field_class_from_symbol(as)
 
-        if block
-          klass.new(field_name, **args || {}, &block)
+        if field_class.present?
+          # The field has been registered before.
+          instantiate_field(field_name, klass: field_class, **args, &block)
         else
-          klass.new(field_name, **args || {})
-        end
+          # The symbol can be transformed to a class and found.
+          class_name = as.to_s.classify
+          field_class = "#{class_name}Field"
 
+          # Discover & load custom field classes
+          if Object.const_defined? field_class
+            instantiate_field(field_name, klass: field_class.safe_constantize, **args, &block)
+          end
+        end
+      elsif as.is_a? Class
+        # The field has been passed as a class.
+        if Object.const_defined? as.to_s
+          instantiate_field(field_name, klass: as, **args, &block)
+        end
       end
     end
 
     def heading(body, **args)
       self.fields << Avo::Fields::HeadingField.new(body, **args)
     end
+
+    private
+
+    def instantiate_field(field_name, klass:, **args, &block)
+      if block
+        klass.new(field_name, **args || {}, &block)
+      else
+        klass.new(field_name, **args || {})
+      end
+    end
+
+    def field_class_from_symbol(symbol)
+      matched_field = Avo::App.fields.find do |field|
+        field[:name].to_s == symbol.to_s
+      end
+
+      return matched_field[:class] if matched_field.present? && matched_field[:class].present?
+    end
   end
 end

data/lib/avo/licensing/pro_license.rb

@@ -4,7 +4,8 @@ module Avo
       def abilities
         [
           :authorization,
-          :custom_tools
+          :custom_tools,
+          :custom_fields
         ]
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.4.0.pre.1"
+  VERSION = "1.4.4"
 end

data/lib/generators/avo/eject_generator.rb

@@ -15,6 +15,7 @@ module Generators
         logo: "app/views/avo/partials/_logo.html.erb",
         head: "app/views/avo/partials/_head.html.erb",
         header: "app/views/avo/partials/_header.html.erb",
+        profile_dropdown: "app/views/avo/partials/_profile_dropdown.html.erb",
         footer: "app/views/avo/partials/_footer.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb"
       }

data/lib/generators/avo/field_generator.rb

@@ -0,0 +1,17 @@
+require "rails/generators"
+
+module Generators
+  module Avo
+    class FieldGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+
+      namespace "avo:field"
+      desc "Add a custom Avo field to your project."
+
+      def handle
+        directory "field/components", "app/components/avo/fields/#{singular_name}_field"
+        template "field/%singular_name%_field.rb.tt", "app/avo/fields/#{singular_name}_field.rb"
+      end
+    end
+  end
+end

data/lib/generators/avo/filter_generator.rb

@@ -13,7 +13,7 @@ module Generators
 
         type = "select" if options[:select]
 
-        template "filters/#{type}_filter.tt", "app/services/avo/filters/#{singular_name}.rb"
+        template "filters/#{type}_filter.tt", "app/avo/filters/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/templates/field/%singular_name%_field.rb.tt

@@ -0,0 +1,5 @@
+class <%= class_name %>Field < Avo::Fields::BaseField
+  def initialize(name, **args, &block)
+    super(name, **args, &block)
+  end
+end

data/lib/generators/avo/templates/field/components/edit_component.html.erb.tt

@@ -0,0 +1,6 @@
+<%%= edit_field_wrapper field: @field, index: @index, form: @form, resource: @resource, displayed_in_modal: @displayed_in_modal do %>
+  <%%= @form.text_field @field.id,
+    class: helpers.input_classes('w-full', has_error: @field.model_errors.include?(@field.id)),
+    placeholder: @field.placeholder,
+    disabled: @field.readonly %>
+<%% end %>

data/lib/generators/avo/templates/field/components/edit_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::EditComponent < Avo::Fields::EditComponent
+end

data/lib/generators/avo/templates/field/components/index_component.html.erb.tt

@@ -0,0 +1,3 @@
+<%%= index_field_wrapper field: @field do %>
+  <%%= @field.value %>
+<%% end %>

data/lib/generators/avo/templates/field/components/index_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::IndexComponent < Avo::Fields::IndexComponent
+end

data/lib/generators/avo/templates/field/components/show_component.html.erb.tt

@@ -0,0 +1,3 @@
+<%%= show_field_wrapper field: @field, index: @index do %>
+  <%%= @field.value %>
+<%% end %>

data/lib/generators/avo/templates/field/components/show_component.rb.tt

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class Avo::Fields::<%= class_name %>Field::ShowComponent < Avo::Fields::ShowComponent
+end

data/lib/generators/avo/templates/tool/sidebar_item.tt

@@ -1 +1 @@
-<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: '/avo/<%= file_name %>' %>
+<%%= render Avo::NavigationLinkComponent.new label: '<%= human_name %>', path: "#{Avo.configuration.root_path}/<%= file_name %>" %>

data/lib/generators/avo/templates/tool/view.tt

@@ -1,5 +1,5 @@
 <div class="flex flex-col">
-  <%%= render Avo::PanelComponent.new title: '<%= human_name %>' do |c| %>
+  <%%= render Avo::PanelComponent.new title: '<%= human_name %>', display_breadcrumbs: true do |c| %>
     <%% c.tools do %>
       <div class="text-sm italic">This is the panels tools section.</div>
     <%% end %>

data/public/avo-packs/css/{application-5bdca030.css → application-68691c73.css}

@@ -2231,6 +2231,11 @@ select {
 	background-color: rgba(59, 130, 246, var(--tw-bg-opacity));
 }
 
+.hover\:bg-green-500:hover {
+	--tw-bg-opacity: 1;
+	background-color: rgba(16, 185, 129, var(--tw-bg-opacity));
+}
+
 .hover\:bg-blue-300:hover {
 	--tw-bg-opacity: 1;
 	background-color: rgba(147, 197, 253, var(--tw-bg-opacity));
@@ -3091,22 +3096,36 @@ svg.tea #steamR {
 }
 
 .spinner {
+  width: 16px;
+  height: 16px;
+
   position: relative;
-  display: inline-block;
-  width: 18px;
-  height: 18px;
-  top: 3px;
+}
+
+
+.double-bounce1, .double-bounce2 {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
   background-color: #333;
-  border-radius: 100%;
-  animation: sk-scaleout 1.0s infinite ease-in-out;
+  opacity: 0.6;
+  position: absolute;
+  top: 0;
+  left: 0;
+  animation: sk-bounce 2.0s infinite ease-in-out;
 }
 
-@keyframes sk-scaleout {
-  0% {
-    transform: scale(0);
-  } 100% {
+.double-bounce2 {
+  animation-delay: -1.0s;
+}
+
+@keyframes sk-bounce {
+  0%, 100% {
+    transform: scale(0.0);
+    -webkit-transform: scale(0.0);
+  } 50% {
     transform: scale(1.0);
-    opacity: 0;
+    -webkit-transform: scale(1.0);
   }
 }
 
@@ -3656,6 +3675,39 @@ span.CodeMirror-selectedtext { background: none; }
   z-index: 50;
 }
 
+progress {
+    height: 0.5rem;
+    border-radius: 0.25rem;
+    border-width: 1px;
+    --tw-border-opacity: 1;
+    border-color: rgba(156, 163, 175, var(--tw-border-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
+    --tw-shadow: inset 0 2px 4px 0 rgba(0, 0, 0, 0.06);
+    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
+progress[value]::-webkit-progress-bar {
+    border-radius: 0.25rem;
+    border-width: 1px;
+    --tw-border-opacity: 1;
+    border-color: rgba(107, 114, 128, var(--tw-border-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
+    --tw-shadow: inset 0 2px 4px 0 rgba(0, 0, 0, 0.06);
+    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
+}
+progress[value]::-webkit-progress-value {
+    border-radius: 0.25rem;
+    --tw-bg-opacity: 1;
+    background-color: rgba(5, 150, 105, var(--tw-bg-opacity))
+}
+progress[value]::-moz-progress-bar {
+    appearance: none;
+    border-radius: 0.25rem;
+    --tw-bg-opacity: 1;
+    background-color: rgba(5, 150, 105, var(--tw-bg-opacity))
+}
+
 .container {
     width: 100%;
 }
@@ -4239,6 +4291,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-bg-opacity: 1;
     background-color: rgba(59, 130, 246, var(--tw-bg-opacity));
 }
+.hover\:bg-green-500:hover {
+    --tw-bg-opacity: 1;
+    background-color: rgba(16, 185, 129, var(--tw-bg-opacity));
+}
 .hover\:bg-blue-300:hover {
     --tw-bg-opacity: 1;
     background-color: rgba(147, 197, 253, var(--tw-bg-opacity));
@@ -4682,12 +4738,15 @@ span.CodeMirror-selectedtext { background: none; }
 .ml-1 {
     margin-left: 0.25rem
 }
+.mr-6 {
+    margin-right: 1.5rem
+}
+.mt-0 {
+    margin-top: 0px
+}
 .ml-1\/12 {
     margin-left: 8.333333%
 }
-.ml-6 {
-    margin-left: 1.5rem
-}
 .-mb-1 {
     margin-bottom: -0.25rem
 }
@@ -4706,6 +4765,9 @@ span.CodeMirror-selectedtext { background: none; }
 .ml-2 {
     margin-left: 0.5rem
 }
+.ml-6 {
+    margin-left: 1.5rem
+}
 .block {
     display: block
 }
@@ -4751,6 +4813,9 @@ span.CodeMirror-selectedtext { background: none; }
 .h-full {
     height: 100%
 }
+.h-12 {
+    height: 3rem
+}
 .h-16 {
     height: 4rem
 }
@@ -4760,9 +4825,6 @@ span.CodeMirror-selectedtext { background: none; }
 .h-10 {
     height: 2.5rem
 }
-.h-12 {
-    height: 3rem
-}
 .max-h-168 {
     max-height: 42rem
 }
@@ -4781,15 +4843,15 @@ span.CodeMirror-selectedtext { background: none; }
 .min-h-1\/3 {
     min-height: 33.333333%
 }
-.min-h-48 {
-    min-height: 12rem
-}
 .min-h-16 {
     min-height: 4rem
 }
 .min-h-inherit {
     min-height: inherit
 }
+.min-h-48 {
+    min-height: 12rem
+}
 .w-5 {
     width: 1.25rem
 }
@@ -4835,6 +4897,9 @@ span.CodeMirror-selectedtext { background: none; }
 .min-w-300px {
     min-width: 300px
 }
+.min-w-\[200px\] {
+    min-width: 200px
+}
 .min-w-4 {
     min-width: 1rem
 }
@@ -4888,12 +4953,12 @@ span.CodeMirror-selectedtext { background: none; }
     -webkit-appearance: none;
             appearance: none
 }
-.grid-cols-3 {
-    grid-template-columns: repeat(3, minmax(0, 1fr))
-}
 .grid-cols-1 {
     grid-template-columns: repeat(1, minmax(0, 1fr))
 }
+.grid-cols-3 {
+    grid-template-columns: repeat(3, minmax(0, 1fr))
+}
 .flex-col {
     flex-direction: column
 }
@@ -4924,18 +4989,18 @@ span.CodeMirror-selectedtext { background: none; }
 .justify-end {
     justify-content: flex-end
 }
-.justify-evenly {
-    justify-content: space-evenly
-}
 .justify-around {
     justify-content: space-around
 }
-.gap-3 {
-    gap: 0.75rem
+.justify-evenly {
+    justify-content: space-evenly
 }
 .gap-6 {
     gap: 1.5rem
 }
+.gap-3 {
+    gap: 0.75rem
+}
 .space-y-2 > :not([hidden]) ~ :not([hidden]) {
     --tw-space-y-reverse: 0;
     margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));
@@ -4956,16 +5021,16 @@ span.CodeMirror-selectedtext { background: none; }
     margin-right: calc(0.5rem * var(--tw-space-x-reverse));
     margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)))
 }
-.space-y-3 > :not([hidden]) ~ :not([hidden]) {
-    --tw-space-y-reverse: 0;
-    margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
-    margin-bottom: calc(0.75rem * var(--tw-space-y-reverse))
-}
 .space-x-3 > :not([hidden]) ~ :not([hidden]) {
     --tw-space-x-reverse: 0;
     margin-right: calc(0.75rem * var(--tw-space-x-reverse));
     margin-left: calc(0.75rem * calc(1 - var(--tw-space-x-reverse)))
 }
+.space-y-3 > :not([hidden]) ~ :not([hidden]) {
+    --tw-space-y-reverse: 0;
+    margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
+    margin-bottom: calc(0.75rem * var(--tw-space-y-reverse))
+}
 .divide-y > :not([hidden]) ~ :not([hidden]) {
     --tw-divide-y-reverse: 0;
     border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
@@ -5013,12 +5078,12 @@ span.CodeMirror-selectedtext { background: none; }
 .rounded {
     border-radius: 0.25rem
 }
-.\!rounded-none {
-    border-radius: 0px !important
-}
 .rounded-full {
     border-radius: 9999px
 }
+.\!rounded-none {
+    border-radius: 0px !important
+}
 .rounded-r-md {
     border-top-right-radius: 0.375rem;
     border-bottom-right-radius: 0.375rem
@@ -5034,6 +5099,9 @@ span.CodeMirror-selectedtext { background: none; }
 .border {
     border-width: 1px
 }
+.border-4 {
+    border-width: 4px
+}
 .border-t {
     border-top-width: 1px
 }
@@ -5110,6 +5178,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(209, 213, 219, var(--tw-border-opacity))
 }
+.border-white {
+    --tw-border-opacity: 1;
+    border-color: rgba(255, 255, 255, var(--tw-border-opacity))
+}
 .border-gray-500 {
     --tw-border-opacity: 1;
     border-color: rgba(107, 114, 128, var(--tw-border-opacity))
@@ -5190,6 +5262,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-bg-opacity: 1;
     background-color: rgba(71, 85, 105, var(--tw-bg-opacity))
 }
+.bg-gray-600 {
+    --tw-bg-opacity: 1;
+    background-color: rgba(75, 85, 99, var(--tw-bg-opacity))
+}
 .bg-opacity-25 {
     --tw-bg-opacity: 0.25
 }
@@ -5261,17 +5337,17 @@ span.CodeMirror-selectedtext { background: none; }
     padding-left: 6rem;
     padding-right: 6rem
 }
-.py-px {
-    padding-top: 1px;
-    padding-bottom: 1px
+.py-0 {
+    padding-top: 0px;
+    padding-bottom: 0px
 }
 .py-3 {
     padding-top: 0.75rem;
     padding-bottom: 0.75rem
 }
-.py-0 {
-    padding-top: 0px;
-    padding-bottom: 0px
+.py-px {
+    padding-top: 1px;
+    padding-bottom: 1px
 }
 .py-8 {
     padding-top: 2rem;
@@ -5283,12 +5359,12 @@ span.CodeMirror-selectedtext { background: none; }
 .pb-0 {
     padding-bottom: 0px
 }
-.pl-6 {
-    padding-left: 1.5rem
-}
 .pb-3\/4 {
     padding-bottom: 75%
 }
+.pl-6 {
+    padding-left: 1.5rem
+}
 .text-center {
     text-align: center
 }
@@ -5441,10 +5517,6 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-text-opacity: 1;
     color: rgba(239, 68, 68, var(--tw-text-opacity))
 }
-.text-red-700 {
-    --tw-text-opacity: 1;
-    color: rgba(185, 28, 28, var(--tw-text-opacity))
-}
 .underline {
     text-decoration: underline
 }
@@ -5613,6 +5685,10 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-bg-opacity: 1;
     background-color: rgba(59, 130, 246, var(--tw-bg-opacity))
 }
+.hover\:bg-green-500:hover {
+    --tw-bg-opacity: 1;
+    background-color: rgba(16, 185, 129, var(--tw-bg-opacity))
+}
 .hover\:bg-blue-300:hover {
     --tw-bg-opacity: 1;
     background-color: rgba(147, 197, 253, var(--tw-bg-opacity))
@@ -5988,4 +6064,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-5bdca030.css.map*/
+/*# sourceMappingURL=application-68691c73.css.map*/