Skip to content

Commit 1348784

Browse files
committed
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
2 parents bb14802 + e82578d commit 1348784

File tree

13 files changed

+117
-136
lines changed

13 files changed

+117
-136
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

package-lock.json

Lines changed: 69 additions & 59 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
@@ -53,7 +53,7 @@
5353
"@types/js-yaml": "^4.0.9",
5454
"@types/node": "^22.13.5",
5555
"@types/react": "^19.0.10",
56-
"@types/react-dom": "19.1.3",
56+
"@types/react-dom": "19.1.4",
5757
"@types/react-syntax-highlighter": "^15.5.13",
5858
"@ui5/webcomponents-cypress-commands": "^2.7.2",
5959
"@vitejs/plugin-react": "^4.3.4",

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

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { APIError } from '../../../lib/api/error.ts';
3535
import { useTranslation } from 'react-i18next';
3636
import { YamlViewButtonWithLoader } from '../../Yaml/YamlViewButtonWithLoader.tsx';
3737
import { IllustratedBanner } from '../../Ui/IllustratedBanner/IllustratedBanner.tsx';
38-
import { useFrontendConfig } from '../../../context/FrontendConfigContext.tsx';
38+
import { useLink } from '../../../lib/shared/useLink.ts';
3939
import IllustrationMessageType from '@ui5/webcomponents-fiori/dist/types/IllustrationMessageType.js';
4040

4141
interface Props {
@@ -65,7 +65,7 @@ export function ControlPlaneListWorkspaceGridTile({
6565
DeleteWorkspaceResource(projectNamespace, workspaceName),
6666
);
6767

68-
const { links } = useFrontendConfig();
68+
const { mcpCreationGuide } = useLink();
6969
const errorView = createErrorView(cpsError);
7070

7171
function createErrorView(error: APIError) {
@@ -156,7 +156,7 @@ export function ControlPlaneListWorkspaceGridTile({
156156
subtitle={t('IllustratedBanner.subtitleMessage')}
157157
illustrationName={IllustrationMessageType.NoData}
158158
help={{
159-
link: links.COM_PAGE_GETTING_STARTED_MCP,
159+
link: mcpCreationGuide,
160160
buttonText: t('IllustratedBanner.helpButton'),
161161
}}
162162
/>

src/components/Dialogs/KubectlCommandInfo/KubectlBaseDialog.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import { KubectlTerminal } from './KubectlTerminal';
1515
import { useState, useEffect, ReactNode } from 'react';
1616
import { useTranslation, Trans } from 'react-i18next';
17-
import { useFrontendConfig } from '../../../context/FrontendConfigContext.tsx';
17+
import { useLink } from '../../../lib/shared/useLink.ts';
1818

1919
export interface FormField {
2020
id: string;
@@ -47,7 +47,7 @@ export const KubectlBaseDialog = ({
4747
customCommands,
4848
}: KubectlBaseDialogProps) => {
4949
const { t } = useTranslation();
50-
const { links } = useFrontendConfig();
50+
const { gettingStartedGuide } = useLink();
5151
const [formValues, setFormValues] = useState<Record<string, string>>({});
5252

5353
useEffect(() => {
@@ -165,9 +165,7 @@ export const KubectlBaseDialog = ({
165165
<Trans
166166
i18nKey="KubectlBaseDialog.onboardingGuide"
167167
components={{
168-
link1: (
169-
<Link href={links.COM_PAGE_GETTING_STARTED} target="_blank" />
170-
),
168+
link1: <Link href={gettingStartedGuide} target="_blank" />,
171169
}}
172170
/>
173171
</MessageStrip>

0 commit comments

Comments
 (0)