Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix viewers stats date filter label after a reset

Chocobozzz54bfae82ad7f
diff --git a/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts b/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
index 8818638a84..3f519a6215 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
+++ b/client/src/app/+videos-publish-manage/shared-manage/stats/video-stats.component.ts
@@ -1,4 +1,4 @@
-import { NgFor, NgIf } from '@angular/common'
+import { CommonModule } from '@angular/common'
import { Component, LOCALE_ID, OnInit, inject } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { ActivatedRoute } from '@angular/router'
@@ -6,7 +6,7 @@ import { Notifier, PeerTubeRouterService } from '@app/core'
import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.component'
import { NumberFormatterPipe } from '@app/shared/shared-main/common/number-formatter.pipe'
import { LiveVideoService } from '@app/shared/shared-video-live/live-video.service'
-import { NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavLinkBase, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
+import { NgbNavModule, NgbNavOutlet } from '@ng-bootstrap/ng-bootstrap'
import { secondsToTime } from '@peertube/peertube-core-utils'
import {
HttpStatusCode,
@@ -63,20 +63,14 @@ ChartJSDefaults.color = getComputedStyle(document.documentElement).getPropertyVa
],
providers: [ NumberFormatterPipe ],
imports: [
- NgFor,
- NgIf,
+ CommonModule,
HelpComponent,
EmbedComponent,
SelectOptionsComponent,
FormsModule,
- NgbNav,
- NgbNavItem,
- NgbNavLink,
- NgbNavLinkBase,
- NgbNavContent,
+ NgbNavModule,
ChartModule,
ButtonComponent,
- NgbNavOutlet,
GlobalIconComponent
]
})
@@ -185,6 +179,10 @@ export class VideoStatsComponent implements OnInit {
? new Date(params.endDate)
: undefined
+ if (!this.statsStartDate && !this.statsEndDate) {
+ this.currentDateFilter = 'all'
+ }
+
this.loadChart()
this.loadOverallStats()
})
diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts
index 7cf5d63c94..d7b10dcaa3 100644
--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts
+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-menu.component.ts
@@ -8,7 +8,7 @@ import { VideoManageController } from './video-manage-controller.service'
@Component({
selector: 'my-video-manage-menu',
- template: '<my-lateral-menu [config]="menuConfig" />',
+ template: '<my-lateral-menu [config]="menuConfig" [globalQueryParams]="globalQueryParams" />',
imports: [
CommonModule,
LateralMenuComponent
@@ -22,6 +22,13 @@ export class VideoManageMenuComponent implements OnInit {
menuConfig: LateralMenuConfig
+ // Remove these query params when navigating between pages
+ // They are added by the stats page
+ globalQueryParams: Record<string, any> = {
+ startDate: null,
+ endDate: null
+ }
+
private videoEdit: VideoEdit
private replaceFileEnabled: boolean
private studioEnabled: boolean
diff --git a/client/src/app/shared/shared-main/menu/lateral-menu.component.html b/client/src/app/shared/shared-main/menu/lateral-menu.component.html
index ae95c122a5..1024c707d9 100644
--- a/client/src/app/shared/shared-main/menu/lateral-menu.component.html
+++ b/client/src/app/shared/shared-main/menu/lateral-menu.component.html
@@ -24,7 +24,7 @@
<span class="label" *ngTemplateOutlet="label"></span>
</my-unavailable-menu-entry>
} @else {
- <a [routerLink]="entry.routerLink" queryParamsHandling="merge" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
+ <a [routerLink]="entry.routerLink" [queryParams]="globalQueryParams()" queryParamsHandling="merge" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
<ng-container *ngTemplateOutlet="icon"></ng-container>
<ng-container *ngTemplateOutlet="label"></ng-container>
</a>
diff --git a/client/src/app/shared/shared-main/menu/lateral-menu.component.ts b/client/src/app/shared/shared-main/menu/lateral-menu.component.ts
index 9640f0f745..fb27e5c364 100644
--- a/client/src/app/shared/shared-main/menu/lateral-menu.component.ts
+++ b/client/src/app/shared/shared-main/menu/lateral-menu.component.ts
@@ -41,6 +41,7 @@ export type LateralMenuConfig = {
})
export class LateralMenuComponent {
config = input.required<LateralMenuConfig>()
+ globalQueryParams = input<Record<string, any>>()
isDisplayed (entry: LateralMenuLinkEntry) {
if (!entry.isDisplayed) return true