From 5c40aa25e35ce3dd5614415b95ad83b0329d5542 Mon Sep 17 00:00:00 2001 From: Tomohisa Igarashi Date: Tue, 7 May 2024 11:41:06 -0400 Subject: [PATCH 1/3] fix: Use Simple as default selection for expression Fixes: #867 Start with setHeader, setProperty, setVariable, setBody and filter --- .../camel-component-default.service.test.ts | 54 +++++++++++++++++++ .../camel-component-default.service.ts | 45 ++++++++++++++++ 2 files changed, 99 insertions(+) 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 21d9f513f..e1f2489b9 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 @@ -46,5 +46,59 @@ describe('CamelComponentDefaultService', () => { expect(doCatchDefault.id).toBeDefined(); expect(doCatchDefault.exception).toHaveLength(1); }); + + it('should return the default value for a setHeader processor', () => { + const setHeaderDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'processor', + name: 'setHeader', + } as DefinedComponent); + expect(setHeaderDefault.setHeader).toBeDefined(); + expect((setHeaderDefault.setHeader!.id as string).startsWith('setHeader-')).toBeTruthy(); + expect(setHeaderDefault.setHeader!.name).toBeUndefined(); + expect((setHeaderDefault.setHeader!.expression as any).simple.expression).toEqual(''); + }); + + it('should return the default value for a setProperty processor', () => { + const setPropertyDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'processor', + name: 'setProperty', + } as DefinedComponent); + expect(setPropertyDefault.setProperty).toBeDefined(); + expect((setPropertyDefault.setProperty!.id as string).startsWith('setProperty-')).toBeTruthy(); + expect(setPropertyDefault.setProperty!.name).toBeUndefined(); + expect((setPropertyDefault.setProperty!.expression as any).simple.expression).toEqual(''); + }); + + it('should return the default value for a setVariable processor', () => { + const setVariableDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'processor', + name: 'setVariable', + } as DefinedComponent); + expect(setVariableDefault.setVariable).toBeDefined(); + expect((setVariableDefault.setVariable!.id as string).startsWith('setVariable-')).toBeTruthy(); + expect(setVariableDefault.setVariable!.name).toBeUndefined(); + expect((setVariableDefault.setVariable!.expression as any).simple.expression).toEqual(''); + }); + + it('should return the default value for a setBody processor', () => { + const setBodyDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'processor', + name: 'setBody', + } as DefinedComponent); + expect(setBodyDefault.setBody).toBeDefined(); + expect((setBodyDefault.setBody!.id as string).startsWith('setBody-')).toBeTruthy(); + expect((setBodyDefault.setBody!.expression as any).simple.expression).toEqual(''); + }); + + it('should return the default value for a filter processor', () => { + const filterDefault = CamelComponentDefaultService.getDefaultNodeDefinitionValue({ + type: 'processor', + name: 'filter', + } as DefinedComponent); + expect(filterDefault.filter).toBeDefined(); + expect((filterDefault.filter!.id as string).startsWith('filter-')).toBeTruthy(); + expect((filterDefault.filter!.expression as any).simple.expression).toEqual(''); + expect(filterDefault.filter!.steps).toEqual([]); + }); }); }); 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 033391edb..eaf1f92d9 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 @@ -123,6 +123,51 @@ export class CamelComponentDefaultService { steps: [] `); + case 'setHeader': + return parse(` + setHeader: + id: ${getCamelRandomId('setHeader')} + expression: + simple: + expression: "" + `); + + case 'setProperty': + return parse(` + setProperty: + id: ${getCamelRandomId('setProperty')} + expression: + simple: + expression: "" + `); + + case 'setVariable': + return parse(` + setVariable: + id: ${getCamelRandomId('setVariable')} + expression: + simple: + expression: "" + `); + + case 'setBody': + return parse(` + setBody: + id: ${getCamelRandomId('setBody')} + expression: + simple: + expression: "" + `); + + case 'filter': + return parse(` + filter: + id: ${getCamelRandomId('filter')} + expression: + simple: + expression: "" + steps: [] + `); default: return { [processorName]: { From c88cba85c52420e9218f527976034cdeab75e6a6 Mon Sep 17 00:00:00 2001 From: Tomohisa Igarashi Date: Tue, 7 May 2024 12:04:21 -0400 Subject: [PATCH 2/3] Update packages/ui/src/models/visualization/flows/support/camel-component-default.service.ts Co-authored-by: Ricardo M. --- .../camel-component-default.service.ts | 41 ++----------------- 1 file changed, 4 insertions(+), 37 deletions(-) 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 eaf1f92d9..e73739a00 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 @@ -124,49 +124,16 @@ export class CamelComponentDefaultService { `); case 'setHeader': - return parse(` - setHeader: - id: ${getCamelRandomId('setHeader')} - expression: - simple: - expression: "" - `); - case 'setProperty': - return parse(` - setProperty: - id: ${getCamelRandomId('setProperty')} - expression: - simple: - expression: "" - `); - case 'setVariable': - return parse(` - setVariable: - id: ${getCamelRandomId('setVariable')} - expression: - simple: - expression: "" - `); - - case 'setBody': - return parse(` - setBody: - id: ${getCamelRandomId('setBody')} - expression: - simple: - expression: "" - `); - + case 'setBody': case 'filter': return parse(` - filter: - id: ${getCamelRandomId('filter')} + [processorName]: + id: ${getCamelRandomId(processorName)} expression: simple: - expression: "" - steps: [] + expression: {} `); default: return { From 2ffa9fc8bfce5263d5fb73f2d2d4d77b8e0e2c96 Mon Sep 17 00:00:00 2001 From: Tomohisa Igarashi Date: Tue, 7 May 2024 12:14:35 -0400 Subject: [PATCH 3/3] fix --- .../support/camel-component-default.service.test.ts | 12 ++++++------ .../flows/support/camel-component-default.service.ts | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) 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 e1f2489b9..dd655fb2b 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 @@ -55,7 +55,7 @@ describe('CamelComponentDefaultService', () => { expect(setHeaderDefault.setHeader).toBeDefined(); expect((setHeaderDefault.setHeader!.id as string).startsWith('setHeader-')).toBeTruthy(); expect(setHeaderDefault.setHeader!.name).toBeUndefined(); - expect((setHeaderDefault.setHeader!.expression as any).simple.expression).toEqual(''); + expect((setHeaderDefault.setHeader!.expression as any).simple.expression).toEqual({}); }); it('should return the default value for a setProperty processor', () => { @@ -66,7 +66,7 @@ describe('CamelComponentDefaultService', () => { expect(setPropertyDefault.setProperty).toBeDefined(); expect((setPropertyDefault.setProperty!.id as string).startsWith('setProperty-')).toBeTruthy(); expect(setPropertyDefault.setProperty!.name).toBeUndefined(); - expect((setPropertyDefault.setProperty!.expression as any).simple.expression).toEqual(''); + expect((setPropertyDefault.setProperty!.expression as any).simple.expression).toEqual({}); }); it('should return the default value for a setVariable processor', () => { @@ -77,7 +77,7 @@ describe('CamelComponentDefaultService', () => { expect(setVariableDefault.setVariable).toBeDefined(); expect((setVariableDefault.setVariable!.id as string).startsWith('setVariable-')).toBeTruthy(); expect(setVariableDefault.setVariable!.name).toBeUndefined(); - expect((setVariableDefault.setVariable!.expression as any).simple.expression).toEqual(''); + expect((setVariableDefault.setVariable!.expression as any).simple.expression).toEqual({}); }); it('should return the default value for a setBody processor', () => { @@ -87,7 +87,7 @@ describe('CamelComponentDefaultService', () => { } as DefinedComponent); expect(setBodyDefault.setBody).toBeDefined(); expect((setBodyDefault.setBody!.id as string).startsWith('setBody-')).toBeTruthy(); - expect((setBodyDefault.setBody!.expression as any).simple.expression).toEqual(''); + expect((setBodyDefault.setBody!.expression as any).simple.expression).toEqual({}); }); it('should return the default value for a filter processor', () => { @@ -97,8 +97,8 @@ describe('CamelComponentDefaultService', () => { } as DefinedComponent); expect(filterDefault.filter).toBeDefined(); expect((filterDefault.filter!.id as string).startsWith('filter-')).toBeTruthy(); - expect((filterDefault.filter!.expression as any).simple.expression).toEqual(''); - expect(filterDefault.filter!.steps).toEqual([]); + expect((filterDefault.filter!.expression as any).simple.expression).toEqual({}); + expect(filterDefault.filter!.steps).toBeUndefined(); }); }); }); 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 e73739a00..f6ee1cf49 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 @@ -126,10 +126,10 @@ export class CamelComponentDefaultService { case 'setHeader': case 'setProperty': case 'setVariable': - case 'setBody': + case 'setBody': case 'filter': return parse(` - [processorName]: + ${processorName}: id: ${getCamelRandomId(processorName)} expression: simple: