From 782ed976b39dbe6336b3771c140592b64c7d0674 Mon Sep 17 00:00:00 2001 From: Johannes Ott Date: Wed, 19 Mar 2025 20:51:37 +0100 Subject: [PATCH 1/5] improve readability --- src/components/ControlPlane/ComponentList.tsx | 1 + src/components/Shared/ConfiguredAnalyticsTable.tsx | 1 + src/index.css | 4 ++++ src/views/ControlPlanes/ControlPlaneView.tsx | 8 ++++---- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/ControlPlane/ComponentList.tsx b/src/components/ControlPlane/ComponentList.tsx index 40cfb783..25dbef59 100644 --- a/src/components/ControlPlane/ComponentList.tsx +++ b/src/components/ControlPlane/ComponentList.tsx @@ -51,6 +51,7 @@ export default function ComponentList({ mcp }: { mcp: ControlPlaneType }) { columns={componentTableColumns} minRows={0} data={data} + style={{marginLeft: "12px", marginRight: "12px"}} /> diff --git a/src/components/Shared/ConfiguredAnalyticsTable.tsx b/src/components/Shared/ConfiguredAnalyticsTable.tsx index 53865676..0dfec5e5 100644 --- a/src/components/Shared/ConfiguredAnalyticsTable.tsx +++ b/src/components/Shared/ConfiguredAnalyticsTable.tsx @@ -23,6 +23,7 @@ export default function ConfiguredAnalyticsTable(props: Props) { scaleWidthMode={AnalyticalTableScaleWidthMode.Smart} loading={props.isLoading} filterable + style={{margin: "12px"}} /> ); } diff --git a/src/index.css b/src/index.css index af8be8fc..9db48715 100644 --- a/src/index.css +++ b/src/index.css @@ -86,6 +86,10 @@ margin-bottom: -30px; } +.cp-panel { + margin: 12px; +} + .cp-panel-crossplane { background-color: #FFC933; } diff --git a/src/views/ControlPlanes/ControlPlaneView.tsx b/src/views/ControlPlanes/ControlPlaneView.tsx index 9da57233..516c8cf9 100644 --- a/src/views/ControlPlanes/ControlPlaneView.tsx +++ b/src/views/ControlPlanes/ControlPlaneView.tsx @@ -74,22 +74,22 @@ export default function ControlPlaneView() { titleText="Components" hideTitleText > - Components} noAnimation> + Components} noAnimation> - Crossplane} noAnimation> + Managed Resources} noAnimation> - GitOps} noAnimation> + GitOps} noAnimation> From ff27178aa34f97cf5fca0cb38d6bfbddd4edd25f Mon Sep 17 00:00:00 2001 From: Johannes Ott Date: Wed, 19 Mar 2025 20:51:43 +0100 Subject: [PATCH 2/5] align wording --- public/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/en.json b/public/locales/en.json index 1c24f1b6..2a000f72 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -6,7 +6,7 @@ "signInButton": "Sign in" }, "ComponentList": { - "tableComponentHeader": "Component", + "tableComponentHeader": "Name", "tableVersionHeader": "Version" }, "FluxList": { From 40d6a20ee3a3cbedd318fa67ead6ef27db85c843 Mon Sep 17 00:00:00 2001 From: Johannes Ott Date: Wed, 19 Mar 2025 21:05:27 +0100 Subject: [PATCH 3/5] add margin to missing table --- src/components/ControlPlane/ManagedResources.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ControlPlane/ManagedResources.tsx b/src/components/ControlPlane/ManagedResources.tsx index 32fabc2e..237e0e78 100644 --- a/src/components/ControlPlane/ManagedResources.tsx +++ b/src/components/ControlPlane/ManagedResources.tsx @@ -84,6 +84,7 @@ export function ManagedResources() { {!error && Date: Fri, 21 Mar 2025 14:43:12 +0100 Subject: [PATCH 4/5] Move texts to en.json --- public/locales/en.json | 5 ++++- src/views/ControlPlanes/ControlPlaneView.tsx | 22 ++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/public/locales/en.json b/public/locales/en.json index 812a08c8..ed90ab29 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -129,7 +129,10 @@ "title": "Projects" }, "ControlPlaneView": { - "accessError": "Managed Control Plane does not have access information yet" + "accessError": "Managed Control Plane does not have access information yet", + "componentsTitle": "Components", + "managedResourcesTitle": "Managed Resources", + "gitOpsTitle": "GitOps" }, "ToastContext": { "errorMessage": "useToast must be used within a ToastProvider" diff --git a/src/views/ControlPlanes/ControlPlaneView.tsx b/src/views/ControlPlanes/ControlPlaneView.tsx index 3e380715..85897382 100644 --- a/src/views/ControlPlanes/ControlPlaneView.tsx +++ b/src/views/ControlPlanes/ControlPlaneView.tsx @@ -88,14 +88,18 @@ export default function ControlPlaneView() { Components} + header={ + + {t('ControlPlaneView.componentsTitle')} + + } noAnimation > @@ -104,14 +108,18 @@ export default function ControlPlaneView() { Managed Resources} + header={ + + {t('ControlPlaneView.managedResourcesTitle')} + + } noAnimation > @@ -120,14 +128,16 @@ export default function ControlPlaneView() { GitOps} + header={ + {t('ControlPlaneView.gitOpsTitle')} + } noAnimation > From d1493bc0e69e52d7e1f57dd38fdedc95e220bc3a Mon Sep 17 00:00:00 2001 From: Andreas Kienle Date: Fri, 28 Mar 2025 09:10:36 +0100 Subject: [PATCH 5/5] Fix texts --- public/locales/en.json | 6 +++--- src/components/ControlPlane/ManagedResources.tsx | 2 +- src/components/ControlPlane/ProvidersConfig.tsx | 2 +- src/views/ControlPlanes/ControlPlaneView.tsx | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/public/locales/en.json b/public/locales/en.json index f04d074d..cd44daea 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -20,7 +20,7 @@ "tableCreatedHeader": "Created" }, "ManagedResources": { - "headerManagedResources": "Resources", + "header": "Managed Resources", "tableHeaderKind": "Kind", "tableHeaderName": "Name", "tableHeaderCreated": "Created", @@ -128,7 +128,7 @@ "ControlPlaneView": { "accessError": "Managed Control Plane does not have access information yet", "componentsTitle": "Components", - "managedResourcesTitle": "Managed Resources", + "crossplaneTitle": "Crossplane", "gitOpsTitle": "GitOps" }, "ToastContext": { @@ -150,7 +150,7 @@ "tableHeaderHealthy": "Healthy" }, "ProvidersConfig": { - "headerProvidersConfig": "Providers Config" + "header": "Provider Configs" }, "validationErrors": { "required": "This field is required!", diff --git a/src/components/ControlPlane/ManagedResources.tsx b/src/components/ControlPlane/ManagedResources.tsx index 296469dd..255c7faa 100644 --- a/src/components/ControlPlane/ManagedResources.tsx +++ b/src/components/ControlPlane/ManagedResources.tsx @@ -106,7 +106,7 @@ export function ManagedResources() { return ( <> - {t('ManagedResources.headerManagedResources')} + {t('ManagedResources.header')} {error && } diff --git a/src/components/ControlPlane/ProvidersConfig.tsx b/src/components/ControlPlane/ProvidersConfig.tsx index 4c4dd8de..74646ac5 100644 --- a/src/components/ControlPlane/ProvidersConfig.tsx +++ b/src/components/ControlPlane/ProvidersConfig.tsx @@ -12,7 +12,7 @@ export function ProvidersConfig() { return ( <> - {t('ProvidersConfig.headerProvidersConfig')} + {t('ProvidersConfig.header')} - {t('ControlPlaneView.managedResourcesTitle')} + {t('ControlPlaneView.crossplaneTitle')} } noAnimation