diff --git a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts index e9f680125..78e6f5ab2 100644 --- a/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts +++ b/packages/ui-tests/cypress/e2e/designer/specialStepConfiguration/loadBalancerConfig.cy.ts @@ -35,10 +35,10 @@ describe('Tests for sidebar loadBalancer step configuration', () => { 'steps:', '- to:', 'parameters: {}', - 'uri: log', + 'uri: log:InfoLogger', '- to:', 'parameters: {}', - 'uri: log', + 'uri: log:InfoLogger', 'description: loadBalancerDescription', 'inheritErrorHandler: true', 'id: testId', diff --git a/packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml b/packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml index 2556c2190..a9601ad0a 100644 --- a/packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml +++ b/packages/ui-tests/cypress/fixtures/flows/camelRoute/multiflow.yaml @@ -8,7 +8,7 @@ steps: - log: id: log-6809 - message: template message + message: ${body} - route: id: route-4321 from: @@ -19,4 +19,4 @@ steps: - log: id: log-2966 - message: template message + message: ${body} diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml index 1e6c145e8..7368dacce 100644 --- a/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml +++ b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/missingId.yaml @@ -12,4 +12,4 @@ expression: body-constant - log: id: log-4225 - message: template message + message: ${body} diff --git a/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml index e103ae8d8..a695072b1 100644 --- a/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml +++ b/packages/ui-tests/cypress/fixtures/flows/malformed/camelRoute/unknownNode.yaml @@ -7,10 +7,10 @@ repeatCount: "5" steps: - setBody: - # wrong id placement - creates unknown node + # wrong id placement - creates unknown node - id: setBody-3518 # wrong id placement - log: id: log-4225 - message: template message + message: ${body} id: route-8484 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 index 3ebd083bc..54e596878 100644 --- a/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap +++ b/packages/ui/src/components/Visualization/Canvas/__snapshots__/CanvasSideBar.test.tsx.snap @@ -221,7 +221,7 @@ parameters: steps: - log: id: log-1234 - message: template message + message: \${body} diff --git a/packages/ui/src/hooks/entities.test.tsx b/packages/ui/src/hooks/entities.test.tsx index 524b27014..e70423ba2 100644 --- a/packages/ui/src/hooks/entities.test.tsx +++ b/packages/ui/src/hooks/entities.test.tsx @@ -80,7 +80,7 @@ describe('useEntities', () => { steps: - log: id: log-1234 - message: template message + message: \${body} `, ); }); @@ -178,7 +178,7 @@ describe('useEntities', () => { steps: - log: id: log-1234 - message: template message + message: \${body} `; const { result } = renderHook(() => useEntities()); @@ -219,7 +219,7 @@ describe('useEntities', () => { steps: - log: id: log-1234 - message: template message + message: \${body} `, ); }); diff --git a/packages/ui/src/models/visualization/flows/support/camel-component-default.service.test.ts b/packages/ui/src/models/visualization/flows/support/camel-component-default.service.test.ts index d5bde4f4c..3499b9812 100644 --- a/packages/ui/src/models/visualization/flows/support/camel-component-default.service.test.ts +++ b/packages/ui/src/models/visualization/flows/support/camel-component-default.service.test.ts @@ -43,10 +43,20 @@ describe('CamelComponentDefaultService', () => { name: 'log', } as DefinedComponent) as any; expect(logDefault.log).toBeDefined(); - expect((logDefault.log.id as string).startsWith('log-')).toBeTruthy(); + expect(logDefault.log.id as string).toMatch(/^log-/); expect(logDefault.log.message).toEqual('${body}'); }); + it('should return the default value for a log component', () => { + const logDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'component', + name: 'log', + } as DefinedComponent) as any; + expect(logDefault.to).toBeDefined(); + expect(logDefault.to.id as string).toMatch(/^to-/); + expect(logDefault.to.uri).toEqual('log:InfoLogger'); + }); + it('should return the default value for a doCatch processor', () => { const doCatchDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ type: 'processor', diff --git a/packages/ui/src/models/visualization/flows/support/camel-component-default.service.ts b/packages/ui/src/models/visualization/flows/support/camel-component-default.service.ts index 02028f2a3..ffa81ed3f 100644 --- a/packages/ui/src/models/visualization/flows/support/camel-component-default.service.ts +++ b/packages/ui/src/models/visualization/flows/support/camel-component-default.service.ts @@ -43,12 +43,23 @@ export class CamelComponentDefaultService { } private static getDefaultValueFromComponent(componentName: string): object { - return parse(` - to: - id: ${getCamelRandomId('to')} - uri: "${componentName}" - parameters: {} - `); + switch (componentName) { + case 'log': + return parse(` + to: + id: ${getCamelRandomId('to')} + uri: log:InfoLogger + parameters: {} + `); + + default: + return parse(` + to: + id: ${getCamelRandomId('to')} + uri: "${componentName}" + parameters: {} + `); + } } private static getDefaultValueFromKamelet(kameletName: string): object { diff --git a/packages/ui/src/models/visualization/flows/templates/route.ts b/packages/ui/src/models/visualization/flows/templates/route.ts index 36584b3ac..88d826f7d 100644 --- a/packages/ui/src/models/visualization/flows/templates/route.ts +++ b/packages/ui/src/models/visualization/flows/templates/route.ts @@ -11,5 +11,5 @@ export const routeTemplate = () => { steps: - log: id: ${getCamelRandomId('log')} - message: template message`; + message: \${body}`; };