X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=bcc88487856d9aff1877b2bbcd9bdeb2e992e095;hb=636d73c58866ed235c207719e41fdde3c2d6c969;hp=ed20d9c016f3a757c06eb9065da32cd5ef0a7a72;hpb=56f0876184a792cff3c6123c95d9e52eaa450a28;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts index ed20d9c01..bcc884878 100644 --- a/client/src/app/menu/menu.component.ts +++ b/client/src/app/menu/menu.component.ts @@ -1,22 +1,35 @@ -import { ViewportScroller } from '@angular/common' import { HotkeysService } from 'angular2-hotkeys' import * as debug from 'debug' import { switchMap } from 'rxjs/operators' +import { ViewportScroller } from '@angular/common' import { Component, OnInit, ViewChild } from '@angular/core' import { Router } from '@angular/router' +import { + AuthService, + AuthStatus, + AuthUser, + HooksService, + MenuSection, + MenuService, + RedirectService, + ScreenService, + ServerService, + UserService +} from '@app/core' import { scrollToTop } from '@app/helpers' -import { AuthService, AuthStatus, AuthUser, MenuService, RedirectService, ScreenService, ServerService, UserService } from '@app/core' import { LanguageChooserComponent } from '@app/menu/language-chooser.component' import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' -import { ServerConfig, UserRight, VideoConstant } from '@shared/models' -import { NgbDropdown, NgbDropdownConfig } from '@ng-bootstrap/ng-bootstrap' +import { PeertubeModalService } from '@app/shared/shared-main/peertube-modal/peertube-modal.service' +import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' +import { PluginsManager } from '@root-helpers/plugins-manager' +import { HTMLServerConfig, ServerConfig, UserRight, VideoConstant } from '@shared/models' const logger = debug('peertube:menu:MenuComponent') @Component({ selector: 'my-menu', templateUrl: './menu.component.html', - styleUrls: ['./menu.component.scss'] + styleUrls: [ './menu.component.scss' ] }) export class MenuComponent implements OnInit { @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent @@ -34,8 +47,13 @@ export class MenuComponent implements OnInit { currentInterfaceLanguage: string + menuSections: MenuSection[] = [] + private languages: VideoConstant[] = [] + + private htmlServerConfig: HTMLServerConfig private serverConfig: ServerConfig + private routesPerRight: { [role in UserRight]?: string } = { [UserRight.MANAGE_USERS]: '/admin/users', [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends', @@ -54,69 +72,43 @@ export class MenuComponent implements OnInit { private hotkeysService: HotkeysService, private screenService: ScreenService, private menuService: MenuService, - private dropdownConfig: NgbDropdownConfig, - private router: Router - ) { - this.dropdownConfig.container = 'body' - } + private modalService: PeertubeModalService, + private router: Router, + private hooks: HooksService + ) { } get isInMobileView () { return this.screenService.isInMobileView() } get dropdownContainer () { - if (this.isInMobileView) { - return null - } else { - return this.dropdownConfig.container - } + if (this.isInMobileView) return null + + return 'body' as 'body' } get language () { return this.languageChooserModal.getCurrentLanguage() } - get instanceName () { - return this.serverConfig.instance.name - } - ngOnInit () { - this.serverConfig = this.serverService.getTmpConfig() - this.serverService.getConfig() - .subscribe(config => this.serverConfig = config) + this.htmlServerConfig = this.serverService.getHTMLConfig() + this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage() this.isLoggedIn = this.authService.isLoggedIn() - if (this.isLoggedIn === true) { - this.user = this.authService.getUser() - - this.computeNSFWPolicy() - this.computeVideosLink() - } - - this.computeAdminAccess() - - this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage() + this.updateUserState() + this.buildMenuSections() this.authService.loginChangedSource.subscribe( status => { if (status === AuthStatus.LoggedIn) { this.isLoggedIn = true - this.user = this.authService.getUser() - - this.computeAdminAccess() - this.computeVideosLink() - - logger('Logged in.') } else if (status === AuthStatus.LoggedOut) { this.isLoggedIn = false - this.user = undefined - - this.computeAdminAccess() - - logger('Logged out.') - } else { - console.error('Unknown auth status: ' + status) } + + this.updateUserState() + this.buildMenuSections() } ) @@ -130,9 +122,26 @@ export class MenuComponent implements OnInit { this.authService.userInformationLoaded .subscribe(() => this.buildUserLanguages()) }) + + this.serverService.getConfig() + .subscribe(config => this.serverConfig = config) + + this.modalService.openQuickSettingsSubject + .subscribe(() => this.openQuickSettings()) + } + + getExternalLoginHref () { + if (this.serverConfig.client.menu.login.redirectOnSingleExternalAuth !== true) return undefined + + const externalAuths = this.serverConfig.plugin.registeredExternalAuths + if (externalAuths.length !== 1) return undefined + + return PluginsManager.getExternalAuthHref(externalAuths[0]) } isRegistrationAllowed () { + if (!this.serverConfig) return false + return this.serverConfig.signup.allowed && this.serverConfig.signup.allowedForCurrentIP } @@ -241,6 +250,22 @@ export class MenuComponent implements OnInit { } } + private async buildMenuSections () { + const menuSections = [] + + if (this.isLoggedIn) { + menuSections.push( + this.menuService.buildLibraryLinks(this.user?.canSeeVideosLink) + ) + } + + menuSections.push( + this.menuService.buildCommonLinks(this.htmlServerConfig) + ) + + this.menuSections = await this.hooks.wrapObject(menuSections, 'common', 'filter:left-menu.links.create.result') + } + private buildUserLanguages () { if (!this.user) { this.videoLanguages = [] @@ -248,7 +273,7 @@ export class MenuComponent implements OnInit { } if (!this.user.videoLanguages) { - this.videoLanguages = [$localize`any language`] + this.videoLanguages = [ $localize`any language` ] return } @@ -264,6 +289,8 @@ export class MenuComponent implements OnInit { } private computeVideosLink () { + if (!this.isLoggedIn) return + this.authService.userInformationLoaded .pipe( switchMap(() => this.user.computeCanSeeVideosLink(this.userService.getMyVideoQuotaUsed())) @@ -293,4 +320,14 @@ export class MenuComponent implements OnInit { break } } + + private updateUserState () { + this.user = this.isLoggedIn + ? this.authService.getUser() + : undefined + + this.computeAdminAccess() + this.computeNSFWPolicy() + this.computeVideosLink() + } }