-
Notifications
You must be signed in to change notification settings - Fork 900
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(core/pageTitle): Use promise based API for showing/hiding spinner (…
- Loading branch information
1 parent
f3a64a3
commit bedfdb6
Showing
5 changed files
with
147 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 0 additions & 112 deletions
112
app/scripts/modules/core/pageTitle/pageTitle.service.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
app/scripts/modules/core/pageTitle/pageTitle.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| import { module, IScope } from 'angular'; | ||
| import { TransitionService, Rejection, RejectType, StateParams } from '@uirouter/core'; | ||
|
|
||
| interface IMainConfig { | ||
| field: string; | ||
| label: string; | ||
| } | ||
|
|
||
| interface ISectionConfig { | ||
| title: string; | ||
| } | ||
|
|
||
| interface IDetailsConfig { | ||
| title: string; | ||
| nameParam?: string; | ||
| accountParam?: string; | ||
| regionParam?: string; | ||
| } | ||
|
|
||
| interface IStatePageData { | ||
| pageTitleMain?: IMainConfig; | ||
| pageTitleSection?: ISectionConfig; | ||
| pageTitleDetails?: IDetailsConfig; | ||
| } | ||
|
|
||
| interface IPageDataParts { | ||
| main: string; | ||
| section: string; | ||
| details: string; | ||
| } | ||
|
|
||
| export class PageTitleService { | ||
| public static $inject = [ '$rootScope', '$stateParams', '$transitions' ]; | ||
|
|
||
| private previousPageTitle = 'Spinnaker'; | ||
|
|
||
| constructor(private $rootScope: IScope, private $stateParams: StateParams, $transitions: TransitionService) { | ||
| $rootScope.routing = 0; | ||
|
|
||
| $transitions.onStart({}, transition => { | ||
| this.handleRoutingStart(); | ||
| const onSuccess = () => this.handleRoutingSuccess(transition.to().data); | ||
| const onReject = (err: Rejection) => this.handleRoutingError(err); | ||
| transition.promise.then(onSuccess, onReject); | ||
| }); | ||
| } | ||
|
|
||
| public handleRoutingStart(): void { | ||
| this.$rootScope.routing++; | ||
| this.previousPageTitle = document.title; | ||
| document.title = 'Spinnaker: Loading...'; | ||
| } | ||
|
|
||
| public handleRoutingError(rejection: Rejection): void { | ||
| this.$rootScope.routing--; | ||
| const cancelled = rejection.type === RejectType.ABORTED; | ||
| document.title = cancelled ? this.previousPageTitle : 'Spinnaker: Error'; | ||
| } | ||
|
|
||
| public handleRoutingSuccess(config: IStatePageData): void { | ||
| const parts: IPageDataParts = this.configurePageTitle(config); | ||
| let title = parts.main || 'Spinnaker'; | ||
| if (parts.section) { | ||
| title += ' · ' + parts.section; | ||
| } | ||
| if (parts.details) { | ||
| title += ' · ' + parts.details; | ||
| } | ||
| this.$rootScope.routing = false; | ||
| document.title = title; | ||
| } | ||
|
|
||
| public resolveStateParams(config: IDetailsConfig): string { | ||
| if (!config) { | ||
| return null; | ||
| } | ||
|
|
||
| const { $stateParams } = this; | ||
| const { title, nameParam, accountParam, regionParam } = config; | ||
|
|
||
| let result = title; | ||
|
|
||
| if (nameParam) { | ||
| result += ': ' + $stateParams[nameParam]; | ||
| } | ||
|
|
||
| if (accountParam || regionParam) { | ||
| result += ' ('; | ||
| if (accountParam && regionParam) { | ||
| result += $stateParams[accountParam] + ':' + $stateParams[regionParam]; | ||
| } else { | ||
| result += $stateParams[accountParam] || $stateParams[regionParam]; | ||
| } | ||
| result += ')'; | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| public configureSection(sectionConfig: ISectionConfig): string { | ||
| return this.resolveStateParams(sectionConfig); | ||
| } | ||
|
|
||
| public configureDetails(detailsConfig: IDetailsConfig): string { | ||
| return this.resolveStateParams(detailsConfig); | ||
| } | ||
|
|
||
| public configureMain(mainConfig: IMainConfig): string { | ||
| const { $stateParams } = this; | ||
| let main = null; | ||
| if (!mainConfig) { | ||
| return main; | ||
| } | ||
| if (mainConfig.field) { | ||
| main = $stateParams[mainConfig.field]; | ||
| } | ||
| if (mainConfig.label) { | ||
| main = mainConfig.label; | ||
| } | ||
| return main; | ||
| } | ||
|
|
||
| public configurePageTitle(data: IStatePageData = {}): IPageDataParts { | ||
| return { | ||
| main: this.configureMain(data.pageTitleMain), | ||
| section: this.configureSection(data.pageTitleSection), | ||
| details: this.configureDetails(data.pageTitleDetails) | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| export const CORE_PAGETITLE_SERVICE = 'spinnaker.core.pageTitle.service'; | ||
|
|
||
| module(CORE_PAGETITLE_SERVICE, [require('angular-ui-router').default]) | ||
| .service('pageTitleService', PageTitleService) | ||
| .run(['pageTitleService', (pts: PageTitleService) => pts]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters