forest_admin_datasource_customizer 1.0.0.pre.beta.100 → 1.0.0.pre.beta.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e75e6411c41adeca16240e0ae6983a9f4a108bce9caadddd3d3f5c45fd865ae
-  data.tar.gz: 3623510010514079e49daa70f81b22f6f0a07aff10582b9d5e97f01f833167b9
+  metadata.gz: 916589f8ad75c0b803ddd5bf005c36c44376651991114654912c54057b87098f
+  data.tar.gz: 76db3232dc1899a6e467d1650bdb946e409648ab6b90ca5283afb41069f041c8
 SHA512:
-  metadata.gz: 45aa5a275ceea9b6e07405fd061e5e4cee1bda74fcac8060a997c05da207c9e17da9a0a5e61da9e75407d45bba9f0fe62c3a0a2f6137be919dad4e7149764c74
-  data.tar.gz: 8ae98816d8db32755f23bd1fdd04bb55c754b38acc23dfaebac85a59396aa28f9b95ea1557b5facf24c01b7b1e608edea046b79bb5e4fd5953beee8154a0732f
+  metadata.gz: 92c6fc56621eb603ab3fc3964944ee5e0022f992a46660e105ad6d1782059c0b64780005bbd14a33e9a77aba7ed677be8965fbd645d41222684f45b1b22d1faa
+  data.tar.gz: dd1928aa3c397c4ca0ee30067dabf36883ce22b0f82028ab1ae25db90f890aed3ad0ece6f0003e2a8d0afc14c7ebe959e5915a9fbc91aa55d6d7c696664241fc

data/lib/forest_admin_datasource_customizer/datasource_customizer.rb

@@ -45,6 +45,10 @@ module ForestAdminDatasourceCustomizer
         datasource.collections.each_value do |collection|
           @composite_datasource.add_collection(collection)
         end
+
+        datasource.schema[:charts].each do |chart|
+          @composite_datasource.add_chart(chart)
+        end
       })
 
       @datasources << datasource
@@ -88,6 +92,27 @@ module ForestAdminDatasourceCustomizer
       root_datasource
     end
 
+    def render_chart(caller, name)
+      return @composite_datasource.render_chart(caller, name) if @composite_datasource.schema[:charts].any?(name)
+
+      raise ForestAdminAgent::Http::Exceptions::NotFoundError, "Chart '#{name}' is not defined in the dataSource."
+    end
+
+    def reload!(logger: nil)
+      old_composite = @composite_datasource
+
+      begin
+        new_composite = ForestAdminDatasourceToolkit::Datasource.new
+        @stack.reload!(new_composite, logger)
+        @composite_datasource = new_composite
+      rescue StandardError => e
+        @composite_datasource = old_composite
+        raise e
+      end
+
+      datasource(logger)
+    end
+
     private
 
     def push_customization(&customization)

data/lib/forest_admin_datasource_customizer/decorators/action/action_collection_decorator.rb

@@ -41,7 +41,7 @@ module ForestAdminDatasourceCustomizer
           used = []
           context = get_context(caller, action, form_values, filter, used, metas[:change_field])
 
-          dynamic_fields = action.form
+          dynamic_fields = action.form.deep_dup
           dynamic_fields = select_in_form_fields(dynamic_fields, metas[:search_field]) if metas[:search_field]
           dynamic_fields = drop_defaults(context, dynamic_fields, form_values)
           dynamic_fields = drop_ifs(context, dynamic_fields) unless metas[:include_hidden_fields]
@@ -56,7 +56,7 @@ module ForestAdminDatasourceCustomizer
         end
 
         def refine_schema(sub_schema)
-          sub_schema[:actions] = @actions
+          sub_schema[:actions] = sub_schema[:actions].merge(@actions)
 
           sub_schema
         end

data/lib/forest_admin_datasource_customizer/decorators/action/base_action.rb

@@ -2,7 +2,7 @@ module ForestAdminDatasourceCustomizer
   module Decorators
     module Action
       class BaseAction
-        attr_reader :scope, :form, :is_generate_file, :description, :submit_button_label, :execute
+        attr_reader :scope, :form, :is_generate_file, :description, :submit_button_label, :execute, :static_form
 
         def initialize(scope:, form: nil, is_generate_file: false, description: nil, submit_button_label: nil, &execute)
           @scope = scope
@@ -11,16 +11,25 @@ module ForestAdminDatasourceCustomizer
           @description = description
           @submit_button_label = submit_button_label
           @execute = execute
+          @static_form = false
         end
 
-        def build_elements
-          @form = FormFactory.build_elements(form)
+        def self.from_plain_object(action)
+          new(
+            scope: action[:scope],
+            form: FormFactory.build_elements(action[:form]),
+            is_generate_file: action[:is_generate_file],
+            description: action[:description],
+            submit_button_label: action[:submit_button_label],
+            &action[:execute]
+          )
         end
 
-        def static_form?
-          return form&.all?(&:static?) if form
+        def build_elements
+          @form = FormFactory.build_elements(@form)
+          @static_form = @form ? @form&.all?(&:static?) : true
 
-          true
+          self
         end
 
         def validate_fields_ids(form = @form, used = [])

data/lib/forest_admin_datasource_customizer/decorators/action/form_factory.rb

@@ -6,7 +6,7 @@ module ForestAdminDatasourceCustomizer
           form&.map do |field|
             case field
             when Hash
-              if field.key?(:widget)
+              if field.key?(:widget) && !field[:widget].nil?
                 build_widget(field)
               elsif field[:type] == 'Layout'
                 build_layout_element(field)
@@ -14,9 +14,11 @@ module ForestAdminDatasourceCustomizer
                 DynamicField.new(**field)
               end
             when FormLayoutElement::RowElement
-              build_elements(field.fields)
+              field.fields = build_elements(field.fields)
+              field
             when FormLayoutElement::PageElement
-              build_elements(field.elements)
+              field.elements = build_elements(field.elements)
+              field
             else
               field
             end

data/lib/forest_admin_datasource_customizer/decorators/decorators_stack.rb

@@ -9,7 +9,52 @@ module ForestAdminDatasourceCustomizer
 
       def initialize(datasource)
         @customizations = []
+        @applied_customizations = []
+        init_stack(datasource)
+      end
+
+      def queue_customization(customization)
+        @customizations << customization
+      end
+
+      # Apply all customizations
+      # Plugins may queue new customizations, or call other plugins which will queue customizations.
+      #
+      # This method will be called recursively and clears the queue at each recursion to ensure
+      # that all customizations are applied in the right order.
+      def apply_queued_customizations(logger, store_customizations: true)
+        queued_customizations = @customizations.clone
+        @customizations = []
+
+        while queued_customizations.length.positive?
+          customization = queued_customizations.shift
+          customization.call
+
+          @applied_customizations << customization if store_customizations
+
+          apply_queued_customizations(logger, store_customizations: false)
+        end
+      end
 
+      def reload!(datasource, logger)
+        backup = backup_stack
+        @customizations = @applied_customizations.dup
+        @applied_customizations = []
+
+        begin
+          init_stack(datasource)
+          apply_queued_customizations(logger)
+          logger.log('Debug', 'Reloading customizations')
+        rescue StandardError => e
+          logger.log('Error', "Error while reloading customizations: #{e.message}, restoring previous state")
+          restore_stack(backup)
+          raise e
+        end
+      end
+
+      private
+
+      def init_stack(datasource)
         last = datasource
         last = @override = DatasourceDecorator.new(last, Override::OverrideCollectionDecorator)
         last = DatasourceDecorator.new(last, Empty::EmptyCollectionDecorator)
@@ -42,22 +87,15 @@ module ForestAdminDatasourceCustomizer
         @datasource = last
       end
 
-      def queue_customization(customization)
-        @customizations << customization
+      def backup_stack
+        instance_variables.each_with_object({}) do |var, hash|
+          hash[var] = instance_variable_get(var)
+        end
       end
 
-      # Apply all customizations
-      # Plugins may queue new customizations, or call other plugins which will queue customizations.
-      #
-      # This method will be called recursively and clears the queue at each recursion to ensure
-      # that all customizations are applied in the right order.
-      def apply_queued_customizations(logger)
-        queued_customizations = @customizations.clone
-        @customizations = []
-
-        while queued_customizations.length.positive?
-          queued_customizations.shift.call
-          apply_queued_customizations(logger)
+      def restore_stack(backup)
+        backup.each do |var, value|
+          instance_variable_set(var, value)
         end
       end
     end

data/lib/forest_admin_datasource_customizer/decorators/rename_collection/rename_collection_datasource_decorator.rb

@@ -31,9 +31,18 @@ module ForestAdminDatasourceCustomizer
           super
         end
 
-        def rename_collections(renames = [])
-          renames.each do |current_name, new_name|
-            rename_collection(current_name, new_name)
+        def rename_collections(renames)
+          case renames
+          when Proc
+            collections.each_key do |name|
+              rename_collection(name, renames.call(name) || name)
+            end
+          when Hash
+            renames.each do |old_name, new_name|
+              rename_collection(old_name, new_name)
+            end
+          else
+            raise Exceptions::ForestException, 'Invalid argument for rename_collections, must be a function or a hash'
           end
         end
 

data/lib/forest_admin_datasource_customizer/decorators/search/search_collection_decorator.rb

@@ -13,10 +13,13 @@ module ForestAdminDatasourceCustomizer
 
         def disable_search
           @disabled_search = true
+          mark_schema_as_dirty
         end
 
         def replace_search(replacer)
           @replacer = replacer
+          @disabled_search = false
+          mark_schema_as_dirty
         end
 
         def refine_schema(sub_schema)

data/lib/forest_admin_datasource_customizer/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceCustomizer
-  VERSION = "1.0.0-beta.100"
+  VERSION = "1.0.0-beta.102"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_customizer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.100
+  version: 1.0.0.pre.beta.102
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport