Skip to content

Commit 27443df

Browse files
committed
Merge branch 'main' into feature/copy-status-info-pasting-into-support-channels
2 parents d23dbe4 + 61e02e9 commit 27443df

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.card {
2+
margin: 0.75rem 0.75rem 0.75rem 0;
3+
}
4+
5+
.container {
6+
padding: 1.25rem;
7+
}
8+
9+
.row {
10+
padding-top: 1.25rem;
11+
}

src/components/ControlPlanes/ControlPlaneCard.tsx renamed to src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ import { Button, Card, FlexBox, Label, Title } from '@ui5/webcomponents-react';
22
import '@ui5/webcomponents-fiori/dist/illustrations/NoData.js';
33
import '@ui5/webcomponents-fiori/dist/illustrations/EmptyList.js';
44
import '@ui5/webcomponents-icons/dist/delete';
5-
import ConnectButton from './ConnectButton.tsx';
6-
import { ListWorkspacesType } from '../../lib/api/types/crate/listWorkspaces.ts';
5+
import ConnectButton from '../ConnectButton.tsx';
6+
import { ListWorkspacesType } from '../../../lib/api/types/crate/listWorkspaces.ts';
77
import {
88
ListControlPlanesType,
99
ReadyStatus,
10-
} from '../../lib/api/types/crate/controlPlanes.ts';
10+
} from '../../../lib/api/types/crate/controlPlanes.ts';
1111
import TitleLevel from '@ui5/webcomponents/dist/types/TitleLevel.js';
1212
import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
1313
import { useState } from 'react';
14-
import { useApiResourceMutation } from '../../lib/api/useApiResource.ts';
14+
import { useApiResourceMutation } from '../../../lib/api/useApiResource.ts';
1515
import {
1616
DeleteMCPResource,
1717
DeleteMCPType,
1818
PatchMCPResourceForDeletion,
1919
PatchMCPResourceForDeletionBody,
20-
} from '../../lib/api/types/crate/deleteMCP.ts';
21-
import { DeleteConfirmationDialog } from '../Dialogs/DeleteConfirmationDialog.tsx';
22-
import MCPHealthPopoverButton from '../ControlPlane/MCPHealthPopoverButton.tsx';
23-
import { KubectlDeleteMcp } from '../Dialogs/KubectlCommandInfo/Controllers/KubectlDeleteMcp.tsx';
20+
} from '../../../lib/api/types/crate/deleteMCP.ts';
21+
import { DeleteConfirmationDialog } from '../../Dialogs/DeleteConfirmationDialog.tsx';
22+
import MCPHealthPopoverButton from '../../ControlPlane/MCPHealthPopoverButton.tsx';
23+
import styles from './ControlPlaneCard.module.css';
24+
import { KubectlDeleteMcp } from '../../Dialogs/KubectlCommandInfo/Controllers/KubectlDeleteMcp.tsx';
2425

2526
interface Props {
2627
controlPlane: ListControlPlanesType;
@@ -53,11 +54,8 @@ export function ControlPlaneCard({
5354

5455
return (
5556
<>
56-
<Card
57-
key={`${name}--${namespace}`}
58-
style={{ margin: '12px 12px 12px 0' }}
59-
>
60-
<div style={{ padding: '20px' }}>
57+
<Card key={`${name}--${namespace}`} className={styles.card}>
58+
<div className={styles.container}>
6159
<FlexBox direction="Column">
6260
<FlexBox direction="Row" justifyContent="SpaceBetween">
6361
<FlexBox direction="Column">
@@ -81,7 +79,7 @@ export function ControlPlaneCard({
8179
direction="Row"
8280
justifyContent="SpaceBetween"
8381
alignItems="Center"
84-
style={{ paddingTop: '20px' }}
82+
className={styles.row}
8583
>
8684
<MCPHealthPopoverButton
8785
mcpStatus={controlPlane.status}

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import '@ui5/webcomponents-icons/dist/delete';
1111
import ButtonDesign from '@ui5/webcomponents/dist/types/ButtonDesign.js';
1212
import { CopyButton } from '../../Shared/CopyButton.tsx';
1313
import { NoManagedControlPlaneBanner } from '../NoManagedControlPlaneBanner.tsx';
14-
import { ControlPlaneCard } from '../ControlPlaneCard.tsx';
14+
import { ControlPlaneCard } from '../ControlPlaneCard/ControlPlaneCard.tsx';
1515
import {
1616
ListWorkspacesType,
1717
isWorkspaceReady,

0 commit comments

Comments
 (0)