From c74dc602a682475abb37adff16b0964303321c15 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 18 Aug 2023 13:43:59 +0200 Subject: [PATCH] Simplify table pagination footer --- .../follows/followers-list/followers-list.component.html | 3 +-- .../follows/following-list/following-list.component.html | 3 +-- .../registration-list/registration-list.component.html | 3 +-- .../video-block-list/video-block-list.component.html | 3 +-- .../overview/comments/video-comment-list.component.html | 3 +-- .../+admin/overview/users/user-list/user-list.component.html | 4 +--- .../src/app/+admin/overview/videos/video-list.component.html | 3 +-- client/src/app/+admin/system/jobs/jobs.component.html | 4 +--- .../runners/runner-job-list/runner-job-list.component.html | 3 +-- .../system/runners/runner-list/runner-list.component.html | 3 +-- .../runner-registration-token-list.component.html | 3 +-- .../my-video-channel-syncs.component.html | 3 +-- .../my-video-imports/my-video-imports.component.html | 3 +-- client/src/app/core/rest/rest-table.ts | 4 ++++ .../shared/shared-abuse-list/abuse-list-table.component.html | 4 +--- .../shared/shared-moderation/account-blocklist.component.html | 3 +-- .../shared/shared-moderation/server-blocklist.component.html | 3 +-- 17 files changed, 20 insertions(+), 35 deletions(-) diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index 3326d59db..806a4b49e 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html @@ -7,8 +7,7 @@ [value]="followers" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} followers" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [(selection)]="selectedRows" > diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html index 07495a74c..0220f9726 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.html +++ b/client/src/app/+admin/follows/following-list/following-list.component.html @@ -7,8 +7,7 @@ [value]="following" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} hosts" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [(selection)]="selectedRows" > diff --git a/client/src/app/+admin/moderation/registration-list/registration-list.component.html b/client/src/app/+admin/moderation/registration-list/registration-list.component.html index 8e5e2cf49..f34e3b46e 100644 --- a/client/src/app/+admin/moderation/registration-list/registration-list.component.html +++ b/client/src/app/+admin/moderation/registration-list/registration-list.component.html @@ -7,8 +7,7 @@ [value]="registrations" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [(selection)]="selectedRows" [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} registrations" + [(selection)]="selectedRows" [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" > diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html index 53bc6a178..d15903024 100644 --- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html +++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html @@ -7,8 +7,7 @@ [value]="blocklist" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} blocked videos" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" > diff --git a/client/src/app/+admin/overview/comments/video-comment-list.component.html b/client/src/app/+admin/overview/comments/video-comment-list.component.html index df9bccc0a..61ea5f8d1 100644 --- a/client/src/app/+admin/overview/comments/video-comment-list.component.html +++ b/client/src/app/+admin/overview/comments/video-comment-list.component.html @@ -11,8 +11,7 @@ [value]="comments" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" [selectionPageOnly]="true" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} comments" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" [(selection)]="selectedRows" > diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index e37ad2a3e..b74b03e98 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html @@ -7,9 +7,7 @@ [value]="users" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [resizableColumns]="true" [(selection)]="selectedRows" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" [selectionPageOnly]="true" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} users" - [expandedRowKeys]="expandedRows" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" >
diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html index 3a4666435..21092d370 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.html +++ b/client/src/app/+admin/overview/videos/video-list.component.html @@ -7,8 +7,7 @@ [value]="videos" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [resizableColumns]="true" [(selection)]="selectedRows" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" [selectionPageOnly]="true" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} videos" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" [ngClass]="{ loading: loading }" > diff --git a/client/src/app/+admin/system/jobs/jobs.component.html b/client/src/app/+admin/system/jobs/jobs.component.html index a5266bde5..742b9c696 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.html +++ b/client/src/app/+admin/system/jobs/jobs.component.html @@ -35,9 +35,7 @@ [value]="jobs" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="uniqId" [first]="pagination.start" [tableStyle]="{'table-layout':'auto'}" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} jobs" - [expandedRowKeys]="expandedRows" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" > diff --git a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html index 1a40da0c0..685f55e62 100644 --- a/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html +++ b/client/src/app/+admin/system/runners/runner-job-list/runner-job-list.component.html @@ -14,8 +14,7 @@ [value]="runnerJobs" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [(selection)]="selectedRows" [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} runner jobs" + [(selection)]="selectedRows" [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" dataKey="uuid" > diff --git a/client/src/app/+admin/system/runners/runner-list/runner-list.component.html b/client/src/app/+admin/system/runners/runner-list/runner-list.component.html index b131d1a74..9cdf58cdb 100644 --- a/client/src/app/+admin/system/runners/runner-list/runner-list.component.html +++ b/client/src/app/+admin/system/runners/runner-list/runner-list.component.html @@ -14,8 +14,7 @@ [value]="runners" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} remote runners" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" > diff --git a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.html b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.html index 4ff2c3b4c..eaab0c6cc 100644 --- a/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.html +++ b/client/src/app/+admin/system/runners/runner-registration-token-list/runner-registration-token-list.component.html @@ -16,8 +16,7 @@ [value]="registrationTokens" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} registration tokens" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" > diff --git a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.html b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.html index 5275fb517..1b52a9b4e 100644 --- a/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.html +++ b/client/src/app/+my-library/my-video-channel-syncs/my-video-channel-syncs.component.html @@ -13,8 +13,7 @@ *ngIf="syncEnabled()" [value]="channelSyncs" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" [first]="pagination.start" [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} synchronizations" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" > diff --git a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html index 34d5bc4b2..b898c38cb 100644 --- a/client/src/app/+my-library/my-video-imports/my-video-imports.component.html +++ b/client/src/app/+my-library/my-video-imports/my-video-imports.component.html @@ -17,8 +17,7 @@ diff --git a/client/src/app/core/rest/rest-table.ts b/client/src/app/core/rest/rest-table.ts index ec4c570d4..536a0aec0 100644 --- a/client/src/app/core/rest/rest-table.ts +++ b/client/src/app/core/rest/rest-table.ts @@ -82,6 +82,10 @@ export abstract class RestTable { return this.selectedRows.length !== 0 } + getPaginationTemplate () { + return $localize`{first} - {last} of {totalRecords}` + } + protected abstract reloadDataInternal (): void protected reloadData () { diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html index 3bed812d1..0ce0624fc 100644 --- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html +++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html @@ -2,9 +2,7 @@ [value]="abuses" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [first]="pagination.start" [rowsPerPageOptions]="rowsPerPageOptions" [sortField]="sort.field" [sortOrder]="sort.order" dataKey="id" [resizableColumns]="true" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} reports" - [expandedRowKeys]="expandedRows" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" [expandedRowKeys]="expandedRows" >
diff --git a/client/src/app/shared/shared-moderation/account-blocklist.component.html b/client/src/app/shared/shared-moderation/account-blocklist.component.html index 609a8cecd..e6a28adc9 100644 --- a/client/src/app/shared/shared-moderation/account-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/account-blocklist.component.html @@ -7,8 +7,7 @@ [value]="blockedAccounts" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" [first]="pagination.start" [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} muted accounts" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" >
diff --git a/client/src/app/shared/shared-moderation/server-blocklist.component.html b/client/src/app/shared/shared-moderation/server-blocklist.component.html index a98333339..eeca04f4a 100644 --- a/client/src/app/shared/shared-moderation/server-blocklist.component.html +++ b/client/src/app/shared/shared-moderation/server-blocklist.component.html @@ -8,8 +8,7 @@ [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions" [first]="pagination.start" [sortField]="sort.field" [sortOrder]="sort.order" [lazy]="true" (onLazyLoad)="loadLazy($event)" [lazyLoadOnInit]="false" - [showCurrentPageReport]="true" i18n-currentPageReportTemplate - currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} muted instances" + [showCurrentPageReport]="true" [currentPageReportTemplate]="getPaginationTemplate()" >