Skip to content

Commit 3f203be

Browse files
committed
Merge branch 'main' into ft/tab-navigation
2 parents 3e9ad97 + e0faf2a commit 3f203be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+737
-511
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 }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BUILD STAGE
2-
FROM node:24-slim@sha256:cadbfafeb6baf87eaaffa40b3640209c4b7fd38cebde65059d15bc39cd636b85 AS build-stage
2+
FROM node:24-slim@sha256:9cd5e2bb1f5c5a6636e2946b3ea2d54a4148989537f8cfdfbb43c88c79dd1d5b AS build-stage
33
WORKDIR /usr/src/app
44

55
# Copy package.json and package-lock.json

package-lock.json

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

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@
2525
"@apollo/client": "3.14.0",
2626
"@fastify/autoload": "6.3.1",
2727
"@fastify/cookie": "11.0.2",
28-
"@fastify/env": "5.0.2",
29-
"@fastify/helmet": "13.0.1",
28+
"@fastify/env": "5.0.3",
29+
"@fastify/helmet": "13.0.2",
3030
"@fastify/http-proxy": "11.3.0",
3131
"@fastify/secure-session": "8.2.0",
3232
"@fastify/sensible": "6.0.3",
3333
"@fastify/session": "11.1.0",
3434
"@fastify/static": "8.2.0",
3535
"@fastify/vite": "8.2.0",
3636
"@hookform/resolvers": "5.2.2",
37-
"@sentry/node": "10.14.0",
38-
"@sentry/react": "10.14.0",
37+
"@sentry/node": "10.15.0",
38+
"@sentry/react": "10.15.0",
3939
"@sentry/vite-plugin": "4.3.0",
4040
"@ui5/webcomponents": "2.14.0",
4141
"@ui5/webcomponents-fiori": "2.14.0",
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",
4949
"dotenv": "17.2.2",
5050
"fastify": "5.6.1",
51-
"fastify-plugin": "5.0.1",
51+
"fastify-plugin": "5.1.0",
5252
"graphql": "16.11.0",
5353
"graphql-config": "5.1.5",
5454
"i18next": "25.5.2",
@@ -58,8 +58,8 @@
5858
"react-dom": "19.1.1",
5959
"react-error-boundary": "6.0.0",
6060
"react-hook-form": "7.63.0",
61-
"react-i18next": "15.7.3",
62-
"react-router-dom": "7.9.1",
61+
"react-i18next": "16.0.0",
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,13 +74,13 @@
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.15",
7878
"@types/react-dom": "19.1.9",
7979
"@types/react-syntax-highlighter": "15.5.13",
8080
"@ui5/webcomponents-cypress-commands": "2.14.1",
81-
"@vitejs/plugin-react": "5.0.3",
82-
"@vitest/eslint-plugin": "1.3.12",
83-
"cypress": "15.2.0",
81+
"@vitejs/plugin-react": "5.0.4",
82+
"@vitest/eslint-plugin": "1.3.13",
83+
"cypress": "15.3.0",
8484
"eslint-config-prettier": "10.1.8",
8585
"eslint-import-resolver-typescript": "4.4.4",
8686
"eslint-plugin-i18next": "6.1.3",
@@ -93,7 +93,7 @@
9393
"fastify-tsconfig": "3.0.0",
9494
"globals": "16.4.0",
9595
"prettier": "3.6.2",
96-
"tsx": "4.20.5",
96+
"tsx": "4.20.6",
9797
"typescript": "5.9.2",
9898
"typescript-eslint": "8.44.1",
9999
"vite": "7.1.7",

public/co-logo-orchestrating.png

-143 KB
Binary file not shown.

public/locales/en.json

Lines changed: 7 additions & 6 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",
@@ -374,7 +374,8 @@
374374
"update": "Update"
375375
},
376376
"yaml": {
377-
"YAML": "File"
377+
"YAML": "File",
378+
"showOnlyImportant": "Show only important fields"
378379
},
379380
"createMCP": {
380381
"dialogTitle": "Create Managed Control Plane",

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({

src/AppRouter.tsx

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { SentryRoutes } from './mount.ts';
66
import ProjectPage from './spaces/onboarding/pages/ProjectPage.tsx';
77
import McpPage from './spaces/mcp/pages/McpPage.tsx';
88
import { SearchParamToggleVisibility } from './components/Helper/FeatureToggleExistance.tsx';
9+
import { SplitterProvider } from './components/Splitter/SplitterContext.tsx';
10+
import { SplitterLayout } from './components/Splitter/SplitterLayout.tsx';
911

1012
function AppRouter() {
1113
return (
@@ -20,20 +22,24 @@ function AppRouter() {
2022
<ShellBarComponent />
2123
</SearchParamToggleVisibility>
2224

23-
<Router>
24-
<SentryRoutes>
25-
<Route path="/mcp" element={<GlobalProviderOutlet />}>
26-
<Route path="projects" element={<ProjectListView />} />
27-
<Route path="projects/:projectName" element={<ProjectPage />} />
28-
<Route
29-
path="projects/:projectName/workspaces/:workspaceName/mcps/:controlPlaneName"
30-
element={<McpPage />}
31-
/>
32-
</Route>
33-
<Route path="/" element={<Navigate to="/mcp/projects" />} />
34-
<Route path="*" element={<Navigate to="/" />} />
35-
</SentryRoutes>
36-
</Router>
25+
<SplitterProvider>
26+
<SplitterLayout>
27+
<Router>
28+
<SentryRoutes>
29+
<Route path="/mcp" element={<GlobalProviderOutlet />}>
30+
<Route path="projects" element={<ProjectListView />} />
31+
<Route path="projects/:projectName" element={<ProjectPage />} />
32+
<Route
33+
path="projects/:projectName/workspaces/:workspaceName/mcps/:controlPlaneName"
34+
element={<McpPage />}
35+
/>
36+
</Route>
37+
<Route path="/" element={<Navigate to="/mcp/projects" />} />
38+
<Route path="*" element={<Navigate to="/" />} />
39+
</SentryRoutes>
40+
</Router>
41+
</SplitterLayout>
42+
</SplitterProvider>
3743
</>
3844
);
3945
}
55.1 KB
Loading

0 commit comments

Comments
 (0)