Skip to content

Commit 846b341

Browse files
authored
Merge branch 'main' into yaml-view-improvements
2 parents f176198 + 99d7445 commit 846b341

File tree

14 files changed

+166
-111
lines changed

14 files changed

+166
-111
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
type=raw,value={{branch}}
4141
4242
- name: Log in to the Container registry
43-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
43+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
4444
with:
4545
registry: ${{ env.REGISTRY }}
4646
username: ${{ github.actor }}

.github/workflows/on-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fi
5050
5151
- name: Log in to the Container registry
52-
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
52+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
5353
with:
5454
registry: ${{ env.REGISTRY }}
5555
username: ${{ github.actor }}

package-lock.json

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@ui5/webcomponents-icons": "2.14.0",
4343
"@ui5/webcomponents-react": "2.14.1",
4444
"@ui5/webcomponents-react-charts": "2.14.1",
45-
"@xyflow/react": "12.8.5",
45+
"@xyflow/react": "12.8.6",
4646
"clsx": "2.1.1",
4747
"dagre": "0.8.5",
4848
"diff": "^8.0.2",
@@ -59,7 +59,7 @@
5959
"react-error-boundary": "6.0.0",
6060
"react-hook-form": "7.63.0",
6161
"react-i18next": "16.0.0",
62-
"react-router-dom": "7.9.2",
62+
"react-router-dom": "7.9.3",
6363
"react-syntax-highlighter": "15.6.6",
6464
"react-time-ago": "7.3.5",
6565
"swr": "2.3.6",
@@ -74,7 +74,7 @@
7474
"@types/dagre": "0.7.53",
7575
"@types/js-yaml": "4.0.9",
7676
"@types/node": "22.18.6",
77-
"@types/react": "19.1.13",
77+
"@types/react": "19.1.14",
7878
"@types/react-dom": "19.1.9",
7979
"@types/react-syntax-highlighter": "15.5.13",
8080
"@ui5/webcomponents-cypress-commands": "2.14.1",

public/co-logo-orchestrating.png

-143 KB
Binary file not shown.

public/locales/en.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Login": {
3-
"welcomeMessage": "Welcome to openMCP UI",
4-
"description": "Your place to manage your openMCPs, see your installed components and managed resources!",
5-
"learnMore": "Learn more in our documentation",
6-
"signInButton": "Sign in"
2+
"SignInPage": {
3+
"welcomeMessage": "Welcome to ManagedControlPlane UI",
4+
"subtitle": "Your central hub to orchestrate control planes, components, and managed resources",
5+
"learnMoreLink": "Learn about ManagedControlPlanes",
6+
"signInButton": "Sign In"
77
},
88
"Entities": {
99
"ManagedControlPlane": "ManagedControlPlane",

src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useAuthOnboarding } from './spaces/onboarding/auth/AuthContextOnboardin
33
import '@ui5/webcomponents-icons/dist/AllIcons.d.ts';
44
import { useEffect } from 'react';
55
import { useFrontendConfig } from './context/FrontendConfigContext.tsx';
6-
import LoginView from './views/Login.tsx';
6+
import { SignInPage } from './spaces/onboarding/pages/SignInPage/SignInPage.tsx';
77
import { BusyIndicator } from '@ui5/webcomponents-react';
88
import * as Sentry from '@sentry/react';
99

@@ -22,7 +22,7 @@ function App() {
2222
}
2323

2424
if (!auth.isAuthenticated) {
25-
return <LoginView />;
25+
return <SignInPage />;
2626
}
2727

2828
Sentry.setUser({
55.1 KB
Loading
59.7 KB
Loading
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import { SignInPage } from './SignInPage.tsx';
2+
import { useAuthOnboarding } from '../../auth/AuthContextOnboarding.tsx';
3+
import { useLink } from '../../../../lib/shared/useLink.ts'; // if useLink relies on router
4+
5+
describe('SignInPage', () => {
6+
let logInCalled = false;
7+
const fakeUseAuthOnboarding = (() => ({
8+
login: () => {
9+
logInCalled = true;
10+
},
11+
})) as typeof useAuthOnboarding;
12+
13+
beforeEach(() => {
14+
logInCalled = false;
15+
});
16+
17+
it('renders the SignInPage', () => {
18+
cy.mount(<SignInPage useAuthOnboarding={fakeUseAuthOnboarding} />);
19+
20+
cy.get('ui5-title').should('exist');
21+
});
22+
23+
it('calls the login function when the user clicks the "Sign In" button', () => {
24+
cy.mount(<SignInPage useAuthOnboarding={fakeUseAuthOnboarding} />);
25+
26+
cy.wrap(null).then(() => {
27+
expect(logInCalled).to.equal(false);
28+
});
29+
30+
cy.get('ui5-button').eq(0).should('contain', 'Sign In').click();
31+
32+
cy.wrap(null).then(() => {
33+
expect(logInCalled).to.equal(true);
34+
});
35+
});
36+
37+
it('contains a link to the documentation', () => {
38+
const fakeUseLink = (() => ({
39+
documentationHomepage: 'https://link-to-documentation.com',
40+
})) as typeof useLink;
41+
42+
cy.mount(<SignInPage useAuthOnboarding={fakeUseAuthOnboarding} useLink={fakeUseLink} />);
43+
44+
cy.get('a')
45+
.should('have.attr', 'target', '_blank')
46+
.and('have.attr', 'rel', 'noreferrer')
47+
.and('have.attr', 'href', 'https://link-to-documentation.com');
48+
});
49+
});

0 commit comments

Comments
 (0)