Compare commits

...

2 Commits

Author SHA1 Message Date
cc712e7427 Update FilamentStock model to restore 'updatedAt' column for tracking
All checks were successful
farmcontrol/farmcontrol-ui/pipeline/head This commit looks good
- Reintroduced the 'updatedAt' column in the FilamentStock model, ensuring accurate tracking of updates while maintaining its read-only status and layout properties.
2026-07-26 19:00:24 +01:00
8ab1045732 Update TimeDisplay component to enhance layout flexibility
- Added the 'wrap' property to the Flex container in TimeDisplay, allowing for better handling of content overflow and improving overall layout adaptability.
2026-07-26 19:00:17 +01:00
2 changed files with 8 additions and 8 deletions

View File

@ -107,7 +107,7 @@ const TimeDisplay = ({
const formattedDate = dayjs(dateTime).format(dateFormat) const formattedDate = dayjs(dateTime).format(dateFormat)
return ( return (
<Flex align={'center'} gap={'small'}> <Flex align={'center'} gap={'small'} wrap>
{showDate || showTime ? <Text type={type}>{formattedDate}</Text> : null} {showDate || showTime ? <Text type={type}>{formattedDate}</Text> : null}
{showSince ? <Tag style={{ margin: 0 }}>{timeAgo}</Tag> : null} {showSince ? <Tag style={{ margin: 0 }}>{timeAgo}</Tag> : null}
</Flex> </Flex>

View File

@ -66,6 +66,13 @@ export const FilamentStock = {
readOnly: true, readOnly: true,
columnWidth: 180 columnWidth: 180
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'state', name: 'state',
label: 'State', label: 'State',
@ -74,13 +81,6 @@ export const FilamentStock = {
readOnly: true, readOnly: true,
columnWidth: 250 columnWidth: 250
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'filament', name: 'filament',
label: 'Filament', label: 'Filament',