Move LoadingStatus to types The enum can be used by plugins as well. Release-Notes: skip Google-bug-id: b/302634799 Change-Id: I74a695d8220dc2501fbf0743c69b81c114d6d7ed
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 c6675b3..85d9000 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
@@ -88,7 +88,11 @@ import {isUnresolved} from '../../../utils/comment-util'; import {PaperTabsElement} from '@polymer/paper-tabs/paper-tabs'; import {GrFileList} from '../gr-file-list/gr-file-list'; -import {EditRevisionInfo, ParsedChangeInfo} from '../../../types/types'; +import { + EditRevisionInfo, + LoadingStatus, + ParsedChangeInfo, +} from '../../../types/types'; import { EditableContentSaveEvent, FileActionTapEvent, @@ -120,7 +124,6 @@ ShortcutSection, shortcutsServiceToken, } from '../../../services/shortcuts/shortcuts-service'; -import {LoadingStatus} from '../../../models/change/change-model'; import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve} from '../../../models/dependency'; import {checksModelToken} from '../../../models/checks/checks-model';
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 19483a2..fba0392 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
@@ -59,11 +59,10 @@ import {GrEditControls} from '../../edit/gr-edit-controls/gr-edit-controls'; import {SinonFakeTimers} from 'sinon'; import {GerritView} from '../../../services/router/router-model'; -import {ParsedChangeInfo} from '../../../types/types'; +import {LoadingStatus, ParsedChangeInfo} from '../../../types/types'; import { ChangeModel, changeModelToken, - LoadingStatus, } from '../../../models/change/change-model'; import {FocusTarget} from '../gr-reply-dialog/gr-reply-dialog'; import {GrChangeStar} from '../../shared/gr-change-star/gr-change-star';
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 24f8a34..f43e521 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
@@ -22,11 +22,9 @@ import {GrDialog} from '../../shared/gr-dialog/gr-dialog'; import {testResolver} from '../../../test/common-test-setup'; import {userModelToken} from '../../../models/user/user-model'; -import { - changeModelToken, - LoadingStatus, -} from '../../../models/change/change-model'; +import {changeModelToken} from '../../../models/change/change-model'; import {GrAccountChip} from '../../shared/gr-account-chip/gr-account-chip'; +import {LoadingStatus} from '../../../types/types'; suite('gr-confirm-rebase-dialog tests', () => { let element: GrConfirmRebaseDialog;
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts index 9c1c3ce..93424b1 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view_test.ts
@@ -54,7 +54,6 @@ import { changeModelToken, ChangeModel, - LoadingStatus, } from '../../../models/change/change-model'; import {assertIsDefined} from '../../../utils/common-util'; import {GrDiffModeSelector} from '../gr-diff-mode-selector/gr-diff-mode-selector'; @@ -77,6 +76,7 @@ import {FileNameToNormalizedFileInfoMap} from '../../../models/change/files-model'; import {RestApiService} from '../../../services/gr-rest-api/gr-rest-api'; import {GrDiffCursor} from '../../../embed/diff/gr-diff-cursor/gr-diff-cursor'; +import {LoadingStatus} from '../../../types/types'; function createComment( id: string,
diff --git a/polygerrit-ui/app/models/change/change-model.ts b/polygerrit-ui/app/models/change/change-model.ts index f534a43..f1d28db 100644 --- a/polygerrit-ui/app/models/change/change-model.ts +++ b/polygerrit-ui/app/models/change/change-model.ts
@@ -27,7 +27,7 @@ findEdit, sortRevisions, } from '../../utils/patch-set-util'; -import {isDefined, ParsedChangeInfo} from '../../types/types'; +import {isDefined, LoadingStatus, ParsedChangeInfo} from '../../types/types'; import {fireAlert, fireTitleChange} from '../../utils/event-util'; import {RestApiService} from '../../services/gr-rest-api/gr-rest-api'; import {select} from '../../utils/observable-util'; @@ -50,13 +50,6 @@ import {ReportingService} from '../../services/gr-reporting/gr-reporting'; import {Timing} from '../../constants/reporting'; -export enum LoadingStatus { - NOT_LOADED = 'NOT_LOADED', - LOADING = 'LOADING', - RELOADING = 'RELOADING', - LOADED = 'LOADED', -} - const ERR_REVIEW_STATUS = 'Couldn’t change file review status.'; export interface ChangeState {
diff --git a/polygerrit-ui/app/models/change/change-model_test.ts b/polygerrit-ui/app/models/change/change-model_test.ts index 00a03fe..f074ac3 100644 --- a/polygerrit-ui/app/models/change/change-model_test.ts +++ b/polygerrit-ui/app/models/change/change-model_test.ts
@@ -30,11 +30,14 @@ PatchSetNum, PatchSetNumber, } from '../../types/common'; -import {EditRevisionInfo, ParsedChangeInfo} from '../../types/types'; +import { + EditRevisionInfo, + LoadingStatus, + ParsedChangeInfo, +} from '../../types/types'; import {getAppContext} from '../../services/app-context'; import { ChangeState, - LoadingStatus, updateChangeWithEdit, updateRevisionsWithCommitShas, } from './change-model';
diff --git a/polygerrit-ui/app/types/types.ts b/polygerrit-ui/app/types/types.ts index c9f3414..17720fd 100644 --- a/polygerrit-ui/app/types/types.ts +++ b/polygerrit-ui/app/types/types.ts
@@ -32,6 +32,13 @@ GENERIC = 'GENERIC', } +export enum LoadingStatus { + NOT_LOADED = 'NOT_LOADED', + LOADING = 'LOADING', + RELOADING = 'RELOADING', + LOADED = 'LOADED', +} + export interface AuthRequestInit extends RequestInit { // RequestInit define headers as HeadersInit, i.e. // Headers | string[][] | Record<string, string>