commit b8edee9ab470c97ef34e98254d75baee370206ad Author: Dhruv Srivastava Date: Mon Oct 19 10:20:07 2020 +0200 Replace parseInt() with Number Typescript guide recommends using Number() instead of parseInt when radix is 10 Change-Id: I814ad5e5c2b092e7310b87e30be4069da1ce8998 diff --git a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts index 27e6f32..c998cd8 100644 --- a/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts +++ b/polygerrit-ui/app/elements/admin/gr-permission/gr-permission.ts @@ -306,10 +306,7 @@ export class GrPermission extends GestureEventListeners( _computeLabelValues(values: LabelTypeInfoValues): ComputedLabelValue[] { const valuesArr: ComputedLabelValue[] = []; - const keys = Object.keys(values).sort( - // TODO(TS): change parseInto to Number(...) according to typescript style guide - (a, b) => parseInt(a, 10) - parseInt(b, 10) - ); + const keys = Object.keys(values).sort((a, b) => Number(a) - Number(b)); for (const key of keys) { let text = values[key]; @@ -318,7 +315,7 @@ export class GrPermission extends GestureEventListeners( } // The value from the server being used to choose which item is // selected is in integer form, so this must be converted. - valuesArr.push({value: parseInt(key, 10), text}); + valuesArr.push({value: Number(key), text}); } return valuesArr; } diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts index 63bbaee..606a731 100644 --- a/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts +++ b/polygerrit-ui/app/elements/change-list/gr-change-list-view/gr-change-list-view.ts @@ -229,7 +229,7 @@ export class GrChangeListView extends GestureEventListeners( if (!match) { return defaultLimit; } - return parseInt(match[1], 10); + return Number(match[1]); } _computeNavLink( diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts index 68fb622..0a85954 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts @@ -950,7 +950,7 @@ export class GrChangeView extends KeyboardShortcutMixin( } _handleRobotCommentPatchSetChanged(e: CustomEvent<{value: string}>) { - const patchSet = parseInt(e.detail.value) as PatchSetNum; + const patchSet = Number(e.detail.value) as PatchSetNum; if (patchSet === this._currentRobotCommentsPatchSet) return; this._currentRobotCommentsPatchSet = patchSet; } @@ -2016,10 +2016,7 @@ export class GrChangeView extends KeyboardShortcutMixin( const lineHeight = getComputedStyle(this).lineHeight; // Slice returns a number as a string, convert to an int. - this._lineHeight = parseInt( - lineHeight.slice(0, lineHeight.length - 2), - 10 - ); + this._lineHeight = Number(lineHeight.slice(0, lineHeight.length - 2)); this._change = change; if ( @@ -2043,7 +2040,7 @@ export class GrChangeView extends KeyboardShortcutMixin( if (thePatchNum === 'edit') { return revision._number === thePatchNum; } - return revision._number === parseInt(`${thePatchNum}`, 10); + return revision._number === Number(`${thePatchNum}`); } ); } @@ -2672,7 +2669,7 @@ export class GrChangeView extends KeyboardShortcutMixin( if (patchNumStr === 'edit') { patchNum = EditPatchSetNum; } else { - patchNum = parseInt(`${patchNumStr}`, 10) as PatchSetNum; + patchNum = Number(`${patchNumStr}`) as PatchSetNum; } if (patchNum === this._selectedRevision._number) { diff --git a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.ts b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.ts index 8202328..60a6058 100644 --- a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.ts +++ b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row.ts @@ -133,14 +133,12 @@ export class GrLabelScoreRow extends GestureEventListeners( ) { return []; } - const startPosition = this.labelValues[ - parseInt(permittedLabels[label][0], 10) - ]; + const startPosition = this.labelValues[Number(permittedLabels[label][0])]; if (side === 'start') { return new Array(startPosition); } const endPosition = this.labelValues[ - parseInt(permittedLabels[label][permittedLabels[label].length - 1], 10) + Number(permittedLabels[label][permittedLabels[label].length - 1]) ]; return new Array(Object.keys(this.labelValues).length - endPosition - 1); } @@ -159,8 +157,7 @@ export class GrLabelScoreRow extends GestureEventListeners( // default_value is an int, convert it to string label, e.g. "+1". return permittedLabels[label.name].find( value => - parseInt(value, 10) === - (labels[label.name] as QuickLabelInfo).default_value + Number(value) === (labels[label.name] as QuickLabelInfo).default_value ); } return; diff --git a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.ts b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.ts index 2e9189e..d528192 100644 --- a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.ts +++ b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.ts @@ -85,7 +85,7 @@ export class GrLabelScores extends GestureEventListeners( const selectedVal = typeof selectorEl.selectedValue === 'string' - ? parseInt(selectorEl.selectedValue, 10) + ? Number(selectorEl.selectedValue) : selectorEl.selectedValue; if (selectedVal === undefined) { @@ -101,7 +101,7 @@ export class GrLabelScores extends GestureEventListeners( let prevValNum: number | null | undefined; if (typeof prevVal === 'string') { - prevValNum = parseInt(prevVal, 10); + prevValNum = Number(prevVal); } else { prevValNum = prevVal; } @@ -123,7 +123,7 @@ export class GrLabelScores extends GestureEventListeners( numberValue?: number ) { for (const k in (labels[labelName] as DetailedLabelInfo).values) { - if (parseInt(k, 10) === numberValue) { + if (Number(k) === numberValue) { return k; } } @@ -191,7 +191,7 @@ export class GrLabelScores extends GestureEventListeners( const values: Set = new Set(); for (const label of labels) { for (const value of permittedLabels[label]) { - values.add(parseInt(value, 10)); + values.add(Number(value)); } } diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts index 7c71eaa..a36fc18 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts @@ -996,9 +996,7 @@ export class GrReplyDialog extends KeyboardShortcutMixin( const isUploader = this._uploader?._account_id === currentUser._account_id; this._attentionCcsCount = removeServiceUsers(ccs.base).length; this._currentAttentionSet = new Set( - Object.keys(change.attention_set || {}).map( - id => parseInt(id) as AccountId - ) + Object.keys(change.attention_set || {}).map(id => Number(id) as AccountId) ); const newAttention = new Set(this._currentAttentionSet); if (change.status === ChangeStatus.NEW) { diff --git a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts index 5ca7d88..9c3fa42 100644 --- a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts +++ b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.ts @@ -129,7 +129,7 @@ export class GrReviewerList extends GestureEventListeners( return Object.keys(labels).map(label => { return { label, - scores: labels[label].map(v => parseInt(v, 10)), + scores: labels[label].map(v => Number(v)), }; }); } diff --git a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts index 94f0302..21ff4dc 100644 --- a/polygerrit-ui/app/elements/core/gr-router/gr-router.ts +++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.ts @@ -728,7 +728,7 @@ export class GrRouter extends GestureEventListeners( } return { leftSide: !!match[1], - lineNum: parseInt(match[2], 10), + lineNum: Number(match[2]), }; } diff --git a/polygerrit-ui/app/elements/diff/gr-coverage-layer/gr-coverage-layer.ts b/polygerrit-ui/app/elements/diff/gr-coverage-layer/gr-coverage-layer.ts index 2167641..6f9705f 100644 --- a/polygerrit-ui/app/elements/diff/gr-coverage-layer/gr-coverage-layer.ts +++ b/polygerrit-ui/app/elements/diff/gr-coverage-layer/gr-coverage-layer.ts @@ -84,7 +84,7 @@ export class GrCoverageLayer let elementLineNumber; const dataValue = lineNumberEl.getAttribute('data-value'); if (dataValue) { - elementLineNumber = parseInt(dataValue, 10); + elementLineNumber = Number(dataValue); } if (!elementLineNumber || elementLineNumber < 1) return; diff --git a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts index 2486c03..a3db656 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-cursor/gr-diff-cursor.ts @@ -425,7 +425,7 @@ export class GrDiffCursor extends GestureEventListeners( return { leftSide: cell.matches('.left'), - number: parseInt(number, 10), + number: Number(number), }; } diff --git a/polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection.ts b/polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection.ts index fab2b59..b75ba8f 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection.ts @@ -241,13 +241,13 @@ export class GrDiffSelection extends GestureEventListeners( range.endContainer.classList.contains('right')); const startLineDataValue = startLineEl.getAttribute('data-value'); if (!startLineDataValue) return; - const startLineNum = parseInt(startLineDataValue, 10); + const startLineNum = Number(startLineDataValue); let endLineNum; if (endsAtOtherEmptySide) { endLineNum = startLineNum + 1; } else if (endLineEl) { const endLineDataValue = endLineEl.getAttribute('data-value'); - if (endLineDataValue) endLineNum = parseInt(endLineDataValue, 10); + if (endLineDataValue) endLineNum = Number(endLineDataValue); } return this._getRangeFromDiff( diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts index 3d0dede..3f2c6a3 100644 --- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts +++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts @@ -163,9 +163,7 @@ export class GrEditorView extends KeyboardShortcutMixin( this._patchNum = value.patchNum || (SPECIAL_PATCH_SET_NUM.EDIT as PatchSetNum); this._lineNum = - typeof value.lineNum === 'string' - ? parseInt(value.lineNum) - : value.lineNum; + typeof value.lineNum === 'string' ? Number(value.lineNum) : value.lineNum; // NOTE: This may be called before attachment (e.g. while parentElement is // null). Fire title-change in an async so that, if attachment to the DOM diff --git a/polygerrit-ui/app/elements/gr-app-element.js b/polygerrit-ui/app/elements/gr-app-element.js index b67bea0..93b051c 100644 --- a/polygerrit-ui/app/elements/gr-app-element.js +++ b/polygerrit-ui/app/elements/gr-app-element.js @@ -498,7 +498,7 @@ class GrAppElement extends KeyboardShortcutMixin( const hash = e.detail.hash.substring(1); let pathname = e.detail.pathname; - if (pathname.startsWith('/c/') && parseInt(hash, 10) > 0) { + if (pathname.startsWith('/c/') && Number(hash) > 0) { pathname += '@' + hash; } this.set('_path', pathname); diff --git a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.ts b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.ts index 6699f25..fd10a16 100644 --- a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.ts +++ b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor.ts @@ -84,7 +84,7 @@ export class GrEmailEditor extends GestureEventListeners( if (!(target instanceof Element)) return; const indexStr = target.getAttribute('data-index'); if (indexStr === null) return; - const index = parseInt(indexStr, 10); + const index = Number(indexStr); const email = this._emails[index]; this.push('_emailsToRemove', email); this.splice('_emails', index, 1); diff --git a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.ts b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.ts index 92ae1c4..21e414b 100644 --- a/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.ts +++ b/polygerrit-ui/app/elements/settings/gr-gpg-editor/gr-gpg-editor.ts @@ -97,7 +97,7 @@ export class GrGpgEditor extends GestureEventListeners( _showKey(e: Event) { const el = (dom(e) as EventApi).localTarget as Element; - const index = parseInt(el.getAttribute('data-index')!, 10); + const index = Number(el.getAttribute('data-index')!); this._keyToView = this._keys[index]; this.$.viewKeyOverlay.open(); } @@ -108,7 +108,7 @@ export class GrGpgEditor extends GestureEventListeners( _handleDeleteKey(e: Event) { const el = (dom(e) as EventApi).localTarget as Element; - const index = parseInt(el.getAttribute('data-index')!, 10); + const index = Number(el.getAttribute('data-index')!); this.push('_keysToRemove', this._keys[index]); this.splice('_keys', index, 1); this.hasUnsavedChanges = true; diff --git a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.ts b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.ts index 15f2d4f..507caef 100644 --- a/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.ts +++ b/polygerrit-ui/app/elements/settings/gr-ssh-editor/gr-ssh-editor.ts @@ -93,7 +93,7 @@ export class GrSshEditor extends GestureEventListeners( _showKey(e: Event) { const el = (dom(e) as EventApi).localTarget as GrButton; - const index = parseInt(el.getAttribute('data-index')!, 10); + const index = Number(el.getAttribute('data-index')!); this._keyToView = this._keys[index]; this.$.viewKeyOverlay.open(); } @@ -104,7 +104,7 @@ export class GrSshEditor extends GestureEventListeners( _handleDeleteKey(e: Event) { const el = (dom(e) as EventApi).localTarget as GrButton; - const index = parseInt(el.getAttribute('data-index')!, 10); + const index = Number(el.getAttribute('data-index')!); this.push('_keysToRemove', this._keys[index]); this.splice('_keys', index, 1); this.hasUnsavedChanges = true; diff --git a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts index e1adae5..15f9c6b 100644 --- a/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts +++ b/polygerrit-ui/app/elements/settings/gr-watched-projects-editor/gr-watched-projects-editor.ts @@ -138,7 +138,7 @@ export class GrWatchedProjectsEditor extends GestureEventListeners( const el = (dom(e) as EventApi).localTarget as HTMLInputElement; const dataIndex = el.getAttribute('data-index'); if (dataIndex === null || !this._projects) return; - const index = parseInt(dataIndex, 10); + const index = Number(dataIndex); const project = this._projects[index]; this.splice('_projects', index, 1); this.push('_projectsToRemove', project); @@ -221,7 +221,7 @@ export class GrWatchedProjectsEditor extends GestureEventListeners( const dataIndex = el.getAttribute('data-index'); const key = el.getAttribute('data-key'); if (dataIndex === null || key === null) return; - const index = parseInt(dataIndex, 10); + const index = Number(dataIndex); const checked = el.checked; this.set(['_projects', index, key], !!checked); this.hasUnsavedChanges = true; diff --git a/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info.ts b/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info.ts index c9e448e..626e918 100644 --- a/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info.ts +++ b/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info.ts @@ -203,9 +203,8 @@ export class GrLabelInfo extends GestureEventListeners( } target.disabled = true; - const accountID = parseInt( - `${target.getAttribute('data-account-id')}`, - 10 + const accountID = Number( + `${target.getAttribute('data-account-id')}` ) as AccountId; this._xhrPromise = this.$.restAPI .deleteVote(this.change._number, accountID, this.label) diff --git a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts b/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts index 6bf0776..b3c0a85 100644 --- a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts +++ b/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts @@ -288,7 +288,7 @@ export class GrTextarea extends KeyboardShortcutMixin( _getFontSize() { const fontSizePx = getComputedStyle(this).fontSize || '12px'; - return parseInt(fontSizePx.substr(0, fontSizePx.length - 2), 10); + return Number(fontSizePx.substr(0, fontSizePx.length - 2)); } _getScrollTop() { diff --git a/polygerrit-ui/app/services/gr-auth/gr-auth_impl.ts b/polygerrit-ui/app/services/gr-auth/gr-auth_impl.ts index b5330e7..8fe7c35 100644 --- a/polygerrit-ui/app/services/gr-auth/gr-auth_impl.ts +++ b/polygerrit-ui/app/services/gr-auth/gr-auth_impl.ts @@ -201,7 +201,7 @@ export class Auth implements AuthService { return false; } - const expiration = new Date(parseInt(token.expires_at, 10) * 1000); + const expiration = new Date(Number(token.expires_at) * 1000); if (Date.now() >= expiration.getTime()) { return false; } diff --git a/polygerrit-ui/app/utils/label-util.ts b/polygerrit-ui/app/utils/label-util.ts index 3a2556f..4313745 100644 --- a/polygerrit-ui/app/utils/label-util.ts +++ b/polygerrit-ui/app/utils/label-util.ts @@ -26,7 +26,7 @@ export const CODE_REVIEW = 'Code-Review'; export function getVotingRange(label?: LabelInfo): VotingRangeInfo | undefined { if (!label || !isDetailedLabelInfo(label)) return undefined; - const values = Object.keys(label.values).map(v => parseInt(v, 10)); + const values = Object.keys(label.values).map(v => Number(v)); values.sort((a, b) => a - b); if (!values.length) return undefined; return {min: values[0], max: values[values.length - 1]}; diff --git a/polygerrit-ui/app/utils/patch-set-util.ts b/polygerrit-ui/app/utils/patch-set-util.ts index 48ef367..3632afe 100644 --- a/polygerrit-ui/app/utils/patch-set-util.ts +++ b/polygerrit-ui/app/utils/patch-set-util.ts @@ -321,5 +321,5 @@ export function findSortedIndex( */ export function getParentIndex(rangeBase: PatchSetNum) { - return -parseInt(`${rangeBase}`, 10); + return -Number(`${rangeBase}`); }