Skip to content
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

[PUI] Machines table refactor #8352

Merged
merged 4 commits into from
Oct 24, 2024
Merged

[PUI] Machines table refactor #8352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4878742
Reorganize MachineManagementPanel
SchrodingersGat Oct 24, 2024
5ff485c
Code cleanup
SchrodingersGat Oct 24, 2024
9230282
Refactor machine drawer display
SchrodingersGat Oct 24, 2024
95e5ef6
Refactor MachineTypeDetailDrawer
SchrodingersGat Oct 24, 2024
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
122 changes: 78 additions & 44 deletions src/frontend/src/pages/Index/Settings/AdminCenter/MachineManagementPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import { Trans } from '@lingui/macro';
import { t } from '@lingui/macro';
import {
Accordion,
ActionIcon,
Alert,
Code,
Group,
List,
Space,
Stack,
Text,
Title
Text
} from '@mantine/core';
import { IconRefresh } from '@tabler/icons-react';
import { IconInfoCircle, IconRefresh } from '@tabler/icons-react';
import { useQuery } from '@tanstack/react-query';
import { useMemo } from 'react';

import { api } from '../../../../App';
import { StylishText } from '../../../../components/items/StylishText';
import { ApiEndpoints } from '../../../../enums/ApiEndpoints';
import { apiUrl } from '../../../../states/ApiState';
import { MachineListTable } from '../../../../tables/machine/MachineListTable';
Expand All @@ -32,45 +34,77 @@ export default function MachineManagementPanel() {
staleTime: 10 * 1000
});

return (
<Stack>
<MachineListTable props={{}} />

<Space h="10px" />

<Stack gap={'xs'}>
<Title order={5}>
<Trans>Machine types</Trans>
</Title>
<MachineTypeListTable props={{}} />
</Stack>
const hasErrors = useMemo(() => {
return (
registryStatus?.registry_errors &&
registryStatus.registry_errors.length > 0
);
}, [registryStatus]);

<Space h="10px" />

<Stack gap={'xs'}>
<Group>
<Title order={5}>
<Trans>Machine Error Stack</Trans>
</Title>
<ActionIcon variant="outline" onClick={() => refetch()}>
<IconRefresh />
</ActionIcon>
</Group>
{registryStatus?.registry_errors &&
registryStatus.registry_errors.length === 0 ? (
<Text style={{ fontStyle: 'italic' }}>
<Trans>There are no machine registry errors.</Trans>
</Text>
) : (
<List>
{registryStatus?.registry_errors?.map((error, i) => (
<List.Item key={i}>
<Code>{error.message}</Code>
</List.Item>
))}
</List>
)}
</Stack>
</Stack>
return (
<Accordion multiple defaultValue={['machinelist', 'machinetypes']}>
<Accordion.Item value="machinelist">
<Accordion.Control>
<StylishText size="lg">{t`Machines`}</StylishText>
</Accordion.Control>
<Accordion.Panel>
<MachineListTable props={{}} />
</Accordion.Panel>
</Accordion.Item>
<Accordion.Item value="machinetypes">
<Accordion.Control>
<StylishText size="lg">{t`Machine Types`}</StylishText>
</Accordion.Control>
<Accordion.Panel>
<MachineTypeListTable props={{}} />
</Accordion.Panel>
</Accordion.Item>
<Accordion.Item value="machineerrors">
<Accordion.Control>
<StylishText size="lg">{t`Machine Errors`}</StylishText>
</Accordion.Control>
<Accordion.Panel>
<Stack gap="xs">
<Group
justify="space-beteen"
wrap="nowrap"
style={{ width: '100%' }}
>
{hasErrors ? (
<Alert
flex={10}
color="red"
title={t`Registry Registry Errors`}
icon={<IconInfoCircle />}
>
<Text>{t`There are machine registry errors`}</Text>
</Alert>
) : (
<Alert
flex={10}
color="green"
title={t`Machine Registry Errors`}
icon={<IconInfoCircle />}
>
<Text>{t`There are no machine registry errors`}</Text>
</Alert>
)}
<ActionIcon variant="outline" onClick={() => refetch()}>
<IconRefresh />
</ActionIcon>
</Group>
{hasErrors && (
<List>
{registryStatus?.registry_errors?.map((error, i) => (
<List.Item key={i}>
<Code>{error.message}</Code>
</List.Item>
))}
</List>
)}
</Stack>
</Accordion.Panel>
</Accordion.Item>
</Accordion>
);
}
Loading
Loading