Skip to content

PD - Flagger generated objects #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 21, 2022
Merged

PD - Flagger generated objects #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b85a91
move customDataTable styled out of main render fn
TheGostKasper Jul 20, 2022
45b95b9
move Flagger objects to new tab
TheGostKasper Jul 21, 2022
2c18fd1
Merge branch 'main' of https://github.com/weaveworks/weave-gitops-ent…
TheGostKasper Jul 21, 2022
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
18 changes: 15 additions & 3 deletions ui-cra/src/components/ProgressiveDelivery/CanaryDetails/CanaryDetailsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ function CanaryDetailsSection({
const [open, setOpen] = useState(true);

const { conditions, ...restStatus } = canary?.status || { conditions: [] };
const { lastTransitionTime, ...restConditionObj } = conditions![0] || { lastTransitionTime: '' };
const { lastTransitionTime, ...restConditionObj } = conditions![0] || {
lastTransitionTime: '',
};

const toggleCollapse = () => {
setOpen(!open);
Expand Down Expand Up @@ -75,7 +77,11 @@ function CanaryDetailsSection({
/>
<CanaryRowHeader
rowkey="Application"
value={automation?.kind && automation?.name ? `${automation?.kind}/${automation?.name}` : '--'}
value={
automation?.kind && automation?.name
? `${automation?.kind}/${automation?.name}`
: '--'
}
/>
<CanaryRowHeader
rowkey="Deployment Strategy"
Expand All @@ -87,7 +93,9 @@ function CanaryDetailsSection({
</CanaryRowHeader>
<CanaryRowHeader rowkey="Provider" value={canary.provider} />

<div className={`${classes.sectionHeaderWrapper} ${classes.cardTitle}`}>
<div
className={`${classes.sectionHeaderWrapper} ${classes.cardTitle}`}
>
Status
</div>

Expand Down Expand Up @@ -116,7 +124,11 @@ function CanaryDetailsSection({
))}
</TableBody>
</Table>
</CanaryDetailsWrapper>
</RouterTab>

<RouterTab name="Objects" path={`${path}/objects`}>
<CanaryDetailsWrapper>
<ListManagedObjects
clusterName={canary.clusterName || ''}
name={canary.name || ''}
Expand Down
65 changes: 32 additions & 33 deletions ui-cra/src/components/ProgressiveDelivery/CanaryDetails/ManagedObjectsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,46 @@ import styled, { ThemeProvider } from 'styled-components';
import { usePolicyStyle } from '../../Policies/PolicyStyles';
import { TableWrapper } from '../CanaryStyles';

export const ManagedObjectsTable = ({ objects }: { objects: any[] }) => {
const classes = usePolicyStyle();

const CustomDataTable = styled(DataTable)`
const CustomDataTable = styled(DataTable)`
thead > tr {
background: ${theme.colors.neutral10};
}
`;

export const ManagedObjectsTable = ({ objects }: { objects: any[] }) => {
const classes = usePolicyStyle();

return (
<div className={classes.root}>
<ThemeProvider theme={theme}>
<TableWrapper id="objects-list">
<CustomDataTable
rows={objects}
fields={[
{
label: 'Name',
value: 'name',
},
{
label: 'Type',
value: (object) => (
`${object.groupVersionKind.version}/${object.groupVersionKind.kind}`
),
},
{
label: 'Namespace',
value: 'namespace',
},
{
label: 'Status',
value: 'status',
},
{
label: 'Images',
value: 'images',
},
]}
/>
</TableWrapper>
<TableWrapper id="objects-list">
<CustomDataTable
rows={objects}
fields={[
{
label: 'Name',
value: 'name',
},
{
label: 'Type',
value: object =>
`${object.groupVersionKind.version}/${object.groupVersionKind.kind}`,
},
{
label: 'Namespace',
value: 'namespace',
},
{
label: 'Status',
value: 'status',
},
{
label: 'Images',
value: 'images',
},
]}
/>
</TableWrapper>
</ThemeProvider>
</div>
);
Expand Down
64 changes: 30 additions & 34 deletions ui-cra/src/components/ProgressiveDelivery/Events/EventsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,36 @@ export const EventsTable = ({ events }: { events: Event[] }) => {
return (
<div className={classes.root}>
<ThemeProvider theme={theme}>
{events.length > 0 ? (
<TableWrapper id="events-list">
<FilterableTable
key={events?.length}
filters={initialFilterState}
rows={events}
fields={[
{
label: 'Reason',
value: 'reason',
textSearchable: true,
},
{
label: 'Message',
value: (e: Event) => (
<span className={classes.messageWrape}>{e.message}</span>
),
maxWidth: 600,
},
{
label: 'From',
value: 'component',
},
{
label: 'Last Updated',
value: (e: Event) => moment(e.timestamp).fromNow() || '--',
sortValue: (e: Event) => e.timestamp,
},
]}
/>
</TableWrapper>
) : (
<p>No data to display</p>
)}
<TableWrapper id="events-list">
<FilterableTable
key={events?.length}
filters={initialFilterState}
rows={events}
fields={[
{
label: 'Reason',
value: 'reason',
textSearchable: true,
},
{
label: 'Message',
value: (e: Event) => (
<span className={classes.messageWrape}>{e.message}</span>
),
maxWidth: 600,
},
{
label: 'From',
value: 'component',
},
{
label: 'Last Updated',
value: (e: Event) => moment(e.timestamp).fromNow() || '--',
sortValue: (e: Event) => e.timestamp,
},
]}
/>
</TableWrapper>
</ThemeProvider>
</div>
);
Expand Down