From 0fd682d12bd6ba2b443700cb1d14c5ef753614e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Wed, 4 Dec 2024 14:09:21 +0100 Subject: [PATCH 1/3] feat: Add 4.9.0 to Catalog for Main, Spring Boot and kamelets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Pupier --- packages/catalog-generator/scripts/build-catalogs.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/catalog-generator/scripts/build-catalogs.mjs b/packages/catalog-generator/scripts/build-catalogs.mjs index 5e1d6d24f..bd1dfac35 100644 --- a/packages/catalog-generator/scripts/build-catalogs.mjs +++ b/packages/catalog-generator/scripts/build-catalogs.mjs @@ -15,13 +15,13 @@ const require = createRequire(import.meta.url); const CATALOGS = { // https://repo1.maven.org/maven2/org/apache/camel/camel-catalog/ // https://maven.repository.redhat.com/ga/org/apache/camel/camel-catalog/ - Main: ['4.8.2', '4.4.4', '4.4.0.redhat-00046', '4.8.0.redhat-00017'], + Main: ['4.9.0', '4.8.2', '4.4.4', '4.4.0.redhat-00046', '4.8.0.redhat-00017'], // https://repo1.maven.org/maven2/org/apache/camel/quarkus/camel-quarkus-catalog/ // https://maven.repository.redhat.com/ga/org/apache/camel/quarkus/camel-quarkus-catalog/ Quarkus: ['3.16.0', '3.8.4', '3.8.0.redhat-00018', '3.15.0.redhat-00007'], // https://repo1.maven.org/maven2/org/apache/camel/springboot/camel-catalog-provider-springboot/ // https://maven.repository.redhat.com/ga/org/apache/camel/springboot/camel-catalog-provider-springboot/ - SpringBoot: ['4.8.2', '4.4.4', '4.4.0.redhat-00039', '4.8.0.redhat-00022'], + SpringBoot: ['4.9.0', '4.8.2', '4.4.4', '4.4.0.redhat-00039', '4.8.0.redhat-00022'], }; // https://repo1.maven.org/maven2/org/apache/camel/kamelets/camel-kamelets/ const KAMELETS_VERSION = '4.8.1'; From 7c9db892ccedbd8109758bcd41a17eb71ed1d3b1 Mon Sep 17 00:00:00 2001 From: "Ricardo M." Date: Thu, 5 Dec 2024 13:58:48 +0100 Subject: [PATCH 2/3] chore: fix Camel 4.9.0 tests --- .../Form/dataFormat/DataFormatEditor.test.tsx | 4 +- ...amel-component-schema.service.test.ts.snap | 38 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx b/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx index 1c6d4197d..d5d77040c 100644 --- a/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx +++ b/packages/ui/src/components/Form/dataFormat/DataFormatEditor.test.tsx @@ -160,7 +160,7 @@ describe('DataFormatEditor', () => { fireEvent.change(inputElement, { target: { value: 'json' } }); }); dropdownItems = screen.getAllByTestId(/dataformat-dropdownitem-.*/); - expect(dropdownItems).toHaveLength(3); + expect(dropdownItems).toHaveLength(4); }); it('should clear filter and close the dropdown with close button', async () => { @@ -174,7 +174,7 @@ describe('DataFormatEditor', () => { fireEvent.change(inputElement, { target: { value: 'json' } }); }); let dropdownItems = screen.getAllByTestId(/dataformat-dropdownitem-.*/); - expect(dropdownItems).toHaveLength(3); + expect(dropdownItems).toHaveLength(4); const clearButton = screen.getByLabelText('Clear input value'); await act(async () => { fireEvent.click(clearButton); diff --git a/packages/ui/src/models/visualization/flows/support/__snapshots__/camel-component-schema.service.test.ts.snap b/packages/ui/src/models/visualization/flows/support/__snapshots__/camel-component-schema.service.test.ts.snap index 266c7e9a5..f1eb1bb69 100644 --- a/packages/ui/src/models/visualization/flows/support/__snapshots__/camel-component-schema.service.test.ts.snap +++ b/packages/ui/src/models/visualization/flows/support/__snapshots__/camel-component-schema.service.test.ts.snap @@ -303,13 +303,13 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should build the a "type": "string", }, "variableReceive": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable then the received body is stored only in this variable and not on the current message.", "group": "common", "title": "Variable Receive", "type": "string", }, "variableSend": { - "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current Message , however the headers from the Message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", @@ -656,13 +656,13 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should build the a "type": "string", }, "variableReceive": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable then the received body is stored only in this variable and not on the current message.", "group": "common", "title": "Variable Receive", "type": "string", }, "variableSend": { - "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current Message , however the headers from the Message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", @@ -860,6 +860,14 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should build the a "title": "Backoff Multiplier", "type": "integer", }, + "browseLimit": { + "default": 100, + "deprecated": false, + "description": "Maximum number of messages to keep in memory available for browsing. Use 0 for unlimited.", + "group": "advanced", + "title": "Browse Limit", + "type": "integer", + }, "bufferSize": { "default": 131072, "deprecated": false, @@ -1449,13 +1457,13 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should build the a "type": "string", }, "variableReceive": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable then the received body is stored only in this variable and not on the current message.", "group": "common", "title": "Variable Receive", "type": "string", }, "variableSend": { - "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current Message , however the headers from the Message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", @@ -1561,6 +1569,14 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should build the a "title": "Bridge Error Handler", "type": "boolean", }, + "browseLimit": { + "default": 100, + "deprecated": false, + "description": "Maximum number of messages to keep in memory available for browsing. Use 0 for unlimited.", + "group": "advanced", + "title": "Browse Limit", + "type": "integer", + }, "bufferSize": { "default": 131072, "deprecated": false, @@ -2243,13 +2259,13 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should not build a "type": "string", }, "variableReceive": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable then the received body is stored only in this variable and not on the current message.", "group": "common", "title": "Variable Receive", "type": "string", }, "variableSend": { - "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current Message , however the headers from the Message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", @@ -2436,13 +2452,13 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should transform a "type": "string", }, "variableReceive": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable to store the received message body (only body, not headers). This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using receive variable then the received body is stored only in this variable and not on the current message.", "group": "common", "title": "Variable Receive", "type": "string", }, "variableSend": { - "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current Message , however the headers from the Message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", @@ -2587,7 +2603,7 @@ exports[`CamelComponentSchemaService getVisualComponentSchema should transform a "type": "string", }, "variableSend": { - "description": "To use a variable to store the received message body (only body, not headers). This is handy for easy access to the received message body via variables. Important: When using receive variable then the received body is stored only in this variable and not on the current org.apache.camel.Message .", + "description": "To use a variable as the source for the message body to send. This makes it handy to use variables for user data and to easily control what data to use for sending and receiving. Important: When using send variable then the message body is taken from this variable instead of the current message, however the headers from the message will still be used as well. In other words, the variable is used instead of the message body, but everything else is as usual.", "group": "common", "title": "Variable Send", "type": "string", From 7afe558e08e9f2d8cfa09dc07ae2dba0f8c0521d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 6 Dec 2024 08:42:23 +0100 Subject: [PATCH 3/3] feat: Update Kamelet Catalog to 4.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Pupier --- packages/catalog-generator/scripts/build-catalogs.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/catalog-generator/scripts/build-catalogs.mjs b/packages/catalog-generator/scripts/build-catalogs.mjs index bd1dfac35..3c274e030 100644 --- a/packages/catalog-generator/scripts/build-catalogs.mjs +++ b/packages/catalog-generator/scripts/build-catalogs.mjs @@ -24,7 +24,7 @@ const CATALOGS = { SpringBoot: ['4.9.0', '4.8.2', '4.4.4', '4.4.0.redhat-00039', '4.8.0.redhat-00022'], }; // https://repo1.maven.org/maven2/org/apache/camel/kamelets/camel-kamelets/ -const KAMELETS_VERSION = '4.8.1'; +const KAMELETS_VERSION = '4.9.0'; const generateCatalogs = () => { let camelCatalogPath = '';