Skip to content

Commit 2313a95

Browse files
Merge branch 'main' into feature/copy-status-info-pasting-into-support-channels
2 parents 51d96f7 + 725421e commit 2313a95

File tree

21 files changed

+255
-201
lines changed

21 files changed

+255
-201
lines changed

package-lock.json

Lines changed: 71 additions & 107 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
@@ -72,6 +72,6 @@
7272
"sass-embedded": "^1.86.0",
7373
"typescript": "^5.7.3",
7474
"typescript-eslint": "^8.26.1",
75-
"vite": "^6.2.6"
75+
"vite": "^6.3.4"
7676
}
7777
}

public/locales/en.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
"permissionErrorMessageSubtitle": "Ask a workspace admin to grant you access.",
4848
"loadingErrorMessage": "Failed to list mcps in workspace"
4949
},
50+
"ControlPlaneCard": {
51+
"deleteConfirmationDialog": "MCP deletion triggered. The list will refresh automatically once completed."
52+
},
5053
"ControlPlaneListAllWorkspaces": {
5154
"emptyListTitleMessage": "No Workspaces created yet",
5255
"emptyListSubtitleMessage": "Create a workspace to get started"
@@ -76,14 +79,17 @@
7679
"menuDownload": "Download",
7780
"menuCopy": "Copy to clipboard"
7881
},
79-
"NoManagedControlPlaneBanner": {
82+
"IllustratedBanner": {
8083
"titleMessage": "No ManagedControlPlane",
8184
"subtitleMessage": "Create a ManagedControlPlane to get started",
8285
"helpButton": "Help"
8386
},
8487
"IntelligentBreadcrumbs": {
8588
"homeLabel": "Home"
8689
},
90+
"MCPContext": {
91+
"errorMessage": "An unknown error occurred"
92+
},
8793
"NotInLuigiView": {
8894
"titleMessage": "Opened outside of Hyperspace Portal",
8995
"subtitleMessage": "Looks like this page is not opened inside of the Hyperspace Portal. Contact admins for help."

src/components/ControlPlane/FluxList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default function FluxList() {
4444
if (repoErr || kustomizationErr) {
4545
return (
4646
<IllustratedError
47-
error={repoErr || kustomizationErr}
47+
details={repoErr.message || kustomizationErr.message}
4848
title={t('FluxList.noFluxError')}
4949
/>
5050
);

0 commit comments

Comments
 (0)