From 7400bd657a70da659e7d6444d18e6ef1b7b9cbb9 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Thu, 5 Apr 2018 15:53:57 +0200 Subject: [PATCH] chore: coding style fixes --- flow-typed/promise-toolbox.js | 2 +- .../xo-server-transport-email/src/index.js | 3 +- packages/xo-server/better-stacks.js | 6 +- packages/xo-server/src/api/xo.js | 4 +- .../xo-server/src/xo-mixins/authentication.js | 3 +- .../xo-server/src/xo-mixins/scheduling.js | 4 +- .../xo-web/src/common/sorted-table/index.js | 46 ++++---- .../src/common/xo/migrate-vm-modal/index.js | 2 +- .../src/common/xo/migrate-vms-modal/index.js | 2 +- .../backup/file-restore/restore-file-modal.js | 14 +-- .../xo-web/src/xo-app/backup/new/index.js | 104 +++++++++--------- packages/xo-web/src/xo-app/home/index.js | 56 +++++----- packages/xo-web/src/xo-app/home/vm-item.js | 5 +- packages/xo-web/src/xo-app/new-vm/index.js | 22 ++-- packages/xo-web/src/xo-app/sr/tab-xosan.js | 10 +- packages/xo-web/src/xo-app/vm/tab-general.js | 4 +- .../xo-web/src/xo-app/xoa/update/index.js | 6 +- packages/xo-web/src/xo-app/xosan/index.js | 12 +- 18 files changed, 157 insertions(+), 148 deletions(-) diff --git a/flow-typed/promise-toolbox.js b/flow-typed/promise-toolbox.js index 62e02ab5b..d7a5825b6 100644 --- a/flow-typed/promise-toolbox.js +++ b/flow-typed/promise-toolbox.js @@ -3,7 +3,7 @@ declare module 'promise-toolbox' { declare export function defer(): {| promise: Promise, reject: T => void, - resolve: T => void + resolve: T => void, |} declare export function fromEvent(emitter: mixed, string): Promise declare export function ignoreErrors(): Promise diff --git a/packages/xo-server-transport-email/src/index.js b/packages/xo-server-transport-email/src/index.js index 47c9d3ab7..b57e1117a 100644 --- a/packages/xo-server-transport-email/src/index.js +++ b/packages/xo-server-transport-email/src/index.js @@ -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, diff --git a/packages/xo-server/better-stacks.js b/packages/xo-server/better-stacks.js index 20cf47146..c48101cfd 100644 --- a/packages/xo-server/better-stacks.js +++ b/packages/xo-server/better-stacks.js @@ -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 diff --git a/packages/xo-server/src/api/xo.js b/packages/xo-server/src/api/xo.js index bf0feab98..9cc41ea03 100644 --- a/packages/xo-server/src/api/xo.js +++ b/packages/xo-server/src/api/xo.js @@ -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 }) } diff --git a/packages/xo-server/src/xo-mixins/authentication.js b/packages/xo-server/src/xo-mixins/authentication.js index b6bc4afdd..958f30154 100644 --- a/packages/xo-server/src/xo-mixins/authentication.js +++ b/packages/xo-server/src/xo-mixins/authentication.js @@ -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) diff --git a/packages/xo-server/src/xo-mixins/scheduling.js b/packages/xo-server/src/xo-mixins/scheduling.js index 3880d13ac..8dc09e5b2 100644 --- a/packages/xo-server/src/xo-mixins/scheduling.js +++ b/packages/xo-server/src/xo-mixins/scheduling.js @@ -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 } diff --git a/packages/xo-web/src/common/sorted-table/index.js b/packages/xo-web/src/common/sorted-table/index.js index 1b773c456..a9937f73a 100644 --- a/packages/xo-web/src/common/sorted-table/index.js +++ b/packages/xo-web/src/common/sorted-table/index.js @@ -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 ? ( {' '} diff --git a/packages/xo-web/src/common/xo/migrate-vm-modal/index.js b/packages/xo-web/src/common/xo/migrate-vm-modal/index.js index 0ae9d17c0..4b3d54d1e 100644 --- a/packages/xo-web/src/common/xo/migrate-vm-modal/index.js +++ b/packages/xo-web/src/common/xo/migrate-vm-modal/index.js @@ -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 ) diff --git a/packages/xo-web/src/common/xo/migrate-vms-modal/index.js b/packages/xo-web/src/common/xo/migrate-vms-modal/index.js index 7f5117265..0f8ccc2ef 100644 --- a/packages/xo-web/src/common/xo/migrate-vms-modal/index.js +++ b/packages/xo-web/src/common/xo/migrate-vms-modal/index.js @@ -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 ) diff --git a/packages/xo-web/src/xo-app/backup/file-restore/restore-file-modal.js b/packages/xo-web/src/xo-app/backup/file-restore/restore-file-modal.js index 8fd6cd292..71b596340 100644 --- a/packages/xo-web/src/xo-app/backup/file-restore/restore-file-modal.js +++ b/packages/xo-web/src/xo-app/backup/file-restore/restore-file-modal.js @@ -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( diff --git a/packages/xo-web/src/xo-app/backup/new/index.js b/packages/xo-web/src/xo-app/backup/new/index.js index 0c0fbc043..892813c65 100644 --- a/packages/xo-web/src/xo-app/backup/new/index.js +++ b/packages/xo-web/src/xo-app/backup/new/index.js @@ -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 { {(method === 'vm.rollingDeltaBackup' || method === 'vm.deltaCopy') && ( -
- {_('backupVersionWarning')} -
- )} +
+ {_('backupVersionWarning')} +
+ )} {backupInfo && (
- ) : smartBackupMode && process.env.XOA_PLAN < 3 ? ( - - ) : ( -
- - {_('saveBackupJob')} - - -
- )} + + ) : smartBackupMode && process.env.XOA_PLAN < 3 ? ( + + ) : ( +
+ + {_('saveBackupJob')} + + +
+ )} diff --git a/packages/xo-web/src/xo-app/home/index.js b/packages/xo-web/src/xo-app/home/index.js index 064c7b464..64eceb449 100644 --- a/packages/xo-web/src/xo-app/home/index.js +++ b/packages/xo-web/src/xo-app/home/index.js @@ -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 { {this._getNumberOfSelectedItems() ? _('homeSelectedItems', { - icon: , - selected: this._getNumberOfSelectedItems(), - total: nItems, - }) + icon: , + selected: this._getNumberOfSelectedItems(), + total: nItems, + }) : _('homeDisplayedItems', { - displayed: filteredItems.length, - icon: , - total: nItems, - })} + displayed: filteredItems.length, + icon: , + total: nItems, + })} diff --git a/packages/xo-web/src/xo-app/home/vm-item.js b/packages/xo-web/src/xo-app/home/vm-item.js index e5e764819..a9dd4d88e 100644 --- a/packages/xo-web/src/xo-app/home/vm-item.js +++ b/packages/xo-web/src/xo-app/home/vm-item.js @@ -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 () { diff --git a/packages/xo-web/src/xo-app/new-vm/index.js b/packages/xo-web/src/xo-app/new-vm/index.js index ec172be5b..57d7b4b7f 100644 --- a/packages/xo-web/src/xo-app/new-vm/index.js +++ b/packages/xo-web/src/xo-app/new-vm/index.js @@ -765,8 +765,8 @@ export default class NewVm extends BaseComponent {

{isAdmin || !isEmpty(resourceSets) ? _('newVmCreateNewVmOn', { - select: isAdmin ? selectPool : selectResourceSet, - }) + select: isAdmin ? selectPool : selectResourceSet, + }) : _('newVmCreateNewVmNoPermission')}

@@ -1547,15 +1547,15 @@ export default class NewVm extends BaseComponent { ), template && template.virtualizationMode === 'hvm' && ( - - - - - - ), + + + + + + ), ]} ) diff --git a/packages/xo-web/src/xo-app/sr/tab-xosan.js b/packages/xo-web/src/xo-app/sr/tab-xosan.js index 6b50bc15f..c6510e14e 100644 --- a/packages/xo-web/src/xo-app/sr/tab-xosan.js +++ b/packages/xo-web/src/xo-app/sr/tab-xosan.js @@ -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, } }) diff --git a/packages/xo-web/src/xo-app/vm/tab-general.js b/packages/xo-web/src/xo-app/vm/tab-general.js index d92271367..0f654bac1 100644 --- a/packages/xo-web/src/xo-app/vm/tab-general.js +++ b/packages/xo-web/src/xo-app/vm/tab-general.js @@ -118,8 +118,8 @@ export default connectStore(() => {

{lastShutdownTime ? _('vmHaltedSince', { - ago: , - }) + ago: , + }) : _('vmNotRunning')}

)} diff --git a/packages/xo-web/src/xo-app/xoa/update/index.js b/packages/xo-web/src/xo-app/xoa/update/index.js index ad96fbab8..00058fe7f 100644 --- a/packages/xo-web/src/xo-app/xoa/update/index.js +++ b/packages/xo-web/src/xo-app/xoa/update/index.js @@ -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({ diff --git a/packages/xo-web/src/xo-app/xosan/index.js b/packages/xo-web/src/xo-app/xosan/index.js index 0bb80f080..c623c6899 100644 --- a/packages/xo-web/src/xo-app/xosan/index.js +++ b/packages/xo-web/src/xo-app/xosan/index.js @@ -70,12 +70,12 @@ const XOSAN_COLUMNS = [ const badStatus = every(status[sr.id]) ? null : _('xosanBadStatus', { - badStatuses: ( -
    - {map(status, (_, status) =>
  • {status}
    • )} -
- ), - }) + badStatuses: ( +
    + {map(status, (_, status) =>
  • {status}
    • )} +
+ ), + }) if (pbdsDetached != null || badStatus != null) { return (