From f77eb73b5e02bed9e223dafc1c203ceb7c05b6e5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Feb 2020 10:27:16 +0100 Subject: Fix angular 9 build --- client/src/app/shared/rest/rest-table.ts | 3 +-- client/src/app/shared/rest/rest.service.ts | 2 +- client/src/app/shared/shared.module.ts | 2 +- client/src/app/shared/video-abuse/video-abuse.service.ts | 2 +- client/src/app/shared/video-blacklist/video-blacklist.service.ts | 2 +- client/src/app/shared/video-import/video-import.service.ts | 2 +- client/src/app/shared/video-ownership/video-ownership.service.ts | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts index c180346af..f44643c0f 100644 --- a/client/src/app/shared/rest/rest-table.ts +++ b/client/src/app/shared/rest/rest-table.ts @@ -1,6 +1,5 @@ import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage' -import { LazyLoadEvent } from 'primeng/components/common/lazyloadevent' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { LazyLoadEvent, SortMeta } from 'primeng/api' import { RestPagination } from './rest-pagination' import { Subject } from 'rxjs' import { debounceTime, distinctUntilChanged } from 'rxjs/operators' diff --git a/client/src/app/shared/rest/rest.service.ts b/client/src/app/shared/rest/rest.service.ts index 16bb6d82c..5bd2b5e43 100644 --- a/client/src/app/shared/rest/rest.service.ts +++ b/client/src/app/shared/rest/rest.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core' import { HttpParams } from '@angular/common/http' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ComponentPagination, ComponentPaginationLight } from './component-pagination.model' import { RestPagination } from './rest-pagination' diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index d06d37d8c..f39a889e9 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -7,7 +7,7 @@ import { MarkdownTextareaComponent } from '@app/shared/forms/markdown-textarea.c import { HelpComponent } from '@app/shared/misc/help.component' import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive' import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes' -import { SharedModule as PrimeSharedModule } from 'primeng/components/common/shared' +import { SharedModule as PrimeSharedModule } from 'primeng/api' import { AUTH_INTERCEPTOR_PROVIDER } from './auth' import { ButtonComponent } from './buttons/button.component' import { DeleteButtonComponent } from './buttons/delete-button.component' diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index b0b59ea0c..61a328575 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -1,7 +1,7 @@ import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' import { ResultList, VideoAbuse, VideoAbuseUpdate } from '../../../../../shared' import { environment } from '../../../environments/environment' diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts index 491fa698b..116177c4a 100644 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts @@ -1,7 +1,7 @@ import { catchError, map, concatMap, toArray } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { from as observableFrom, Observable } from 'rxjs' import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared' import { Video } from '../video/video.model' diff --git a/client/src/app/shared/video-import/video-import.service.ts b/client/src/app/shared/video-import/video-import.service.ts index 3e3fb7dfb..afd9e3fb5 100644 --- a/client/src/app/shared/video-import/video-import.service.ts +++ b/client/src/app/shared/video-import/video-import.service.ts @@ -9,7 +9,7 @@ import { VideoImportCreate, VideoUpdate } from '../../../../../shared/models/vid import { objectToFormData } from '@app/shared/misc/utils' import { ResultList } from '../../../../../shared/models/result-list.model' import { UserService } from '@app/shared/users/user.service' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { RestPagination } from '@app/shared/rest' import { ServerService } from '@app/core' diff --git a/client/src/app/shared/video-ownership/video-ownership.service.ts b/client/src/app/shared/video-ownership/video-ownership.service.ts index aa9e4839a..b95d5b792 100644 --- a/client/src/app/shared/video-ownership/video-ownership.service.ts +++ b/client/src/app/shared/video-ownership/video-ownership.service.ts @@ -5,7 +5,7 @@ import { environment } from '../../../environments/environment' import { RestExtractor, RestService } from '../rest' import { VideoChangeOwnershipCreate } from '../../../../../shared/models/videos' import { Observable } from 'rxjs/index' -import { SortMeta } from 'primeng/components/common/sortmeta' +import { SortMeta } from 'primeng/api' import { ResultList, VideoChangeOwnership } from '../../../../../shared' import { RestPagination } from '@app/shared/rest' import { VideoChangeOwnershipAccept } from '../../../../../shared/models/videos/video-change-ownership-accept.model' -- cgit v1.2.3