avo 2.46.0 → 3.0.0.pre2

data/lib/avo/concerns/{has_fields.rb → has_items.rb}

@@ -1,23 +1,18 @@
 module Avo
   module Concerns
-    module HasFields
+    module HasItems
       extend ActiveSupport::Concern
 
       included do
         class_attribute :items_holder
-        class_attribute :items_index, default: 0
-        class_attribute :tabs_holder
-        class_attribute :tabs_tabs_holder
-        class_attribute :raw_tabs
-        class_attribute :tools_holder
       end
 
       class_methods do
         # DSL methods
-        def field(name, **args, &block)
+        def field(name, as: :text, **args, &block)
           ensure_items_holder_initialized
 
-          items_holder.field name, **args, &block
+          items_holder.field name, as: as, **args, &block
         end
 
         def panel(name = nil, **args, &block)
@@ -26,16 +21,10 @@ module Avo
           items_holder.panel name, **args, &block
         end
 
-        def row(**args, &block)
-          ensure_items_holder_initialized
-
-          items_holder.row(**args, &block)
-        end
-
         def tabs(**args, &block)
           ensure_items_holder_initialized
 
-          items_holder.tabs Avo::TabGroupBuilder.parse_block(**args, &block)
+          items_holder.tabs Avo::Resources::Items::TabGroup::Builder.parse_block(**args, &block)
         end
 
         def tool(klass, **args)
@@ -53,7 +42,7 @@ module Avo
         def sidebar(**args, &block)
           ensure_items_holder_initialized
 
-          items_holder.sidebar Avo::SidebarBuilder.parse_block(**args, &block)
+          items_holder.sidebar Avo::Resources::Items::Sidebar::Builder.parse_block(**args, &block)
         end
         # END DSL methods
 
@@ -65,10 +54,6 @@ module Avo
           end
         end
 
-        def tools
-          tools_holder
-        end
-
         # Dives deep into panels and tabs to fetch all the fields for a resource.
         def fields(only_root: false)
           fields = []
@@ -98,10 +83,6 @@ module Avo
             if item.is_field?
               fields << item
             end
-
-            if item.is_row?
-              fields << extract_fields_from_items(tab)
-            end
           end
 
           fields.flatten
@@ -109,7 +90,7 @@ module Avo
 
         def tab_groups
           items.select do |item|
-            item.instance_of? Avo::TabGroup
+            item.is_tab_group?
           end
         end
 
@@ -121,7 +102,7 @@ module Avo
           thing.items.each do |item|
             if item.is_field?
               fields << item
-            elsif item.is_panel? || item.is_row?
+            elsif item.is_panel?
               fields << extract_fields_from_items(item)
             end
           end
@@ -130,35 +111,22 @@ module Avo
         end
 
         def ensure_items_holder_initialized
-          self.items_holder ||= Avo::ItemsHolder.new
-        end
-
-        def add_to_fields(instance)
-          self.items ||= []
-          self.items << instance
-          increment_order_index
-        end
-
-        def increment_order_index
-          self.items_index += 1
+          self.items_holder ||= Avo::Resources::Items::Holder.new
         end
       end
 
+      attr_accessor :items_holder
+
       delegate :invalid_fields, to: :items_holder
       delegate :items, to: :items_holder
 
-      def hydrate_fields(model: nil, view: nil)
+      def hydrate_fields
         fields.map do |field|
-          field.hydrate(model: @model, view: @view, resource: self)
+          field.hydrate(record: @record, view: @view, resource: self)
         end
-
         self
       end
 
-      def get_tabs
-        tabs_holder
-      end
-
       def fields(**args)
         self.class.fields(**args)
       end
@@ -172,15 +140,30 @@ module Avo
 
         return [] if fields.blank?
 
-        fields.map do |field|
+        items = fields.map do |field|
           field.hydrate(resource: self, user: user, view: view)
         end
+
+        if Avo::App.license.lacks_with_trial(:advanced_fields)
+          items = items.reject do |field|
+            field.type == "tags"
+          end
+        end
+
+        items
+      end
+
+      def get_preview_fields
+        get_field_definitions.select do |field|
+          field.visible_in_view?(view: :preview)
+        end
       end
 
       def get_fields(panel: nil, reflection: nil, only_root: false)
         fields = get_field_definitions(only_root: only_root)
           .select do |field|
-            field.visible_on?(view)
+            # Get the fields for this view
+            field.visible_in_view?(view: view)
           end
           .select do |field|
             field.visible?
@@ -220,7 +203,7 @@ module Avo
           end
         end
 
-        hydrate_fields(model: @model, view: @view)
+        hydrate_fields
 
         fields
       end
@@ -232,12 +215,9 @@ module Avo
       end
 
       def tools
-        check_license
-
-        return [] if App.license.lacks_with_trial :resource_tools
         return [] if self.class.tools.blank?
 
-        self.items
+        items
           .select do |item|
             next if item.nil?
 
@@ -248,7 +228,7 @@ module Avo
             tool
           end
           .select do |item|
-            item.visible_on?(view)
+            item.visible_in_view?(view: view)
           end
       end
 
@@ -259,75 +239,108 @@ module Avo
         panelless_items = []
         panelfull_items = []
 
-        items.each do |item|
-          if item.respond_to? :hydrate
-            item.hydrate(view: view)
-          end
-
-          # fields and tabs can be hidden on some views
-          if item.respond_to? :visible_on?
-            next unless item.visible_on?(view)
-          end
-          # each field has it's own visibility checker
-          if item.respond_to? :visible?
-            item.hydrate(view: view) if item.view.nil?
-
-            next unless item.visible?
-          end
-          # check if the user is authorized to view it
-          if item.respond_to? :authorized?
-            next unless item.hydrate(model: @model).authorized?
-          end
-
-          if item.is_field?
-            if item.has_own_panel?
-              panelfull_items << item
+        visible_items
+          .each do |item|
+            if item.is_field?
+              if item.has_own_panel?
+                panelfull_items << item
+              else
+                panelless_items << item
+              end
             else
-              panelless_items << item
+              panelfull_items << item
             end
-          else
-            panelfull_items << item
           end
-        end
 
         # Make sure all tabs panelfull_items are setted as inside tabs
-        panelfull_items.grep(Avo::TabGroup).each do |tab_group|
-          tab_group.items.grep(Avo::Tab).each do |tab|
-            tab.items.grep(Avo::Panel).each do |panel|
-              set_target_to_top panel.items.grep(Avo::Fields::BelongsToField)
-
-              panel.items.grep(Avo::Row).each do |row|
-                set_target_to_top row.items.grep(Avo::Fields::BelongsToField)
+        panelfull_items.grep(Avo::Resources::Items::TabGroup).each do |tab_group|
+          tab_group.items.grep(Avo::Resources::Items::Tab).each do |tab|
+            tab.items.grep(Avo::Resources::Items::Panel).each do |panel|
+              panel.items.grep(Avo::Fields::BelongsToField).each do |field|
+                field.target = :_top
               end
             end
           end
         end
 
         # Add all the panelles fields to a new panel
-        main_panel_holder = Avo::ItemsHolder.new
+        main_panel_holder = Avo::Resources::Items::Holder.new
         main_panel_holder.items = panelless_items
 
         # Add that panel to the main panel
-        main_panel = Avo::MainPanel.new
+        main_panel = Avo::Resources::Items::MainPanel.new
         main_panel.items_holder = main_panel_holder
 
         # Return all the items but this time with all the panelless ones inside the main panel
         [main_panel, *panelfull_items]
       end
 
-      private
-
-      def set_target_to_top(fields)
-        fields.each do |field|
-          field.target = :_top
+      def items
+        if items_holder.present?
+          items_holder.items
+        else
+          []
         end
       end
 
-      def check_license
-        if !Rails.env.production? && App.license.present? && App.license.lacks(:resource_tools)
-          # Add error message to let the developer know the resource tool will not be available in a production environment.
-          Avo::App.error_messages.push "Warning: Your license is invalid or doesn't support resource tools. The resource tools will not be visible in a production environment."
+      def visible_items
+        items
+          .map do |item|
+            if view.present?
+              res = self.class.ancestors.include?(Avo::BaseResource) ? self : resource
+              item.hydrate(view: view, resource: res)
+            end
+
+            item
+          end
+          .select do |item|
+            item.visible_in_view?(view: view)
+          end
+          .select do |item|
+            item.visible?
+          end
+          .select do |item|
+            if item.respond_to?(:visible_in_view?)
+              item.visible_in_view? view: view
+            else
+              true
+            end
+          end
+          .select do |item|
+            if !item.is_heading? && view.in?([:edit, :update, :new, :create])
+              if item.respond_to?(:id)
+                item.resource.record.respond_to?("#{item.id}=")
+              else
+                true
+              end
+            else
+              true
+            end
+          end
+          .select do |item|
+            # Check if the user is authorized to view it.
+            # This is usually used for has_* fields
+            if item.respond_to? :authorized?
+              item.authorized?
+            else
+              true
+            end
+          end
+          .compact
+      end
+
+      def is_empty?
+        visible_items.blank?
+      end
+
+      def hydrate(**args)
+        super(**args)
+
+        items_holder.items.each do |item|
+          item.hydrate(**args)
         end
+
+        self
       end
     end
   end

data/lib/avo/concerns/{has_resource_stimulus_controllers.rb → has_stimulus_controllers.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Concerns
-    module HasResourceStimulusControllers
+    module HasStimulusControllers
       extend ActiveSupport::Concern
 
       included do

data/lib/avo/concerns/is_resource_item.rb

@@ -2,42 +2,30 @@
 module Avo
   module Concerns
     module IsResourceItem
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :item_type, default: nil
-      end
-
-      def is_field?
-        self.class.item_type == :field
-      end
-
-      def is_panel?
-        self.class.item_type == :panel || self.class.item_type == :main_panel
-      end
-
-      def is_main_panel?
-        self.class.item_type == :main_panel
-      end
-
-      def is_tool?
-        self.class.item_type == :tool
-      end
-
-      def is_tab?
-        self.class.item_type == :tab
-      end
-
-      def is_tab_group?
-        self.class.item_type == :tab_group
-      end
-
-      def is_sidebar?
-        self.class.item_type == :sidebar
-      end
-
-      def is_row?
-        self.class.item_type == :row
+      # These attributes are required to be hydrated in order to properly find the visible_items
+      attr_accessor :resource
+      attr_accessor :view
+
+      def hydrate(**args)
+        args.each do |key, value|
+          if respond_to?("#{key}=")
+            send("#{key}=", value)
+          end
+        end
+
+        self
+      end
+
+      # Returns the final state of if an item is visible or not
+      # For items that have children it checks to see if it contains any visible children.
+      def visible?
+        # For items that may contains other items like tabs and panels we should also check
+        # if any on their children have visible items.
+        if self.class.ancestors.include?(Avo::Concerns::HasItems)
+          return false unless visible_items.any?
+        end
+
+        super
       end
     end
   end

data/lib/avo/concerns/is_visible.rb

@@ -0,0 +1,15 @@
+# Adds the ability to set the visibility of an item in the execution context.
+module Avo
+  module Concerns
+    module IsVisible
+      attr_accessor :visible
+
+      def visible?
+        # Default to true
+        return true unless visible.present?
+
+        Avo::ExecutionContext.new(target: visible, resource: @resource).handle
+      end
+    end
+  end
+end

data/lib/avo/concerns/visible_in_different_views.rb

@@ -0,0 +1,126 @@
+module Avo
+  module Concerns
+    module VisibleInDifferentViews
+      attr_accessor :show_on_index
+      attr_accessor :show_on_show
+      attr_accessor :show_on_new
+      attr_accessor :show_on_edit
+      attr_accessor :show_on_preview
+
+      def post_initialize
+        initialize_views
+      end
+
+      def initialize_views
+        # Set defaults
+        @show_on_index = @show_on_index.nil? ? true : @show_on_index
+        @show_on_show = @show_on_show.nil? ? true : @show_on_show
+        @show_on_new = @show_on_new.nil? ? true : @show_on_new
+        @show_on_edit = @show_on_edit.nil? ? true : @show_on_edit
+        @show_on_preview = @show_on_preview.nil? ? false : @show_on_preview
+
+        if @args.present?
+          # Execute options
+          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?
+        end
+      end
+
+      # Validates if the field is visible on certain view
+      def visible_in_view?(view:)
+        raise "No view specified on visibility check." if view.blank?
+
+        send "show_on_#{view}"
+      end
+
+      def show_on(*where)
+        return show_on_all if where.include? :all
+
+        normalize_views(where).flatten.each do |view|
+          show_on_view view
+        end
+      end
+
+      def hide_on(*where)
+        return hide_on_all if where.include? :all
+
+        normalize_views(where).flatten.each do |view|
+          hide_on_view view
+        end
+      end
+
+      def only_on(*where)
+        hide_on_all
+        normalize_views(where).flatten.each do |view|
+          show_on_view view
+        end
+      end
+
+      def except_on(*where)
+        show_on_all
+        normalize_views(where).flatten.each do |view|
+          show_on_view view
+        end
+      end
+
+      # When submitting the form on creation, the new page will be create but we don't have a visibility marker for create so we'll default to new
+      def show_on_create
+        show_on_new
+      end
+
+      # When submitting the form on update, the new page will be create but we don't have a visibility marker for update so we'll default to edit
+      def show_on_update
+        show_on_edit
+      end
+
+      private
+
+      def show_on_view(view)
+        send("show_on_#{view}=", true)
+      end
+
+      def hide_on_view(view)
+        send("show_on_#{view}=", false)
+      end
+
+      def only_on_view(view)
+        hide_on_all
+        show_on_view view
+      end
+
+      def except_on_view(view)
+        show_on_all
+        hide_on_view view
+      end
+
+      def show_on_all
+        @show_on_index = true
+        @show_on_show = true
+        @show_on_edit = true
+        @show_on_new = true
+        @show_on_preview = true
+      end
+
+      def hide_on_all
+        @show_on_index = false
+        @show_on_show = false
+        @show_on_edit = false
+        @show_on_new = false
+        @show_on_preview = false
+      end
+
+      def normalize_views(*views_and_groups)
+        forms = views_and_groups.flatten! & [:forms]
+
+        if forms.present?
+          views_and_groups -= forms
+          views_and_groups += [:new, :edit]
+        end
+
+        views_and_groups.flatten.uniq
+      end
+    end
+  end
+end

data/lib/avo/configuration/branding.rb

@@ -32,40 +32,28 @@ class Avo::Configuration::Branding
   end
 
   def logo
-    return @default_logo if Avo::App.license.lacks_with_trial(:branding)
-
     @logo || @default_logo
   end
 
   def logomark
-    return @default_logomark if Avo::App.license.lacks_with_trial(:branding)
-
     @logomark || @default_logomark
   end
 
   def placeholder
-    return @default_placeholder if Avo::App.license.lacks_with_trial(:branding)
-
     @placeholder || @default_placeholder
   end
 
   def chart_colors
-    return @default_chart_colors if Avo::App.license.lacks_with_trial(:branding)
-
     @chart_colors || @default_chart_colors
   end
 
   def favicon
-    return @default_favicon if Avo::App.license.lacks_with_trial(:branding)
-
     @favicon || @default_favicon
   end
 
   private
 
   def colors
-    return @default_colors if Avo::App.license.lacks_with_trial(:branding)
-
     @default_colors.merge(@colors) || @default_colors
   end