Skip to content

Commit a033be0

Browse files
committed
init
1 parent b1c3da2 commit a033be0

File tree

4 files changed

+43
-6
lines changed

4 files changed

+43
-6
lines changed

src/components/ControlPlane/FluxList.tsx

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { ResourceStatusCell } from '../Shared/ResourceStatusCell.tsx';
1010
import { YamlViewButton } from '../Yaml/YamlViewButton.tsx';
1111
import { useMemo } from 'react';
1212
import StatusFilter from '../Shared/StatusFilter/StatusFilter.tsx';
13+
import { ResourceStatusCellWithButton } from '../Shared/ResourceStatusCellWithButton.tsx';
1314

1415
export default function FluxList() {
1516
const { data: gitReposData, error: repoErr, isLoading: repoIsLoading } = useApiResource(FluxRequest); //404 if component not enabled
@@ -36,6 +37,7 @@ export default function FluxList() {
3637
isReady: boolean;
3738
statusUpdateTime?: string;
3839
item: unknown;
40+
status: unknown;
3941
};
4042

4143
const gitReposColumns: AnalyticalTableColumnDefinition[] = useMemo(
@@ -102,12 +104,21 @@ export default function FluxList() {
102104
Filter: ({ column }) => <StatusFilter column={column} />,
103105
Cell: (cellData: CellData<FluxRow['isReady']>) =>
104106
cellData.cell.row.original?.isReady != null ? (
105-
<ResourceStatusCell
106-
value={cellData.cell.row.original?.isReady}
107-
transitionTime={
108-
cellData.cell.row.original?.statusUpdateTime ? cellData.cell.row.original?.statusUpdateTime : ''
109-
}
110-
/>
107+
<span>
108+
<ResourceStatusCell
109+
value={cellData.cell.row.original?.isReady}
110+
transitionTime={
111+
cellData.cell.row.original?.statusUpdateTime ? cellData.cell.row.original?.statusUpdateTime : ''
112+
}
113+
/>
114+
<ResourceStatusCellWithButton
115+
value={cellData.cell.row.original?.isReady}
116+
transitionTime={
117+
cellData.cell.row.original?.statusUpdateTime ? cellData.cell.row.original?.statusUpdateTime : ''
118+
}
119+
errorMessage={cellData.cell.row.original?.status?.message}
120+
/>
121+
</span>
111122
) : null,
112123
},
113124

@@ -141,6 +152,7 @@ export default function FluxList() {
141152
revision: shortenCommitHash(item.status.artifact?.revision ?? '-'),
142153
created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
143154
item: item,
155+
status: item.status?.conditions?.find((x) => x.type === 'Ready'),
144156
};
145157
}) ?? [];
146158

@@ -152,6 +164,7 @@ export default function FluxList() {
152164
statusUpdateTime: item.status?.conditions?.find((x) => x.type === 'Ready')?.lastTransitionTime,
153165
created: timeAgo.format(new Date(item.metadata.creationTimestamp)),
154166
item: item,
167+
status: item.status?.conditions?.find((x) => x.type === 'Ready'),
155168
};
156169
}) ?? [];
157170

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { Icon } from '@ui5/webcomponents-react';
2+
import { timeAgo } from '../../utils/i18n/timeAgo';
3+
export interface StatusCellProps {
4+
value: boolean;
5+
transitionTime: string;
6+
errorMessage?: string;
7+
}
8+
9+
export const ResourceStatusCellWithButton = ({ value, transitionTime, errorMessage }: StatusCellProps) => {
10+
// if (!value) {
11+
console.log(errorMessage);
12+
// }
13+
alert(errorMessage);
14+
return (
15+
<Icon
16+
design={value ? 'Positive' : 'Negative'}
17+
name={value ? 'sys-enter-2' : 'sys-cancel-2'}
18+
showTooltip={true}
19+
accessibleName={transitionTime ? timeAgo.format(new Date(transitionTime)) : '-'}
20+
/>
21+
);
22+
};

src/components/Yaml/YamlViewButton.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export const YamlViewButton: FC<YamlViewButtonProps> = ({ resourceObject }) => {
1616
const [isOpen, setIsOpen] = useState(false);
1717
const { t } = useTranslation();
1818
const resource = resourceObject as Resource;
19+
console.log(removeManagedFieldsProperty(resource));
1920
const yamlString = useMemo(() => {
2021
return stringify(removeManagedFieldsProperty(resource));
2122
}, [resource]);

src/lib/api/types/flux/listKustomization.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export type KustomizationsResponse = {
1717
};
1818
conditions: [
1919
{
20+
message: string;
2021
status: string;
2122
type: string;
2223
lastTransitionTime: string;

0 commit comments

Comments
 (0)