Move all DI models to a new models/ directory. The goal is that services/ should only include things that are part of appContext that gr-diff might depend on. Change-Id: I558b2b878bdb4cf853b779fbe641364c83565177
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD index 898de14..bc5cd96 100644 --- a/polygerrit-ui/app/BUILD +++ b/polygerrit-ui/app/BUILD
@@ -15,6 +15,7 @@ "embed", "gr-diff", "mixins", + "models", "samples", "scripts", "services",
diff --git a/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts b/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts index 27cdac3..fe11a65 100644 --- a/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts +++ b/polygerrit-ui/app/elements/change/gr-change-summary/gr-change-summary.ts
@@ -59,7 +59,7 @@ import {modifierPressed} from '../../../utils/dom-util'; import {DropdownLink} from '../../shared/gr-dropdown/gr-dropdown'; import {fontStyles} from '../../../styles/gr-font-styles'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve} from '../../../services/dependency'; export enum SummaryChipStyles {
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 5a54599..de926c4 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
@@ -197,7 +197,7 @@ } from '../../../utils/attention-set-util'; import {listen} from '../../../services/shortcuts/shortcuts-service'; import {LoadingStatus} from '../../../services/change/change-model'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve, DIPolymerElement} from '../../../services/dependency'; const MIN_LINES_FOR_COMMIT_COLLAPSE = 18;
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.ts b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.ts index 9bcedc8..640b9db 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.ts +++ b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.ts
@@ -31,7 +31,7 @@ import {subscribe} from '../../lit/subscription-controller'; import {getAppContext} from '../../../services/app-context'; import {ParsedChangeInfo} from '../../../types/types'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve} from '../../../services/dependency'; @customElement('gr-confirm-submit-dialog')
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts index 94039f4..3f9c8b2 100644 --- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts +++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
@@ -86,8 +86,8 @@ import {listen} from '../../../services/shortcuts/shortcuts-service'; import {select} from '../../../utils/observable-util'; import {resolve, DIPolymerElement} from '../../../services/dependency'; -import {browserModelToken} from '../../../services/browser/browser-model'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {browserModelToken} from '../../../models/browser/browser-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; export const DEFAULT_NUM_FILES_SHOWN = 200;
diff --git a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.ts b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.ts index 8ae0115..da4954ed 100644 --- a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.ts +++ b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.ts
@@ -50,7 +50,7 @@ FormattedReviewerUpdateInfo, ParsedChangeInfo, } from '../../../types/types'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve, DIPolymerElement} from '../../../services/dependency'; /**
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts index 9aafd36..1600990 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
@@ -89,8 +89,8 @@ import {Subscription} from 'rxjs'; import {DisplayLine, RenderPreferences} from '../../../api/diff'; import {resolve, DIPolymerElement} from '../../../services/dependency'; -import {browserModelToken} from '../../../services/browser/browser-model'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {browserModelToken} from '../../../models/browser/browser-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; const EMPTY_BLAME = 'No blame information for this diff.';
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts b/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts index a5ab586..bdcb927 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-mode-selector/gr-diff-mode-selector.ts
@@ -26,7 +26,7 @@ import {FixIronA11yAnnouncer} from '../../../types/types'; import {getAppContext} from '../../../services/app-context'; import {fireIronAnnounce} from '../../../utils/event-util'; -import {browserModelToken} from '../../../services/browser/browser-model'; +import {browserModelToken} from '../../../models/browser/browser-model'; import {resolve, DIPolymerElement} from '../../../services/dependency'; @customElement('gr-diff-mode-selector')
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts index 92657dc..04dc26e 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts +++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.ts
@@ -118,8 +118,8 @@ import {LoadingStatus} from '../../../services/change/change-model'; import {DisplayLine} from '../../../api/diff'; import {GrDownloadDialog} from '../../change/gr-download-dialog/gr-download-dialog'; -import {browserModelToken} from '../../../services/browser/browser-model'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {browserModelToken} from '../../../models/browser/browser-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve, DIPolymerElement} from '../../../services/dependency'; import {BehaviorSubject} from 'rxjs';
diff --git a/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select.ts b/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select.ts index b6397b0..975489b 100644 --- a/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select.ts +++ b/polygerrit-ui/app/elements/diff/gr-patch-range-select/gr-patch-range-select.ts
@@ -51,7 +51,7 @@ import {LitElement, PropertyValues, css, html} from 'lit'; import {customElement, property, query, state} from 'lit/decorators'; import {subscribe} from '../../lit/subscription-controller'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {resolve} from '../../../services/dependency'; // Maximum length for patch set descriptions.
diff --git a/polygerrit-ui/app/elements/gr-app-element.ts b/polygerrit-ui/app/elements/gr-app-element.ts index 288489e..8218130 100644 --- a/polygerrit-ui/app/elements/gr-app-element.ts +++ b/polygerrit-ui/app/elements/gr-app-element.ts
@@ -85,7 +85,7 @@ import {assertIsDefined} from '../utils/common-util'; import {listen} from '../services/shortcuts/shortcuts-service'; import {resolve, DIPolymerElement} from '../services/dependency'; -import {browserModelToken} from '../services/browser/browser-model'; +import {browserModelToken} from '../models/browser/browser-model'; interface ErrorInfo { text: string;
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts index c2cf42a..abef3dd 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts +++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
@@ -71,7 +71,7 @@ import {ValueChangedEvent} from '../../../types/events'; import {notDeepEqual} from '../../../utils/deep-util'; import {resolve} from '../../../services/dependency'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; const NEWLINE_PATTERN = /\n/g;
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts index 18ef5a9..c8c9915 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts +++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
@@ -56,7 +56,7 @@ import {fire, fireEvent} from '../../../utils/event-util'; import {assertIsDefined} from '../../../utils/common-util'; import {Key, Modifier} from '../../../utils/dom-util'; -import {commentsModelToken} from '../../../services/comments/comments-model'; +import {commentsModelToken} from '../../../models/comments/comments-model'; import {sharedStyles} from '../../../styles/shared-styles'; import {subscribe} from '../../lit/subscription-controller'; import {ShortcutController} from '../../lit/shortcut-controller';
diff --git a/polygerrit-ui/app/services/browser/browser-model.ts b/polygerrit-ui/app/models/browser/browser-model.ts similarity index 95% rename from polygerrit-ui/app/services/browser/browser-model.ts rename to polygerrit-ui/app/models/browser/browser-model.ts index b436926..697cea6 100644 --- a/polygerrit-ui/app/services/browser/browser-model.ts +++ b/polygerrit-ui/app/models/browser/browser-model.ts
@@ -16,8 +16,8 @@ */ import {Observable, combineLatest} from 'rxjs'; import {distinctUntilChanged, map} from 'rxjs/operators'; -import {Finalizable} from '../registry'; -import {define} from '../dependency'; +import {Finalizable} from '../../services/registry'; +import {define} from '../../services/dependency'; import {DiffViewMode} from '../../api/diff'; import {UserModel} from '../user/user-model'; import {Model} from '../model';
diff --git a/polygerrit-ui/app/services/comments/comments-model.ts b/polygerrit-ui/app/models/comments/comments-model.ts similarity index 97% rename from polygerrit-ui/app/services/comments/comments-model.ts rename to polygerrit-ui/app/models/comments/comments-model.ts index cafe6e4..ae7d213 100644 --- a/polygerrit-ui/app/services/comments/comments-model.ts +++ b/polygerrit-ui/app/models/comments/comments-model.ts
@@ -36,19 +36,19 @@ } from '../../utils/comment-util'; import {deepEqual} from '../../utils/deep-util'; import {select} from '../../utils/observable-util'; -import {RouterModel} from '../router/router-model'; -import {Finalizable} from '../registry'; -import {define} from '../dependency'; +import {RouterModel} from '../../services/router/router-model'; +import {Finalizable} from '../../services/registry'; +import {define} from '../../services/dependency'; import {combineLatest, Subscription} from 'rxjs'; import {fire, fireAlert, fireEvent} from '../../utils/event-util'; import {CURRENT} from '../../utils/patch-set-util'; -import {RestApiService} from '../gr-rest-api/gr-rest-api'; -import {ChangeModel} from '../change/change-model'; +import {RestApiService} from '../../services/gr-rest-api/gr-rest-api'; +import {ChangeModel} from '../../services/change/change-model'; import {Interaction, Timing} from '../../constants/reporting'; import {assertIsDefined} from '../../utils/common-util'; import {debounce, DelayedTask} from '../../utils/async-util'; import {pluralize} from '../../utils/string-util'; -import {ReportingService} from '../gr-reporting/gr-reporting'; +import {ReportingService} from '../../services/gr-reporting/gr-reporting'; import {Model} from '../model'; export interface CommentState {
diff --git a/polygerrit-ui/app/services/comments/comments-model_test.ts b/polygerrit-ui/app/models/comments/comments-model_test.ts similarity index 96% rename from polygerrit-ui/app/services/comments/comments-model_test.ts rename to polygerrit-ui/app/models/comments/comments-model_test.ts index a8f2118..e713893 100644 --- a/polygerrit-ui/app/services/comments/comments-model_test.ts +++ b/polygerrit-ui/app/models/comments/comments-model_test.ts
@@ -29,8 +29,8 @@ TEST_NUMERIC_CHANGE_ID, } from '../../test/test-data-generators'; import {stubRestApi, waitUntil, waitUntilCalled} from '../../test/test-utils'; -import {getAppContext} from '../app-context'; -import {GerritView} from '../router/router-model'; +import {getAppContext} from '../../services/app-context'; +import {GerritView} from '../../services/router/router-model'; import {PathToCommentsInfoMap} from '../../types/common'; suite('comments model tests', () => {
diff --git a/polygerrit-ui/app/services/config/config-model.ts b/polygerrit-ui/app/models/config/config-model.ts similarity index 92% rename from polygerrit-ui/app/services/config/config-model.ts rename to polygerrit-ui/app/models/config/config-model.ts index a0122e9..6a9d8ee 100644 --- a/polygerrit-ui/app/services/config/config-model.ts +++ b/polygerrit-ui/app/models/config/config-model.ts
@@ -17,9 +17,9 @@ import {ConfigInfo, RepoName, ServerInfo} from '../../types/common'; import {from, of, Subscription} from 'rxjs'; import {switchMap} from 'rxjs/operators'; -import {Finalizable} from '../registry'; -import {RestApiService} from '../gr-rest-api/gr-rest-api'; -import {ChangeModel} from '../change/change-model'; +import {Finalizable} from '../../services/registry'; +import {RestApiService} from '../../services/gr-rest-api/gr-rest-api'; +import {ChangeModel} from '../../services/change/change-model'; import {select} from '../../utils/observable-util'; import {Model} from '../model';
diff --git a/polygerrit-ui/app/services/model.ts b/polygerrit-ui/app/models/model.ts similarity index 100% rename from polygerrit-ui/app/services/model.ts rename to polygerrit-ui/app/models/model.ts
diff --git a/polygerrit-ui/app/services/user/user-model.ts b/polygerrit-ui/app/models/user/user-model.ts similarity index 97% rename from polygerrit-ui/app/services/user/user-model.ts rename to polygerrit-ui/app/models/user/user-model.ts index eab4c5b..5e9ed3f 100644 --- a/polygerrit-ui/app/services/user/user-model.ts +++ b/polygerrit-ui/app/models/user/user-model.ts
@@ -29,9 +29,9 @@ createDefaultPreferences, createDefaultDiffPrefs, } from '../../constants/constants'; -import {RestApiService} from '../gr-rest-api/gr-rest-api'; +import {RestApiService} from '../../services/gr-rest-api/gr-rest-api'; import {DiffPreferencesInfo} from '../../types/diff'; -import {Finalizable} from '../registry'; +import {Finalizable} from '../../services/registry'; import {select} from '../../utils/observable-util'; import {Model} from '../model';
diff --git a/polygerrit-ui/app/services/app-context-init.ts b/polygerrit-ui/app/services/app-context-init.ts index 0cb3876..2679bd9 100644 --- a/polygerrit-ui/app/services/app-context-init.ts +++ b/polygerrit-ui/app/services/app-context-init.ts
@@ -26,13 +26,16 @@ import {ChecksModel} from './checks/checks-model'; import {GrJsApiInterface} from '../elements/shared/gr-js-api-interface/gr-js-api-interface-element'; import {GrStorageService} from './storage/gr-storage_impl'; -import {UserModel} from './user/user-model'; -import {CommentsModel, commentsModelToken} from './comments/comments-model'; +import {UserModel} from '../models/user/user-model'; +import { + CommentsModel, + commentsModelToken, +} from '../models/comments/comments-model'; import {RouterModel} from './router/router-model'; import {ShortcutsService} from './shortcuts/shortcuts-service'; import {assertIsDefined} from '../utils/common-util'; -import {ConfigModel} from './config/config-model'; -import {BrowserModel, browserModelToken} from './browser/browser-model'; +import {ConfigModel} from '../models/config/config-model'; +import {BrowserModel, browserModelToken} from '../models/browser/browser-model'; /** * The AppContext lazy initializator for all services
diff --git a/polygerrit-ui/app/services/app-context.ts b/polygerrit-ui/app/services/app-context.ts index 2e02ebf..dcf3d32 100644 --- a/polygerrit-ui/app/services/app-context.ts +++ b/polygerrit-ui/app/services/app-context.ts
@@ -24,10 +24,10 @@ import {ChecksModel} from './checks/checks-model'; import {JsApiService} from '../elements/shared/gr-js-api-interface/gr-js-api-types'; import {StorageService} from './storage/gr-storage'; -import {UserModel} from './user/user-model'; +import {UserModel} from '../models/user/user-model'; import {RouterModel} from './router/router-model'; import {ShortcutsService} from './shortcuts/shortcuts-service'; -import {ConfigModel} from './config/config-model'; +import {ConfigModel} from '../models/config/config-model'; export interface AppContext { routerModel: RouterModel;
diff --git a/polygerrit-ui/app/services/change/change-model.ts b/polygerrit-ui/app/services/change/change-model.ts index 3e12a86..0ba1e6c 100644 --- a/polygerrit-ui/app/services/change/change-model.ts +++ b/polygerrit-ui/app/services/change/change-model.ts
@@ -49,7 +49,7 @@ import {Finalizable} from '../registry'; import {select} from '../../utils/observable-util'; import {assertIsDefined} from '../../utils/common-util'; -import {Model} from '../model'; +import {Model} from '../../models/model'; export enum LoadingStatus { NOT_LOADED = 'NOT_LOADED',
diff --git a/polygerrit-ui/app/services/checks/checks-model.ts b/polygerrit-ui/app/services/checks/checks-model.ts index 55f3219..2bdee51 100644 --- a/polygerrit-ui/app/services/checks/checks-model.ts +++ b/polygerrit-ui/app/services/checks/checks-model.ts
@@ -55,7 +55,7 @@ import {Execution} from '../../constants/reporting'; import {fireAlert, fireEvent} from '../../utils/event-util'; import {RouterModel} from '../router/router-model'; -import {Model} from '../model'; +import {Model} from '../../models/model'; /** * The checks model maintains the state of checks for two patchsets: the latest
diff --git a/polygerrit-ui/app/services/router/router-model.ts b/polygerrit-ui/app/services/router/router-model.ts index f64bba1..5bd228b 100644 --- a/polygerrit-ui/app/services/router/router-model.ts +++ b/polygerrit-ui/app/services/router/router-model.ts
@@ -19,7 +19,7 @@ import {distinctUntilChanged, map} from 'rxjs/operators'; import {Finalizable} from '../registry'; import {NumericChangeId, PatchSetNum} from '../../types/common'; -import {Model} from '../model'; +import {Model} from '../../models/model'; export enum GerritView { ADMIN = 'admin',
diff --git a/polygerrit-ui/app/services/shortcuts/shortcuts-service.ts b/polygerrit-ui/app/services/shortcuts/shortcuts-service.ts index 79f2993..41591a2 100644 --- a/polygerrit-ui/app/services/shortcuts/shortcuts-service.ts +++ b/polygerrit-ui/app/services/shortcuts/shortcuts-service.ts
@@ -33,7 +33,7 @@ } from '../../utils/dom-util'; import {ReportingService} from '../gr-reporting/gr-reporting'; import {Finalizable} from '../registry'; -import {UserModel} from '../user/user-model'; +import {UserModel} from '../../models/user/user-model'; export type SectionView = Array<{binding: string[][]; text: string}>;
diff --git a/polygerrit-ui/app/test/test-app-context-init.ts b/polygerrit-ui/app/test/test-app-context-init.ts index 491a891..7837ddc 100644 --- a/polygerrit-ui/app/test/test-app-context-init.ts +++ b/polygerrit-ui/app/test/test-app-context-init.ts
@@ -29,18 +29,15 @@ import {ChangeModel} from '../services/change/change-model'; import {ChecksModel} from '../services/checks/checks-model'; import {GrJsApiInterface} from '../elements/shared/gr-js-api-interface/gr-js-api-interface-element'; -import {UserModel} from '../services/user/user-model'; +import {UserModel} from '../models/user/user-model'; import { CommentsModel, commentsModelToken, -} from '../services/comments/comments-model'; +} from '../models/comments/comments-model'; import {RouterModel} from '../services/router/router-model'; import {ShortcutsService} from '../services/shortcuts/shortcuts-service'; -import {ConfigModel} from '../services/config/config-model'; -import { - BrowserModel, - browserModelToken, -} from '../services/browser/browser-model'; +import {ConfigModel} from '../models/config/config-model'; +import {BrowserModel, browserModelToken} from '../models/browser/browser-model'; export function createTestAppContext(): AppContext & Finalizable { const appRegistry: Registry<AppContext> = {
diff --git a/polygerrit-ui/app/test/test-utils.ts b/polygerrit-ui/app/test/test-utils.ts index 7652039..fbc2433 100644 --- a/polygerrit-ui/app/test/test-utils.ts +++ b/polygerrit-ui/app/test/test-utils.ts
@@ -23,7 +23,7 @@ import {StorageService} from '../services/storage/gr-storage'; import {AuthService} from '../services/gr-auth/gr-auth'; import {ReportingService} from '../services/gr-reporting/gr-reporting'; -import {UserModel} from '../services/user/user-model'; +import {UserModel} from '../models/user/user-model'; import {ShortcutsService} from '../services/shortcuts/shortcuts-service'; import {queryAndAssert, query} from '../utils/common-util'; import {FlagsService} from '../services/flags/flags';
diff --git a/polygerrit-ui/app/tsconfig.json b/polygerrit-ui/app/tsconfig.json index 5040496..a335926 100644 --- a/polygerrit-ui/app/tsconfig.json +++ b/polygerrit-ui/app/tsconfig.json
@@ -87,6 +87,7 @@ "embed/**/*", "gr-diff/**/*", "mixins/**/*", + "models/**/*", "samples/**/*", "scripts/**/*", "services/**/*",
diff --git a/polygerrit-ui/app/tsconfig_bazel.json b/polygerrit-ui/app/tsconfig_bazel.json index dfd2078..cd83fc0 100644 --- a/polygerrit-ui/app/tsconfig_bazel.json +++ b/polygerrit-ui/app/tsconfig_bazel.json
@@ -16,6 +16,7 @@ "embed/**/*", "gr-diff/**/*", "mixins/**/*", + "models/**/*", "samples/**/*", "scripts/**/*", "services/**/*",
diff --git a/polygerrit-ui/app/tsconfig_bazel_test.json b/polygerrit-ui/app/tsconfig_bazel_test.json index 7137e23..be3c934 100644 --- a/polygerrit-ui/app/tsconfig_bazel_test.json +++ b/polygerrit-ui/app/tsconfig_bazel_test.json
@@ -20,6 +20,7 @@ "embed/**/*", "gr-diff/**/*", "mixins/**/*", + "models/**/*", "samples/**/*", "scripts/**/*", "services/**/*",