fix(collection): add missing function enable_search and add_segments (#…

…91)

packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_collection.rb

@@ -40,7 +40,7 @@ def self.build_actions(collection)
 
         def self.build_segments(collection)
           if collection.schema[:segments]
-            collection.schema[:segments].keys.sort.map { |name| { id: "#{collection.name}.#{name}", name: name } }
+            collection.schema[:segments].sort.map { |name| { id: "#{collection.name}.#{name}", name: name } }
           else
             []
           end

packages/forest_admin_agent/spec/shared/factory.rb

@@ -36,7 +36,7 @@ def collection_build(args = {})
           fields: {},
           countable: false,
           searchable: false,
-          segments: {}
+          segments: []
         }.merge(args[:schema]),
         execute: nil,
         get_form: nil,

packages/forest_admin_datasource_customizer/lib/forest_admin_datasource_customizer/decorators/segment/segment_collection_decorator.rb

@@ -20,7 +20,7 @@ def add_segment(name, definition)
         end
 
         def refine_schema(sub_schema)
-          sub_schema[:segments] = sub_schema[:segments].merge(@segments)
+          sub_schema[:segments] = sub_schema[:segments] | @segments.keys
 
           sub_schema
         end

packages/forest_admin_datasource_customizer/spec/lib/forest_admin_datasource_customizer/datasource_customizer_spec.rb

@@ -18,7 +18,7 @@ module ForestAdminDatasourceCustomizer
           countable: false,
           searchable: false,
           charts: [],
-          segments: {},
+          segments: [],
           actions: {}
         }
       )

packages/forest_admin_datasource_customizer/spec/shared/factory.rb

@@ -35,7 +35,7 @@ def collection_build(args = {})
           fields: {},
           countable: false,
           searchable: false,
-          segments: {}
+          segments: []
         }.merge(args[:schema] || {}),
         execute: nil,
         get_form: nil,

packages/forest_admin_datasource_toolkit/lib/forest_admin_datasource_toolkit/collection.rb

@@ -16,7 +16,7 @@ def initialize(datasource, name, native_driver = nil)
         countable: false,
         searchable: false,
         charts: [],
-        segments: {},
+        segments: [],
         actions: {}
       }
     end
@@ -25,6 +25,10 @@ def enable_count
       schema[:countable] = true
     end
 
+    def enable_search
+      schema[:searchable] = true
+    end
+
     def is_countable?
       schema[:countable]
     end
@@ -33,6 +37,10 @@ def is_searchable?
       schema[:searchable]
     end
 
+    def add_segments(segments)
+      schema[:segments] = schema[:segments] | segments
+    end
+
     def fields
       schema[:fields]
     end

packages/forest_admin_datasource_toolkit/spec/lib/forest_admin_datasource_toolkit/collection_spec.rb

@@ -65,5 +65,40 @@ module ForestAdminDatasourceToolkit
         )
       end
     end
+
+    describe 'enable_count' do
+      it 'set at true the countable option' do
+        expect(@collection.is_countable?).to be false
+
+        @collection.enable_count
+
+        expect(@collection.is_countable?).to be true
+      end
+    end
+
+    describe 'enable_search' do
+      it 'set at true the searchable option' do
+        expect(@collection.is_searchable?).to be false
+
+        @collection.enable_search
+
+        expect(@collection.is_searchable?).to be true
+      end
+    end
+
+    describe 'add_segments' do
+      it 'add segments into the schema' do
+        @collection.add_segments(%w[segment_1 segment_2])
+
+        expect(@collection.schema[:segments]).to eq(%w[segment_1 segment_2])
+      end
+
+      it 'add segments into the schema with existing segments' do
+        @collection.add_segments(%w[segment_1 segment_2])
+        @collection.add_segments(%w[segment_3])
+
+        expect(@collection.schema[:segments]).to eq(%w[segment_1 segment_2 segment_3])
+      end
+    end
   end
 end

packages/forest_admin_datasource_toolkit/spec/shared/factory.rb

@@ -20,7 +20,7 @@ def collection_build(args = {})
           fields: {},
           countable: false,
           searchable: false,
-          segments: {}
+          segments: []
         }.merge(args[:schema]),
         execute: nil,
         get_form: nil,