Merge branch 'release/2.1.0' into develop

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

diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts
index 0af1dca9cc9710675a9e124f0886acfe8b8e5174..c8c1561054c0de160c39903bde137860c0329c30 100644 (file)
--- a/client/src/app/+about/about-instance/about-instance.component.ts
+++ b/client/src/app/+about/about-instance/about-instance.component.ts
@@ -1,12 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Notifier, ServerService } from '@app/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ContactAdminModalComponent } from '@app/+about/about-instance/contact-admin-modal.component'
 import { InstanceService } from '@app/shared/instance/instance.service'
-import { MarkdownService } from '@app/shared/renderer'
-import { forkJoin } from 'rxjs'
-import { first } from 'rxjs/operators'
-import { peertubeTranslate } from '@shared/models'
+import { ServerConfig } from '@shared/models'
+import { ActivatedRoute } from '@angular/router'
+import { ResolverData } from './about-instance.resolver'
 
 @Component({
   selector: 'my-about-instance',
@@ -23,72 +21,55 @@ export class AboutInstanceComponent implements OnInit {
     terms: '',
     codeOfConduct: '',
     moderationInformation: '',
-    administrator: ''
+    administrator: '',
+    hardwareInformation: ''
   }
 
+  creationReason = ''
   maintenanceLifetime = ''
   businessModel = ''
 
   languages: string[] = []
   categories: string[] = []
 
+  serverConfig: ServerConfig
+
   constructor (
+    private route: ActivatedRoute,
     private notifier: Notifier,
     private serverService: ServerService,
-    private instanceService: InstanceService,
-    private markdownService: MarkdownService,
-    private i18n: I18n
+    private instanceService: InstanceService
   ) {}
 
   get instanceName () {
-    return this.serverService.getConfig().instance.name
+    return this.serverConfig.instance.name
   }
 
   get isContactFormEnabled () {
-    return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled
+    return this.serverConfig.email.enabled && this.serverConfig.contactForm.enabled
   }
 
   get isNSFW () {
-    return this.serverService.getConfig().instance.isNSFW
+    return this.serverConfig.instance.isNSFW
   }
 
-  ngOnInit () {
-    forkJoin([
-      this.instanceService.getAbout(),
-      this.serverService.localeObservable.pipe(first()),
-      this.serverService.videoLanguagesLoaded.pipe(first()),
-      this.serverService.videoCategoriesLoaded.pipe(first())
-    ]).subscribe(
-      async ([ res, translations ]) => {
-        this.shortDescription = res.instance.shortDescription
-
-        this.maintenanceLifetime = res.instance.maintenanceLifetime
-        this.businessModel = res.instance.businessModel
-
-        for (const key of [ 'description', 'terms', 'codeOfConduct', 'moderationInformation', 'administrator' ]) {
-          this.html[ key ] = await this.markdownService.textMarkdownToHTML(res.instance[ key ])
-        }
-
-        const languagesArray = this.serverService.getVideoLanguages()
-        const categoriesArray = this.serverService.getVideoCategories()
+  async ngOnInit () {
+    this.serverConfig = this.serverService.getTmpConfig()
+    this.serverService.getConfig()
+        .subscribe(config => this.serverConfig = config)
 
-        this.languages = res.instance.languages
-                            .map(l => {
-                              const languageObj = languagesArray.find(la => la.id === l)
+    const { about, languages, categories }: ResolverData = this.route.snapshot.data.instanceData
 
-                              return peertubeTranslate(languageObj.label, translations)
-                            })
+    this.languages = languages
+    this.categories = categories
 
-        this.categories = res.instance.categories
-                             .map(c => {
-                               const categoryObj = categoriesArray.find(ca => ca.id === c)
+    this.shortDescription = about.instance.shortDescription
 
-                               return peertubeTranslate(categoryObj.label, translations)
-                             })
-      },
+    this.creationReason = about.instance.creationReason
+    this.maintenanceLifetime = about.instance.maintenanceLifetime
+    this.businessModel = about.instance.businessModel
 
-      () => this.notifier.error(this.i18n('Cannot get about information from server'))
-    )
+    this.html = await this.instanceService.buildHtml(about)
   }
 
   openContactModal () {