diff --git a/src/components/Dashboard/common/ObjectList.jsx b/src/components/Dashboard/common/ObjectList.jsx index 639c17fb..79ea72d8 100644 --- a/src/components/Dashboard/common/ObjectList.jsx +++ b/src/components/Dashboard/common/ObjectList.jsx @@ -1,33 +1,48 @@ import PropTypes from 'prop-types' import ObjectDisplay from './ObjectDisplay' -import { Space, Typography } from 'antd' +import { Flex, Typography } from 'antd' +import ScrollBox from './ScrollBox' const { Text } = Typography -const ObjectList = ({ value, objectType, style, showHyperlink = false }) => { +const ObjectList = ({ + value, + objectType, + style, + showHyperlink = false, + scrollHorizontal = false +}) => { if (!value || !Array.isArray(value) || value.length === 0) { return n/a } - return ( - + const listContents = ( + {value.map((item) => ( - +
+ +
))} -
+ ) + + if (scrollHorizontal) { + return {listContents} + } else { + return listContents + } } ObjectList.propTypes = { value: PropTypes.array, objectType: PropTypes.string, style: PropTypes.object, - showHyperlink: PropTypes.bool + showHyperlink: PropTypes.bool, + scrollHorizontal: PropTypes.bool } export default ObjectList diff --git a/src/components/Dashboard/common/ObjectProperty.jsx b/src/components/Dashboard/common/ObjectProperty.jsx index 68b1f7f1..e2947ef3 100644 --- a/src/components/Dashboard/common/ObjectProperty.jsx +++ b/src/components/Dashboard/common/ObjectProperty.jsx @@ -480,6 +480,7 @@ const ObjectProperty = ({ value={value} objectType={objectType} showHyperlink={showHyperlink} + scrollHorizontal={inTable} /> ) } diff --git a/src/components/Dashboard/common/SimplePropertyFilter.jsx b/src/components/Dashboard/common/SimplePropertyFilter.jsx index 454558b1..bf6f7f92 100644 --- a/src/components/Dashboard/common/SimplePropertyFilter.jsx +++ b/src/components/Dashboard/common/SimplePropertyFilter.jsx @@ -28,6 +28,11 @@ const getOptionKey = (option) => { const getDisplayValue = (option, property) => { if (!property) return option + if (property.type === 'objectList') { + if (Array.isArray(option)) return option + if (option && typeof option === 'object' && option._id) return [option] + if (option != null) return [{ _id: option }] + } if (property.type === 'object') { if (option && typeof option === 'object' && option._id) return option if (option != null) return { _id: option }