fix

alexvolha · alexvolha · commit fb8f50e4baa0 · 2024-06-24T13:11:31.000+03:00
diff --git a/uncoder-core/app/translator/core/render.py b/uncoder-core/app/translator/core/render.py
@@ -287,7 +287,7 @@ def generate_query(self, tokens: list[TOKEN_TYPE], source_mapping: SourceMapping
             result_values.append(self.apply_token(token=token, source_mapping=source_mapping))
         return "".join(result_values)
 
-    def wrap_with_meta_info(self, query: str, meta_info: MetaInfoContainer) -> str:
+    def wrap_with_meta_info(self, query: str, meta_info: Optional[MetaInfoContainer]) -> str:
         if wrap_query_with_meta_info_ctx_var.get() and meta_info and (meta_info.id or meta_info.title):
             meta_info_dict = {
                 "name: ": meta_info.title,
diff --git a/uncoder-core/app/translator/platforms/logrhythm_axon/renders/logrhythm_axon_query.py b/uncoder-core/app/translator/platforms/logrhythm_axon/renders/logrhythm_axon_query.py
@@ -232,12 +232,13 @@ def apply_token(self, token: Union[FieldValue, Keyword, Identifier], source_mapp
                         f"Uncoder does not support complex regexp for unmapped field:"
                         f" {token.field.source_name} for LogRhythm Axon"
                     ) from exc
-            return self.group_token % self.logical_operators_map[LogicalOperatorType.OR].join(
+            joined = self.logical_operators_map[LogicalOperatorType.OR].join(
                 [
                     self.field_value_render.apply_field_value(field=field, operator=token.operator, value=token.value)
                     for field in mapped_fields
                 ]
             )
+            return self.group_token % joined if len(mapped_fields) > 1 else joined
 
         return super().apply_token(token, source_mapping)
 

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,13 @@ def apply_token(self, token: Union[FieldValue, Keyword, Identifier], source_mapp`
`232`	`232`	`f"Uncoder does not support complex regexp for unmapped field:"`
`233`	`233`	`f" {token.field.source_name} for LogRhythm Axon"`
`234`	`234`	`) from exc`
`235`		`- return self.group_token % self.logical_operators_map[LogicalOperatorType.OR].join(`
	`235`	`+ joined = self.logical_operators_map[LogicalOperatorType.OR].join(`
`236`	`236`	`[`
`237`	`237`	`self.field_value_render.apply_field_value(field=field, operator=token.operator, value=token.value)`
`238`	`238`	`for field in mapped_fields`
`239`	`239`	`]`
`240`	`240`	`)`
	`241`	`+ return self.group_token % joined if len(mapped_fields) > 1 else joined`
`241`	`242`
`242`	`243`	`return super().apply_token(token, source_mapping)`
`243`	`244`