X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=03eb83cb8fa18f68b50c89b203e8411f388c02ea;hb=9b82d49da868536701d80ef1071df0e7cd301b7a;hp=6b18e5feba9958a68a90e698de25208b30548663;hpb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 6b18e5feb..03eb83cb8 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -4,7 +4,7 @@ import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular
 import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core'
 import { is18nPath } from '../../../shared/models/i18n'
 import { ScreenService } from '@app/shared/misc/screen.service'
-import { debounceTime, filter, map, pairwise, skip, switchMap } from 'rxjs/operators'
+import { debounceTime, filter, map, pairwise } from 'rxjs/operators'
 import { Hotkey, HotkeysService } from 'angular2-hotkeys'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { fromEvent } from 'rxjs'
@@ -15,7 +15,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { POP_STATE_MODAL_DISMISS } from '@app/shared/misc/constants'
 import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
 import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
-import { UserRole } from '@shared/models'
+import { ServerConfig, UserRole } from '@shared/models'
 import { User } from '@app/shared'
 import { InstanceService } from '@app/shared/instance/instance.service'
 
@@ -33,6 +33,8 @@ export class AppComponent implements OnInit {
 
   customCSS: SafeHtml
 
+  private serverConfig: ServerConfig
+
   constructor (
     private i18n: I18n,
     private viewportScroller: ViewportScroller,
@@ -51,17 +53,8 @@ export class AppComponent implements OnInit {
     private modalService: NgbModal
   ) { }
 
-  get serverVersion () {
-    return this.serverService.getConfig().serverVersion
-  }
-
-  get serverCommit () {
-    const commit = this.serverService.getConfig().serverCommit || ''
-    return (commit !== '') ? '...' + commit : commit
-  }
-
   get instanceName () {
-    return this.serverService.getConfig().instance.name
+    return this.serverConfig.instance.name
   }
 
   get defaultRoute () {
@@ -71,6 +64,13 @@ export class AppComponent implements OnInit {
   ngOnInit () {
     document.getElementById('incompatible-browser').className += ' browser-ok'
 
+    this.serverConfig = this.serverService.getTmpConfig()
+    this.serverService.getConfig()
+        .subscribe(config => this.serverConfig = config)
+
+    this.loadPlugins()
+    this.themeService.initialize()
+
     this.authService.loadClientCredentials()
 
     if (this.isUserLoggedIn()) {
@@ -78,17 +78,6 @@ export class AppComponent implements OnInit {
       this.authService.refreshUserInformation()
     }
 
-    // Load custom data from server
-    this.serverService.loadConfig()
-    this.serverService.loadVideoCategories()
-    this.serverService.loadVideoLanguages()
-    this.serverService.loadVideoLicences()
-    this.serverService.loadVideoPrivacies()
-    this.serverService.loadVideoPlaylistPrivacies()
-
-    this.loadPlugins()
-    this.themeService.initialize()
-
     // Do not display menu on small screens
     if (this.screenService.isInSmallView()) {
       this.isMenuDisplayed = false
@@ -192,10 +181,8 @@ export class AppComponent implements OnInit {
 
   private injectJS () {
     // Inject JS
-    this.serverService.configLoaded
-        .subscribe(() => {
-          const config = this.serverService.getConfig()
-
+    this.serverService.getConfig()
+        .subscribe(config => {
           if (config.instance.customizations.javascript) {
             try {
               // tslint:disable:no-eval
@@ -209,17 +196,14 @@ export class AppComponent implements OnInit {
 
   private injectCSS () {
     // Inject CSS if modified (admin config settings)
-    this.serverService.configLoaded
-        .pipe(skip(1)) // We only want to subscribe to reloads, because the CSS is already injected by the server
+    this.serverService.configReloaded
         .subscribe(() => {
           const headStyle = document.querySelector('style.custom-css-style')
           if (headStyle) headStyle.parentNode.removeChild(headStyle)
 
-          const config = this.serverService.getConfig()
-
           // We test customCSS if the admin removed the css
-          if (this.customCSS || config.instance.customizations.css) {
-            const styleTag = '<style>' + config.instance.customizations.css + '</style>'
+          if (this.customCSS || this.serverConfig.instance.customizations.css) {
+            const styleTag = '<style>' + this.serverConfig.instance.customizations.css + '</style>'
             this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag)
           }
         })
@@ -232,24 +216,22 @@ export class AppComponent implements OnInit {
   }
 
   private async openModalsIfNeeded () {
-    this.serverService.configLoaded
+    this.authService.userInformationLoaded
         .pipe(
-          switchMap(() => this.authService.userInformationLoaded),
           map(() => this.authService.getUser()),
           filter(user => user.role === UserRole.ADMINISTRATOR)
-        ).subscribe(user => setTimeout(() => this.openAdminModals(user))) // setTimeout because of ngIf in template
+        ).subscribe(user => setTimeout(() => this._openAdminModalsIfNeeded(user))) // setTimeout because of ngIf in template
   }
 
-  private async openAdminModals (user: User) {
+  private async _openAdminModalsIfNeeded (user: User) {
     if (user.noWelcomeModal !== true) return this.welcomeModal.show()
 
-    const config = this.serverService.getConfig()
-    if (user.noInstanceConfigWarningModal === true || !config.signup.allowed) return
+    if (user.noInstanceConfigWarningModal === true || !this.serverConfig.signup.allowed) return
 
     this.instanceService.getAbout()
       .subscribe(about => {
         if (
-          config.instance.name.toLowerCase() === 'peertube' ||
+          this.serverConfig.instance.name.toLowerCase() === 'peertube' ||
           !about.instance.terms ||
           !about.instance.administrator ||
           !about.instance.maintenanceLifetime