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.

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

chore: update UI5 from v1 to v2 #3542

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e5930e3
chore: UI5 bump packages (#3439)
OliwiaGowor Oct 31, 2024
527ab33
fix: adjust render, css names and imports (#3440)
OliwiaGowor Nov 4, 2024
cd703c0
chore: adjust spacing to classNames (#3442)
mrCherry97 Nov 4, 2024
0ff4119
fix: Ui5 codemod adjustments (#3449)
OliwiaGowor Nov 6, 2024
7b1e4dc
fix: adjust DynamicPageComponent (#3445)
OliwiaGowor Nov 8, 2024
9c39bff
fix: toast adjustments (#3462)
mrCherry97 Nov 8, 2024
ba9135e
fix: adjust tokens (#3463)
OliwiaGowor Nov 8, 2024
ce4764e
fix: adjust badges (#3464)
OliwiaGowor Nov 12, 2024
c85f1bd
fix: adjust headers size (#3467)
OliwiaGowor Nov 13, 2024
a565ab1
fix: defaultProps (#3469)
mrCherry97 Nov 13, 2024
a486ff6
fix: spinner size (#3474)
mrCherry97 Nov 14, 2024
c702d0c
fix: theme (#3475)
OliwiaGowor Nov 15, 2024
da69d7c
fix: adjust forms (#3473)
OliwiaGowor Nov 18, 2024
57d5921
fix: adjust Preferences modal (#3476)
OliwiaGowor Nov 18, 2024
7a03881
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
mrCherry97 Nov 19, 2024
dd3e052
fix: props
mrCherry97 Nov 19, 2024
5e543ee
fix: objectPageHeader styling and modules card (#3487)
mrCherry97 Nov 20, 2024
bcf9884
fix: Ui5 console errors (#3486)
OliwiaGowor Nov 20, 2024
23431fc
fix: adjust V1 Tables (#3491)
OliwiaGowor Nov 22, 2024
dc93f43
fix: change logo acc name (#3518)
OliwiaGowor Dec 5, 2024
3517ff7
remove unnecessary css code from reset.css & some minor adjustments (…
chriskari Dec 10, 2024
5b7fd61
fix: Busola is flickering when ObjectPage is opened (#3498)
OliwiaGowor Dec 13, 2024
4120fed
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
mrCherry97 Dec 17, 2024
71908da
fix: selected in lists (#3543)
mrCherry97 Dec 17, 2024
049a830
fix: Fix delete cluster action (#3540)
akucharska Dec 18, 2024
764bf23
fix: Toast is hidden behind Dialogs (#3538)
OliwiaGowor Dec 18, 2024
445f263
Merge branch 'main' into ui5-migrate-v2
mrCherry97 Dec 20, 2024
f0cf797
fix: adjust Cypress tests (#3553)
OliwiaGowor Dec 23, 2024
5f41290
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Dec 23, 2024
cedc25c
chore: add unsafe eval for accessibility tests (#3554)
mrCherry97 Dec 23, 2024
413b65f
fix: small leftover bugs (#3555)
OliwiaGowor Dec 24, 2024
eb90c63
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Dec 27, 2024
16c7efb
feat: migrate UI5 vitest unit tests to cypress component tests (#3551)
chriskari Dec 30, 2024
ec75207
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Dec 30, 2024
589bf60
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Jan 2, 2025
0bace38
fix: theme on initial and refresh (#3565)
OliwiaGowor Jan 2, 2025
e9ea9fb
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Jan 2, 2025
34644e6
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Jan 10, 2025
150d427
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrat…
OliwiaGowor Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 0 additions & 6 deletions .github/workflows/pull-integration-cluster-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Install Chrome # this step could be removed after https://github.com/cypress-io/cypress/issues/30374 is resolved
shell: bash
run: |
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.119-1_amd64.deb
sudo apt install --allow-downgrades -y /tmp/chrome.deb
rm /tmp/chrome.deb
Comment on lines -19 to -24
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can remove it, but it will be nice to have it documented in internal docs, how to do this, in case same problem will appear in the future

- uses: gardenlinux/workflow-telemetry-action@v2
with:
comment_on_pr: false
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/pull-integration-namespace-k3d.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
- name: Install Chrome
shell: bash
run: |
wget --no-verbose -O /tmp/chrome.deb https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.119-1_amd64.deb
sudo apt install --allow-downgrades -y /tmp/chrome.deb
rm /tmp/chrome.deb
- uses: gardenlinux/workflow-telemetry-action@v2
with:
comment_on_pr: false
Expand Down
25 changes: 16 additions & 9 deletions .github/workflows/pull-unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
name: PR Unit Tests
name: PR Unit and Component Tests

on:
on:
pull_request:
types: [opened, edited, synchronize, reopened, ready_for_review]
paths:
- ".github/workflows/pull-unit-tests.yml"
- "public/**"
- "src/**"
- "package.json"
- '.github/workflows/pull-unit-tests.yml'
- 'public/**'
- 'src/**'
- 'backend/**'
- 'package.json'
- 'cypress/support/**'
- 'cypress.config.component.ts'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

To consider, in my opinion we need to run this workflow every time when something will be changed in whole cypress.

Suggested change
- 'cypress/support/**'
- 'cypress/**'


jobs:
run-unit-test:
run-unit-and-component-test:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
Expand All @@ -27,7 +30,11 @@ jobs:
run: |
set -e
npm ci
- name: run_tests
- name: run_unit_tests
shell: bash
run: |
run: |
npm run test
- name: run_component_tests
shell: bash
run: |
npm run component-test-headless
14 changes: 14 additions & 0 deletions cypress.config.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { defineConfig } from 'cypress';

export default defineConfig({
component: {
screenshotOnRunFailure: false,
includeShadowDom: true,
devServer: {
framework: 'react',
bundler: 'vite',
},
specPattern: 'src/**/*.cy.{js,jsx,ts,tsx}',
supportFile: 'cypress/support/component.jsx',
},
});
12 changes: 12 additions & 0 deletions cypress/support/component-index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<title>Components App</title>
</head>
<body>
<div data-cy-root></div>
</body>
</html>
37 changes: 37 additions & 0 deletions cypress/support/component.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/* global Cypress */
import React from 'react';
import { mount } from 'cypress/react18';
import { ThemeProvider } from '@ui5/webcomponents-react';
import { MemoryRouter } from 'react-router-dom';
import { RecoilRoot } from 'recoil';

import i18n from 'i18next';
import { initReactI18next } from 'react-i18next';
import { I18nextProvider } from 'react-i18next';

i18n.use(initReactI18next).init({
lng: 'en',
fallbackLng: false,
nsSeparator: '::',
defaultNS: 'translation',
saveMissing: true,
interpolation: {
escapeValue: false,
},
});

Cypress.Commands.add(
'mount',
(component, { initializeRecoil, ...options } = {}) => {
return mount(
<RecoilRoot initializeState={initializeRecoil}>
<I18nextProvider i18n={i18n}>
<MemoryRouter>
<ThemeProvider>{component}</ThemeProvider>
</MemoryRouter>
</I18nextProvider>
</RecoilRoot>,
options,
);
},
);
2 changes: 1 addition & 1 deletion docs/contributor/testing-strategy.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Each pull request (PR) to the repository triggers CI/CD jobs that verify the Bus
- `PR Kyma Dashboard Smoke Tests Prod / run-smoke-test-prod` - Performs smoke testing for Busola with PROD environement and configuration related to the Kyma functionalities using a k3d cluster with installed Kyma.
- `PR Lighthouse Test / run-lighthouse-test` - Performs performance testing for Busola - threshold for accessibility: 80, best-practices: 100.
- `PR Lint Check / run-lint-check` - Performing ESlint and Prettier code quality.
- `PR Unit Tests / run-unit-test` - Performs unit tests of the Busola.
- `PR Unit and Component Tests / run-unit-and-component-test` - Performs unit tests and component tests of Busola.
- `Lint Markdown Links PR / markdown-link-check` - Checks links in documentation.
- `CodeQL / Analyze (javascript)` - Code quality static code check.

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<meta name="theme-color" content="#000000" />
<meta
http-equiv="Content-Security-Policy"
content="font-src 'self' https://sdk.openui5.org/; script-src 'self' blob:; object-src 'self';"
content="font-src 'self' https://sdk.openui5.org/; script-src 'self' 'unsafe-eval' blob:; object-src 'self';"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this change should be also on the main, please double-check if there is no problem between the main and feature-branch

/>
<title>Busola</title>
</head>
Expand Down
Loading
Loading