serverConfig: ServerConfig
+ initialized = false
+
private lastScrollHash: string
constructor (
private viewportScroller: ViewportScroller,
private route: ActivatedRoute,
- private serverService: ServerService,
private instanceService: InstanceService
) {}
}
async ngOnInit () {
- this.serverConfig = this.serverService.getTmpConfig()
- this.serverService.getConfig()
- .subscribe(config => this.serverConfig = config)
+ const { about, languages, categories, serverConfig }: ResolverData = this.route.snapshot.data.instanceData
- const { about, languages, categories }: ResolverData = this.route.snapshot.data.instanceData
+ this.serverConfig = serverConfig
this.languages = languages
this.categories = categories
this.businessModel = about.instance.businessModel
this.html = await this.instanceService.buildHtml(about)
+
+ this.initialized = true
}
ngAfterViewChecked () {
- if (window.location.hash && window.location.hash !== this.lastScrollHash) {
+ if (this.initialized && window.location.hash && window.location.hash !== this.lastScrollHash) {
this.viewportScroller.scrollToAnchor(window.location.hash.replace('#', ''))
this.lastScrollHash = window.location.hash
import { map, switchMap } from 'rxjs/operators'
import { Injectable } from '@angular/core'
import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
+import { ServerService } from '@app/core'
import { InstanceService } from '@app/shared/shared-instance'
-import { About } from '@shared/models/server'
+import { About, ServerConfig } from '@shared/models/server'
-export type ResolverData = { about: About, languages: string[], categories: string[] }
+export type ResolverData = { about: About, languages: string[], categories: string[], serverConfig: ServerConfig }
@Injectable()
export class AboutInstanceResolver implements Resolve<any> {
- constructor (private instanceService: InstanceService) {}
+ constructor (
+ private instanceService: InstanceService,
+ private serverService: ServerService
+ ) {}
resolve (route: ActivatedRouteSnapshot) {
return this.instanceService.getAbout()
switchMap(about => {
return forkJoin([
this.instanceService.buildTranslatedLanguages(about),
- this.instanceService.buildTranslatedCategories(about)
- ]).pipe(map(([ languages, categories ]) => ({ about, languages, categories })))
+ this.instanceService.buildTranslatedCategories(about),
+ this.serverService.getConfig()
+ ]).pipe(map(([ languages, categories, serverConfig ]) => ({ about, languages, categories, serverConfig })))
})
)
}