Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(xo-web/home/pool): hide pro icon support for non XCP-ng pool #6661

Merged
merged 4 commits into from
Feb 14, 2023
Merged

fix(xo-web/home/pool): hide pro icon support for non XCP-ng pool #6661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b42bce1
fix(xo-web/home/pool): hide pro icon support for non XCP-ng pool
MathieuRA Feb 8, 2023
020643a
CHANGELOG.unrelease.md
MathieuRA Feb 8, 2023
a4c8b21
rajaa feedback
MathieuRA Feb 14, 2023
9ecfabc
Merge branch 'master' into fix/proSupportIconPool
MathieuRA Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [Pool/License] Fix license expiration on license binding modal (PR [#6666](https://github.com/vatesfr/xen-orchestra/pull/6666))
- [NBD Backup] Fix VDI not disconnecting from control domain (PR [#6660](https://github.com/vatesfr/xen-orchestra/pull/6660))
- [NBD Backup] Improve performance by avoid unnecessary VDI transfers
- [Home/Pool] Do not check for support on non `XCP-ng` pool (PR [#6661](https://github.com/vatesfr/xen-orchestra/pull/6661))

### Packages to release

Expand Down
6 changes: 5 additions & 1 deletion packages/xo-web/src/xo-app/home/pool-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ export default class PoolItem extends Component {
return icon(tooltip)
}

_isXcpngPool() {
return Object.values(this.props.poolHosts)[0].productBrand === 'XCP-ng'
Rajaa-BARHTAOUI marked this conversation as resolved.
Show resolved Hide resolved
}

render() {
const { item: pool, expandAll, isAdmin, selected, hostMetrics, poolHosts, nSrs, nVms } = this.props
const { missingPatchCount } = this.state
Expand All @@ -102,7 +106,7 @@ export default class PoolItem extends Component {
<Ellipsis>
<Text value={pool.name_label} onChange={this._setNameLabel} useLongClick />
</Ellipsis>
{isAdmin && <span className='ml-1'>{this._getPoolLicenseIcon()}</span>}
{isAdmin && this._isXcpngPool() && <span className='ml-1'>{this._getPoolLicenseIcon()}</span>}
&nbsp;&nbsp;
{missingPatchCount > 0 && (
<span>
Expand Down