forest_admin_agent 1.0.0.pre.beta.52 → 1.0.0.pre.beta.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bec92ea32b9602067eec7ecaed2c92c63332c386c5d3d0fd25bf46b545005b8
-  data.tar.gz: 4e9ab47da288d943439ba1c593d58d9345cd720cfc4095b01ecac9f415e7eec1
+  metadata.gz: 6d00ce0b7ec12194e89b3356eeafea21b554920c02eb6e44add1446950cabe9c
+  data.tar.gz: 570008a865ef664bc286370771808897b8b0d04c2326c1b13e68e276d57815f5
 SHA512:
-  metadata.gz: a6ff92445703b96cce83d4603ea92ed20ef3c62db86e26a311ec65fb80d458c359522d7cfecba53b851595470fa7058297b9c78f8619bae1f022735bc9fa5eb8
-  data.tar.gz: 275d80a856cae78442d462f26126f9882ea30acccfc6c9b24bdbf82e09fad504aee259d0444d814c842a7dcce4691b9e462bc1eafc47e4a35a19ea4fa1fc8c39
+  metadata.gz: 9b1fd6024a979ef4cbcc13812a2543fb44586b59c3af1acb5222bdff6da121d3795c910e9699ac64a5df57e94a1ba213eb2aa05b89612cbf6e191cf46ea29285
+  data.tar.gz: 882468f6dbbc8f8f742d9dce4b94925f507e2f54dee873b1186bae14391c53d2a47707a476fb41259f9d7179b81d346feb227789fb473723ffc6c6f9a4ff4eee

data/lib/forest_admin_agent/serializer/forest_serializer_override.rb

@@ -60,7 +60,10 @@ module ForestAdminAgent
                 objects.each do |obj|
                   relation = ForestAdminAgent::Facades::Container.datasource.get_collection(options[:class_name]).schema[:fields][attribute_name]
                   relation_class_name = ForestAdminAgent::Facades::Container.datasource.get_collection(relation.foreign_collection).name
-                  obj_serializer = JSONAPI::Serializer.find_serializer(obj, options)
+                  option_relation = options.clone
+                  option_relation[:class_name] = relation_class_name
+                  obj_serializer = JSONAPI::Serializer.find_serializer(obj, option_relation)
+
                   # Use keys of ['posts', '1'] for the results to enforce uniqueness.
                   # Spec: A compound document MUST NOT include more than one resource object for each
                   # type and id pair.
@@ -200,7 +203,6 @@ module ForestAdminAgent
                 # of the internal special merging logic.
                 find_recursive_relationships(obj, inclusion_tree, relationship_data, passthrough_options)
               end
-
               result['included'] = relationship_data.map do |_, data|
                 included_passthrough_options = {}
                 included_passthrough_options[:base_url] = passthrough_options[:base_url]

data/lib/forest_admin_agent/utils/schema/frontend_validation_utils.rb

@@ -53,8 +53,11 @@ module ForestAdminAgent
         def self.convert_validation_list(column)
           return [] if column.validations.empty?
 
-          rules = column.validations.dup.map { |rule| simplify_rule(column.column_type, rule) }
-          remove_duplicates_in_place(rules).map { |rule| SUPPORTED[rule[:operator]].call(rule) }
+          rules = column.validations.map { |rule| simplify_rule(column.column_type, rule) }
+          remove_duplicates_in_place(rules)
+
+          rules.filter { |rule| rule.is_a?(Hash) && rule.key?(:operator) }
+               .map { |rule| SUPPORTED[rule[:operator]].call(rule) }
         end
 
         def self.simplify_rule(column_type, rule)
@@ -74,11 +77,16 @@ module ForestAdminAgent
             timezone = 'Europe/Paris' # we're sending the schema => use random tz
             tree = ConditionTreeEquivalent.get_equivalent_tree(leaf, operators, column_type, timezone)
 
-            if tree.is_a? Nodes::ConditionTreeLeaf
-              [tree]
-            else
-              tree.conditions
-            end
+            conditions = if tree.is_a? Nodes::ConditionTreeLeaf
+                           [tree]
+                         else
+                           tree.conditions
+                         end
+
+            return conditions.filter { |c| c.is_a?(Nodes::ConditionTreeLeaf) }
+                             .filter { |c| c.operator != Operators::EQUAL && c.operator != Operators::NOT_EQUAL }
+                             .map { |c| simplify_rule(column_type, operator: c.operator, value: c.value) }
+                             .first
           rescue StandardError
             # Just ignore errors, they mean that the operator is not supported by the frontend
             # and that we don't have an automatic conversion for it.
@@ -91,36 +99,44 @@ module ForestAdminAgent
           []
         end
 
-        # The frontend crashes when it receives multiple rules of the same type.
-        # This method merges the rules which can be merged and drops the others.
         def self.remove_duplicates_in_place(rules)
           used = {}
-          rules.each_with_index do |rule, key|
-            if used.key?(rule[:operator])
-              rule = rules[rule[:operator]]
-              new_rule = rule
-              rules.delete(key)
-              rules[used[rule[:operator]]] = merge_into(rule, new_rule)
-            else
-              used[rule[:operator]] = key
+
+          i = 0
+          while i < rules.length
+            rule = rules[i]
+            if rule.is_a?(Hash) && rule.key?(:operator)
+              if used.key?(rule[:operator])
+                existing_rule = rules[used[rule[:operator]]]
+                new_rule = rules.delete_at(i)
+
+                merge_into(existing_rule, new_rule)
+                # Adjust the index to account for the removed element
+                i -= 1
+              else
+                used[rule[:operator]] = i
+              end
             end
+            i += 1
           end
-
-          rules
         end
 
-        def merge_into(rule, new_rule)
-          if [Operators::GREATER_THAN, Operators::AFTER, Operators::LONGER_THAN].include? rule[:operator]
+        # rubocop:disable Style/EmptyElse
+        def self.merge_into(rule, new_rule)
+          case rule[:operator]
+          when Operators::GREATER_THAN, Operators::AFTER, Operators::LONGER_THAN
             rule[:value] = [rule[:value], new_rule[:value]].max
-          elsif [Operators::LESS_THAN, Operators::BEFORE, Operators::SHORTER_THAN].include? rule[:operator]
+          when Operators::LESS_THAN, Operators::BEFORE, Operators::SHORTER_THAN
             rule[:value] = [rule[:value], new_rule[:value]].min
-          elsif rule[:operator] == Operators::MATCH
-            # TODO
+          when Operators::MATCH
+            regex = rule[:value].gsub(/\W/, '')
+            new_regex = new_rule[:value].gsub(/\W/, '')
+            rule[:value] = "/^(?=#{regex})(?=#{new_regex}).*$/i"
+          else
+            # Ignore the rules that we can't deduplicate (we could log a warning here).
           end
-          # else Ignore the rules that we can't deduplicate (we could log a warning here).
-
-          rule
         end
+        # rubocop:enable Style/EmptyElse
       end
     end
   end

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "forest-rails"
 
-        LIANA_VERSION = "1.0.0-beta.52"
+        LIANA_VERSION = "1.0.0-beta.54"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.52"
+  VERSION = "1.0.0-beta.54"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.52
+  version: 1.0.0.pre.beta.54
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport