chore: coding style fixes
This commit is contained in:
parent
da62cba3f8
commit
7400bd657a
2
flow-typed/promise-toolbox.js
vendored
2
flow-typed/promise-toolbox.js
vendored
@ -3,7 +3,7 @@ declare module 'promise-toolbox' {
|
||||
declare export function defer<T>(): {|
|
||||
promise: Promise<T>,
|
||||
reject: T => void,
|
||||
resolve: T => void
|
||||
resolve: T => void,
|
||||
|}
|
||||
declare export function fromEvent(emitter: mixed, string): Promise<mixed>
|
||||
declare export function ignoreErrors(): Promise<void>
|
||||
|
@ -58,7 +58,8 @@ export const configurationSchema = {
|
||||
},
|
||||
port: {
|
||||
type: 'integer',
|
||||
description: 'port of the SMTP server (defaults to 25 or 465 for TLS)',
|
||||
description:
|
||||
'port of the SMTP server (defaults to 25 or 465 for TLS)',
|
||||
},
|
||||
secure: {
|
||||
default: false,
|
||||
|
@ -8,12 +8,14 @@ try {
|
||||
const filtered = frames.filter(function (frame) {
|
||||
const name = frame && frame.getFileName()
|
||||
|
||||
return (// has a filename
|
||||
return (
|
||||
// has a filename
|
||||
name &&
|
||||
// contains a separator (no internal modules)
|
||||
name.indexOf(sep) !== -1 &&
|
||||
// does not start with `internal`
|
||||
name.lastIndexOf('internal', 0) !== -1)
|
||||
name.lastIndexOf('internal', 0) !== -1
|
||||
)
|
||||
})
|
||||
|
||||
// depd (used amongst other by express requires at least 3 frames
|
||||
|
@ -42,7 +42,9 @@ function handleGetAllObjects (req, res, { filter, limit }) {
|
||||
|
||||
export function getAllObjects ({ filter, limit, ndjson = false }) {
|
||||
return ndjson
|
||||
? this.registerHttpRequest(handleGetAllObjects, { filter, limit }).then($getFrom => ({ $getFrom }))
|
||||
? this.registerHttpRequest(handleGetAllObjects, { filter, limit }).then(
|
||||
$getFrom => ({ $getFrom })
|
||||
)
|
||||
: this.getObjects({ filter, limit })
|
||||
}
|
||||
|
||||
|
@ -154,7 +154,8 @@ export default class {
|
||||
id: await generateToken(),
|
||||
user_id: userId,
|
||||
expiration:
|
||||
Date.now() + (typeof expiresIn === 'string' ? ms(expiresIn) : expiresIn),
|
||||
Date.now() +
|
||||
(typeof expiresIn === 'string' ? ms(expiresIn) : expiresIn),
|
||||
})
|
||||
|
||||
await this._tokens.add(token)
|
||||
|
@ -15,7 +15,7 @@ export type Schedule = {|
|
||||
jobId: string,
|
||||
name: string,
|
||||
timezone?: string,
|
||||
userId: string
|
||||
userId: string,
|
||||
|}
|
||||
|
||||
const normalize = schedule => {
|
||||
@ -45,7 +45,7 @@ export default class Scheduling {
|
||||
first: Function,
|
||||
get: Function,
|
||||
remove: Function,
|
||||
update: Function
|
||||
update: Function,
|
||||
|}
|
||||
_runs: { __proto__: null, [string]: () => void }
|
||||
|
||||
|
@ -327,15 +327,15 @@ export default class SortedTable extends Component {
|
||||
'userData' in props
|
||||
? () => this.props.userData
|
||||
: createCollectionWrapper(() => {
|
||||
const { props } = this
|
||||
const userData = {}
|
||||
Object.keys(props).forEach(key => {
|
||||
if (startsWith(key, 'data-')) {
|
||||
userData[key.slice(5)] = props[key]
|
||||
}
|
||||
const { props } = this
|
||||
const userData = {}
|
||||
Object.keys(props).forEach(key => {
|
||||
if (startsWith(key, 'data-')) {
|
||||
userData[key.slice(5)] = props[key]
|
||||
}
|
||||
})
|
||||
return isEmpty(userData) ? undefined : userData
|
||||
})
|
||||
return isEmpty(userData) ? undefined : userData
|
||||
})
|
||||
|
||||
let selectedColumn = props.defaultColumn
|
||||
if (selectedColumn == null) {
|
||||
@ -649,8 +649,8 @@ export default class SortedTable extends Component {
|
||||
}
|
||||
|
||||
const method = (selected === undefined
|
||||
? !selectedItemsIds.has(item.id)
|
||||
: selected)
|
||||
? !selectedItemsIds.has(item.id)
|
||||
: selected)
|
||||
? 'add'
|
||||
: 'delete'
|
||||
|
||||
@ -659,16 +659,16 @@ export default class SortedTable extends Component {
|
||||
selectedItemsIds:
|
||||
range && (previous = this._previous) !== undefined
|
||||
? selectedItemsIds.withMutations(selectedItemsIds => {
|
||||
let i = previous
|
||||
let end = current
|
||||
if (previous > current) {
|
||||
i = current
|
||||
end = previous
|
||||
}
|
||||
for (; i <= end; ++i) {
|
||||
selectedItemsIds[method](visibleItems[i].id)
|
||||
}
|
||||
})
|
||||
let i = previous
|
||||
let end = current
|
||||
if (previous > current) {
|
||||
i = current
|
||||
end = previous
|
||||
}
|
||||
for (; i <= end; ++i) {
|
||||
selectedItemsIds[method](visibleItems[i].id)
|
||||
}
|
||||
})
|
||||
: selectedItemsIds[method](item.id),
|
||||
})
|
||||
|
||||
@ -842,9 +842,9 @@ export default class SortedTable extends Component {
|
||||
{nItems === nAllItems
|
||||
? _('sortedTableNumberOfItems', { nTotal: nItems })
|
||||
: _('sortedTableNumberOfFilteredItems', {
|
||||
nFiltered: nItems,
|
||||
nTotal: nAllItems,
|
||||
})}
|
||||
nFiltered: nItems,
|
||||
nTotal: nAllItems,
|
||||
})}
|
||||
{all ? (
|
||||
<span>
|
||||
{' '}
|
||||
|
@ -81,7 +81,7 @@ export default class MigrateVmModalBody extends BaseComponent {
|
||||
host =>
|
||||
host
|
||||
? sr =>
|
||||
isSrWritable(sr) &&
|
||||
isSrWritable(sr) &&
|
||||
(sr.$container === host.id || sr.$container === host.$pool)
|
||||
: false
|
||||
)
|
||||
|
@ -73,7 +73,7 @@ export default class MigrateVmsModalBody extends BaseComponent {
|
||||
host =>
|
||||
host
|
||||
? sr =>
|
||||
isSrWritable(sr) &&
|
||||
isSrWritable(sr) &&
|
||||
(sr.$container === host.id || sr.$container === host.$pool)
|
||||
: false
|
||||
)
|
||||
|
@ -43,13 +43,13 @@ const formatFilesOptions = (rawFiles, path) => {
|
||||
const files =
|
||||
path !== '/'
|
||||
? [
|
||||
{
|
||||
name: '..',
|
||||
id: '..',
|
||||
path: getParentPath(path),
|
||||
content: {},
|
||||
},
|
||||
]
|
||||
{
|
||||
name: '..',
|
||||
id: '..',
|
||||
path: getParentPath(path),
|
||||
content: {},
|
||||
},
|
||||
]
|
||||
: []
|
||||
|
||||
return files.concat(
|
||||
|
@ -425,32 +425,32 @@ export default class New extends Component {
|
||||
type: 'crossProduct',
|
||||
items: isArray(vms.vms)
|
||||
? [
|
||||
{
|
||||
type: 'set',
|
||||
values: map(vms.vms, vm => ({ id: extractId(vm) })),
|
||||
},
|
||||
{
|
||||
type: 'set',
|
||||
values: [mainParams],
|
||||
},
|
||||
]
|
||||
{
|
||||
type: 'set',
|
||||
values: map(vms.vms, vm => ({ id: extractId(vm) })),
|
||||
},
|
||||
{
|
||||
type: 'set',
|
||||
values: [mainParams],
|
||||
},
|
||||
]
|
||||
: [
|
||||
{
|
||||
type: 'set',
|
||||
values: [mainParams],
|
||||
},
|
||||
{
|
||||
type: 'map',
|
||||
collection: {
|
||||
type: 'fetchObjects',
|
||||
pattern: this._constructPattern(vms),
|
||||
{
|
||||
type: 'set',
|
||||
values: [mainParams],
|
||||
},
|
||||
iteratee: {
|
||||
type: 'extractProperties',
|
||||
mapping: { id: 'id' },
|
||||
{
|
||||
type: 'map',
|
||||
collection: {
|
||||
type: 'fetchObjects',
|
||||
pattern: this._constructPattern(vms),
|
||||
},
|
||||
iteratee: {
|
||||
type: 'extractProperties',
|
||||
mapping: { id: 'id' },
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
},
|
||||
}
|
||||
|
||||
@ -607,10 +607,10 @@ export default class New extends Component {
|
||||
</fieldset>
|
||||
{(method === 'vm.rollingDeltaBackup' ||
|
||||
method === 'vm.deltaCopy') && (
|
||||
<div className='alert alert-warning' role='alert'>
|
||||
<Icon icon='error' /> {_('backupVersionWarning')}
|
||||
</div>
|
||||
)}
|
||||
<div className='alert alert-warning' role='alert'>
|
||||
<Icon icon='error' /> {_('backupVersionWarning')}
|
||||
</div>
|
||||
)}
|
||||
{backupInfo && (
|
||||
<div>
|
||||
<GenericInput
|
||||
@ -704,31 +704,31 @@ export default class New extends Component {
|
||||
backupInfo &&
|
||||
process.env.XOA_PLAN <
|
||||
REQUIRED_XOA_PLAN[backupInfo.jobKey] ? (
|
||||
<Upgrade
|
||||
place='newBackup'
|
||||
available={REQUIRED_XOA_PLAN[backupInfo.jobKey]}
|
||||
/>
|
||||
) : smartBackupMode && process.env.XOA_PLAN < 3 ? (
|
||||
<Upgrade place='newBackup' available={3} />
|
||||
) : (
|
||||
<fieldset className='pull-right pt-1'>
|
||||
<ActionButton
|
||||
btnStyle='primary'
|
||||
className='mr-1'
|
||||
disabled={!backupInfo}
|
||||
form='form-new-vm-backup'
|
||||
handler={this._handleSubmit}
|
||||
icon='save'
|
||||
redirectOnSuccess='/backup/overview'
|
||||
size='large'
|
||||
>
|
||||
{_('saveBackupJob')}
|
||||
</ActionButton>
|
||||
<Button onClick={this._handleReset} size='large'>
|
||||
{_('selectTableReset')}
|
||||
</Button>
|
||||
</fieldset>
|
||||
)}
|
||||
<Upgrade
|
||||
place='newBackup'
|
||||
available={REQUIRED_XOA_PLAN[backupInfo.jobKey]}
|
||||
/>
|
||||
) : smartBackupMode && process.env.XOA_PLAN < 3 ? (
|
||||
<Upgrade place='newBackup' available={3} />
|
||||
) : (
|
||||
<fieldset className='pull-right pt-1'>
|
||||
<ActionButton
|
||||
btnStyle='primary'
|
||||
className='mr-1'
|
||||
disabled={!backupInfo}
|
||||
form='form-new-vm-backup'
|
||||
handler={this._handleSubmit}
|
||||
icon='save'
|
||||
redirectOnSuccess='/backup/overview'
|
||||
size='large'
|
||||
>
|
||||
{_('saveBackupJob')}
|
||||
</ActionButton>
|
||||
<Button onClick={this._handleReset} size='large'>
|
||||
{_('selectTableReset')}
|
||||
</Button>
|
||||
</fieldset>
|
||||
)}
|
||||
</Col>
|
||||
</Row>
|
||||
</Container>
|
||||
|
@ -647,12 +647,12 @@ export default class Home extends Component {
|
||||
this._setFilter(
|
||||
pools.length
|
||||
? ComplexMatcher.setPropertyClause(
|
||||
filter,
|
||||
'$pool',
|
||||
new ComplexMatcher.Or(
|
||||
map(pools, pool => new ComplexMatcher.String(pool.id))
|
||||
filter,
|
||||
'$pool',
|
||||
new ComplexMatcher.Or(
|
||||
map(pools, pool => new ComplexMatcher.String(pool.id))
|
||||
)
|
||||
)
|
||||
)
|
||||
: ComplexMatcher.setPropertyClause(filter, '$pool', undefined)
|
||||
)
|
||||
}
|
||||
@ -662,12 +662,12 @@ export default class Home extends Component {
|
||||
this._setFilter(
|
||||
hosts.length
|
||||
? ComplexMatcher.setPropertyClause(
|
||||
filter,
|
||||
'$container',
|
||||
new ComplexMatcher.Or(
|
||||
map(hosts, host => new ComplexMatcher.String(host.id))
|
||||
filter,
|
||||
'$container',
|
||||
new ComplexMatcher.Or(
|
||||
map(hosts, host => new ComplexMatcher.String(host.id))
|
||||
)
|
||||
)
|
||||
)
|
||||
: ComplexMatcher.setPropertyClause(filter, '$container', undefined)
|
||||
)
|
||||
}
|
||||
@ -677,12 +677,12 @@ export default class Home extends Component {
|
||||
this._setFilter(
|
||||
tags.length
|
||||
? ComplexMatcher.setPropertyClause(
|
||||
filter,
|
||||
'tags',
|
||||
new ComplexMatcher.Or(
|
||||
map(tags, tag => new ComplexMatcher.String(tag.id))
|
||||
filter,
|
||||
'tags',
|
||||
new ComplexMatcher.Or(
|
||||
map(tags, tag => new ComplexMatcher.String(tag.id))
|
||||
)
|
||||
)
|
||||
)
|
||||
: ComplexMatcher.setPropertyClause(filter, 'tags', undefined)
|
||||
)
|
||||
}
|
||||
@ -692,12 +692,12 @@ export default class Home extends Component {
|
||||
this._setFilter(
|
||||
resourceSets.length
|
||||
? ComplexMatcher.setPropertyClause(
|
||||
filter,
|
||||
'resourceSet',
|
||||
new ComplexMatcher.Or(
|
||||
map(resourceSets, set => new ComplexMatcher.String(set.id))
|
||||
filter,
|
||||
'resourceSet',
|
||||
new ComplexMatcher.Or(
|
||||
map(resourceSets, set => new ComplexMatcher.String(set.id))
|
||||
)
|
||||
)
|
||||
)
|
||||
: ComplexMatcher.setPropertyClause(filter, 'resourceSet', undefined)
|
||||
)
|
||||
}
|
||||
@ -892,15 +892,15 @@ export default class Home extends Component {
|
||||
<span className='text-muted'>
|
||||
{this._getNumberOfSelectedItems()
|
||||
? _('homeSelectedItems', {
|
||||
icon: <Icon icon={type.toLowerCase()} />,
|
||||
selected: this._getNumberOfSelectedItems(),
|
||||
total: nItems,
|
||||
})
|
||||
icon: <Icon icon={type.toLowerCase()} />,
|
||||
selected: this._getNumberOfSelectedItems(),
|
||||
total: nItems,
|
||||
})
|
||||
: _('homeDisplayedItems', {
|
||||
displayed: filteredItems.length,
|
||||
icon: <Icon icon={type.toLowerCase()} />,
|
||||
total: nItems,
|
||||
})}
|
||||
displayed: filteredItems.length,
|
||||
icon: <Icon icon={type.toLowerCase()} />,
|
||||
total: nItems,
|
||||
})}
|
||||
</span>
|
||||
</Col>
|
||||
<Col mediumSize={8} className='text-xs-right hidden-sm-down'>
|
||||
|
@ -42,7 +42,10 @@ import styles from './index.css'
|
||||
})
|
||||
@connectStore(() => ({
|
||||
container: createGetObject((_, props) => props.item.$container),
|
||||
totalDiskSize: createSumBy(createGetVmDisks((_, props) => props.item), 'size'),
|
||||
totalDiskSize: createSumBy(
|
||||
createGetVmDisks((_, props) => props.item),
|
||||
'size'
|
||||
),
|
||||
}))
|
||||
export default class VmItem extends Component {
|
||||
get _isRunning () {
|
||||
|
@ -765,8 +765,8 @@ export default class NewVm extends BaseComponent {
|
||||
<h2>
|
||||
{isAdmin || !isEmpty(resourceSets)
|
||||
? _('newVmCreateNewVmOn', {
|
||||
select: isAdmin ? selectPool : selectResourceSet,
|
||||
})
|
||||
select: isAdmin ? selectPool : selectResourceSet,
|
||||
})
|
||||
: _('newVmCreateNewVmNoPermission')}
|
||||
</h2>
|
||||
</Col>
|
||||
@ -1547,15 +1547,15 @@ export default class NewVm extends BaseComponent {
|
||||
),
|
||||
template &&
|
||||
template.virtualizationMode === 'hvm' && (
|
||||
<SectionContent>
|
||||
<Item label={_('vmVgpu')}>
|
||||
<SelectVgpuType
|
||||
onChange={this._linkState('vgpuType')}
|
||||
predicate={this._getVgpuTypePredicate()}
|
||||
/>
|
||||
</Item>
|
||||
</SectionContent>
|
||||
),
|
||||
<SectionContent>
|
||||
<Item label={_('vmVgpu')}>
|
||||
<SelectVgpuType
|
||||
onChange={this._linkState('vgpuType')}
|
||||
predicate={this._getVgpuTypePredicate()}
|
||||
/>
|
||||
</Item>
|
||||
</SectionContent>
|
||||
),
|
||||
]}
|
||||
</Section>
|
||||
)
|
||||
|
@ -495,11 +495,11 @@ export default class TabXosan extends Component {
|
||||
size: isEmpty(vm && vm.$VBDs)
|
||||
? null
|
||||
: sum(
|
||||
map(vm.$VBDs, vbdId => {
|
||||
const vdi = vdis[vbds[vbdId].VDI]
|
||||
return vdi === undefined ? 0 : vdi.size
|
||||
})
|
||||
),
|
||||
map(vm.$VBDs, vbdId => {
|
||||
const vdi = vdis[vbds[vbdId].VDI]
|
||||
return vdi === undefined ? 0 : vdi.size
|
||||
})
|
||||
),
|
||||
vm,
|
||||
}
|
||||
})
|
||||
|
@ -118,8 +118,8 @@ export default connectStore(() => {
|
||||
<p className='text-xs-center'>
|
||||
{lastShutdownTime
|
||||
? _('vmHaltedSince', {
|
||||
ago: <FormattedRelative value={lastShutdownTime * 1000} />,
|
||||
})
|
||||
ago: <FormattedRelative value={lastShutdownTime * 1000} />,
|
||||
})
|
||||
: _('vmNotRunning')}
|
||||
</p>
|
||||
)}
|
||||
|
@ -54,9 +54,9 @@ const update = () => xoaUpdater.update()
|
||||
const upgrade = ({ runningJobsExist }) =>
|
||||
runningJobsExist
|
||||
? confirm({
|
||||
title: _('upgradeWarningTitle'),
|
||||
body: _('upgradeWarningMessage'),
|
||||
}).then(() => xoaUpdater.upgrade())
|
||||
title: _('upgradeWarningTitle'),
|
||||
body: _('upgradeWarningMessage'),
|
||||
}).then(() => xoaUpdater.upgrade())
|
||||
: xoaUpdater.upgrade()
|
||||
|
||||
@addSubscriptions({
|
||||
|
@ -70,12 +70,12 @@ const XOSAN_COLUMNS = [
|
||||
const badStatus = every(status[sr.id])
|
||||
? null
|
||||
: _('xosanBadStatus', {
|
||||
badStatuses: (
|
||||
<ul>
|
||||
{map(status, (_, status) => <li key={status}>{status}</li>)}
|
||||
</ul>
|
||||
),
|
||||
})
|
||||
badStatuses: (
|
||||
<ul>
|
||||
{map(status, (_, status) => <li key={status}>{status}</li>)}
|
||||
</ul>
|
||||
),
|
||||
})
|
||||
|
||||
if (pbdsDetached != null || badStatus != null) {
|
||||
return (
|
||||
|
Loading…
Reference in New Issue
Block a user