Fix(1429): Supporting parameter notation and ceased URI parameters se…

…rialization
lordrip · Oct 2, 2024 · 458400e · 458400e
1 parent f60222a
commit 458400e
Show file tree

Hide file tree

Showing 32 changed files with 338 additions and 484 deletions.
diff --git a/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.test.tsx b/packages/ui/src/components/Visualization/Canvas/Form/CanvasForm.test.tsx
@@ -340,7 +340,10 @@ describe('CanvasForm', () => {
     it('expression field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               setHeader: {
@@ -433,7 +436,10 @@ describe('CanvasForm', () => {
     it('dataformat field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               marshal: {
@@ -523,7 +529,10 @@ describe('CanvasForm', () => {
     it('loadbalancer field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               loadBalance: {
@@ -648,7 +657,10 @@ describe('CanvasForm', () => {
     it('expression field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               setHeader: {
@@ -690,7 +702,10 @@ describe('CanvasForm', () => {
     it('dataformat field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               marshal: {
@@ -732,7 +747,10 @@ describe('CanvasForm', () => {
     it('loadbalancer field', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               loadBalance: {

diff --git a/packages/ui/src/components/Visualization/Canvas/Form/CanvasFormBody.test.tsx b/packages/ui/src/components/Visualization/Canvas/Form/CanvasFormBody.test.tsx
@@ -46,7 +46,10 @@ describe('CanvasFormBody', () => {
     it('expression => main form', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               setHeader: {
@@ -113,7 +116,10 @@ describe('CanvasFormBody', () => {
     it('main form => expression', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               setHeader: {
@@ -185,7 +191,10 @@ describe('CanvasFormBody', () => {
     it('dataformat => main form', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               marshal: {
@@ -243,7 +252,10 @@ describe('CanvasFormBody', () => {
     it('main form => dataformat', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               marshal: {
@@ -307,7 +319,10 @@ describe('CanvasFormBody', () => {
     it('loadbalancer => main form', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               loadBalance: {
@@ -365,7 +380,10 @@ describe('CanvasFormBody', () => {
     it('main form => loadbalancer', async () => {
       const camelRoute = {
         from: {
-          uri: 'timer:tutorial',
+          uri: 'timer',
+          parameters: {
+            timerName: 'tutorial',
+          },
           steps: [
             {
               loadBalance: {

diff --git a/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap b/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap
@@ -218,6 +218,7 @@ exports[`CanvasSideBar displays selected node information 1`] = `
 uri: timer
 parameters:
   period: "1000"
+  timerName: template
 steps:
   - log:
       id: log-1234

diff --git a/packages/ui/src/hooks/entities.test.tsx b/packages/ui/src/hooks/entities.test.tsx
@@ -74,9 +74,10 @@ describe('useEntities', () => {
     id: route-1234
     from:
       id: from-1234
-      uri: timer:template
+      uri: timer
       parameters:
         period: "1000"
+        timerName: template
       steps:
         - log:
             id: log-1234
@@ -171,9 +172,10 @@ describe('useEntities', () => {
     id: route-1234
     from:
       id: from-1234
-      uri: timer:template
+      uri: timer
       parameters:
         period: "1000"
+        timerName: template
       # This comment won't be stored
       steps:
         - log:
@@ -213,9 +215,10 @@ describe('useEntities', () => {
     id: route-1234
     from:
       id: from-1234
-      uri: timer:template
+      uri: timer
       parameters:
         period: "1000"
+        timerName: template
       steps:
         - log:
             id: log-1234

diff --git a/packages/ui/src/models/camel/__snapshots__/camel-resource.test.ts.snap b/packages/ui/src/models/camel/__snapshots__/camel-resource.test.ts.snap
@@ -8,16 +8,22 @@ exports[`createCamelResource should create an empty KameletResource if no args i
         "id": "from-1234",
         "parameters": {
           "period": "{{period}}",
+          "timerName": "user",
         },
         "steps": [
           {
-            "to": "https://random-data-api.com/api/v2/users",
+            "to": {
+              "parameters": {
+                "httpUri": "random-data-api.com/api/v2/users",
+              },
+              "uri": "https",
+            },
           },
           {
             "to": "kamelet:sink",
           },
         ],
-        "uri": "timer:user",
+        "uri": "timer",
       },
       "id": "kamelet-1234",
     },

diff --git a/packages/ui/src/models/camel/__snapshots__/camel-route-resource.test.ts.snap b/packages/ui/src/models/camel/__snapshots__/camel-route-resource.test.ts.snap
@@ -5,6 +5,9 @@ exports[`CamelRouteResource toJSON should return JSON 1`] = `
   {
     "route": {
       "from": {
+        "parameters": {
+          "timerName": "tutorial",
+        },
         "steps": [
           {
             "set-header": {
@@ -58,7 +61,7 @@ exports[`CamelRouteResource toJSON should return JSON 1`] = `
             },
           },
         ],
-        "uri": "timer:tutorial",
+        "uri": "timer",
       },
       "id": "route-8888",
     },

diff --git a/packages/ui/src/models/camel/__snapshots__/kamelet-resource.test.ts.snap b/packages/ui/src/models/camel/__snapshots__/kamelet-resource.test.ts.snap
@@ -42,16 +42,22 @@ exports[`KameletResource should convert to JSON 1`] = `
         "id": "from-1234",
         "parameters": {
           "period": "{{period}}",
+          "timerName": "user",
         },
         "steps": [
           {
-            "to": "https://random-data-api.com/api/v2/users",
+            "to": {
+              "parameters": {
+                "httpUri": "random-data-api.com/api/v2/users",
+              },
+              "uri": "https",
+            },
           },
           {
             "to": "kamelet:sink",
           },
         ],
-        "uri": "timer:user",
+        "uri": "timer",
       },
     },
     "types": {
@@ -105,16 +111,22 @@ exports[`KameletResource should create a new KameletResource 1`] = `
         "id": "from-1234",
         "parameters": {
           "period": "{{period}}",
+          "timerName": "user",
         },
         "steps": [
           {
-            "to": "https://random-data-api.com/api/v2/users",
+            "to": {
+              "parameters": {
+                "httpUri": "random-data-api.com/api/v2/users",
+              },
+              "uri": "https",
+            },
           },
           {
             "to": "kamelet:sink",
           },
         ],
-        "uri": "timer:user",
+        "uri": "timer",
       },
     },
     "types": {
@@ -169,16 +181,22 @@ exports[`KameletResource should get the visual entities (Camel Route Visual Enti
         "id": "from-1234",
         "parameters": {
           "period": "{{period}}",
+          "timerName": "user",
         },
         "steps": [
           {
-            "to": "https://random-data-api.com/api/v2/users",
+            "to": {
+              "parameters": {
+                "httpUri": "random-data-api.com/api/v2/users",
+              },
+              "uri": "https",
+            },
           },
           {
             "to": "kamelet:sink",
           },
         ],
-        "uri": "timer:user",
+        "uri": "timer",
       },
       "id": "kamelet-1234",
     },

diff --git a/packages/ui/src/models/visualization/flows/abstract-camel-visual-entity.test.ts b/packages/ui/src/models/visualization/flows/abstract-camel-visual-entity.test.ts
@@ -133,15 +133,15 @@ describe('AbstractCamelVisualEntity', () => {
 
   describe('updateModel', () => {
     it('should update the model with the new value', () => {
-      const newUri = 'timer:MyTimer';
+      const newUri = 'timer';
       abstractVisualEntity.updateModel('from', { uri: newUri });
 
       expect(abstractVisualEntity.route.from.uri).toEqual(newUri);
     });
 
     it('should delegate the serialization to the `CamelComponentSchemaService`', () => {
-      const newUri = 'timer:MyTimer';
-      const spy = jest.spyOn(CamelComponentSchemaService, 'getUriSerializedDefinition');
+      const newUri = 'timer';
+      const spy = jest.spyOn(CamelComponentSchemaService, 'getMultiValueSerializedDefinition');
       abstractVisualEntity.updateModel('from', { uri: newUri });
 
       expect(spy).toHaveBeenCalledWith('from', { uri: newUri });

diff --git a/packages/ui/src/models/visualization/flows/abstract-camel-visual-entity.ts b/packages/ui/src/models/visualization/flows/abstract-camel-visual-entity.ts
@@ -77,8 +77,7 @@ export abstract class AbstractCamelVisualEntity<T extends object> implements Bas
 
   updateModel(path: string | undefined, value: unknown): void {
     if (!path) return;
-    let updatedValue = CamelComponentSchemaService.getUriSerializedDefinition(path, value);
-    updatedValue = CamelComponentSchemaService.getMultiValueSerializedDefinition(path, updatedValue);
+    const updatedValue = CamelComponentSchemaService.getMultiValueSerializedDefinition(path, value);
 
     setValue(this.route, path, updatedValue);
   }

diff --git a/packages/ui/src/models/visualization/flows/camel-route-visual-entity.test.ts b/packages/ui/src/models/visualization/flows/camel-route-visual-entity.test.ts
@@ -120,7 +120,7 @@ describe('Camel Route', () => {
 
       camelEntity.getComponentSchema('from.uri');
 
-      expect(spy).toHaveBeenCalledWith('from.uri', 'timer:tutorial');
+      expect(spy).toHaveBeenCalledWith('from.uri', 'timer');
     });
   });
 

diff --git a/packages/ui/src/models/visualization/flows/kamelet-visual-entity.test.ts b/packages/ui/src/models/visualization/flows/kamelet-visual-entity.test.ts
@@ -120,7 +120,7 @@ describe('KameletVisualEntity', () => {
       }
     }
     const kamelet = new KameletVisualEntityTest(kameletDef);
-    expect(kamelet.getRootUri()).toEqual('timer:tutorial');
+    expect(kamelet.getRootUri()).toEqual('timer');
   });
 
   describe('toVizNode', () => {

diff --git a/packages/ui/src/models/visualization/flows/nodes/mappers/base-node-mapper.test.ts b/packages/ui/src/models/visualization/flows/nodes/mappers/base-node-mapper.test.ts
@@ -17,9 +17,9 @@ describe('BaseNodeMapper', () => {
     path = 'from';
     componentLookup = {
       processorName: 'from' as keyof ProcessorDefinition,
-      componentName: 'timer:timerName',
+      componentName: 'timer',
     };
-    entityDefinition = { uri: 'timer:timerName', steps: [] };
+    entityDefinition = { uri: 'timer', parameters: { timerName: 'timerName' }, steps: [] };
   });
 
   describe('getVizNodeFromProcessor', () => {
@@ -31,14 +31,17 @@ describe('BaseNodeMapper', () => {
         path,
         icon: expect.any(String),
         processorName: 'from',
-        componentName: 'timer:timerName',
+        componentName: 'timer',
       });
     });
 
     it('should return a VisualizationNode with children', () => {
       const routeDefinition: RouteDefinition = {
         from: {
-          uri: 'timer:timerName',
+          uri: 'timer',
+          parameters: {
+            timerName: 'timerName',
+          },
           steps: [{ log: 'logName' }, { to: 'direct:anotherRoute' }],
         },
       };
@@ -52,7 +55,10 @@ describe('BaseNodeMapper', () => {
     it('should return a VisualizationNode with special children', () => {
       const routeDefinition: RouteDefinition = {
         from: {
-          uri: 'timer:timerName',
+          uri: 'timer',
+          parameters: {
+            timerName: 'timerName',
+          },
           steps: [
             {
               doTry: {