X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Babout%2Fabout-instance%2Fabout-instance.resolver.ts;h=ee0219df0cfa36f1676d09fc09729d30aae59668;hb=2989628b7913383b39ac34c7db8666a21f8e5037;hp=9a5924ebb8d9cf11d3e49a17af85b3b35596d3ad;hpb=8e08d415f9473b6b72fef698729453e726da16e7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+about/about-instance/about-instance.resolver.ts b/client/src/app/+about/about-instance/about-instance.resolver.ts index 9a5924ebb..ee0219df0 100644 --- a/client/src/app/+about/about-instance/about-instance.resolver.ts +++ b/client/src/app/+about/about-instance/about-instance.resolver.ts @@ -1,30 +1,27 @@ import { forkJoin } from 'rxjs' import { map, switchMap } from 'rxjs/operators' import { Injectable } from '@angular/core' -import { ActivatedRouteSnapshot, Resolve } from '@angular/router' -import { ServerService } from '@app/core' +import { Resolve } from '@angular/router' import { InstanceService } from '@app/shared/shared-instance' -import { About, ServerConfig } from '@shared/models/server' +import { About } from '@shared/models/server' -export type ResolverData = { about: About, languages: string[], categories: string[], serverConfig: ServerConfig } +export type ResolverData = { about: About, languages: string[], categories: string[] } @Injectable() export class AboutInstanceResolver implements Resolve { constructor ( - private instanceService: InstanceService, - private serverService: ServerService + private instanceService: InstanceService ) {} - resolve (route: ActivatedRouteSnapshot) { + resolve () { return this.instanceService.getAbout() .pipe( switchMap(about => { return forkJoin([ this.instanceService.buildTranslatedLanguages(about), - this.instanceService.buildTranslatedCategories(about), - this.serverService.getConfig() - ]).pipe(map(([ languages, categories, serverConfig ]) => ({ about, languages, categories, serverConfig }))) + this.instanceService.buildTranslatedCategories(about) + ]).pipe(map(([ languages, categories ]) => ({ about, languages, categories }) as ResolverData)) }) ) }