fix: hide tags field on community license (#1806)

avo-hq · Jun 28, 2023 · a45a460 · a45a460
1 parent 3334570
commit a45a460
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 241 deletions.
diff --git a/lib/avo/concerns/has_fields.rb b/lib/avo/concerns/has_fields.rb
@@ -168,23 +168,9 @@ def get_field_definitions(only_root: false)
 
         return [] if fields.blank?
 
-        items = fields.map do |field|
+        fields.map do |field|
           field.hydrate(resource: self, user: user, view: view)
         end
-
-        if Avo::App.license.lacks_with_trial(:custom_fields)
-          items = items.reject do |field|
-            field.custom?
-          end
-        end
-
-        if Avo::App.license.lacks_with_trial(:advanced_fields)
-          items = items.reject do |field|
-            field.type == "tags"
-          end
-        end
-
-        items
       end
 
       def get_fields(panel: nil, reflection: nil, only_root: false)

diff --git a/lib/avo/items_holder.rb b/lib/avo/items_holder.rb
@@ -1,9 +1,23 @@
 module Avo
   class ItemsHolder
     attr_reader :tools
-    attr_accessor :items
+    attr_writer :items
     attr_accessor :invalid_fields
 
+    def items
+      items = @items
+
+      if Avo::App.license.lacks_with_trial(:custom_fields)
+        items.reject! { |item| item.is_field? && item.custom? }
+      end
+
+      if Avo::App.license.lacks_with_trial(:advanced_fields)
+        items.reject! { |item| item.is_field? && item.type == "tags" }
+      end
+
+      items
+    end
+
     def initialize
       @items = []
       @items_index = 0