factorize account/server blocklists for users and instance (#2875)

[github/Chocobozzz/PeerTube.git] / client / src / app / +my-account / my-account.component.ts

diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index d98d06f8e7f619c25a2ee8c95b73a17dfd7e5dbc..ca447c0540a793968bbdc2097ae02b52dd31a76d 100644 (file)
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -1,20 +1,28 @@
-import { Component } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { TopMenuDropdownParam } from '@app/shared/menu/top-menu-dropdown.component'
+import { ServerConfig } from '@shared/models'
 
 @Component({
   selector: 'my-my-account',
   templateUrl: './my-account.component.html',
   styleUrls: [ './my-account.component.scss' ]
 })
-export class MyAccountComponent {
+export class MyAccountComponent implements OnInit {
   menuEntries: TopMenuDropdownParam[] = []
 
+  private serverConfig: ServerConfig
+
   constructor (
     private serverService: ServerService,
     private i18n: I18n
-  ) {
+  ) { }
+
+  ngOnInit (): void {
+    this.serverConfig = this.serverService.getTmpConfig()
+    this.serverService.getConfig()
+        .subscribe(config => this.serverConfig = config)
 
     const libraryEntries: TopMenuDropdownParam = {
       label: this.i18n('My library'),
@@ -64,7 +72,7 @@ export class MyAccountComponent {
           iconName: 'user'
         },
         {
-          label: this.i18n('Muted instances'),
+          label: this.i18n('Muted servers'),
           routerLink: '/my-account/blocklist/servers',
           iconName: 'server'
         },
@@ -91,7 +99,7 @@ export class MyAccountComponent {
   }
 
   isVideoImportEnabled () {
-    const importConfig = this.serverService.getConfig().import.videos
+    const importConfig = this.serverConfig.import.videos
 
     return importConfig.http.enabled || importConfig.torrent.enabled
   }