Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/update kaoto 2.5.0-M1 #772

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feat/update kaoto 2.5.0-M1 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0379281
chore: Update kaoto to 2.5.0-M1
lordrip Jan 15, 2025
80ecda6
chore: remove @patternfly/core override
lordrip Jan 16, 2025
328b672
Adapt tests for Patternfly v6
apupier Jan 16, 2025
536215e
Remove commented out code
apupier Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# 2.5.0
- Upgrade to Kaoto 2.5.0-M1

# 2.4.0

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<p align="center">
<a href="https://marketplace.visualstudio.com/items?itemName=redhat.vscode-kaoto"><img src="https://img.shields.io/visual-studio-marketplace/v/redhat.vscode-kaoto?style=for-the-badge" alt="Marketplace Version"/></a>
<a href="https://github.com/KaotoIO/kaoto/releases"><img alt="Kaoto UI version" src="https://img.shields.io/badge/Kaoto_UI-2.4.0-orange?style=for-the-badge"></a>
<a href="https://github.com/KaotoIO/kaoto/releases"><img alt="Kaoto UI version" src="https://img.shields.io/badge/Kaoto_UI-2.5.0--M1-orange?style=for-the-badge"></a>
<img src="https://img.shields.io/badge/VS%20Code-1.74.0+-blue?style=for-the-badge" alt="Visual Studio Code Support"/>
<a href="https://github.com/KaotoIO/vscode-kaoto/blob/main/LICENSE"><img src="https://img.shields.io/github/license/KaotoIO/vscode-kaoto?color=blue&style=for-the-badge" alt="License"/></a>
<a href="https://camel.zulipchat.com/#narrow/stream/258729-camel-tooling"><img src="https://img.shields.io/badge/zulip-join_chat-brightgreen?color=yellow&style=for-the-badge" alt="Zulip"/></a></br>
Expand Down Expand Up @@ -45,7 +45,7 @@

### Embedded

- [Kaoto](https://github.com/KaotoIO/kaoto) in version [2.4.0](https://github.com/KaotoIO/kaoto/releases/tag/2.4.0).
- [Kaoto](https://github.com/KaotoIO/kaoto) in version [2.5.0-M1](https://github.com/KaotoIO/kaoto/releases/tag/2.5.0-M1).

### Issues

Expand Down
6 changes: 3 additions & 3 deletions it-tests/BasicFlow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ async function deleteDataMapperStep(driver: WebDriver, workspaceFolder: string)
await driver.actions().contextClick(kaotoNodeConfigured).perform();

await driver.wait(
until.elementLocated(By.className('pf-v5-c-dropdown pf-m-expanded'))
until.elementLocated(By.className('pf-topology-context-menu__c-dropdown__menu'))
);
await (await driver.findElement(By.xpath("//*[@data-testid='context-menu-item-delete']"))).click();

Expand All @@ -252,7 +252,7 @@ async function addActiveMQStep(driver: WebDriver) {
await driver.actions().contextClick(canvasNode).perform();

await driver.wait(
until.elementLocated(By.className('pf-v5-c-dropdown pf-m-expanded'))
until.elementLocated(By.className('pf-topology-context-menu__c-dropdown__menu'))
);
await (await driver.findElement(By.xpath("//\*[@data-testid='context-menu-item-replace']"))).click();

Expand All @@ -271,7 +271,7 @@ async function addDatamapperStep(driver: WebDriver) {
await driver.actions().contextClick(canvasNode).perform();

await driver.wait(
until.elementLocated(By.className('pf-v5-c-dropdown pf-m-expanded'))
until.elementLocated(By.className('pf-topology-context-menu__c-dropdown__menu'))
);
await (await driver.findElement(By.xpath("//*[@data-testid='context-menu-item-replace']"))).click();

Expand Down
4 changes: 2 additions & 2 deletions it-tests/PropertyPanelLoading.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('Property panel loading test', function () {
await driver.wait(until.elementLocated(stepWhenXpath), 5_000);
await (await driver.findElement(stepWhenXpath)).click();
await driver.wait(
until.elementLocated(By.className('pf-v5-c-card')
until.elementLocated(By.className('pf-v6-c-card')
), 5_000);

const closeBtn = await driver.findElement(By.xpath("//button[@data-testid='close-side-bar']"));
Expand All @@ -50,7 +50,7 @@ describe('Property panel loading test', function () {

try {
await driver.wait(
until.elementLocated(By.className('pf-v5-c-card')
until.elementLocated(By.className('pf-v6-c-card')
), 5_000);
throw new Error('Property panel was not closed!')
} catch (error) {
Expand Down
8 changes: 4 additions & 4 deletions it-tests/SwitchBetweenTabs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ describe('Switching between editor tabs', function () {

const locators = {
EditorTabs: {
tabsList: 'pf-v5-c-tabs__list',
tabsItem: 'pf-v5-c-tabs__item',
tabsList: 'pf-v6-c-tabs__list',
tabsItem: 'pf-v6-c-tabs__item',
activeTabAttribute: 'aria-selected',
tabLabelAttribute: 'aria-label',
tabText: 'pf-v5-c-tabs__item-text',
tabText: 'pf-v6-c-tabs__item-text',
designTabLabel: 'Design canvas',
beansTabLabel: 'Beans editor',
dataMapperTabLabel: 'DataMapper',
Expand All @@ -27,7 +27,7 @@ describe('Switching between editor tabs', function () {
detailsView: 'metadata-editor-modal-details-view'
},
DataMapper: {
howTo: 'pf-v5-l-bullseye datamapper-howto'
howTo: 'pf-v6-l-bullseye datamapper-howto'
}
}

Expand Down
12 changes: 6 additions & 6 deletions it-tests/settings/CatalogURLSettings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ describe('User Settings', function () {
selector: (label: string) => By.xpath(`//li[@data-testid='runtime-selector-${label}']`)
},
RuntimeSelectorItems: {
list: By.className('pf-v5-c-menu__list'),
listItem: By.className('pf-v5-c-menu__list-item'),
label: By.className('pf-v5-c-menu__item-text')
list: By.className('pf-v6-c-menu__list'),
listItem: By.className('pf-v6-c-menu__list-item'),
label: By.className('pf-v6-c-menu__item-text')
},
KaotoView: {
catalogButton: By.xpath(`//button[@id='topology-control-bar-catalog-button']`),
catalog: {
window: By.xpath(`//div[@data-ouia-component-id='CatalogModal']`),
list: By.className('pf-v5-c-data-list'),
gallery: By.className('pf-v5-l-gallery pf-m-gutter'),
listItem: By.className('pf-v5-c-data-list__item-row'),
list: By.className('pf-v6-c-data-list'),
gallery: By.className('pf-v6-l-gallery pf-m-gutter'),
listItem: By.className('pf-v6-c-data-list__item-row'),
listItemProvider: By.className('catalog-data-list-item__provider'),
listButton: By.xpath(`//button[@id='toggle-layout-button-List']`),
galleryButton: By.xpath(`//button[@id='toggle-layout-button-Gallery']`),
Expand Down
20 changes: 7 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
"test:it:clean": "rimraf ./test-resources && rimraf ./out && rimraf *.vsix"
},
"dependencies": {
"@kaoto/kaoto": "2.4.0",
"@kaoto/kaoto": "2.5.0-M1",
"@kie-tools-core/backend": "0.32.0",
"@kie-tools-core/editor": "0.32.0",
"@kie-tools-core/i18n": "0.32.0",
"@kie-tools-core/vscode-extension": "0.32.0",
"@patternfly/patternfly": "5.4.2",
"@patternfly/react-code-editor": "5.4.15",
"@patternfly/react-core": "5.4.12",
"@patternfly/react-icons": "5.4.2",
"@patternfly/react-table": "5.4.13",
"@patternfly/react-topology": "5.4.1",
"@patternfly/patternfly": "6.1.0",
"@patternfly/react-code-editor": "6.1.0",
"@patternfly/react-core": "6.1.0",
"@patternfly/react-icons": "6.1.0",
"@patternfly/react-table": "6.1.0",
"@patternfly/react-topology": "6.1.0",
"@redhat-developer/vscode-redhat-telemetry": "^0.9.1",
"monaco-editor": "^0.50.0",
"monaco-yaml": "5.2.3",
Expand Down Expand Up @@ -239,12 +239,6 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"semver": "7.5.2",
"@patternfly/patternfly": "5.4.0",
"@patternfly/react-code-editor": "5.4.0",
"@patternfly/react-core": "5.4.0",
"@patternfly/react-icons": "5.4.0",
"@patternfly/react-table": "5.4.0",
"@patternfly/react-topology": "5.4.0",
"dset": "^3.1.4",
"cross-spawn": "^7.0.5"
},
Expand Down
1 change: 0 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ const commonConfig = (env) => {
alias: {
"react": path.resolve('./node_modules/react'),
"react-dom": path.resolve('./node_modules/react-dom'),
"@patternfly/react-core": path.resolve('./node_modules/@patternfly/react-core')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lordrip What is the impact of removing it? (apart from the good news that it allows compilation despite kie using patternfly v4)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alias offers a way to resolve modules in an easier manner by letting you specify the module name in the code in the way you need and then webpack resolving it to the right module.

In this case, we were bypassing the node resolution by fixing all modules requiring @patternfly/react-core to use the root version of it, this prevented @kie-tools-core/* packages from accessing their patternfly v4 version.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if I understand well, now if kie-tools-core is using some patternfly component they will use Patternfly v4 for it, right?
(I would need to search in which case they are used and if it can occur in our context to check that it is working)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it will and it's happening already for the components used by the hotkeys panel (which we don't see) and the initial loading distractor

},
},
plugins: [
Expand Down
Loading
Loading