Skip to content

Commit 07053c8

Browse files
Merge branch 'main' into feat/deleting-managed-resources
2 parents d7e58eb + 33e5876 commit 07053c8

File tree

20 files changed

+565
-394
lines changed

20 files changed

+565
-394
lines changed

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,7 +30,6 @@
3230
"tableCreatedHeader": "Created"
3331
},
3432
"ManagedResources": {
35-
"header": "Managed Resources",
3633
"tableHeaderKind": "Kind",
3734
"tableHeaderName": "Name",
3835
"tableHeaderCreated": "Created",
@@ -48,7 +45,6 @@
4845
"actionColumnHeader": " "
4946
},
5047
"ProvidersConfig": {
51-
"headerProviderConfigs": "Provider Configs",
5248
"tableHeaderProvider": "Provider",
5349
"tableHeaderName": "Name",
5450
"tableHeaderCreated": "Created",
@@ -204,12 +200,23 @@
204200
},
205201
"McpPage": {
206202
"accessError": "Managed Control Plane does not have access information yet",
207-
"componentsTitle": "Components",
208203
"overviewTitle": "Overview",
204+
"dashboardTitle": "Dashboard",
205+
"graphTitle": "Graph",
206+
"componentsTitle": "Components",
209207
"crossplaneTitle": "Crossplane",
210-
"gitOpsTitle": "GitOps",
211-
"landscapersTitle": "Landscapers",
212-
"graphTitle": "Graph"
208+
"providersTitle": "Providers",
209+
"providerConfigsTitle": "ProviderConfigs",
210+
"managedResourcesTitle": "Managed Resources",
211+
"fluxTitle": "Flux",
212+
"gitRepositoriesTitle": "GitRepositories",
213+
"kustomizationsTitle": "Kustomizations",
214+
"landscapersTitle": "Landscapers"
215+
},
216+
"McpHeader": {
217+
"nameLabel": "Name",
218+
"createdByLabel": "Created By",
219+
"createdOnLabel": "Created On"
213220
},
214221
"ToastContext": {
215222
"errorMessage": "useToast must be used within a ToastProvider"
@@ -304,7 +311,6 @@
304311
"learnButton": "Learn how to do this in code"
305312
},
306313
"Providers": {
307-
"headerProviders": "Providers",
308314
"tableHeaderVersion": "Version",
309315
"tableHeaderName": "Name",
310316
"tableHeaderCreated": "Created",
@@ -359,7 +365,9 @@
359365
"remaining": "Remaining",
360366
"active": "Active",
361367
"copyToClipboardSuccessToast": "Copied to clipboard",
362-
"copyToClipboardFailedToast": "Failed to copy to clipboard"
368+
"copyToClipboardFailedToast": "Failed to copy to clipboard",
369+
"resourcesCount": "Resources ({{count}})",
370+
"itemsCount": "Items ({{count}})"
363371
},
364372
"errors": {
365373
"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)