farmcontrol/farmcontrol-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate IdDisplay component into ObjectDisplay for improved ID handling; conditionally render ID when object name is absent.

Browse Source
This commit is contained in:
Tom Butcher 2025-09-05 23:18:57 +01:00
parent 5cf4976635
commit b6cd1bac0b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/Dashboard/common/ObjectDisplay.jsx
View File

@ -5,6 +5,7 @@ import { getModelByName } from '../../../database/ObjectModels'
import { ApiServerContext } from '../context/ApiServerContext' import { ApiServerContext } from '../context/ApiServerContext'
import { AuthContext } from '../context/AuthContext' import { AuthContext } from '../context/AuthContext'
import merge from 'lodash/merge' import merge from 'lodash/merge'
import IdDisplay from './IdDisplay'
const { Text } = Typography const { Text } = Typography
@ -55,7 +56,15 @@ const ObjectDisplay = ({ object, objectType }) => {
<Flex gap={'small'} align='center'> <Flex gap={'small'} align='center'>
<Icon /> <Icon />
{objectData?.color ? <Badge color={objectData?.color} /> : null} {objectData?.color ? <Badge color={objectData?.color} /> : null}
<Text ellipsis>{objectData?.name ? objectData.name : null}</Text> {objectData?.name ? <Text ellipsis>{objectData.name}</Text> : null}
{objectData?._id && !objectData?.name ? (
<IdDisplay
id={objectData?._id}
type={objectType}
longId={false}
showCopy={false}
/>
) : null}
</Flex> </Flex>
) )
} }