Skip to content

Commit 0fc73d0

Browse files
committed
Merge branch 'main' into spike/bff
2 parents 53e802b + e82578d commit 0fc73d0

File tree

19 files changed

+1570
-829
lines changed

19 files changed

+1570
-829
lines changed

.github/workflows/on-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Build and push Docker image
5959
id: push
60-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
60+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
6161
with:
6262
context: .
6363
push: true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Use the latest LTS version of Node.js
22
# https://hub.docker.com/_/node
3-
FROM node:22-alpine3.20@sha256:686b8892b69879ef5bfd6047589666933508f9a5451c67320df3070ba0e9807b AS build-stage
3+
FROM node:22-alpine3.20@sha256:224173ad6a700ec322c7117f616836d0dc6cadd8d6baac57703ccc2eb418a73f AS build-stage
44
WORKDIR /usr/src/app
55

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

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44

55
## About this project
66

7-
UI frontend for @openmcp-project
7+
This repository contains code relevant for the frontend component required in the Managed Control Plane UI (MCP UI), which is part of the @openmcp-project, more info [here](https://github.com/openmcp-project).
8+
9+
The MCP UI enables endusers to work with Managed Control Planes, without having to use kubectl. Note that the current focus of the UI is on displaying information about the various managed resources, as well as the MCP instances themselves. It is also possible to check the status of the resources, and display / copy their YAML representations.
10+
11+
Overall, the UI provides an easy jump-start for everyone interested in checking the status of Managed Control Planes, without having to use kubectl.
812

913
## Requirements and Setup
1014

@@ -59,4 +63,4 @@ We as members, contributors, and leaders pledge to make participation in our com
5963

6064
## Licensing
6165

62-
Copyright 2025 SAP SE or an SAP affiliate company and ui-frontend contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/openmcp-project/ui-frontend).
66+
Copyright 2025 SAP SE or an SAP affiliate company and ui-frontend contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/openmcp-project/ui-frontend).

frontend-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"backendUrl": "http://localhost:3000",
3-
"gatewayUrl": "https://gateway.ui.dev-core.mcpd.shoot.canary.k8s-hana.ondemand.com/kubernetes/graphql",
3+
"gatewayUrl": "http://localhost:3000",
44
"landscape": "LOCAL",
55
"documentationBaseUrl": "http://localhost:3000",
66
"oidcConfig": {

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@types/js-yaml": "^4.0.9",
6666
"@types/node": "^22.13.5",
6767
"@types/react": "^19.0.10",
68-
"@types/react-dom": "19.1.3",
68+
"@types/react-dom": "19.1.4",
6969
"@types/react-syntax-highlighter": "^15.5.13",
7070
"@ui5/webcomponents-cypress-commands": "^2.7.2",
7171
"@vitejs/plugin-react": "^4.3.4",

public/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"subtitleMessage": "Looks like this page is not opened inside of the Hyperspace Portal. Contact admins for help."
9494
},
9595
"ShellBar": {
96+
"betaButtonDescription": "This web app is currently in Beta, and may not ready for productive use. We're actively improving the experience and would love your feedback — your input helps shape the future of the app!",
9697
"signOutButton": "Sign Out"
9798
},
9899
"CreateProjectDialog": {

src/components/ControlPlane/FluxList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default function FluxList() {
115115
'True',
116116
statusUpdateTime: item.status.conditions.find((x) => x.type === 'Ready')
117117
?.lastTransitionTime,
118-
revision: shortenCommitHash(item.status.artifact.revision),
118+
revision: shortenCommitHash(item.status.artifact?.revision ?? '-'),
119119
created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
120120
};
121121
}) ?? [];

src/components/ControlPlane/MCPHealthPopoverButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
import ReactTimeAgo from 'react-time-ago';
1818
import { AnimatedHoverTextButton } from '../Helper/AnimatedHoverTextButton.tsx';
1919
import { useTranslation } from 'react-i18next';
20-
import { useFrontendConfig } from '../../context/FrontendConfigContext.tsx';
20+
import { useLink } from '../../lib/shared/useLink.ts';
2121
export default function MCPHealthPopoverButton({
2222
mcpStatus,
2323
projectName,
@@ -31,7 +31,7 @@ export default function MCPHealthPopoverButton({
3131
}) {
3232
const popoverRef = useRef(null);
3333
const [open, setOpen] = useState(false);
34-
const { links } = useFrontendConfig();
34+
const { githubIssuesSupportTicket } = useLink();
3535

3636
const { t } = useTranslation();
3737

@@ -82,7 +82,7 @@ export default function MCPHealthPopoverButton({
8282
'what-happened': statusDetails,
8383
});
8484

85-
return `${links.COM_PAGE_SUPPORT_GITHUB_ISSUE}?${params}`;
85+
return `${githubIssuesSupportTicket}?${params}`;
8686
};
8787

8888
const statusTableColumns: AnalyticalTableColumnDefinition[] = [

src/components/ControlPlanes/List/ControlPlaneListAllWorkspaces.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
88
import { ControlPlaneListWorkspaceGridTile } from './ControlPlaneListWorkspaceGridTile.tsx';
99
import { useApiResource } from '../../../lib/api/useApiResource.ts';
1010
import { ListWorkspaces } from '../../../lib/api/types/crate/listWorkspaces.ts';
11-
import { useFrontendConfig } from '../../../context/FrontendConfigContext.tsx';
11+
import { useLink } from '../../../lib/shared/useLink.ts';
1212
import { useTranslation } from 'react-i18next';
1313

1414
interface Props {
1515
projectName: string;
1616
}
1717

1818
export default function ControlPlaneListAllWorkspaces({ projectName }: Props) {
19-
const { links } = useFrontendConfig();
19+
const { workspaceCreationGuide } = useLink();
2020
const { data: allWorkspaces, error } = useApiResource(
2121
ListWorkspaces(projectName),
2222
);
@@ -45,7 +45,7 @@ export default function ControlPlaneListAllWorkspaces({ projectName }: Props) {
4545
design={ButtonDesign.Emphasized}
4646
icon="sap-icon://question-mark"
4747
onClick={() => {
48-
window.open(links.COM_PAGE_GETTING_STARTED_WORKSPACE, '_blank');
48+
window.open(workspaceCreationGuide, '_blank');
4949
}}
5050
>
5151
Help

0 commit comments

Comments
 (0)