refactor(kamelet): update Kamelet structure to use route.from instead of from

packages/ui-tests/cypress/e2e/designer/basicNodeActions/stepCopy.cy.ts

@@ -107,15 +107,17 @@ describe('Tests for Design page', { browser: '!firefox' }, () => {
           types: { out: { mediaType: 'application/json' } },
           dependencies: ['camel:timer', 'camel:http', 'camel:kamelet'],
           template: {
-            from: {
-              id: 'from-1870',
-              uri: 'timer:user',
-              parameters: { period: '{{period}}' },
-              steps: [
-                { setBody: { id: 'setBody-3387', expression: { simple: {} } } },
-                { marshal: { id: 'marshal-1414' } },
-                { to: { uri: 'kamelet:sink', parameters: {} } },
-              ],
+            route: {
+              from: {
+                id: 'from-1870',
+                uri: 'timer:user',
+                parameters: { period: '{{period}}' },
+                steps: [
+                  { setBody: { id: 'setBody-3387', expression: { simple: {} } } },
+                  { marshal: { id: 'marshal-1414' } },
+                  { to: { uri: 'kamelet:sink', parameters: {} } },
+                ],
+              },
             },
           },
         },

packages/ui-tests/cypress/e2e/designer/branchingFlows/branchingStepAddition.cy.ts

@@ -63,8 +63,8 @@ describe('Test for Branching actions from the canvas', () => {
     cy.checkNodeExist('activemq', 1);
     cy.checkEdgeExists(
       'eip-action',
-      'template.from.steps.1.choice.when.0.steps.1.setHeader',
-      'template.from.steps.1.choice.when.0.steps.2.to',
+      'template.route.from.steps.1.choice.when.0.steps.1.setHeader',
+      'template.route.from.steps.1.choice.when.0.steps.2.to',
     );
   });
 
@@ -79,8 +79,8 @@ describe('Test for Branching actions from the canvas', () => {
     cy.checkNodeExist('activemq', 1);
     cy.checkEdgeExists(
       'eip-action',
-      'template.from.steps.1.choice.when.0.steps.0.to',
-      'template.from.steps.1.choice.when.0.steps.1.to',
+      'template.route.from.steps.1.choice.when.0.steps.0.to',
+      'template.route.from.steps.1.choice.when.0.steps.1.to',
     );
   });
 
@@ -93,6 +93,6 @@ describe('Test for Branching actions from the canvas', () => {
     cy.chooseFromCatalog('component', 'activemq');
 
     cy.checkNodeExist('activemq', 1);
-    cy.checkEdgeExists('eip-action', 'template.from.steps.2.to', 'template.from.steps.3.filter');
+    cy.checkEdgeExists('eip-action', 'template.route.from.steps.2.to', 'template.route.from.steps.3.filter');
   });
 });

packages/ui-tests/cypress/fixtures/flows/kamelet/basic.yaml

@@ -24,18 +24,19 @@ spec:
     - camel:http
     - camel:kamelet
   template:
-    from:
-      id: from-1870
-      uri: timer:user
-      parameters:
-        period: "{{period}}"
-      steps:
-        - setBody:
-            id: setBody-3387
-            expression:
-              simple: {}
-        - marshal:
-            id: marshal-1414
-        - to:
-            uri: kamelet:sink
-            parameters: {}
+    route:
+      from:
+        id: from-1870
+        uri: timer:user
+        parameters:
+          period: "{{period}}"
+        steps:
+          - setBody:
+              id: setBody-3387
+              expression:
+                simple: {}
+          - marshal:
+              id: marshal-1414
+          - to:
+              uri: kamelet:sink
+              parameters: {}

packages/ui/src/models/__snapshots__/kaoto-resource.test.ts.snap

@@ -3,7 +3,9 @@
 exports[`CamelResourceFactory.createCamelResource > should create an empty KameletResource if no args is specified 1`] = `
 [
   {
-    "from": {},
+    "route": {
+      "from": {},
+    },
   },
 ]
 `;

packages/ui/src/models/camel/__snapshots__/kamelet-resource.test.ts.snap

@@ -38,26 +38,28 @@ exports[`KameletResource > should convert to JSON 1`] = `
     ],
     "template": {
       "beans": undefined,
-      "from": {
-        "id": "from-1234",
-        "parameters": {
-          "period": "{{period}}",
-          "timerName": "user",
-        },
-        "steps": [
-          {
-            "to": {
-              "parameters": {
-                "httpUri": "random-data-api.com/api/v2/users",
+      "route": {
+        "from": {
+          "id": "from-1234",
+          "parameters": {
+            "period": "{{period}}",
+            "timerName": "user",
+          },
+          "steps": [
+            {
+              "to": {
+                "parameters": {
+                  "httpUri": "random-data-api.com/api/v2/users",
+                },
+                "uri": "https",
               },
-              "uri": "https",
             },
-          },
-          {
-            "to": "kamelet:sink",
-          },
-        ],
-        "uri": "timer",
+            {
+              "to": "kamelet:sink",
+            },
+          ],
+          "uri": "timer",
+        },
       },
     },
     "types": {
@@ -107,26 +109,28 @@ exports[`KameletResource > should create a new KameletResource 1`] = `
     ],
     "template": {
       "beans": undefined,
-      "from": {
-        "id": "from-1234",
-        "parameters": {
-          "period": "{{period}}",
-          "timerName": "user",
-        },
-        "steps": [
-          {
-            "to": {
-              "parameters": {
-                "httpUri": "random-data-api.com/api/v2/users",
+      "route": {
+        "from": {
+          "id": "from-1234",
+          "parameters": {
+            "period": "{{period}}",
+            "timerName": "user",
+          },
+          "steps": [
+            {
+              "to": {
+                "parameters": {
+                  "httpUri": "random-data-api.com/api/v2/users",
+                },
+                "uri": "https",
               },
-              "uri": "https",
             },
-          },
-          {
-            "to": "kamelet:sink",
-          },
-        ],
-        "uri": "timer",
+            {
+              "to": "kamelet:sink",
+            },
+          ],
+          "uri": "timer",
+        },
       },
     },
     "types": {
@@ -163,10 +167,12 @@ exports[`KameletResource > should create a new KameletResource with a kamelet 1`
     "dependencies": [],
     "template": {
       "beans": [],
-      "from": {
-        "id": "from",
-        "steps": [],
-        "uri": "kamelet:source",
+      "route": {
+        "from": {
+          "id": "from",
+          "steps": [],
+          "uri": "kamelet:source",
+        },
       },
     },
   },
@@ -176,26 +182,28 @@ exports[`KameletResource > should create a new KameletResource with a kamelet 1`
 exports[`KameletResource > should get the visual entities (Camel Route Visual Entity) 1`] = `
 [
   {
-    "from": {
-      "id": "from-1234",
-      "parameters": {
-        "period": "{{period}}",
-        "timerName": "user",
-      },
-      "steps": [
-        {
-          "to": {
-            "parameters": {
-              "httpUri": "random-data-api.com/api/v2/users",
+    "route": {
+      "from": {
+        "id": "from-1234",
+        "parameters": {
+          "period": "{{period}}",
+          "timerName": "user",
+        },
+        "steps": [
+          {
+            "to": {
+              "parameters": {
+                "httpUri": "random-data-api.com/api/v2/users",
+              },
+              "uri": "https",
             },
-            "uri": "https",
           },
-        },
-        {
-          "to": "kamelet:sink",
-        },
-      ],
-      "uri": "timer",
+          {
+            "to": "kamelet:sink",
+          },
+        ],
+        "uri": "timer",
+      },
     },
   },
 ]

packages/ui/src/models/camel/kamelet-resource.test.ts

@@ -43,12 +43,14 @@ describe('KameletResource', () => {
         },
         dependencies: [],
         template: {
-          from: {
-            id: 'from',
-            uri: 'kamelet:source',
-            steps: [],
-          },
           beans: [],
+          route: {
+            from: {
+              id: 'from',
+              uri: 'kamelet:source',
+              steps: [],
+            },
+          },
         },
       },
     });

packages/ui/src/models/camel/kamelet-resource.ts

@@ -69,7 +69,7 @@ export class KameletResource extends CamelKResource implements RouteTemplateBean
     // Call toJSON() on the flow entity to apply property sorting
     const flowJson = this.flow.toJSON();
     setValue(this.resource, 'metadata.name', this.flow.getId());
-    setValue(this.resource, 'spec.template.from', flowJson.from);
+    setValue(this.resource, 'spec.template.route', flowJson.route);
     setValue(this.resource, 'spec.template.beans', this.beans?.parent.beans);
     return this.resource as IKameletDefinition;
   }

packages/ui/src/models/camel/kamelets-catalog.ts

@@ -1,4 +1,4 @@
-import { BeanFactory, FromDefinition, Kamelet } from '@kaoto/camel-catalog/types';
+import { BeanFactory, FromDefinition, Kamelet, RouteDefinition } from '@kaoto/camel-catalog/types';
 
 import { KaotoSchemaDefinition } from '../kaoto-schema';
 import { SourceSchemaType } from './source-schema-type';
@@ -49,7 +49,8 @@ export interface IKameletSpec {
   dependencies: string[];
   template: {
     beans?: BeanFactory[];
-    from: FromDefinition;
+    route: RouteDefinition;
+    from?: FromDefinition;
   };
   dataTypes?: {
     in?: {

packages/ui/src/models/visualization/flows/abstract-camel-visual-entity.ts

@@ -236,7 +236,7 @@ export abstract class AbstractCamelVisualEntity<T extends object> implements Bas
   canDragNode(path?: string) {
     if (!isDefined(path)) return false;
 
-    return path !== 'route' && path !== 'route.from' && path !== 'template.from';
+    return path !== 'route' && path !== 'route.from' && path !== 'template.route.from';
   }
 
   canDropOnNode(path?: string) {

packages/ui/src/models/visualization/flows/kamelet-visual-entity.test.ts

@@ -1,5 +1,6 @@
 import catalogLibrary from '@kaoto/camel-catalog/index.json';
-import { CatalogLibrary } from '@kaoto/camel-catalog/types';
+import { CatalogLibrary, RouteDefinition } from '@kaoto/camel-catalog/types';
+import { cloneDeep } from 'lodash';
 
 import { DynamicCatalogRegistry } from '../../../dynamic-catalog/dynamic-catalog-registry';
 import { mockRandomValues } from '../../../stubs';
@@ -54,7 +55,9 @@ describe('KameletVisualEntity', () => {
           type: 'source',
         },
         template: {
-          from: camelFromJson.from,
+          route: {
+            from: camelFromJson.from,
+          },
         },
         dependencies: [],
       },
@@ -65,6 +68,16 @@ describe('KameletVisualEntity', () => {
     expect(new KameletVisualEntity(kameletDef)).toBeTruthy();
   });
 
+  it('should normalize template.from to template.route.from and remove template.from', () => {
+    const kameletDefWithFrom = cloneDeep(kameletDef);
+    kameletDefWithFrom.spec.template.from = kameletDefWithFrom.spec.template.route.from;
+    kameletDefWithFrom.spec.template.route = undefined as unknown as RouteDefinition;
+
+    const kameletVisualEntity = new KameletVisualEntity(kameletDefWithFrom);
+    expect(kameletVisualEntity.kamelet.spec.template.from).toBeUndefined();
+    expect(kameletVisualEntity.kamelet.spec.template.route?.from).toEqual(camelFromJson.from);
+  });
+
   it('should set the id to the name if provided', () => {
     const kameletVisualEntity = new KameletVisualEntity(kameletDef);
     expect(kameletVisualEntity.id).toBe('My Kamelet');
@@ -138,12 +151,27 @@ describe('KameletVisualEntity', () => {
     expect(fetchNodeSchemaSpy).toHaveBeenCalledWith(ids);
   });
 
-  it('should return the root uri', () => {
+  it('should return the root uri when using template.from (short syntax)', () => {
+    class KameletVisualEntityTest extends KameletVisualEntity {
+      getRootUri(): string | undefined {
+        return super.getRootUri();
+      }
+    }
+    const kamelet = new KameletVisualEntityTest(kameletDef);
+    expect(kamelet.getRootUri()).toBe('timer');
+  });
+
+  it('should return the root uri when using template.route.from', () => {
     class KameletVisualEntityTest extends KameletVisualEntity {
       getRootUri(): string | undefined {
         return super.getRootUri();
       }
     }
+    kameletDef.spec.template = {
+      route: {
+        from: camelFromJson.from,
+      },
+    };
     const kamelet = new KameletVisualEntityTest(kameletDef);
     expect(kamelet.getRootUri()).toBe('timer');
   });