diff --git a/packages/web/src/appobj/AppObjectList.js b/packages/web/src/appobj/AppObjectList.js index c2770646f..7f6ac8556 100644 --- a/packages/web/src/appobj/AppObjectList.js +++ b/packages/web/src/appobj/AppObjectList.js @@ -96,15 +96,19 @@ function AppObjectListItem({ function AppObjectGroup({ group, items }) { const [isExpanded, setIsExpanded] = React.useState(true); const theme = useTheme(); + const filtered = items.filter(x => x.component); + let countText = filtered.length.toString(); + if (filtered.length < items.length) countText += `/${items.length}`; + return ( <> setIsExpanded(!isExpanded)} theme={theme}> - {group} {items && `(${items.filter(x => x.component).length})`} + {group} {items && `(${countText})`} - {isExpanded && items.map(x => x.component)} + {isExpanded && filtered.map(x => x.component)} ); } @@ -141,8 +145,7 @@ export function AppObjectList({ const listGrouped = _.compact( (list || []).map(data => { const matcher = AppObjectComponent.createMatcher && AppObjectComponent.createMatcher(data); - if (matcher && !matcher(filter)) return null; - const component = createComponent(data); + const component = matcher && !matcher(filter) ? null : createComponent(data); const group = groupFunc(data); return { group, data, component }; }) diff --git a/packages/web/src/appobj/SubColumnParamList.js b/packages/web/src/appobj/SubColumnParamList.js index 6c2f49c94..792b915d8 100644 --- a/packages/web/src/appobj/SubColumnParamList.js +++ b/packages/web/src/appobj/SubColumnParamList.js @@ -5,13 +5,15 @@ import { AppObjectCore } from './AppObjectCore'; import { AppObjectList } from './AppObjectList'; function ColumnAppObject({ data, commonProps }) { - const { columnName, dataType } = data; + const { columnName, dataType, foreignKey } = data; + let extInfo = dataType; + if (foreignKey) extInfo += ` -> ${foreignKey.refTableName}`; return (