chore(Form): Remove Dataformat editor

KaotoIO · Jan 8, 2025 · d231747 · d231747
1 parent cc6e1af
commit d231747
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 561 deletions.
diff --git a/...-generator/src/main/java/io/kaoto/camelcatalog/generator/CamelYamlDslSchemaProcessor.java b/...-generator/src/main/java/io/kaoto/camelcatalog/generator/CamelYamlDslSchemaProcessor.java
@@ -30,7 +30,6 @@
  */
 public class CamelYamlDslSchemaProcessor {
     private static final String PROCESSOR_DEFINITION = "org.apache.camel.model.ProcessorDefinition";
-    private static final String TOKENIZER_DEFINITION = "org.apache.camel.model.TokenizerDefinition";
     private static final String ROUTE_CONFIGURATION_DEFINITION = "org.apache.camel.model.RouteConfigurationDefinition";
     private static final String REST_DEFINITION = "org.apache.camel.model.rest.RestDefinition";
     private static final String LOAD_BALANCE_DEFINITION = "org.apache.camel.model.LoadBalanceDefinition";
@@ -44,6 +43,10 @@ public class CamelYamlDslSchemaProcessor {
     private final ObjectMapper jsonMapper;
     private final ObjectNode yamlDslSchema;
     private final List<String> processorBlocklist = List.of("org.apache.camel.model.KameletDefinition");
+    static final String TOKENIZER_DEFINITION = "org.apache.camel.model.TokenizerDefinition";
+    static final String MARSHAL_DEFINITION = "org.apache.camel.model.MarshalDefinition";
+    static final String UNMARSHAL_DEFINITION = "org.apache.camel.model.UnmarshalDefinition";
+    private static final List<String> VALIDATED_ONE_OF = List.of(TOKENIZER_DEFINITION, MARSHAL_DEFINITION, UNMARSHAL_DEFINITION);
 
     /**
      * The processor properties those should be handled separately, i.e. remove from
@@ -296,7 +299,7 @@ public Map<String, ObjectNode> getProcessors() throws Exception {
             processor.remove("oneOf");
 
             /* Preparation for TokenizerDefinition, this could be propagated to all EIPs in the future */
-            if (processorFQCN.equals(TOKENIZER_DEFINITION)) {
+            if (VALIDATED_ONE_OF.contains(processorFQCN)) {
                 removeEmptyProperties(processor);
                 extractSingleOneOfFromAnyOf(processor);
                 removeNotFromOneOf(processor);
@@ -436,12 +439,6 @@ private void processAndRemoveAnyOfForSubCatalogs(String name, ObjectNode definit
                 definition.put("$comment", "expression");
                 break;
             }
-            var refParent = def.findParent("$ref");
-            if (refParent != null
-                    && refParent.get("$ref").asText().startsWith("#/definitions/org.apache.camel.model.dataformat")) {
-                definition.put("$comment", "dataformat");
-                break;
-            }
             if (LOAD_BALANCE_DEFINITION.equals(name)) {
                 definition.put("$comment", "loadbalance");
                 break;

diff --git a/...og-generator/src/test/java/io/kaoto/camelcatalog/generator/CamelCatalogProcessorTest.java b/...og-generator/src/test/java/io/kaoto/camelcatalog/generator/CamelCatalogProcessorTest.java
@@ -359,4 +359,12 @@ void testGetLoadBalancerCatalog() throws Exception {
     void testLoadBalancerEnumParameter() throws Exception {
         checkEnumParameters(loadBalancerCatalog);
     }
+
+    @Test
+    void testMarshalEip() {
+        var marshalProperties = processorCatalog.withObject("/marshal").withObject("/propertiesSchema");
+        var marshalOneOfDef = marshalProperties.withArray("/oneOf");
+
+        assertEquals(41, marshalOneOfDef.size());
+    }
 }
diff --git a/packages/ui/src/components/Form/OneOf/OneOfSchemaList.tsx b/packages/ui/src/components/Form/OneOf/OneOfSchemaList.tsx
@@ -8,11 +8,12 @@ import {
   TextContent,
   TextVariants,
 } from '@patternfly/react-core';
-import { FunctionComponent, PropsWithChildren, Ref, useCallback, useEffect, useState } from 'react';
+import { FunctionComponent, PropsWithChildren, Ref, useCallback, useEffect, useMemo, useState } from 'react';
 import { OneOfSchemas } from '../../../utils/get-oneof-schema-list';
 import { isDefined } from '../../../utils/is-defined';
 import { SchemaService } from '../schema.service';
 import './OneOfSchemaList.scss';
+import { TypeaheadField } from '../customField/TypeaheadField';
 
 interface OneOfComponentProps extends PropsWithChildren {
   name: string;

diff --git a/packages/ui/src/components/Form/dataFormat/DataFormatEditor.scss b/packages/ui/src/components/Form/dataFormat/DataFormatEditor.scss
diff --git a/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx b/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx