import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { filter, map, pairwise, switchMap } from 'rxjs/operators'
-import { DOCUMENT, PlatformLocation, ViewportScroller } from '@angular/common'
+import { delay, forkJoin } from 'rxjs'
+import { filter, first, map } from 'rxjs/operators'
+import { DOCUMENT, getLocaleDirection, PlatformLocation } from '@angular/common'
import { AfterViewInit, Component, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core'
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { Event, GuardsCheckStart, NavigationEnd, RouteConfigLoadEnd, RouteConfigLoadStart, Router, Scroll } from '@angular/router'
-import { AuthService, MarkdownService, RedirectService, ScreenService, ServerService, ThemeService, User } from '@app/core'
+import { Event, GuardsCheckStart, RouteConfigLoadEnd, RouteConfigLoadStart, Router } from '@angular/router'
+import {
+ AuthService,
+ MarkdownService,
+ PeerTubeRouterService,
+ RedirectService,
+ ScreenService,
+ ScrollService,
+ ServerService,
+ ThemeService,
+ User,
+ UserLocalStorageService
+} from '@app/core'
import { HooksService } from '@app/core/plugins/hooks.service'
import { PluginService } from '@app/core/plugins/plugin.service'
+import { AccountSetupWarningModalComponent } from '@app/modal/account-setup-warning-modal.component'
+import { AdminWelcomeModalComponent } from '@app/modal/admin-welcome-modal.component'
import { CustomModalComponent } from '@app/modal/custom-modal.component'
import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
-import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
import { NgbConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { LoadingBarService } from '@ngx-loading-bar/core'
+import { logger } from '@root-helpers/logger'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import { getShortLocale } from '@shared/core-utils/i18n'
-import { BroadcastMessageLevel, HTMLServerConfig, ServerConfig, UserRole } from '@shared/models'
+import { BroadcastMessageLevel, HTMLServerConfig, UserRole } from '@shared/models'
import { MenuService } from './core/menu/menu.service'
import { POP_STATE_MODAL_DISMISS } from './helpers'
+import { GlobalIconName } from './shared/shared-icons'
import { InstanceService } from './shared/shared-instance'
@Component({
export class AppComponent implements OnInit, AfterViewInit {
private static BROADCAST_MESSAGE_KEY = 'app-broadcast-message-dismissed'
- @ViewChild('welcomeModal') welcomeModal: WelcomeModalComponent
+ @ViewChild('accountSetupWarningModal') accountSetupWarningModal: AccountSetupWarningModalComponent
+ @ViewChild('adminWelcomeModal') adminWelcomeModal: AdminWelcomeModalComponent
@ViewChild('instanceConfigWarningModal') instanceConfigWarningModal: InstanceConfigWarningModalComponent
@ViewChild('customModal') customModal: CustomModalComponent
constructor (
@Inject(DOCUMENT) private document: Document,
@Inject(LOCALE_ID) private localeId: string,
- private viewportScroller: ViewportScroller,
private router: Router,
private authService: AuthService,
private serverService: ServerService,
+ private peertubeRouter: PeerTubeRouterService,
private pluginService: PluginService,
private instanceService: InstanceService,
private domSanitizer: DomSanitizer,
private markdownService: MarkdownService,
private ngbConfig: NgbConfig,
private loadingBar: LoadingBarService,
+ private scrollService: ScrollService,
+ private userLocalStorage: UserLocalStorageService,
public menu: MenuService
) {
this.ngbConfig.animation = false
return this.serverConfig.instance.name
}
- goToDefaultRoute () {
- return this.router.navigateByUrl(this.redirectService.getDefaultRoute())
- }
-
ngOnInit () {
document.getElementById('incompatible-browser').className += ' browser-ok'
+ this.loadUser()
+
this.serverConfig = this.serverService.getHTMLConfig()
this.hooks.runAction('action:application.init', 'common')
}
this.initRouteEvents()
+ this.scrollService.enableScrollRestoration()
this.injectJS()
this.injectCSS()
this.openModalsIfNeeded()
this.document.documentElement.lang = getShortLocale(this.localeId)
+ this.document.documentElement.dir = getLocaleDirection(this.localeId)
}
ngAfterViewInit () {
this.pluginService.initializeCustomModal(this.customModal)
}
+ // ---------------------------------------------------------------------------
+
+ getDefaultRoute () {
+ return this.redirectService.getDefaultRoute().split('?')[0]
+ }
+
+ getDefaultRouteQuery () {
+ return this.router.parseUrl(this.redirectService.getDefaultRoute()).queryParams
+ }
+
+ // ---------------------------------------------------------------------------
+
getToggleTitle () {
if (this.menu.isDisplayed()) return $localize`Close the left menu`
this.screenService.isBroadcastMessageDisplayed = false
}
+ getNotificationIcon (message: { severity: 'success' | 'error' | 'info' }): GlobalIconName {
+ switch (message.severity) {
+ case 'error':
+ return 'cross'
+ case 'success':
+ return 'tick'
+ case 'info':
+ return 'help'
+ }
+ }
+
private initRouteEvents () {
- let resetScroll = true
const eventsObs = this.router.events
- const scrollEvent = eventsObs.pipe(filter((e: Event): e is Scroll => e instanceof Scroll))
-
- // Handle anchors/restore position
- scrollEvent.subscribe(e => {
- // scrollToAnchor first to preserve anchor position when using history navigation
- if (e.anchor) {
- setTimeout(() => {
- this.viewportScroller.scrollToAnchor(e.anchor)
- })
-
- return
- }
-
- if (e.position) {
- return this.viewportScroller.scrollToPosition(e.position)
- }
-
- if (resetScroll) {
- return this.viewportScroller.scrollToPosition([ 0, 0 ])
- }
- })
-
- const navigationEndEvent = eventsObs.pipe(filter((e: Event): e is NavigationEnd => e instanceof NavigationEnd))
-
- // When we add the a-state parameter, we don't want to alter the scroll
- navigationEndEvent.pipe(pairwise())
- .subscribe(([ e1, e2 ]) => {
- try {
- resetScroll = false
-
- const previousUrl = new URL(window.location.origin + e1.urlAfterRedirects)
- const nextUrl = new URL(window.location.origin + e2.urlAfterRedirects)
-
- if (previousUrl.pathname !== nextUrl.pathname) {
- resetScroll = true
- return
- }
-
- const nextSearchParams = nextUrl.searchParams
- nextSearchParams.delete('a-state')
-
- const previousSearchParams = previousUrl.searchParams
-
- nextSearchParams.sort()
- previousSearchParams.sort()
-
- if (nextSearchParams.toString() !== previousSearchParams.toString()) {
- resetScroll = true
- }
- } catch (e) {
- console.error('Cannot parse URL to check next scroll.', e)
- resetScroll = true
- }
- })
-
// Plugin hooks
- navigationEndEvent.subscribe(e => {
+ this.peertubeRouter.getNavigationEndEvents().subscribe(e => {
this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url })
})
}
this.broadcastMessage = {
- message: await this.markdownService.unsafeMarkdownToHTML(messageConfig.message, true),
+ message: await this.markdownService.markdownToUnsafeHTML({ markdown: messageConfig.message }),
dismissable: messageConfig.dismissable,
class: classes[messageConfig.level]
}
// Inject JS
if (this.serverConfig.instance.customizations.javascript) {
try {
- // tslint:disable:no-eval
+ /* eslint-disable no-eval */
eval(this.serverConfig.instance.customizations.javascript)
} catch (err) {
- console.error('Cannot eval custom JavaScript.', err)
+ logger.error('Cannot eval custom JavaScript.', err)
}
}
}
}
}
- private async openModalsIfNeeded () {
- this.authService.userInformationLoaded
+ private openModalsIfNeeded () {
+ const userSub = this.authService.userInformationLoaded
.pipe(
- map(() => this.authService.getUser()),
- filter(user => user.role === UserRole.ADMINISTRATOR),
- switchMap(user => {
- return this.serverService.getConfig()
- .pipe(map(serverConfig => ({ serverConfig, user })))
- })
- ).subscribe(({ serverConfig, user }) => this._openAdminModalsIfNeeded(serverConfig, user))
+ delay(0), // Wait for modals creations
+ map(() => this.authService.getUser())
+ )
+
+ // Admin modal
+ userSub.pipe(
+ filter(user => user.role.id === UserRole.ADMINISTRATOR)
+ ).subscribe(user => this.openAdminModalsIfNeeded(user))
+
+ // Account modal
+ userSub.pipe(
+ filter(user => user.role.id !== UserRole.ADMINISTRATOR)
+ ).subscribe(user => this.openAccountModalsIfNeeded(user))
}
- private async _openAdminModalsIfNeeded (serverConfig: ServerConfig, user: User) {
- if (user.noWelcomeModal !== true) return this.welcomeModal.show()
-
- if (user.noInstanceConfigWarningModal === true || !serverConfig.signup.allowed) return
-
- this.instanceService.getAbout()
- .subscribe(about => {
- if (
- this.serverConfig.instance.name.toLowerCase() === 'peertube' ||
- !about.instance.terms ||
- !about.instance.administrator ||
- !about.instance.maintenanceLifetime
- ) {
- this.instanceConfigWarningModal.show(about)
- }
- })
+ private openAdminModalsIfNeeded (user: User) {
+ if (this.adminWelcomeModal.shouldOpen(user)) {
+ return this.adminWelcomeModal.show()
+ }
+
+ if (!this.instanceConfigWarningModal.shouldOpenByUser(user)) return
+
+ forkJoin([
+ this.serverService.getConfig().pipe(first()),
+ this.instanceService.getAbout().pipe(first())
+ ]).subscribe(([ config, about ]) => {
+ if (this.instanceConfigWarningModal.shouldOpen(config, about)) {
+ this.instanceConfigWarningModal.show(about)
+ }
+ })
+ }
+
+ private openAccountModalsIfNeeded (user: User) {
+ if (this.accountSetupWarningModal.shouldOpen(user)) {
+ this.accountSetupWarningModal.show(user)
+ }
}
private initHotkeys () {
this.hotkeysService.add([
- new Hotkey(['/', 's'], (event: KeyboardEvent): boolean => {
+ new Hotkey([ '/', 's' ], (event: KeyboardEvent): boolean => {
document.getElementById('search-video').focus()
return false
}, undefined, $localize`Focus the search bar`),
}, undefined, $localize`Go to the videos upload page`)
])
}
+
+ private loadUser () {
+ const tokens = this.userLocalStorage.getTokens()
+ if (!tokens) return
+
+ const user = this.userLocalStorage.getLoggedInUser()
+ if (!user) return
+
+ // Initialize user
+ this.authService.buildAuthUser(user, tokens)
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff