Skip to content

Commit 5eb969d

Browse files
Merge branch 'main' into fix/visualise-resources-on-graph-by-name-and-version
2 parents 55b3ad2 + 4af57b5 commit 5eb969d

Some content is hidden

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

42 files changed

+1115
-858
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"@fastify/static": "8.2.0",
3535
"@fastify/vite": "8.2.0",
3636
"@hookform/resolvers": "5.2.2",
37+
"@monaco-editor/react": "^4.7.0",
3738
"@sentry/node": "10.15.0",
3839
"@sentry/react": "10.15.0",
3940
"@sentry/vite-plugin": "4.3.0",
@@ -54,13 +55,14 @@
5455
"i18next": "25.5.2",
5556
"javascript-time-ago": "2.5.12",
5657
"js-yaml": "4.1.0",
58+
"monaco-editor": "^0.45.0",
59+
"monaco-yaml": "^5.4.0",
5760
"react": "19.1.1",
5861
"react-dom": "19.1.1",
5962
"react-error-boundary": "6.0.0",
6063
"react-hook-form": "7.63.0",
6164
"react-i18next": "16.0.0",
6265
"react-router-dom": "7.9.3",
63-
"react-syntax-highlighter": "15.6.6",
6466
"react-time-ago": "7.3.5",
6567
"swr": "2.3.6",
6668
"yaml": "2.8.1",
@@ -76,7 +78,6 @@
7678
"@types/node": "22.18.6",
7779
"@types/react": "19.1.15",
7880
"@types/react-dom": "19.1.9",
79-
"@types/react-syntax-highlighter": "15.5.13",
8081
"@ui5/webcomponents-cypress-commands": "2.14.1",
8182
"@vitejs/plugin-react": "5.0.4",
8283
"@vitest/eslint-plugin": "1.3.13",
@@ -97,6 +98,7 @@
9798
"typescript": "5.9.2",
9899
"typescript-eslint": "8.44.1",
99100
"vite": "7.1.7",
101+
"vite-plugin-static-copy": "^3.1.2",
100102
"vitest": "3.2.4"
101103
}
102104
}

public/locales/en.json

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
"tableCreatedHeader": "Created",
2323
"tableVersionHeader": "Revision",
2424
"noFluxError": "Please install flux to view this component",
25-
"gitOpsTitle": "GitOps",
26-
"kustomizationsTitle": "Kustomizations",
2725
"undefinedError": "Something went wrong"
2826
},
2927
"ProvidersList": {
@@ -32,15 +30,13 @@
3230
"tableCreatedHeader": "Created"
3331
},
3432
"ManagedResources": {
35-
"header": "Managed Resources",
3633
"tableHeaderKind": "Kind",
3734
"tableHeaderName": "Name",
3835
"tableHeaderCreated": "Created",
3936
"tableHeaderSynced": "Synced",
4037
"tableHeaderReady": "Ready"
4138
},
4239
"ProvidersConfig": {
43-
"headerProviderConfigs": "Provider Configs",
4440
"tableHeaderProvider": "Provider",
4541
"tableHeaderName": "Name",
4642
"tableHeaderCreated": "Created",
@@ -196,12 +192,23 @@
196192
},
197193
"McpPage": {
198194
"accessError": "Managed Control Plane does not have access information yet",
199-
"componentsTitle": "Components",
200195
"overviewTitle": "Overview",
196+
"dashboardTitle": "Dashboard",
197+
"graphTitle": "Graph",
198+
"componentsTitle": "Components",
201199
"crossplaneTitle": "Crossplane",
202-
"gitOpsTitle": "GitOps",
203-
"landscapersTitle": "Landscapers",
204-
"graphTitle": "Graph"
200+
"providersTitle": "Providers",
201+
"providerConfigsTitle": "ProviderConfigs",
202+
"managedResourcesTitle": "Managed Resources",
203+
"fluxTitle": "Flux",
204+
"gitRepositoriesTitle": "GitRepositories",
205+
"kustomizationsTitle": "Kustomizations",
206+
"landscapersTitle": "Landscapers"
207+
},
208+
"McpHeader": {
209+
"nameLabel": "Name",
210+
"createdByLabel": "Created By",
211+
"createdOnLabel": "Created On"
205212
},
206213
"ToastContext": {
207214
"errorMessage": "useToast must be used within a ToastProvider"
@@ -296,7 +303,6 @@
296303
"learnButton": "Learn how to do this in code"
297304
},
298305
"Providers": {
299-
"headerProviders": "Providers",
300306
"tableHeaderVersion": "Version",
301307
"tableHeaderName": "Name",
302308
"tableHeaderCreated": "Created",
@@ -351,7 +357,9 @@
351357
"remaining": "Remaining",
352358
"active": "Active",
353359
"copyToClipboardSuccessToast": "Copied to clipboard",
354-
"copyToClipboardFailedToast": "Failed to copy to clipboard"
360+
"copyToClipboardFailedToast": "Failed to copy to clipboard",
361+
"resourcesCount": "Resources ({{count}})",
362+
"itemsCount": "Items ({{count}})"
355363
},
356364
"errors": {
357365
"installError": "Install error",

src/components/ControlPlane/ComponentList.tsx

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
import { AnalyticalTable, AnalyticalTableColumnDefinition } from '@ui5/webcomponents-react';
1+
import {
2+
AnalyticalTable,
3+
AnalyticalTableColumnDefinition,
4+
Panel,
5+
Title,
6+
Toolbar,
7+
ToolbarButton,
8+
ToolbarSpacer,
9+
} from '@ui5/webcomponents-react';
210
import { ControlPlaneType } from '../../lib/api/types/crate/controlPlanes';
311
import { useTranslation } from 'react-i18next';
412

5-
export default function ComponentList({ mcp }: { mcp: ControlPlaneType }) {
13+
export default function ComponentList({ mcp, onEditClick }: { mcp: ControlPlaneType; onEditClick: () => void }) {
614
const { t } = useTranslation();
715

816
const data = [
@@ -40,8 +48,17 @@ export default function ComponentList({ mcp }: { mcp: ControlPlaneType }) {
4048
];
4149

4250
return (
43-
<div>
51+
<Panel
52+
fixed
53+
header={
54+
<Toolbar>
55+
<Title>{t('common.itemsCount', { count: data.length })}</Title>
56+
<ToolbarSpacer />
57+
<ToolbarButton tooltip={t('editMCP.editComponents')} design="Transparent" icon="edit" onClick={onEditClick} />
58+
</Toolbar>
59+
}
60+
>
4461
<AnalyticalTable scaleWidthMode="Smart" columns={componentTableColumns} minRows={0} data={data} />
45-
</div>
62+
</Panel>
4663
);
4764
}

src/components/ControlPlane/FluxList.tsx

Lines changed: 0 additions & 208 deletions
This file was deleted.

0 commit comments

Comments
 (0)