Resolve TODO about removing SPECIAL_PATCH_SET_NUM
Change-Id: I060076a995899946c310b5b63296fcf698f239de
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
index 0b41a1b..4d50c00 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
@@ -40,7 +40,6 @@
stubRestApi,
TestKeyboardShortcutBinder,
} from '../../../test/test-utils';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util';
import {Shortcut} from '../../../mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin';
import {
createAppElementChangeViewParams,
@@ -2775,7 +2774,7 @@
});
element.set('_change.revisions.rev2', {
- _number: SPECIAL_PATCH_SET_NUM.EDIT,
+ _number: EditPatchSetNum,
});
flush();
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
index 2761b89..8fe06f8 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.js
@@ -20,7 +20,6 @@
import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
import {ChangeStatus} from '../../../constants/constants.js';
import {TestKeyboardShortcutBinder} from '../../../test/test-utils.js';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util.js';
import {Shortcut} from '../../../mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.js';
import {_testOnly_findCommentById} from '../gr-comment-api/gr-comment-api.js';
import {GerritView} from '../../../services/router/router-model.js';
@@ -30,6 +29,7 @@
createComment,
} from '../../../test/test-data-generators.js';
import {stubRestApi} from '../../../test/test-utils.js';
+import {EditPatchSetNum} from '../../../types/common.js';
const basicFixture = fixtureFromElement('gr-diff-view');
@@ -1142,7 +1142,7 @@
test('file review status with edit loaded', () => {
const saveReviewedStub = sinon.stub(element, '_saveReviewedState');
- element._patchRange = {patchNum: SPECIAL_PATCH_SET_NUM.EDIT};
+ element._patchRange = {patchNum: EditPatchSetNum};
flush();
assert.isTrue(element._editMode);
@@ -1643,7 +1643,7 @@
element._patchRange = {patchNum: 1};
// Reviewed checkbox should be shown.
assert.isTrue(isVisible(element.$.reviewed));
- element.set('_patchRange.patchNum', SPECIAL_PATCH_SET_NUM.EDIT);
+ element.set('_patchRange.patchNum', EditPatchSetNum);
flush();
assert.isFalse(isVisible(element.$.reviewed));
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
index 5882f10..ae5a5d2 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff_test.js
@@ -23,8 +23,8 @@
import {_setHiddenScroll} from '../../../scripts/hiddenscroll.js';
import {runA11yAudit} from '../../../test/a11y-test-utils.js';
import '@polymer/paper-button/paper-button.js';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util.js';
import {stubRestApi} from '../../../test/test-utils.js';
+import {EditPatchSetNum, ParentPatchSetNum} from '../../../types/common.js';
const basicFixture = fixtureFromElement('gr-diff');
@@ -568,7 +568,7 @@
});
test('addDraftAtLine on an edit', () => {
- element.patchRange.basePatchNum = SPECIAL_PATCH_SET_NUM.EDIT;
+ element.patchRange.basePatchNum = EditPatchSetNum;
sinon.stub(element, '_selectLine');
sinon.stub(element, '_createComment');
const alertSpy = sinon.spy();
@@ -579,8 +579,8 @@
});
test('addDraftAtLine on an edit base', () => {
- element.patchRange.patchNum = SPECIAL_PATCH_SET_NUM.EDIT;
- element.patchRange.basePatchNum = SPECIAL_PATCH_SET_NUM.PARENT;
+ element.patchRange.patchNum = EditPatchSetNum;
+ element.patchRange.basePatchNum = ParentPatchSetNum;
sinon.stub(element, '_selectLine');
sinon.stub(element, '_createComment');
const alertSpy = sinon.spy();
diff --git a/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js b/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js
index 8b40db3..956f087 100644
--- a/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js
+++ b/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select_test.js
@@ -24,9 +24,9 @@
import {RevisionInfo} from '../../shared/revision-info/revision-info.js';
import {createCommentApiMockWithTemplateElement} from '../../../test/mocks/comment-api';
import {html} from '@polymer/polymer/lib/utils/html-tag.js';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util.js';
import {ChangeComments} from '../gr-comment-api/gr-comment-api.js';
import {stubRestApi} from '../../../test/test-utils.js';
+import {EditPatchSetNum} from '../../../types/common.js';
const commentApiMockElement = createCommentApiMockWithTemplateElement(
'gr-patch-range-select-comment-api-mock', html`
@@ -72,7 +72,7 @@
};
const sortedRevisions = [
{_number: 3},
- {_number: SPECIAL_PATCH_SET_NUM.EDIT, basePatchNum: 2},
+ {_number: EditPatchSetNum, basePatchNum: 2},
{_number: 2},
{_number: 1},
];
@@ -86,7 +86,7 @@
}
assert.isTrue(element._computeLeftDisabled('3', patchRange.patchNum));
- patchRange.basePatchNum = SPECIAL_PATCH_SET_NUM.EDIT;
+ patchRange.basePatchNum = EditPatchSetNum;
assert.isTrue(element._computeLeftDisabled('3', patchRange.patchNum,
sortedRevisions));
assert.isTrue(element._computeRightDisabled(patchRange.basePatchNum, '1',
@@ -96,7 +96,7 @@
assert.isFalse(element._computeRightDisabled(patchRange.basePatchNum, '3',
sortedRevisions));
assert.isTrue(element._computeRightDisabled(patchRange.basePatchNum,
- SPECIAL_PATCH_SET_NUM.EDIT, sortedRevisions));
+ EditPatchSetNum, sortedRevisions));
});
test('_computeBaseDropdownContent', () => {
@@ -120,7 +120,7 @@
const patchNum = 1;
const sortedRevisions = [
{_number: 3, created: 'Mon, 01 Jan 2001 00:00:00 GMT'},
- {_number: SPECIAL_PATCH_SET_NUM.EDIT, basePatchNum: 2},
+ {_number: EditPatchSetNum, basePatchNum: 2},
{_number: 2, description: 'description'},
{_number: 1},
];
@@ -284,7 +284,7 @@
const basePatchNum = 1;
const sortedRevisions = [
{_number: 3, created: 'Mon, 01 Jan 2001 00:00:00 GMT'},
- {_number: SPECIAL_PATCH_SET_NUM.EDIT, basePatchNum: 2},
+ {_number: EditPatchSetNum, basePatchNum: 2},
{_number: 2, description: 'description'},
{_number: 1},
];
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 4be8edf..738e884 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
@@ -30,7 +30,6 @@
GerritNav,
GenerateUrlEditViewParameters,
} from '../../core/gr-navigation/gr-navigation';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util';
import {computeTruncatedPath} from '../../../utils/path-list-util';
import {customElement, property} from '@polymer/decorators';
import {ErrorCallback} from '../../../services/gr-rest-api/gr-rest-api';
@@ -40,6 +39,7 @@
EditPreferencesInfo,
Base64FileContent,
NumericChangeId,
+ EditPatchSetNum,
} from '../../../types/common';
import {GrStorage} from '../../shared/gr-storage/gr-storage';
import {HttpMethod, NotifyType} from '../../../constants/constants';
@@ -167,8 +167,7 @@
this._changeNum = value.changeNum;
this._path = value.path;
- this._patchNum =
- value.patchNum || (SPECIAL_PATCH_SET_NUM.EDIT as PatchSetNum);
+ this._patchNum = value.patchNum || (EditPatchSetNum as PatchSetNum);
this._lineNum =
typeof value.lineNum === 'string' ? Number(value.lineNum) : value.lineNum;
@@ -218,14 +217,14 @@
_viewEditInChangeView() {
const patch = this._successfulSave
- ? (SPECIAL_PATCH_SET_NUM.EDIT as PatchSetNum)
+ ? (EditPatchSetNum as PatchSetNum)
: this._patchNum;
if (this._change && patch)
GerritNav.navigateToChange(
this._change,
patch,
undefined,
- patch !== SPECIAL_PATCH_SET_NUM.EDIT
+ patch !== EditPatchSetNum
);
}
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
index 03e0b4c..b101373 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.js
@@ -18,9 +18,9 @@
import '../../../test/common-test-setup-karma.js';
import './gr-editor-view.js';
import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
-import {SPECIAL_PATCH_SET_NUM} from '../../../utils/patch-set-util.js';
import {HttpMethod} from '../../../constants/constants.js';
import {stubRestApi} from '../../../test/test-utils.js';
+import {EditPatchSetNum} from '../../../types/common.js';
const basicFixture = fixtureFromElement('gr-editor-view');
@@ -321,15 +321,15 @@
element._change = {};
navigateStub.restore();
const navStub = sinon.stub(GerritNav, 'navigateToChange');
- element._patchNum = SPECIAL_PATCH_SET_NUM.EDIT;
+ element._patchNum = EditPatchSetNum;
element._viewEditInChangeView();
- assert.equal(navStub.lastCall.args[1], SPECIAL_PATCH_SET_NUM.EDIT);
+ assert.equal(navStub.lastCall.args[1], EditPatchSetNum);
element._patchNum = '1';
element._viewEditInChangeView();
assert.equal(navStub.lastCall.args[1], '1');
element._successfulSave = true;
element._viewEditInChangeView();
- assert.equal(navStub.lastCall.args[1], SPECIAL_PATCH_SET_NUM.EDIT);
+ assert.equal(navStub.lastCall.args[1], EditPatchSetNum);
});
suite('keyboard shortcuts', () => {
diff --git a/polygerrit-ui/app/utils/patch-set-util.ts b/polygerrit-ui/app/utils/patch-set-util.ts
index 4738527..40e3eef 100644
--- a/polygerrit-ui/app/utils/patch-set-util.ts
+++ b/polygerrit-ui/app/utils/patch-set-util.ts
@@ -35,13 +35,6 @@
// Tags identifying ChangeMessages that move change out of WIP state.
const READY_TAGS = ['autogenerated:gerrit:setReadyForReview'];
-// TODO(TS): Replace usages of these constants by
-// EditPatchSetNum and ParentPatchSetNum in common.ts.
-export const SPECIAL_PATCH_SET_NUM = {
- EDIT: 'edit',
- PARENT: 'PARENT',
-};
-
export const CURRENT = 'current';
export interface PatchSet {
