Migrate checks-model to new pattern - Rename service to model on appContext. - Merge ...-model.ts and ...-service.ts. - Rename ...Service to ...Model. - Move all observables onto ...Model. - Inject ...Model in the models and components that were directly accessing the observables. Google-Bug-Id: b/206459178 Change-Id: I65d722a58f264444f0dd1b1a5380187b91c06528
diff --git a/polygerrit-ui/app/elements/checks/gr-checks-results.ts b/polygerrit-ui/app/elements/checks/gr-checks-results.ts index ca53d28..24c06e0 100644 --- a/polygerrit-ui/app/elements/checks/gr-checks-results.ts +++ b/polygerrit-ui/app/elements/checks/gr-checks-results.ts
@@ -32,14 +32,7 @@ Tag, } from '../../api/checks'; import {sharedStyles} from '../../styles/shared-styles'; -import { - CheckRun, - checksSelectedPatchsetNumber$, - RunResult, - someProvidersAreLoadingSelected$, - topLevelActionsSelected$, - topLevelLinksSelected$, -} from '../../services/checks/checks-model'; +import {CheckRun, RunResult} from '../../services/checks/checks-model'; import { allResults, firstPrimaryLink, @@ -95,7 +88,7 @@ @state() labels?: LabelNameToInfoMap; - private checksService = getAppContext().checksService; + private checksModel = getAppContext().checksModel; constructor() { super(); @@ -493,7 +486,7 @@ } private handleAction(e: CustomEvent<Action>) { - this.checksService.triggerAction(e.detail); + this.checksModel.triggerAction(e.detail); } private renderAction(action?: Action) { @@ -733,21 +726,29 @@ */ private isSectionExpandedByUser = new Map<Category, boolean>(); - private readonly checksService = getAppContext().checksService; + private readonly checksModel = getAppContext().checksModel; constructor() { super(); - subscribe(this, topLevelActionsSelected$, x => (this.actions = x)); - subscribe(this, topLevelLinksSelected$, x => (this.links = x)); subscribe( this, - checksSelectedPatchsetNumber$, + this.checksModel.topLevelActionsSelected$, + x => (this.actions = x) + ); + subscribe( + this, + this.checksModel.topLevelLinksSelected$, + x => (this.links = x) + ); + subscribe( + this, + this.checksModel.checksSelectedPatchsetNumber$, x => (this.checksPatchsetNumber = x) ); subscribe(this, latestPatchNum$, x => (this.latestPatchsetNumber = x)); subscribe( this, - someProvidersAreLoadingSelected$, + this.checksModel.someProvidersAreLoadingSelected$, x => (this.someProvidersAreLoading = x) ); } @@ -1101,7 +1102,7 @@ } private handleAction(e: CustomEvent<Action>) { - this.checksService.triggerAction(e.detail); + this.checksModel.triggerAction(e.detail); } private renderAction(action?: Action) { @@ -1112,11 +1113,11 @@ private onPatchsetSelected(e: CustomEvent<{value: string}>) { const patchset = Number(e.detail.value); check(!isNaN(patchset), 'selected patchset must be a number'); - this.checksService.setPatchset(patchset as PatchSetNumber); + this.checksModel.setPatchset(patchset as PatchSetNumber); } private goToLatestPatchset() { - this.checksService.setPatchset(undefined); + this.checksModel.setPatchset(undefined); } private createPatchsetDropdownItems() {