Skip to content
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
684eb23
init
lucasgoral Apr 28, 2025
476ac60
refactor
lucasgoral May 5, 2025
c747f00
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 5, 2025
097864c
Update FluxList.tsx
lucasgoral May 6, 2025
da7c952
Update FluxList.tsx
lucasgoral May 6, 2025
cf31cae
refactor
lucasgoral May 6, 2025
c18cb12
fixes
lucasgoral May 6, 2025
017834f
refactor
lucasgoral May 6, 2025
dddd76b
Update ProvidersConfig.tsx
lucasgoral May 7, 2025
b244c31
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 7, 2025
bda803e
refatcor
lucasgoral May 7, 2025
30588d9
refactor
lucasgoral May 8, 2025
7dfa905
fixes
lucasgoral May 8, 2025
3dc9a0b
fixes
lucasgoral May 9, 2025
99a0ae2
Update YamlViewButton.tsx
lucasgoral May 12, 2025
42f45ed
Merge branch 'feature/display-resource-yaml-for-mcp-' of https://gith…
lucasgoral May 12, 2025
c9ab0d5
added icon
lucasgoral May 12, 2025
fcf60cd
Update ProjectsList.tsx
lucasgoral May 12, 2025
9c5df0d
Update ControlPlaneCard.tsx
lucasgoral May 12, 2025
8b746f8
Update ControlPlaneView.tsx
lucasgoral May 12, 2025
5c68a47
fix
lucasgoral May 13, 2025
8350692
fixes
lucasgoral May 13, 2025
58df16f
refactor
lucasgoral May 13, 2025
62d8f9e
Update frontend-config.json
lucasgoral May 13, 2025
54b668c
Update FluxList.tsx
lucasgoral May 13, 2025
765d8e7
fixes
lucasgoral May 13, 2025
c0d35f1
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 14, 2025
d4ce250
Update ManagedResources.tsx
lucasgoral May 14, 2025
88c379f
Update ResourceStatusCell.tsx
lucasgoral May 14, 2025
b7a96b3
Update frontend-config.json
lucasgoral May 14, 2025
833bca5
refactor
lucasgoral May 14, 2025
ad53b8c
refactor
lucasgoral May 14, 2025
e571615
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 15, 2025
9d7d283
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 15, 2025
c555286
svg refactor
lucasgoral May 16, 2025
09e4246
refactor
lucasgoral May 16, 2025
14cd6e1
Update ProjectsList.tsx
lucasgoral May 16, 2025
735400b
fixes
lucasgoral May 16, 2025
833f271
refactor
lucasgoral May 19, 2025
4e159b4
fixed
lucasgoral May 19, 2025
58f524b
fixed
lucasgoral May 19, 2025
3a6def1
refactor
lucasgoral May 20, 2025
2e95c0b
Update YamlViewButtonWithLoader.tsx
lucasgoral May 20, 2025
bb14802
Update ProjectsList.tsx
lucasgoral May 20, 2025
1348784
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 20, 2025
8186d19
Update YamlViewButton.tsx
lucasgoral May 20, 2025
393c4e0
Update YamlViewButton.tsx
lucasgoral May 20, 2025
2c0c98f
Update YamlViewer.tsx
lucasgoral May 20, 2025
3820714
Merge branch 'main' into feature/display-resource-yaml-for-mcp-
lucasgoral May 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
"copy": "Copy"
},
"yaml": {
"copiedToClipboard": "YAML copied to clipboard!"
"copiedToClipboard": "YAML copied to clipboard!",
"YAML": "YAML"
}
}
165 changes: 105 additions & 60 deletions src/components/ControlPlane/FluxList.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
import ConfiguredAnalyticstable from '../Shared/ConfiguredAnalyticsTable.tsx';
import {
AnalyticalTableColumnDefinition,
FlexBox,
Title,
} from '@ui5/webcomponents-react';
import IllustratedError from '../Shared/IllustratedError.tsx';
import useResource from '../../lib/api/useApiResource';
import { FluxRequest } from '../../lib/api/types/flux/listGitRepo';
import { FluxKustomization } from '../../lib/api/types/flux/listKustomization';
import {
FluxKustomization,
KustomizationsResponse,
} from '../../lib/api/types/flux/listKustomization';
import { useTranslation } from 'react-i18next';
import { timeAgo } from '../../utils/i18n/timeAgo.ts';
import { ResourceStatusCell } from '../Shared/ResourceStatusCell.tsx';
import { YamlViewButton } from '../Yaml/YamlViewButton.tsx';
import { useMemo } from 'react';

export default function FluxList() {
const {
Expand Down Expand Up @@ -39,8 +45,96 @@ export default function FluxList() {
created: string;
isReady: boolean;
statusUpdateTime?: string;
item: unknown;
};

const gitReposColumns: AnalyticalTableColumnDefinition[] = useMemo(
() => [
{
Header: t('FluxList.tableNameHeader'),
accessor: 'name',
minWidth: 250,
},
{
Header: t('FluxList.tableCreatedHeader'),
accessor: 'created',
},
{
Header: t('FluxList.tableVersionHeader'),
accessor: 'revision',
},
{
Header: t('FluxList.tableStatusHeader'),
accessor: 'status',
width: 85,
hAlign: 'Center',
Cell: (cellData: CellData<FluxRow['isReady']>) =>
cellData.cell.row.original?.isReady != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.isReady}
transitionTime={
cellData.cell.row.original?.statusUpdateTime
? cellData.cell.row.original?.statusUpdateTime
: ''
}
/>
) : null,
},
{
Header: t('yaml.YAML'),
hAlign: 'Center',
width: 85,
accessor: 'yaml',
Cell: (cellData: CellData<KustomizationsResponse['items']>) => (
<YamlViewButton resourceObject={cellData.cell.row.original?.item} />
),
},
],
[],
);

const kustomizationsColumns: AnalyticalTableColumnDefinition[] = useMemo(
() => [
{
Header: t('FluxList.tableNameHeader'),
accessor: 'name',
minWidth: 250,
},
{
Header: t('FluxList.tableCreatedHeader'),
accessor: 'created',
},
{
Header: t('FluxList.tableStatusHeader'),
accessor: 'status',
width: 85,
hAlign: 'Center',
Cell: (cellData: CellData<FluxRow['isReady']>) =>
cellData.cell.row.original?.isReady != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.isReady}
transitionTime={
cellData.cell.row.original?.statusUpdateTime
? cellData.cell.row.original?.statusUpdateTime
: ''
}
/>
) : null,
},

{
Header: t('yaml.YAML'),
hAlign: 'Center',
width: 85,
accessor: 'yaml',
Cell: (cellData: CellData<FluxRow>) => (
<YamlViewButton resourceObject={cellData.cell.row.original?.item} />
),
},
],
[],
);

if (repoErr || kustomizationErr) {
return (
<IllustratedError
Expand All @@ -50,62 +144,6 @@ export default function FluxList() {
);
}

const gitReposColumns: AnalyticalTableColumnDefinition[] = [
{
Header: t('FluxList.tableNameHeader'),
accessor: 'name',
},
{
Header: t('FluxList.tableStatusHeader'),
accessor: 'status',
Cell: (cellData: CellData<FluxRow['isReady']>) =>
cellData.cell.row.original?.isReady != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.isReady}
transitionTime={
cellData.cell.row.original?.statusUpdateTime
? cellData.cell.row.original?.statusUpdateTime
: ''
}
/>
) : null,
},
{
Header: t('FluxList.tableVersionHeader'),
accessor: 'revision',
},
{
Header: t('FluxList.tableCreatedHeader'),
accessor: 'created',
},
];

const kustomizationsColumns: AnalyticalTableColumnDefinition[] = [
{
Header: t('FluxList.tableNameHeader'),
accessor: 'name',
},
{
Header: t('FluxList.tableStatusHeader'),
accessor: 'status',
Cell: (cellData: CellData<FluxRow['isReady']>) =>
cellData.cell.row.original?.isReady != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.isReady}
transitionTime={
cellData.cell.row.original?.statusUpdateTime
? cellData.cell.row.original?.statusUpdateTime
: ''
}
/>
) : null,
},
{
Header: t('FluxList.tableCreatedHeader'),
accessor: 'created',
},
];

const gitReposRows: FluxRow[] =
gitReposData?.items?.map((item) => {
return {
Expand All @@ -117,6 +155,7 @@ export default function FluxList() {
?.lastTransitionTime,
revision: shortenCommitHash(item.status.artifact?.revision ?? '-'),
created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
item: item,
};
}) ?? [];

Expand All @@ -130,22 +169,28 @@ export default function FluxList() {
statusUpdateTime: item.status.conditions.find((x) => x.type === 'Ready')
?.lastTransitionTime,
created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
item: item,
};
}) ?? [];

return (
<>
{' '}
<div className="crossplane-table-element">
<Title level="H4">{t('FluxList.gitOpsTitle')}</Title>
<FlexBox justifyContent={'Start'} alignItems={'Center'} gap={'0.5em'}>
<Title level="H4">{t('FluxList.gitOpsTitle')}</Title>
<YamlViewButton resourceObject={gitReposData} />
</FlexBox>
<ConfiguredAnalyticstable
columns={gitReposColumns}
isLoading={repoIsLoading}
data={gitReposRows}
/>
</div>
<div className="crossplane-table-element">
<Title level="H4">{t('FluxList.kustomizationsTitle')}</Title>
<FlexBox justifyContent={'Start'} alignItems={'Center'} gap={'0.5em'}>
<Title level="H4">{t('FluxList.kustomizationsTitle')}</Title>
<YamlViewButton resourceObject={kustmizationData} />
</FlexBox>
<ConfiguredAnalyticstable
columns={kustomizationsColumns}
isLoading={kustomizationIsLoading}
Expand Down
93 changes: 57 additions & 36 deletions src/components/ControlPlane/ManagedResources.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import '@ui5/webcomponents-icons/dist/sys-enter-2';
import '@ui5/webcomponents-icons/dist/sys-cancel-2';
import { resourcesInterval } from '../../lib/shared/constants';
import { ResourceStatusCell } from '../Shared/ResourceStatusCell';
import { YamlViewButton } from '../Yaml/YamlViewButton.tsx';
import { useMemo } from 'react';

interface CellData<T> {
cell: {
Expand All @@ -31,6 +33,7 @@ type ResourceRow = {
syncedTransitionTime: string;
ready: boolean;
readyTransitionTime: string;
item: unknown;
};

export function ManagedResources() {
Expand All @@ -44,42 +47,59 @@ export function ManagedResources() {
refreshInterval: resourcesInterval, // Resources are quite expensive to fetch, so we refresh every 30 seconds
});

const columns: AnalyticalTableColumnDefinition[] = [
{
Header: t('ManagedResources.tableHeaderKind'),
accessor: 'kind',
},
{
Header: t('ManagedResources.tableHeaderName'),
accessor: 'name',
},
{
Header: t('ManagedResources.tableHeaderCreated'),
accessor: 'created',
},
{
Header: t('ManagedResources.tableHeaderSynced'),
accessor: 'synced',
Cell: (cellData: CellData<ResourceRow['synced']>) =>
cellData.cell.row.original?.synced != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.synced}
transitionTime={cellData.cell.row.original?.syncedTransitionTime}
/>
) : null,
},
{
Header: t('ManagedResources.tableHeaderReady'),
accessor: 'ready',
Cell: (cellData: CellData<ResourceRow['ready']>) =>
cellData.cell.row.original?.ready != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.ready}
transitionTime={cellData.cell.row.original?.readyTransitionTime}
/>
) : null,
},
];
const columns: AnalyticalTableColumnDefinition[] = useMemo(
() => [
{
Header: t('ManagedResources.tableHeaderKind'),
accessor: 'kind',
},
{
Header: t('ManagedResources.tableHeaderName'),
accessor: 'name',
},
{
Header: t('ManagedResources.tableHeaderCreated'),
accessor: 'created',
},
{
Header: t('ManagedResources.tableHeaderSynced'),
accessor: 'synced',
hAlign: 'Center',
width: 85,
Cell: (cellData: CellData<ResourceRow['synced']>) =>
cellData.cell.row.original?.synced != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.synced}
transitionTime={cellData.cell.row.original?.syncedTransitionTime}
/>
) : null,
},
{
Header: t('ManagedResources.tableHeaderReady'),
accessor: 'ready',
hAlign: 'Center',
width: 85,
Cell: (cellData: CellData<ResourceRow['ready']>) =>
cellData.cell.row.original?.ready != null ? (
<ResourceStatusCell
value={cellData.cell.row.original?.ready}
transitionTime={cellData.cell.row.original?.readyTransitionTime}
/>
) : null,
},
{
Header: t('yaml.YAML'),
hAlign: 'Center',
width: 85,
accessor: 'yaml',
Cell: (cellData: CellData<ResourceRow>) =>
!!cellData.cell.row.original?.item ? (
<YamlViewButton resourceObject={cellData.cell.row.original?.item} />
) : undefined,
},
],
[],
);

const rows: ResourceRow[] =
managedResources
Expand All @@ -101,6 +121,7 @@ export function ManagedResources() {
syncedTransitionTime: conditionSynced?.lastTransitionTime ?? '',
ready: conditionReady?.status === 'True',
readyTransitionTime: conditionReady?.lastTransitionTime ?? '',
item: item,
};
}),
) ?? [];
Expand Down
Loading
Loading