feat(xo-web/vm/networks): improve tooltip messages (#5227)

See https://github.com/vatesfr/xen-orchestra/issues/4713#issuecomment-667655321
This commit is contained in:
Rajaa.BARHTAOUI 2020-09-09 11:59:54 +02:00 committed by GitHub
parent 481adf3a1e
commit 846eff4984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions

View File

@ -7,6 +7,8 @@
> Users must be able to say: “Nice enhancement, I'm eager to test it” > Users must be able to say: “Nice enhancement, I'm eager to test it”
- [VM/network] VIF's locking mode: improve tooltip messages [#4713](https://github.com/vatesfr/xen-orchestra/issues/4713) (PR [#5227](https://github.com/vatesfr/xen-orchestra/pull/5227))
### Bug fixes ### Bug fixes
> Users must be able to say: “I had this issue, happy to know it's fixed” > Users must be able to say: “I had this issue, happy to know it's fixed”
@ -27,3 +29,5 @@
> - major: if the change breaks compatibility > - major: if the change breaks compatibility
> >
> In case of conflict, the highest (lowest in previous list) `$version` wins. > In case of conflict, the highest (lowest in previous list) `$version` wins.
- xo-web minor

View File

@ -1156,13 +1156,15 @@ const messages = {
vifMacAutoGenerate: 'Auto-generated if empty', vifMacAutoGenerate: 'Auto-generated if empty',
vifAllowedIps: 'Allowed IPs', vifAllowedIps: 'Allowed IPs',
vifNoIps: 'No IPs', vifNoIps: 'No IPs',
vifDisabledNetwork: 'Network disabled', vifLockingModeDisabled: 'VIF locking mode is disabled',
vifLockedNetwork: 'Network locked', vifLockingModeUnlocked: 'VIF locking mode is unlocked',
vifLockingModeLocked: 'VIF locking mode is locked',
networkDefaultLockingModeDisabled: 'Network default locking mode is disabled',
networkDefaultLockingModeUnlocked: 'Network default locking mode is unlocked',
vifLockedNetworkNoIps: vifLockedNetworkNoIps:
'Network locked and no IPs are allowed for this interface', 'Network locked and no IPs are allowed for this interface',
vifUnlockedNetworkWithIps: vifUnlockedNetworkWithIps:
'Network not locked: some IPs are unnecessarily set as allowed for this interface', 'Some IPs are unnecessarily set as allowed for this interface',
vifUnLockedNetwork: 'Network not locked',
vifUnknownNetwork: 'Unknown network', vifUnknownNetwork: 'Unknown network',
vifCreate: 'Create', vifCreate: 'Create',

View File

@ -293,7 +293,7 @@ class VifStatus extends BaseComponent {
if (lockingMode === 'disabled') { if (lockingMode === 'disabled') {
return ( return (
<Tooltip content={_('vifDisabledNetwork')}> <Tooltip content={_('vifLockingModeDisabled')}>
<Icon icon='vif-disable' /> <Icon icon='vif-disable' />
</Tooltip> </Tooltip>
) )
@ -301,7 +301,7 @@ class VifStatus extends BaseComponent {
if (lockingMode === 'unlocked') { if (lockingMode === 'unlocked') {
return ( return (
<Tooltip content={_('vifUnLockedNetwork')}> <Tooltip content={_('vifLockingModeUnlocked')}>
<Icon icon='unlock' /> <Icon icon='unlock' />
</Tooltip> </Tooltip>
) )
@ -309,7 +309,7 @@ class VifStatus extends BaseComponent {
if (lockingMode === 'locked') { if (lockingMode === 'locked') {
return ( return (
<Tooltip content={_('vifLockedNetwork')}> <Tooltip content={_('vifLockingModeLocked')}>
<Icon icon='lock' /> <Icon icon='lock' />
</Tooltip> </Tooltip>
) )
@ -325,7 +325,7 @@ class VifStatus extends BaseComponent {
} }
if (network.defaultIsLocked) { if (network.defaultIsLocked) {
return ( return (
<Tooltip content={_('vifLockedNetwork')}> <Tooltip content={_('networkDefaultLockingModeDisabled')}>
<StackedIcons <StackedIcons
icons={[ icons={[
{ icon: 'vif-disable', size: 1 }, { icon: 'vif-disable', size: 1 },
@ -336,7 +336,7 @@ class VifStatus extends BaseComponent {
) )
} }
return ( return (
<Tooltip content={_('vifUnLockedNetwork')}> <Tooltip content={_('networkDefaultLockingModeUnlocked')}>
<StackedIcons <StackedIcons
icons={[ icons={[
{ icon: 'unlock', size: 1 }, { icon: 'unlock', size: 1 },