OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(client/AbuseDetails): infinite update loop (#5109) 

* fix(client/AbuseDetails): infinite update loop

* Abuse may not have predefined reasons

Co-authored-by: Chocobozzz <me@florianbigard.com>
pull/5115/head
kontrollanten 2022-07-08 10:57:29 +02:00 committed by GitHub
parent f8b4a71d42
commit a28b0f696c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/shared/shared-abuse-list/abuse-details.component.html
View File

@ -60,10 +60,9 @@
<span class="moderation-expanded-text" [innerHTML]="abuse.reasonHtml"></span> <span class="moderation-expanded-text" [innerHTML]="abuse.reasonHtml"></span>
</div> </div>
<div *ngIf="getPredefinedReasons()" class="mt-2 d-flex"> <div *ngIf="predefinedReasons" class="mt-2 d-flex">
<span class="></span> <span>
<span class="> <a *ngFor="let reason of predefinedReasons" [routerLink]="[ '.' ]"
<a *ngFor="let reason of getPredefinedReasons()" [routerLink]="[ '.' ]"
[queryParams]="{ 'search': 'tag:' + reason.id }" class="chip rectangular bg-secondary text-light" [queryParams]="{ 'search': 'tag:' + reason.id }" class="chip rectangular bg-secondary text-light"
> >
<div>{{ reason.label }}</div> <div>{{ reason.label }}</div>

23
client/src/app/shared/shared-abuse-list/abuse-details.component.ts
View File

@ -1,4 +1,4 @@
import { Component, Input } from '@angular/core' import { Component, Input, OnInit } from '@angular/core'
import { durationToString } from '@app/helpers' import { durationToString } from '@app/helpers'
import { AbusePredefinedReasonsString } from '@shared/models' import { AbusePredefinedReasonsString } from '@shared/models'
import { ProcessedAbuse } from './processed-abuse.model' import { ProcessedAbuse } from './processed-abuse.model'
@ -8,10 +8,11 @@ import { ProcessedAbuse } from './processed-abuse.model'
templateUrl: './abuse-details.component.html', templateUrl: './abuse-details.component.html',
styleUrls: [ '../shared-moderation/moderation.scss', './abuse-details.component.scss' ] styleUrls: [ '../shared-moderation/moderation.scss', './abuse-details.component.scss' ]
}) })
export class AbuseDetailsComponent { export class AbuseDetailsComponent implements OnInit {
@Input() abuse: ProcessedAbuse @Input() abuse: ProcessedAbuse
@Input() isAdminView: boolean @Input() isAdminView: boolean
predefinedReasons: { id: string, label: string }[]
private predefinedReasonsTranslations: { [key in AbusePredefinedReasonsString]: string } private predefinedReasonsTranslations: { [key in AbusePredefinedReasonsString]: string }
constructor () { constructor () {
@ -27,6 +28,15 @@ export class AbuseDetailsComponent {
} }
} }
ngOnInit (): void {
if (!this.abuse.predefinedReasons) return
this.predefinedReasons = this.abuse.predefinedReasons.map(r => ({
id: r,
label: this.predefinedReasonsTranslations[r]
}))
}
get startAt () { get startAt () {
return durationToString(this.abuse.video.startAt) return durationToString(this.abuse.video.startAt)
} }
@ -34,13 +44,4 @@ export class AbuseDetailsComponent {
get endAt () { get endAt () {
return durationToString(this.abuse.video.endAt) return durationToString(this.abuse.video.endAt)
} }
getPredefinedReasons () {
if (!this.abuse.predefinedReasons) return []
return this.abuse.predefinedReasons.map(r => ({
id: r,
label: this.predefinedReasonsTranslations[r]
}))
}
} }