Move ChangeStates from /elements to common.ts
Utils should not be importing types from /elements.
Google-bug-id: b/260980834
Release-Notes: skip
Change-Id: Ie90702a82991a36077e87d7cf58974441c7012c7
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 4cff996..cb3e5f3 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
@@ -96,6 +96,7 @@
ServerInfo,
UrlEncodedCommentId,
isRobot,
+ ChangeStates,
} from '../../../types/common';
import {FocusTarget, GrReplyDialog} from '../gr-reply-dialog/gr-reply-dialog';
import {GrIncludedInDialog} from '../gr-included-in-dialog/gr-included-in-dialog';
@@ -138,7 +139,6 @@
until,
} from '../../../utils/async-util';
import {Interaction, Timing} from '../../../constants/reporting';
-import {ChangeStates} from '../../shared/gr-change-status/gr-change-status';
import {getRevertCreatedChangeIds} from '../../../utils/message-util';
import {
getAddedByReason,
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 0b60745..4d97318 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
@@ -76,6 +76,7 @@
QuickLabelInfo,
PatchSetNumber,
CommentThread,
+ ChangeStates,
} from '../../../types/common';
import {GrEditControls} from '../../edit/gr-edit-controls/gr-edit-controls';
import {SinonFakeTimers, SinonStubbedMember} from 'sinon';
@@ -83,7 +84,6 @@
import {GerritView} from '../../../services/router/router-model';
import {ParsedChangeInfo} from '../../../types/types';
import {GrRelatedChangesList} from '../gr-related-changes-list/gr-related-changes-list';
-import {ChangeStates} from '../../shared/gr-change-status/gr-change-status';
import {
ChangeModel,
changeModelToken,
diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
index 073d9f1..269bbea 100644
--- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
+++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
@@ -6,26 +6,13 @@
import '../gr-icon/gr-icon';
import '../gr-tooltip-content/gr-tooltip-content';
import '../../../styles/shared-styles';
-import {ChangeInfo} from '../../../types/common';
+import {ChangeInfo, ChangeStates} from '../../../types/common';
import {sharedStyles} from '../../../styles/shared-styles';
import {LitElement, PropertyValues, html, css} from 'lit';
import {customElement, property, state} from 'lit/decorators.js';
import {createSearchUrl} from '../../../models/views/search';
import {GeneratedWebLink} from '../../../utils/weblink-util';
-export enum ChangeStates {
- ABANDONED = 'Abandoned',
- ACTIVE = 'Active',
- MERGE_CONFLICT = 'Merge Conflict',
- GIT_CONFLICT = 'Git Conflict',
- MERGED = 'Merged',
- PRIVATE = 'Private',
- READY_TO_SUBMIT = 'Ready to submit',
- REVERT_CREATED = 'Revert Created',
- REVERT_SUBMITTED = 'Revert Submitted',
- WIP = 'WIP',
-}
-
export const WIP_TOOLTIP =
"This change isn't ready to be reviewed or submitted. " +
'It will not appear on dashboards unless you are in the attention set, ' +
diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.ts b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.ts
index 4a046e7..36615c0 100644
--- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.ts
@@ -9,10 +9,11 @@
TEST_NUMERIC_CHANGE_ID,
} from '../../../test/test-data-generators';
import './gr-change-status';
-import {ChangeStates, GrChangeStatus, WIP_TOOLTIP} from './gr-change-status';
+import {GrChangeStatus, WIP_TOOLTIP} from './gr-change-status';
import {MERGE_CONFLICT_TOOLTIP} from './gr-change-status';
import {fixture, html, assert} from '@open-wc/testing';
import {queryAndAssert} from '../../../test/test-utils';
+import {ChangeStates} from '../../../types/common';
const PRIVATE_TOOLTIP =
'This change is only visible to its owner and ' +
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index 64d4d0a..e25e87f 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -690,6 +690,19 @@
id?: string;
}
+export enum ChangeStates {
+ ABANDONED = 'Abandoned',
+ ACTIVE = 'Active',
+ MERGE_CONFLICT = 'Merge Conflict',
+ GIT_CONFLICT = 'Git Conflict',
+ MERGED = 'Merged',
+ PRIVATE = 'Private',
+ READY_TO_SUBMIT = 'Ready to submit',
+ REVERT_CREATED = 'Revert Created',
+ REVERT_SUBMITTED = 'Revert Submitted',
+ WIP = 'WIP',
+}
+
export interface DraftCommentProps {
// This must be true for all drafts. Drafts received from the backend will be
// modified immediately with __draft:true before allowing them to get into
diff --git a/polygerrit-ui/app/utils/change-util.ts b/polygerrit-ui/app/utils/change-util.ts
index aa54318..1b0a71d 100644
--- a/polygerrit-ui/app/utils/change-util.ts
+++ b/polygerrit-ui/app/utils/change-util.ts
@@ -11,9 +11,9 @@
ChangeInfo,
AccountInfo,
RelatedChangeAndCommitInfo,
+ ChangeStates,
} from '../types/common';
import {ParsedChangeInfo} from '../types/types';
-import {ChangeStates} from '../elements/shared/gr-change-status/gr-change-status';
import {getUserId, isServiceUser} from './account-util';
// This can be wrong! See WARNING above
diff --git a/polygerrit-ui/app/utils/change-util_test.ts b/polygerrit-ui/app/utils/change-util_test.ts
index 70e6fd6..ccaa1db 100644
--- a/polygerrit-ui/app/utils/change-util_test.ts
+++ b/polygerrit-ui/app/utils/change-util_test.ts
@@ -5,7 +5,6 @@
*/
import {assert} from '@open-wc/testing';
import {ChangeStatus} from '../constants/constants';
-import {ChangeStates} from '../elements/shared/gr-change-status/gr-change-status';
import '../test/common-test-setup';
import {
createAccountWithId,
@@ -15,6 +14,7 @@
} from '../test/test-data-generators';
import {
AccountId,
+ ChangeStates,
CommitId,
NumericChangeId,
PatchSetNum,
