diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index c7919b753..9700d748d 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -10,6 +10,7 @@ - [VM export] Feat export to `ova` format (PR [#6006](https://github.com/vatesfr/xen-orchestra/pull/6006)) - [Backup] Add _Restore Health Check_: ensure a backup is viable by doing an automatic test restore (requires guest tools in the VM) [#6148](https://github.com/vatesfr/xen-orchestra/pull/6148) - [VM migrate] Allow to choose a private network for VIFs network (PR [#6200](https://github.com/vatesfr/xen-orchestra/pull/6200)) +- [Proxy] Disable "Deploy proxy" button for source users (PR [#6199](https://github.com/vatesfr/xen-orchestra/pull/6199)) ### Bug fixes diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index d80cae89a..e7f48f052 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -2395,6 +2395,7 @@ const messages = { trialLicenseInfo: 'You are currently in a {edition} trial period that will end on {date, date, medium}', // ----- proxies ----- + deployProxyDisabled: 'Only available to XOA users', forgetProxyApplianceTitle: 'Forget prox{n, plural, one {y} other {ies}}', forgetProxyApplianceMessage: 'Are you sure you want to forget {n, number} prox{n, plural, one {y} other {ies}}?', forgetProxies: 'Forget proxy(ies)', diff --git a/packages/xo-web/src/xo-app/proxies/index.js b/packages/xo-web/src/xo-app/proxies/index.js index af863af3f..c3b9074ad 100644 --- a/packages/xo-web/src/xo-app/proxies/index.js +++ b/packages/xo-web/src/xo-app/proxies/index.js @@ -28,6 +28,8 @@ import Page from '../page' import deployProxy from './deploy-proxy' import { updateApplianceSettings } from './update-appliance-settings' +import { getXoaPlan, SOURCES } from '../../common/xoa-plans' + const _editProxy = (value, { name, proxy }) => editProxyAppliance(proxy, { [name]: value }) const HEADER = ( @@ -230,6 +232,9 @@ const Proxies = decorate([ return fetchProxyUpgrades([id]) }, }, + computed: { + isFromSource: () => getXoaPlan() === SOURCES, + }, }), withRouter, injectState, @@ -237,7 +242,14 @@ const Proxies = decorate([
- + {_('deployProxy')}