fix(xo-web): component names must be in PascalCase (#5322)

This commit is contained in:
Rajaa.BARHTAOUI
2020-10-20 15:19:59 +02:00
committed by GitHub
parent 7fca6defd6
commit 3733a3c335
3 changed files with 20 additions and 11 deletions

View File

@@ -8,7 +8,6 @@ import Icon from 'icon'
import Tooltip from 'tooltip'
import { alert } from 'modal'
import { isAdmin } from 'selectors'
import { SelectVdi, SelectResourceSetsVdi } from './select-objects'
import { addSubscriptions, connectStore, resolveResourceSet } from './utils'
import { ejectCd, insertCd, subscribeResourceSets } from './xo'
import {
@@ -17,6 +16,10 @@ import {
createGetObject,
createSelector,
} from './selectors'
import {
SelectResourceSetsVdi,
SelectVdi as SelectAnyVdi,
} from './select-objects'
const vdiPredicate = vdi => !vdi.missing
@@ -92,11 +95,11 @@ export default class IsoDevice extends Component {
const { cdDrive, isAdmin, mountedIso } = this.props
const resourceSet = this._getResolvedResourceSet()
const useResourceSet = !(isAdmin || resourceSet === undefined)
const SelectVdi_ = useResourceSet ? SelectResourceSetsVdi : SelectVdi
const SelectVdi = useResourceSet ? SelectResourceSetsVdi : SelectAnyVdi
return (
<div className='input-group'>
<SelectVdi_
<SelectVdi
onChange={this._handleInsert}
predicate={vdiPredicate}
resourceSet={useResourceSet ? resourceSet : undefined}

View File

@@ -32,7 +32,6 @@ import {
noop,
resolveResourceSet,
} from 'utils'
import { SelectSr, SelectVdi, SelectResourceSetsSr } from 'select-objects'
import { SizeInput, Toggle } from 'form'
import { XoSelect, Size, Text } from 'editable'
import { confirm } from 'modal'
@@ -68,6 +67,11 @@ import {
setBootableVbd,
subscribeResourceSets,
} from 'xo'
import {
SelectResourceSetsSr,
SelectSr as SelectAnySr,
SelectVdi,
} from 'select-objects'
const compareSrs = createCompare([isSrShared])
@@ -284,13 +288,13 @@ class NewDisk extends Component {
const diskLimit = this._getResourceSetDiskLimit()
const resourceSet = this._getResolvedResourceSet()
const SelectSr_ =
isAdmin || resourceSet == null ? SelectSr : SelectResourceSetsSr
const SelectSr =
isAdmin || resourceSet == null ? SelectAnySr : SelectResourceSetsSr
return (
<form id='newDiskForm'>
<div className='form-group'>
<SelectSr_
<SelectSr
onChange={this.linkState('sr')}
predicate={this._getSrPredicate()}
required

View File

@@ -28,7 +28,7 @@ import {
resolveResourceSet,
} from 'utils'
import {
SelectNetwork,
SelectNetwork as SelectAnyNetwork,
SelectIp,
SelectResourceSetIp,
SelectResourceSetsNetwork,
@@ -868,13 +868,15 @@ class NewVif extends BaseComponent {
const { mac, network } = this.state
const resourceSet = this._getResolvedResourceSet()
const Select_ =
isAdmin || resourceSet == null ? SelectNetwork : SelectResourceSetsNetwork
const SelectNetwork =
isAdmin || resourceSet == null
? SelectAnyNetwork
: SelectResourceSetsNetwork
return (
<form id='newVifForm'>
<div className='form-group'>
<Select_
<SelectNetwork
onChange={this._selectNetwork}
predicate={this._getNetworkPredicate()}
required