Strict templates enabled

pull/2473/head
Chocobozzz 2020-02-10 14:25:38 +01:00 committed by Chocobozzz
parent 361dcebc75
commit be27ef3b46
31 changed files with 60 additions and 47 deletions

View File

@ -41,7 +41,7 @@
<div>
<p-multiSelect
inputId="instanceCategories" [options]="categoryItems" formControlName="categories" showToggleAll="false"
inputId="instanceCategories" [options]="categoryItems" formControlName="categories" [showToggleAll]="false"
[defaultLabel]="getDefaultCategoryLabel()" [selectedItemsLabel]="getSelectedCategoryLabel()"
emptyFilterMessage="No results found" i18n-emptyFilterMessage
></p-multiSelect>
@ -53,7 +53,7 @@
<div>
<p-multiSelect
inputId="instanceLanguages" [options]="languageItems" formControlName="languages" showToggleAll="false"
inputId="instanceLanguages" [options]="languageItems" formControlName="languages" [showToggleAll]="false"
[defaultLabel]="getDefaultLanguageLabel()" [selectedItemsLabel]="getSelectedLanguageLabel()"
emptyFilterMessage="No results found" i18n-emptyFilterMessage
></p-multiSelect>

View File

@ -6,7 +6,7 @@
<div class="caption">
<input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
(keyup)="onSearch($event.target.value)"
(keyup)="onSearch($event)"
>
</div>
</ng-template>

View File

@ -7,7 +7,7 @@
<div>
<input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
(keyup)="onSearch($event.target.value)"
(keyup)="onSearch($event)"
>
</div>
</div>

View File

@ -3,7 +3,7 @@
</div>
<div class="search-bar">
<input type="text" (input)="onSearchChange($event.target.value)" i18n-placeholder placeholder="Search..."/>
<input type="text" (input)="onSearchChange($event)" i18n-placeholder placeholder="Search..."/>
</div>
<div class="alert alert-info" i18n *ngIf="pluginInstalled">

View File

@ -70,8 +70,10 @@ export class PluginSearchComponent implements OnInit {
this.reloadPlugins()
}
onSearchChange (search: string) {
this.searchSubject.next(search)
onSearchChange (event: Event) {
const target = event.target as HTMLInputElement
this.searchSubject.next(target.value)
}
reloadPlugins () {

View File

@ -25,7 +25,7 @@
<div>
<input
type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
(keyup)="onSearch($event.target.value)"
(keyup)="onSearch($event)"
>
</div>
</div>

View File

@ -28,7 +28,7 @@
<div>
<p-multiSelect
inputId="videoLanguages" [options]="languageItems" formControlName="videoLanguages" showToggleAll="true"
inputId="videoLanguages" [options]="languageItems" formControlName="videoLanguages" [showToggleAll]="true"
[defaultLabel]="getDefaultVideoLanguageLabel()" [selectedItemsLabel]="getSelectedVideoLanguageLabel()"
emptyFilterMessage="No results found" i18n-emptyFilterMessage
></p-multiSelect>

View File

@ -30,7 +30,7 @@
</div>
<my-user-notifications
[ignoreLoadingBar]="true" [infiniteScroll]="false" itemsPerPage="10"
[ignoreLoadingBar]="true" [infiniteScroll]="false" [itemsPerPage]="10"
[markAllAsReadSubject]="markAllAsReadSubject" (notificationsLoaded)="onNotificationLoaded()"
></my-user-notifications>

View File

@ -6,7 +6,6 @@ import { Notifier, UserNotificationSocket } from '@app/core'
import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
import { NavigationEnd, Router } from '@angular/router'
import { filter } from 'rxjs/operators'
import { UserNotificationsComponent } from '@app/shared'
@Component({
selector: 'my-avatar-notification',

View File

@ -146,7 +146,7 @@
[(ngModel)]="advancedSearch.tagsAllOf" name="tagsAllOf" id="tagsAllOf"
[validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
i18n-placeholder placeholder="+ Tag" i18n-secondaryPlaceholder secondaryPlaceholder="Enter a tag"
maxItems="5" modelAsStrings="true"
[maxItems]="5" [modelAsStrings]="true"
></tag-input>
</div>
@ -159,7 +159,7 @@
[(ngModel)]="advancedSearch.tagsOneOf" name="tagsOneOf" id="tagsOneOf"
[validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
i18n-placeholder placeholder="+ Tag" i18n-secondaryPlaceholder secondaryPlaceholder="Enter a tag"
maxItems="5" modelAsStrings="true"
[maxItems]="5" [modelAsStrings]="true"
></tag-input>
</div>
</div>

View File

@ -141,7 +141,8 @@ export class SearchComponent implements OnInit, OnDestroy {
return this.advancedSearch.size()
}
removeVideoFromArray (video: Video) {
// Add VideoChannel for typings, but the template already checks "video" argument is a video
removeVideoFromArray (video: Video | VideoChannel) {
this.results = this.results.filter(r => !this.isVideo(r) || r.id !== video.id)
}

View File

@ -34,10 +34,10 @@ export class ActionDropdownComponent<T> {
@Input() label: string
@Input() theme: DropdownTheme = 'grey'
getActions () {
if (this.actions.length !== 0 && Array.isArray(this.actions[0])) return this.actions
getActions (): DropdownAction<T>[][] {
if (this.actions.length !== 0 && Array.isArray(this.actions[0])) return this.actions as DropdownAction<T>[][]
return [ this.actions ]
return [ this.actions as DropdownAction<T>[] ]
}
areActionsDisplayed (actions: Array<DropdownAction<T> | DropdownAction<T>[]>, entry: T): boolean {

View File

@ -8,5 +8,5 @@ import { Component, Input } from '@angular/core'
export class EditButtonComponent {
@Input() label: string
@Input() routerLink: string[] = []
@Input() routerLink: string[] | string = []
}

View File

@ -21,7 +21,7 @@ import { MarkdownService } from '@app/shared/renderer'
export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit {
@Input() content = ''
@Input() classes: string[] = []
@Input() classes: string[] | { [klass: string]: any[] | any } = []
@Input() textareaWidth = '100%'
@Input() textareaHeight = '150px'
@Input() previewColumn = false

View File

@ -26,7 +26,7 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
allowedExtensionsMessage = ''
private serverConfig: ServerConfig
private file: File
private file: Blob
constructor (
private sanitizer: DomSanitizer,
@ -49,7 +49,7 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor {
this.allowedExtensionsMessage = this.videoImageExtensions.join(', ')
}
onFileChanged (file: File) {
onFileChanged (file: Blob) {
this.file = file
this.propagateChange(this.file)

View File

@ -65,8 +65,9 @@ export abstract class RestTable {
})
}
onSearch (search: string) {
this.searchStream.next(search)
onSearch (event: Event) {
const target = event.target as HTMLInputElement
this.searchStream.next(target.value)
}
protected abstract loadData (): void

View File

@ -55,7 +55,7 @@
</button>
<button class="dropdown-item dropdown-item-neutral" i18n>Subscribe with a Mastodon account:</button>
<my-remote-subscribe showHelp="true" [uri]="uri"></my-remote-subscribe>
<my-remote-subscribe [showHelp]="true" [uri]="uri"></my-remote-subscribe>
<div class="dropdown-divider"></div>

View File

@ -14,6 +14,7 @@ import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
import { ServerConfig } from '@shared/models'
import { GlobalIconName } from '@app/shared/images/global-icon.component'
enum GroupDate {
UNKNOWN = 0,
@ -61,7 +62,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
actions: {
routerLink: string
iconName: string
iconName: GlobalIconName
label: string
}[] = []

View File

@ -1,12 +1,12 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
import { Notifier, RedirectService } from '@app/core'
import { VideoBlacklistService } from '../../../shared/video-blacklist'
import { VideoDetails } from '../../../shared/video/video-details.model'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
import { FormReactive, VideoBlacklistValidatorsService } from '@app/shared/forms'
import { Video } from '@app/shared/video/video.model'
@Component({
selector: 'my-video-blacklist',
@ -14,7 +14,7 @@ import { FormReactive, VideoBlacklistValidatorsService } from '@app/shared/forms
styleUrls: [ './video-blacklist.component.scss' ]
})
export class VideoBlacklistComponent extends FormReactive implements OnInit {
@Input() video: VideoDetails = null
@Input() video: Video = null
@ViewChild('modal', { static: true }) modal: NgbModal

View File

@ -1,13 +1,13 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core'
import { Notifier } from '@app/core'
import { FormReactive } from '../../../shared/forms'
import { VideoDetails } from '../../../shared/video/video-details.model'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
import { VideoAbuseService } from '@app/shared/video-abuse'
import { Video } from '@app/shared/video/video.model'
@Component({
selector: 'my-video-report',
@ -15,7 +15,7 @@ import { VideoAbuseService } from '@app/shared/video-abuse'
styleUrls: [ './video-report.component.scss' ]
})
export class VideoReportComponent extends FormReactive implements OnInit {
@Input() video: VideoDetails = null
@Input() video: Video = null
@ViewChild('modal', { static: true }) modal: NgbModal

View File

@ -12,7 +12,7 @@ export class VideoThumbnailComponent {
@Input() video: Video
@Input() nsfw = false
@Input() routerLink: any[]
@Input() queryParams: any[]
@Input() queryParams: { [ p: string ]: any }
@Input() displayWatchLaterPlaylist: boolean
@Input() inWatchLaterPlaylist: boolean

View File

@ -29,7 +29,7 @@
<tag-input
[validators]="tagValidators" [errorMessages]="tagValidatorsMessages"
i18n-placeholder placeholder="+ Tag" i18n-secondaryPlaceholder secondaryPlaceholder="Enter a new tag"
formControlName="tags" maxItems="5" modelAsStrings="true"
formControlName="tags" [maxItems]="5" [modelAsStrings]="true"
></tag-input>
</div>
@ -44,7 +44,7 @@
</ng-template>
</my-help>
<my-markdown-textarea truncate="250" formControlName="description" markdownVideo="true"></my-markdown-textarea>
<my-markdown-textarea [truncate]="250" formControlName="description" [markdownVideo]="true"></my-markdown-textarea>
<div *ngIf="formErrors.description" class="form-error">
{{ formErrors.description }}

View File

@ -25,7 +25,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
@Input() parentComments: VideoComment[]
@Input() focusOnInit = false
@Output() commentCreated = new EventEmitter<VideoCommentCreate>()
@Output() commentCreated = new EventEmitter<VideoComment>()
@Output() cancel = new EventEmitter()
@ViewChild('visitorModal', { static: true }) visitorModal: NgbModal
@ -96,7 +96,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
this.addingComment = true
const commentCreate: VideoCommentCreate = this.form.value
let obs: Observable<any>
let obs: Observable<VideoComment>
if (this.parentComment) {
obs = this.addCommentReply(commentCreate)

View File

@ -0,0 +1,7 @@
import { VideoCommentThreadTree as VideoCommentThreadTreeServerModel } from '../../../../../../shared/models/videos/video-comment.model'
import { VideoComment } from '@app/videos/+video-watch/comment/video-comment.model'
export class VideoCommentThreadTree implements VideoCommentThreadTreeServerModel {
comment: VideoComment
children: VideoCommentThreadTree[]
}

View File

@ -1,6 +1,5 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
import { User, UserRight } from '../../../../../../shared/models/users'
import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
import { AuthService } from '@app/core/auth'
import { AccountService } from '@app/shared/account/account.service'
import { Video } from '@app/shared/video/video.model'
@ -10,6 +9,7 @@ import { Account } from '@app/shared/account/account.model'
import { Notifier } from '@app/core'
import { UserService } from '@app/shared'
import { Actor } from '@app/shared/actor/actor.model'
import { VideoCommentThreadTree } from '@app/videos/+video-watch/comment/video-comment-thread-tree.model'
@Component({
selector: 'my-video-comment',

View File

@ -1,5 +1,5 @@
import { Account as AccountInterface } from '../../../../../../shared/models/actors'
import { VideoComment as VideoCommentServerModel } from '../../../../../../shared/models/videos/video-comment.model'
import { VideoComment as VideoCommentServerModel, VideoCommentCreate } from '../../../../../../shared/models/videos/video-comment.model'
import { Actor } from '@app/shared/actor/actor.model'
import { getAbsoluteAPIUrl } from '@app/shared/misc/utils'

View File

@ -7,13 +7,14 @@ import { FeedFormat, ResultList } from '../../../../../../shared/models'
import {
VideoComment as VideoCommentServerModel,
VideoCommentCreate,
VideoCommentThreadTree
VideoCommentThreadTree as VideoCommentThreadTreeServerModel
} from '../../../../../../shared/models/videos/video-comment.model'
import { environment } from '../../../../environments/environment'
import { RestExtractor, RestService } from '../../../shared/rest'
import { ComponentPaginationLight } from '../../../shared/rest/component-pagination.model'
import { CommentSortField } from '../../../shared/video/sort-field.type'
import { VideoComment } from './video-comment.model'
import { VideoCommentThreadTree } from '@app/videos/+video-watch/comment/video-comment-thread-tree.model'
@Injectable()
export class VideoCommentService {
@ -76,9 +77,9 @@ export class VideoCommentService {
const url = `${VideoCommentService.BASE_VIDEO_URL + videoId}/comment-threads/${threadId}`
return this.authHttp
.get(url)
.get<VideoCommentThreadTreeServerModel>(url)
.pipe(
map(tree => this.extractVideoCommentTree(tree as VideoCommentThreadTree)),
map(tree => this.extractVideoCommentTree(tree)),
catchError(err => this.restExtractor.handleError(err))
)
}
@ -138,12 +139,12 @@ export class VideoCommentService {
return { data: comments, total: totalComments }
}
private extractVideoCommentTree (tree: VideoCommentThreadTree) {
if (!tree) return tree
private extractVideoCommentTree (tree: VideoCommentThreadTreeServerModel) {
if (!tree) return tree as VideoCommentThreadTree
tree.comment = new VideoComment(tree.comment)
tree.children.forEach(c => this.extractVideoCommentTree(c))
return tree
return tree as VideoCommentThreadTree
}
}

View File

@ -1,8 +1,7 @@
import { Component, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild, Output, EventEmitter } from '@angular/core'
import { Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'
import { ActivatedRoute } from '@angular/router'
import { ConfirmService, Notifier } from '@app/core'
import { Subject, Subscription } from 'rxjs'
import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
import { AuthService } from '../../../core/auth'
import { ComponentPagination, hasMoreItems } from '../../../shared/rest/component-pagination.model'
import { User } from '../../../shared/users'
@ -13,6 +12,7 @@ import { VideoCommentService } from './video-comment.service'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { Syndication } from '@app/shared/video/syndication.model'
import { HooksService } from '@app/core/plugins/hooks.service'
import { VideoCommentThreadTree } from '@app/videos/+video-watch/comment/video-comment-thread-tree.model'
@Component({
selector: 'my-video-comments',

View File

@ -42,7 +42,7 @@
<ngb-tab i18n-title title="QR-Code" id="qrcode">
<ng-template ngbTabContent>
<div class="tab-content">
<qrcode [qrdata]="getVideoUrl()" size="256" level="Q"></qrcode>
<qrcode [qrdata]="getVideoUrl()" [size]="256" level="Q"></qrcode>
</div>
</ng-template>
</ngb-tab>

View File

@ -37,6 +37,7 @@
},
"angularCompilerOptions": {
"strictInjectionParameters": true,
"fullTemplateTypeCheck": true
"fullTemplateTypeCheck": true,
"strictTemplates": true
}
}

View File

@ -1,7 +1,7 @@
export interface RegisterServerSettingOptions {
name: string
label: string
type: 'input'
type: 'input' | 'input-checkbox' | 'input-textarea'
// If the setting is not private, anyone can view its value (client code included)
// If the setting is private, only server-side hooks can access it