diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 997443b46..ebbbb387b 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -9,6 +9,7 @@ - [VM] Move boot order setting from Disk tab to Advanced tab [#1523](https://github.com/vatesfr/xen-orchestra/issues/1523#issuecomment-563141573) (PR [#4975](https://github.com/vatesfr/xen-orchestra/pull/4975)) - [XOA/licenses] Display proxy licenses (PR [#4944](https://github.com/vatesfr/xen-orchestra/pull/4944)) +- [Network selector] Display pool's name [#4885](https://github.com/vatesfr/xen-orchestra/issues/4885) (PR [#4990](https://github.com/vatesfr/xen-orchestra/pull/4990)) ### Bug fixes diff --git a/packages/xo-web/src/common/render-xo-item.js b/packages/xo-web/src/common/render-xo-item.js index df33bc149..c1806460d 100644 --- a/packages/xo-web/src/common/render-xo-item.js +++ b/packages/xo-web/src/common/render-xo-item.js @@ -318,12 +318,17 @@ Vdi.defaultProps = { export const Network = decorate([ connectStore(() => { const getObject = createGetObject() + const getPool = createGetObject( + createSelector(getObject, network => get(() => network.$pool)) + ) + // FIXME: props.self ugly workaround to get object as a self user return (state, props) => ({ network: getObject(state, props, props.self), + pool: getPool(state, props), }) }), - ({ id, network }) => { + ({ id, network, pool }) => { if (network === undefined) { return unknowItem(id, 'network') } @@ -331,6 +336,9 @@ export const Network = decorate([ return ( {network.name_label} + {pool !== undefined && ( + {` - ${pool.name_label}`} + )} ) },