Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +about / about-instance / about-instance.resolver.ts

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 94c6abe5a413d200628fd23bc85c114569bed237..9a5924ebb8d9cf11d3e49a17af85b3b35596d3ad 100644 (file)
--- a/client/src/app/+about/about-instance/about-instance.resolver.ts
+++ b/client/src/app/+about/about-instance/about-instance.resolver.ts
@@ -1,16 +1,19 @@
+import { forkJoin } from 'rxjs'
+import { map, switchMap } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
-import { map, switchMap } from 'rxjs/operators'
-import { forkJoin } from 'rxjs'
-import { InstanceService } from '@app/shared/instance/instance.service'
-import { About } from '@shared/models/server'
+import { ServerService } from '@app/core'
+import { InstanceService } from '@app/shared/shared-instance'
+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
+    private instanceService: InstanceService,
+    private serverService: ServerService
   ) {}
 
   resolve (route: ActivatedRouteSnapshot) {
@@ -19,8 +22,9 @@ export class AboutInstanceResolver implements Resolve<any> {
                  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 })))
                  })
                )
   }