diff options
Diffstat (limited to 'client/src/app/core/routing/server-config-resolver.service.ts')
-rw-r--r-- | client/src/app/core/routing/server-config-resolver.service.ts | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/client/src/app/core/routing/server-config-resolver.service.ts b/client/src/app/core/routing/server-config-resolver.service.ts index ec7d6428f..3b7ed99bf 100644 --- a/client/src/app/core/routing/server-config-resolver.service.ts +++ b/client/src/app/core/routing/server-config-resolver.service.ts | |||
@@ -1,17 +1,13 @@ | |||
1 | import { Injectable } from '@angular/core' | 1 | import { Injectable } from '@angular/core' |
2 | import { Resolve } from '@angular/router' | 2 | import { Resolve } from '@angular/router' |
3 | import { ServerService } from '@app/core/server' | 3 | import { ServerService } from '@app/core/server' |
4 | import { ServerConfig } from '@shared/models' | ||
4 | 5 | ||
5 | @Injectable() | 6 | @Injectable() |
6 | export class ServerConfigResolver implements Resolve<boolean> { | 7 | export class ServerConfigResolver implements Resolve<ServerConfig> { |
7 | constructor ( | 8 | constructor (private server: ServerService) {} |
8 | private server: ServerService | ||
9 | ) {} | ||
10 | 9 | ||
11 | resolve () { | 10 | resolve () { |
12 | // FIXME: directly returning this.server.configLoaded does not seem to work | 11 | return this.server.getConfig() |
13 | return new Promise<boolean>(res => { | ||
14 | return this.server.configLoaded.subscribe(() => res(true)) | ||
15 | }) | ||
16 | } | 12 | } |
17 | } | 13 | } |