Move EmailInfo from common.ts to rest-api.ts
A plugin wants to depend on the type, so moving types/ dir to api/ dir.
Release-Notes: skip
Change-Id: Ia60c62d4e9b1c88e40ce67d3ed58e6d7d800e267
diff --git a/polygerrit-ui/app/api/rest-api.ts b/polygerrit-ui/app/api/rest-api.ts
index 044693e..65c5cfaf 100644
--- a/polygerrit-ui/app/api/rest-api.ts
+++ b/polygerrit-ui/app/api/rest-api.ts
@@ -671,6 +671,16 @@
export type EmailAddress = BrandType<string, '_emailAddress'>;
/**
+ * The EmailInfo entity contains information about an email address of a user
+ * https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#email-info
+ */
+export declare interface EmailInfo {
+ email: EmailAddress;
+ preferred?: boolean;
+ pending_confirmation?: boolean;
+}
+
+/**
* The FetchInfo entity contains information about how to fetch a patchset via
* a certain protocol.
* https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#fetch-info
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.ts b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.ts
index 4655c71..ae55a4d 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog_test.ts
@@ -19,6 +19,7 @@
ChangeInfoId,
ChangeStatus,
CommitId,
+ EmailAddress,
GitRef,
HttpMethod,
NumericChangeId,
@@ -67,11 +68,11 @@
const emails = [
{
- email: 'primary@email.com',
+ email: 'primary@email.com' as EmailAddress,
preferred: true,
},
{
- email: 'secondary@email.com',
+ email: 'secondary@email.com' as EmailAddress,
preferred: false,
},
];
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.ts b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.ts
index 038fcd5..1c2a89d 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-rebase-dialog/gr-confirm-rebase-dialog_test.ts
@@ -174,7 +174,7 @@
test('hide rebaseWithCommitterEmail dialog when committer has single email', async () => {
element.committerEmailDropdownItems = [
{
- email: 'test1@example.com',
+ email: 'test1@example.com' as EmailAddress,
preferred: true,
pending_confirmation: true,
},
@@ -186,12 +186,12 @@
test('show rebaseWithCommitterEmail dialog when committer has more than one email', async () => {
element.committerEmailDropdownItems = [
{
- email: 'test1@example.com',
+ email: 'test1@example.com' as EmailAddress,
preferred: true,
pending_confirmation: true,
},
{
- email: 'test2@example.com',
+ email: 'test2@example.com' as EmailAddress,
pending_confirmation: true,
},
];
@@ -230,12 +230,12 @@
};
element.committerEmailDropdownItems = [
{
- email: 'currentuser1@example.com',
+ email: 'currentuser1@example.com' as EmailAddress,
preferred: true,
pending_confirmation: true,
},
{
- email: 'currentuser2@example.com',
+ email: 'currentuser2@example.com' as EmailAddress,
pending_confirmation: true,
},
];
@@ -264,12 +264,12 @@
};
element.committerEmailDropdownItems = [
{
- email: 'uploader1@example.com',
+ email: 'uploader1@example.com' as EmailAddress,
preferred: true,
pending_confirmation: true,
},
{
- email: 'uploader2@example.com',
+ email: 'uploader2@example.com' as EmailAddress,
preferred: false,
pending_confirmation: true,
},
diff --git a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.ts b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.ts
index 84ed8dc..12321c2 100644
--- a/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.ts
+++ b/polygerrit-ui/app/elements/settings/gr-email-editor/gr-email-editor_test.ts
@@ -8,6 +8,7 @@
import {GrEmailEditor} from './gr-email-editor';
import {spyRestApi, stubRestApi} from '../../../test/test-utils';
import {fixture, html, assert} from '@open-wc/testing';
+import {EmailAddress} from '../../../api/rest-api';
suite('gr-email-editor tests', () => {
let element: GrEmailEditor;
@@ -15,9 +16,9 @@
setup(async () => {
const emails = [
- {email: 'email@one.com'},
- {email: 'email@two.com', preferred: true},
- {email: 'email@three.com'},
+ {email: 'email@one.com' as EmailAddress},
+ {email: 'email@two.com' as EmailAddress, preferred: true},
+ {email: 'email@three.com' as EmailAddress},
];
accountEmailStub = stubRestApi('getAccountEmails').returns(
diff --git a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_test.ts b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_test.ts
index dbb89db..fe96d56 100644
--- a/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-editable-content/gr-editable-content_test.ts
@@ -15,6 +15,7 @@
import {GrDropdownList} from '../gr-dropdown-list/gr-dropdown-list';
import {navigationToken} from '../../core/gr-navigation/gr-navigation';
import {
+ EmailAddress,
NumericChangeId,
RepoName,
RevisionPatchSetNum,
@@ -23,11 +24,11 @@
const emails = [
{
- email: 'primary@example.com',
+ email: 'primary@example.com' as EmailAddress,
preferred: true,
},
{
- email: 'secondary@example.com',
+ email: 'secondary@example.com' as EmailAddress,
preferred: false,
},
];
diff --git a/polygerrit-ui/app/types/common.ts b/polygerrit-ui/app/types/common.ts
index e12e1a8..e84221a 100644
--- a/polygerrit-ui/app/types/common.ts
+++ b/polygerrit-ui/app/types/common.ts
@@ -60,6 +60,7 @@
EDIT,
EditPatchSet,
EmailAddress,
+ EmailInfo,
FetchInfo,
FileInfo,
GerritInfo,
@@ -163,6 +164,7 @@
DownloadSchemeInfo,
EditPatchSet,
EmailAddress,
+ EmailInfo,
FileInfo,
FixId,
FixSuggestionInfo,
@@ -1020,16 +1022,6 @@
}
/**
- * The EmailInfo entity contains information about an email address of a user
- * https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#email-info
- */
-export interface EmailInfo {
- email: string;
- preferred?: boolean;
- pending_confirmation?: boolean;
-}
-
-/**
* The CapabilityInfo entity contains information about the global capabilities of a user
* https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#capability-info
*/
