ActivityPub-federated video streaming platform using P2P directly in your web browser
Merge branch 'release/7.2.0' into develop
Chocobozzz3fbaae8ac291
diff --cc client/src/app/+my-library/my-videos/my-videos.component.htmlindex bb4daa50e5,62762a4fe1..1740502a23--- a/client/src/app/+my-library/my-videos/my-videos.component.html+++ b/client/src/app/+my-library/my-videos/my-videos.component.html@@@ -6,121 -6,205 +6,121 @@@}</div>-<p-table- [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" [currentPageReportTemplate]="getPaginationTemplate()"- [expandedRowKeys]="expandedRows" [ngClass]="{ loading: loading }"- class="new-p-table sticky-p-table cell-wrap"+<my-table+ #table+ key="MyVideosComponent"+ [defaultColumns]="columns"+ defaultSort="publishedAt"+ i18n-paginatorText+ paginatorText="videos per page"+ defaultRowsPerPage="5"+ [bulkActions]="bulkActions"+ [dataLoader]="dataLoader"+ [customParseQueryParams]="customParseQueryParams"+ [customUpdateUrl]="customUpdateUrl">- <ng-template pTemplate="caption">- <div class="caption">- <div class="left-buttons">- @if (isInSelectionMode()) {- <my-action-dropdown- i18n-label label="Batch actions" theme="primary"- [actions]="bulkActions" [entry]="selectedRows"- >- </my-action-dropdown>- } @else {- <strong i18n [hidden]="loading">- { totalRecords, plural, =0 {No videos} =1 {1 video} other {{{ totalRecords | myNumberFormatter }} videos}}- </strong>- }- </div>-- <div class="ms-auto right-form">- <div class="d-flex align-items-center">- <label class="label-inline d-none d-inline-block-mw" for="table-search" i18n>Search</label>-- <my-advanced-input-filter- inputId="table-search" icon="true" emitOnInit="false" i18n-placeholder placeholder="Search your videos"- (search)="onSearch($event)"- ></my-advanced-input-filter>- </div>-- <div class="d-flex align-items-center">- <label class="label-inline" for="table-filter" i18n>Filter</label>-- <my-select-checkbox- inputId="table-filter"- showToggleAll="false"- showClear="true"-- [availableItems]="filterItems"- [selectableGroup]="false"- [(ngModel)]="selectedFilterItems"- i18n-placeholder placeholder="All videos"- (ngModelChange)="onFilter()"- >- </my-select-checkbox>- </div>- </div>- </div>+ <ng-template #totalTitle let-totalRecords>+ <ng-container i18n>{ totalRecords, plural, =0 {No videos} =1 {1 video} other {{{ totalRecords | myNumberFormatter }} videos}}</ng-container></ng-template>- <ng-template pTemplate="sorticon" let-sortOrder>- @if (sortOrder === 1) {- <my-button class="ms-2" small="true" active="true" rounded="true" theme="tertiary" icon="chevron-up"></my-button>- } @else if (sortOrder === -1) {- <my-button class="ms-2" small="true" active="true" rounded="true" theme="tertiary" icon="chevron-down"></my-button>- } @else if (sortOrder === 0) {- <my-button class="ms-2" small="true" rounded="true" theme="tertiary" icon="chevron-down"></my-button>- }- </ng-template>+ <ng-template #captionRight>+ <div class="d-flex align-items-center">+ <label class="label-inline d-none d-inline-block-mw" for="table-search" i18n>Search</label>- <ng-template pTemplate="paginatorright" let-item>- <ng-container i18n>videos per page</ng-container>- </ng-template>+ <my-advanced-input-filter+ inputId="table-search" icon="true" emitOnInit="false" i18n-placeholder placeholder="Search your videos"+ (search)="table.onSearch($event, true)"+ ></my-advanced-input-filter>+ </div>- <ng-template pTemplate="header">- <tr>- <th scope="col" width="25px" class="checkbox-cell">- <p-tableHeaderCheckbox ariaLabel="Select all rows" i18n-ariaLabel></p-tableHeaderCheckbox>- </th>-- <th scope="col" *ngIf="isSelected('duration')" [ngbTooltip]="sortTooltip" container="body" pSortableColumn="duration">{{ getColumn('duration').label }} <p-sortIcon field="duration"></p-sortIcon></th>- <th scope="col" *ngIf="isSelected('name')" [ngbTooltip]="sortTooltip" container="body" pSortableColumn="name">{{ getColumn('name').label }} <p-sortIcon field="name"></p-sortIcon></th>- <th scope="col" *ngIf="isSelected('privacy')">{{ getColumn('privacy').label }}</th>- <th scope="col" *ngIf="isSelected('sensitive')">{{ getColumn('sensitive').label }}</th>- <th scope="col" *ngIf="isSelected('playlists')">{{ getColumn('playlists').label }}</th>- <th scope="col" *ngIf="isSelected('insights')" [ngbTooltip]="sortTooltip" container="body" pSortableColumn="views">{{ getColumn('insights').label }} <p-sortIcon field="views"></p-sortIcon></th>- <th scope="col" *ngIf="isSelected('comments')" [ngbTooltip]="sortTooltip" container="body" pSortableColumn="comments">{{ getColumn('comments').label }} <p-sortIcon field="comments"></p-sortIcon></th>- <th scope="col" *ngIf="isSelected('published')" i18n [ngbTooltip]="sortTooltip" container="body" pSortableColumn="publishedAt">{{ getColumn('published').label }} <p-sortIcon field="publishedAt"></p-sortIcon></th>- <th scope="col" *ngIf="isSelected('state')">{{ getColumn('state').label }}</th>-- <th scope="col" width="250px" class="action-head">- <div class="d-flex align-items-center justify-content-between">- <span i18>Actions</span>-- <span class="c-hand column-toggle" >- <div ngbDropdown placement="bottom-left auto" container="body" autoClose="outside" #columnsDropdown="ngbDropdown">- <my-button theme="tertiary" icon="columns" ngbDropdownToggle i18n-title title="Open table configuration" [show]="columnsDropdown.isOpen()"></my-button>-- <div ngbDropdownMenu class="p-3">- <div class="form-group">- <div class="muted small mb-2" i18n>Column displayed:</div>-- @for (column of columns; track column) {- <div class="ms-1 mb-1">- <my-peertube-checkbox- [inputName]="'column-' + column.id" [(ngModel)]="column.selected"- i18n-labelText [labelText]="column.label"- (ngModelChange)="saveSelectedColumns()"- ></my-peertube-checkbox>- </div>- }- </div>- </div>- </div>- </span>- </div>- </th>- </tr>+ <div class="d-flex align-items-center">+ <label class="label-inline" for="table-filter" i18n>Filter</label>++ <my-select-checkbox+ inputId="table-filter"+ showToggleAll="false"+ showClear="true"++ [availableItems]="filterItems"+ [selectableGroup]="false"+ [(ngModel)]="selectedFilterItems"+ i18n-placeholder placeholder="All videos"+ (ngModelChange)="table.onFilter()"+ >+ </my-select-checkbox>+ </div></ng-template>- <ng-template pTemplate="body" let-video>+ <ng-template #tableCells let-video>- <tr [pSelectableRow]="video">- <td class="checkbox-cell">- <p-tableCheckbox [value]="video" ariaLabel="Select this row" i18n-ariaLabel></p-tableCheckbox>- </td>+ <td *ngIf="table.isColumnDisplayed('duration')">+ <my-video-cell [video]="video" thumbnail="true" title="false"></my-video-cell>+ </td>- <td *ngIf="isSelected('duration')">- <my-video-cell [video]="video" thumbnail="true" title="false"></my-video-cell>- </td>+ <td *ngIf="table.isColumnDisplayed('name')">+ <my-video-cell class="video-cell-name" [video]="video" thumbnail="false" title="true"></my-video-cell>+ </td>- <td *ngIf="isSelected('name')">- <my-video-cell class="video-cell-name" [video]="video" thumbnail="false" title="true"></my-video-cell>- </td>+ <td *ngIf="table.isColumnDisplayed('privacy')">+ <div class="d-flex flex-wrap gap-1">+ <my-video-privacy-badge [video]="video"></my-video-privacy-badge>- <td *ngIf="isSelected('privacy')">- <div class="d-flex flex-wrap gap-1">- <my-video-privacy-badge [video]="video"></my-video-privacy-badge>-- <span *ngIf="video.blacklisted" class="pt-badge badge-red" i18n [ngbTooltip]="video.blacklistedReason">Blocked</span>- </div>- </td>-- <td *ngIf="isSelected('sensitive')">- <my-video-nsfw-badge [video]="video"></my-video-nsfw-badge>- </td>+ <span *ngIf="video.blacklisted" class="pt-badge badge-red" i18n [ngbTooltip]="video.blacklistedReason">Blocked</span>+ </div>+ </td>- <td *ngIf="isSelected('playlists')">- <div class="badges playlists">- <a *ngFor="let playlist of (videosContainedInPlaylists[video.id] || [])" class="pt-badge badge-secondary pt-badge-keep-case" [routerLink]="['/w/p/', playlist.playlistShortUUID]">- {{ playlist.playlistDisplayName }}- </a>- </div>- </td>+ <td *ngIf="table.isColumnDisplayed('sensitive')">+ <my-video-nsfw-badge [video]="video"></my-video-nsfw-badge>+ </td>- <td *ngIf="isSelected('insights')">- <a class="pt" [routerLink]="[ '/videos/manage', video.shortUUID, 'stats' ]" i18n-title title="Navigate to the video stats page">- <ng-container i18n>{video.views, plural, =0 {No views} =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}</ng-container>+ <td *ngIf="table.isColumnDisplayed('playlists')">+ <div class="badges playlists">- <a *ngFor="let playlist of (videosContainedInPlaylists[video.id] || [])" class="pt-badge badge-secondary" [routerLink]="['/w/p/', playlist.playlistShortUUID]">++ <a *ngFor="let playlist of (videosContainedInPlaylists[video.id] || [])" class="pt-badge badge-secondary pt-badge-keep-case" [routerLink]="['/w/p/', playlist.playlistShortUUID]">+ {{ playlist.playlistDisplayName }}+ </a>+ </div>+ </td>- <br />+ <td *ngIf="table.isColumnDisplayed('insights')">+ <a class="pt" [routerLink]="[ '/videos/manage', video.shortUUID, 'stats' ]" i18n-title title="Navigate to the video stats page">+ <ng-container i18n>{video.views, plural, =0 {No views} =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}</ng-container>- @if (video.isLive) {- <ng-container i18n>{video.viewers, plural, =0 {No viewers} =1 {1 viewer} other {{{ video.views | myNumberFormatter }} viewers}}</ng-container>- }- </a>- </td>+ <br />- <td *ngIf="isSelected('comments')">- <span i18n>{video.comments, plural, =0 {No comments} =1 {1 comment} other {{{ video.comments | myNumberFormatter }} comments}}</span>- </td>+ @if (video.isLive) {+ <ng-container i18n>{video.viewers, plural, =0 {No viewers} =1 {1 viewer} other {{{ video.views | myNumberFormatter }} viewers}}</ng-container>+ }+ </a>+ </td>- <td *ngIf="isSelected('published')">- {{ video.publishedAt | ptDate: 'short' }}- </td>+ <td *ngIf="table.isColumnDisplayed('comments')">+ <span i18n>{video.comments, plural, =0 {No comments} =1 {1 comment} other {{{ video.comments | myNumberFormatter }} comments}}</span>+ </td>- <td *ngIf="isSelected('state')">- <my-video-state-badge [video]="video"></my-video-state-badge>- </td>+ <td *ngIf="table.isColumnDisplayed('published')">+ {{ video.publishedAt | ptDate: 'short' }}+ </td>- <td class="action-cell">- <div class="d-flex justify-content-end">- <my-button class="me-3" i18n-label label="Manage" [ptRouterLink]="[ '/videos', 'manage', video.shortUUID ]" theme="secondary" icon="film" responsiveLabel="true"></my-button>+ <td *ngIf="table.isColumnDisplayed('state')">+ <my-video-state-badge [video]="video"></my-video-state-badge>+ </td>+ </ng-template>- <my-video-actions-dropdown- placement="bottom auto" buttonDirection="horizontal" buttonStyled="true" [video]="video" [displayOptions]="videoActionsOptions"- [moreActions]="moreVideoActions"- (videoRemoved)="reloadData()" (videoFilesRemoved)="reloadData()" (transcodingCreated)="reloadData()" (videoExistsInPlaylistChange)="fetchVideosContainedInPlaylists([ video ])"- ></my-video-actions-dropdown>- </div>- </td>+ <ng-template #actionCell let-video>+ <my-button class="me-3" i18n-label label="Manage" [ptRouterLink]="[ '/videos', 'manage', video.shortUUID ]" theme="secondary" icon="film" responsiveLabel="true"></my-button>- </tr>+ <my-video-actions-dropdown+ placement="bottom auto" buttonDirection="horizontal" buttonStyled="true" [video]="video" [displayOptions]="videoActionsOptions"+ [moreActions]="moreVideoActions"+ (videoRemoved)="table.loadData()" (videoFilesRemoved)="table.loadData()" (transcodingCreated)="table.loadData()" (videoExistsInPlaylistChange)="fetchVideosContainedInPlaylists([ video ])"+ ></my-video-actions-dropdown></ng-template>- <ng-template pTemplate="emptymessage">- <tr>- <td myAutoColspan>- <div class="no-results">- <ng-container *ngIf="search" i18n>No video found matching current filters.</ng-container>- <ng-container *ngIf="!search" i18n>You don't have any videos published yet.</ng-container>- </div>- </td>- </tr>+ <ng-template #noResults let-search>+ {{ getNoResults(search) }}</ng-template>-</p-table>++</my-table><my-video-change-ownership #videoChangeOwnershipModal></my-video-change-ownership>diff --cc client/src/app/+my-library/my-videos/my-videos.component.tsindex 41fd0293ca,9b0d012cfa..2ead1ada94--- a/client/src/app/+my-library/my-videos/my-videos.component.ts+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts@@@ -1,32 -1,39 +1,25 @@@-import { CommonModule, NgClass, NgIf } from '@angular/common'+import { CommonModule } from '@angular/common'import { Component, inject, OnDestroy, OnInit, viewChild } from '@angular/core'import { FormsModule } from '@angular/forms'-import { ActivatedRoute, Router, RouterLink } from '@angular/router'-import {- AuthService,- AuthUser,- ConfirmService,- LocalStorageService,- Notifier,- PeerTubeRouterService,- RestPagination,- RestTable,- ServerService-} from '@app/core'+import { RouterLink } from '@angular/router'+import { AuthService, AuthUser, ConfirmService, Notifier, RestPagination, ServerService } from '@app/core'import { HeaderService } from '@app/header/header.service'import { formatICU } from '@app/helpers'-import { AutoColspanDirective } from '@app/shared/shared-main/common/auto-colspan.directive'import { Video } from '@app/shared/shared-main/video/video.model'import { VideoService } from '@app/shared/shared-main/video/video.service'+import { TableColumnInfo, TableComponent, TableQueryParams } from '@app/shared/shared-tables/table.component'import { VideoPlaylistService } from '@app/shared/shared-video-playlist/video-playlist.service'import { ChannelToggleComponent } from '@app/shared/standalone-channels/channel-toggle.component'-import { NgbDropdownModule, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'import { arrayify, pick } from '@peertube/peertube-core-utils'- import {- UserRight,- VideoChannel,- VideoExistInPlaylist,- VideoPrivacy,- VideoPrivacyType,- VideosExistInPlaylists- } from '@peertube/peertube-models'+ import { VideoChannel, VideoExistInPlaylist, VideoPrivacy, VideoPrivacyType, VideosExistInPlaylists } from '@peertube/peertube-models'-import { logger } from '@root-helpers/logger'-import debug from 'debug'import uniqBy from 'lodash-es/uniqBy'-import { SharedModule, SortMeta } from 'primeng/api'-import { TableLazyLoadEvent, TableModule } from 'primeng/table'-import { finalize } from 'rxjs/operators'+import { SortMeta } from 'primeng/api'+import { tap } from 'rxjs/operators'import { SelectOptionsItem } from 'src/types'import { AdvancedInputFilterComponent } from '../../shared/shared-forms/advanced-input-filter.component'-import { PeertubeCheckboxComponent } from '../../shared/shared-forms/peertube-checkbox.component'import { SelectCheckboxComponent } from '../../shared/shared-forms/select/select-checkbox.component'-import { ActionDropdownComponent, DropdownAction } from '../../shared/shared-main/buttons/action-dropdown.component'+import { DropdownAction } from '../../shared/shared-main/buttons/action-dropdown.component'import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'import { PTDatePipe } from '../../shared/shared-main/common/date.pipe'import { NumberFormatterPipe } from '../../shared/shared-main/common/number-formatter.pipe'diff --cc client/src/sass/primeng.scssindex 5897eed355,0000000000..e67320c2c0mode 100644,000000..100644--- a/client/src/sass/primeng.scss+++ b/client/src/sass/primeng.scss@@@ -1,340 -1,0 +1,340 @@@+@use "_variables" as *;+@use "_mixins" as *;++.p-select-list .p-select-option:hover {+ color: pvar(--fg);+ background: pvar(--bg-secondary-400);+}++// ---------------------------------------------------------------------------+// Input chips+// ---------------------------------------------------------------------------++.p-chip:has(.p-chip-remove-icon) {+ // TODO: remove when https://github.com/primefaces/primeng/pull/18344 is released+ padding-inline-end: var(--p-chip-padding-x) !important;+}++.p-inputchips-input {+ // TODO: fix in upstream?+ gap: 1rem !important;+}++.p-inputchips-input:has(.p-inputchips-chip) {+ padding-left: pvar(--input-x-padding) !important;+ padding-right: pvar(--input-x-padding) !important;+}++.p-inputchips.p-input-wrapper {+ width: 100%;+}++.p-chip-label {+ text-transform: uppercase;+}++// ---------------------------------------------------------------------------+// Multi Select+// ---------------------------------------------------------------------------++p-multiselect-item {+ line-height: 1;+}++// ---------------------------------------------------------------------------+// Checkbox+// ---------------------------------------------------------------------------++.p-checkbox.p-disabled .p-checkbox-box {+ opacity: 0.6;+}++.p-checkbox {+ vertical-align: middle !important;+}++// ---------------------------------------------------------------------------+// Toast (notifications)+// ---------------------------------------------------------------------------++p-toast {+ .p-toast {+ width: auto;+ max-width: 300px;+ min-width: 200px;++ .p-toast-icon-close {+ color: pvar(--fg-300);+ position: absolute;+ right: 5px;+ top: 5px;+ width: 18px;+ height: 18px;+ background: url("../assets/images/feather/x.svg") no-repeat;+ background-size: contain;+ }+ }++ .p-toast-message {+ font-family: $main-fonts;+ background-color: pvar(--bg) !important;+ color: pvar(--fg) !important;+ border-radius: 5px;+ box-sizing: border-box;+ border: 1px solid #EBEEF5 !important;+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);+ overflow: hidden;++ .notification-block {+ display: flex;+ align-items: center;+ width: 100%;++ .message {+ flex-grow: 1;++ @include margin-left(10px);++ h3 {+ font-size: 21px;+ }++ p {+ margin-bottom: 0;++ @include peertube-word-wrap;+ }+ }+ }+ }++ .p-toast-message-success my-global-icon {+ color: #8BC34A !important;+ }++ .p-toast-message-error my-global-icon {+ color: #F44336 !important;+ }++ .p-toast-message-warn my-global-icon {+ color: #F1680D !important;+ }++ .p-toast-message-info my-global-icon {+ color: #03A9F4 !important;+ }+}++// ---------------------------------------------------------------------------+// Colorpicker+// ---------------------------------------------------------------------------++p-colorpicker .p-colorpicker-preview {+ border: 1px solid pvar(--fg-300);+}++// ---------------------------------------------------------------------------+// Data table+// ---------------------------------------------------------------------------++p-table {+ --action-cell-padding-right: 0.25em;++ margin-bottom: 0.5rem;+ display: block;++ &.loading table {+ opacity: 0.5;+ }++ table {+ table-layout: auto;+ }++ th {+ font-size: 14px;+ padding: 5px 0.25rem 5px 1rem !important;++ .column-toggle {+ .dropdown > my-button::after {+ display: none;+ }+ }++ @include ellipsis;+ }++ .column-toggle .tertiary-button:not(.active) {+ color: pvar(--fg-300) !important;+ }++ td,+ th {+ // It's like min-height in tables+ min-height: 46px;+ }++ .p-sortable-column-icon {+ display: inline-block;+ position: relative;+ top: -1px;+ vertical-align: middle;++ .tertiary-button:not(.active) {+ color: pvar(--secondary-icon-color) !important;+ }+ }++ .p-datatable-table-container {+ overflow: auto;+ max-width: 100%;++ table {+ width: 100%;+ }+ }++ .p-datatable-header {+ border: 0;++ .caption {+ min-height: 40px;+ width: 100%;+ display: inline-flex;+ align-items: center;+ flex-wrap: wrap;+ gap: 0.5rem;++ .left-buttons {+ color: pvar(--fg-300);++ @include font-size(22px);+ }++ .right-block {+ display: flex;+ flex-wrap: wrap;+ gap: 1rem;+ }+ }+ }++ .p-datatable-tbody {+ tr {+ &:hover {+ background-color: pvar(--bg-secondary-350);+ }+ }+ }++ td.checkbox-cell,+ th.checkbox-cell {+ @include padding-left(0.25rem !important);+ @include padding-right(0 !important);++ @media screen and (max-width: $mobile-view) {+ @include padding-left(0 !important);+ }+ }++ .action-cell {+ @include padding-right(var(--action-cell-padding-right));++ // Align with "actions" head title+ &.has-action.has-column-config {+ @include padding-right(calc(42px + var(--action-cell-padding-right)));+ }+ }+- .pt-badge {++ .pt-badge:not(.pt-badge-keep-case) {+ text-transform: uppercase;+ }++ p-paginator {+ .p-paginator {+ padding-top: 1rem;++ border-top: 1px solid pvar(--bg-secondary-400) !important;+ display: flex;+ justify-content: center;+ align-items: center;+ }++ .p-paginator-first {+ margin-left: auto;+ }++ .p-paginator-last {+ margin-right: auto;+ }++ .p-iconwrapper {+ color: pvar(--fg-300);+ }++ .p-paginator-page-selected {+ font-weight: $font-bold !important;+ }++ .p-paginator-content-end {+ color: pvar(--fg-300);++ @include margin-left(0);+ }+ }++ @media screen and (max-width: $small-view) {+ .p-datatable-container {+ table {+ width: auto;+ }+ }++ p-paginator {+ .p-paginator-current {+ display: none !important;+ }+ }+ }++ @media screen and (max-width: $mobile-view) {+ p-paginator {+ .p-paginator-page:not(.p-paginator-page-selected) {+ display: none;+ }++ .p-paginator-rpp-dropdown {+ display: none;+ }++ .p-paginator-content-end {+ display: none;+ }+ }++ .p-datatable-header .caption > * {+ width: 100%;+ }+ }+}++p-tablecheckbox:hover div .p-checkbox-box {+ box-shadow: 0 0 0 0.1rem rgba(87, 85, 217, 0.2);+}++.sticky-table {+ @media screen and (min-width: $small-view) {+ .action-cell,+ .action-head {+ position: sticky;+ right: 0;++ @include padding-right(0.5rem !important);+ }++ .action-cell {+ z-index: 10;+ background-color: inherit;+ }+ }+}