Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix report page bugs. Fixes #558 (#568)

Browse source
This commit is contained in:
Dessalines 2022-02-02 09:56:43 -05:00 committed by GitHub
parent ea33553f65
commit 26fbd3c8e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shared/components/comment/comment-report.tsx
View file

@ -56,6 +56,8 @@ export class CommentReport extends Component<CommentReportProps, any> {
moderators={[]}
admins={[]}
enableDownvotes={true}
viewOnly={true}
showCommunity={true}
/>
<div>
{i18n.t("reporter")}: <PersonListing person={r.creator} />

9
src/shared/components/post/post-listing.tsx
View file

@ -82,6 +82,7 @@ interface PostListingProps {
admins?: PersonViewSafe[];
enableDownvotes: boolean;
enableNsfw: boolean;
viewOnly?: boolean;
}
export class PostListing extends Component<PostListingProps, PostListingState> {
@ -513,8 +514,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
return (
<div class="d-flex justify-content-start flex-wrap text-muted font-weight-bold mb-1">
{this.commentsButton}
{mobile && this.mobileVotes}
{UserService.Instance.myUserInfo && this.postActions(mobile)}
{mobile && !this.props.viewOnly && this.mobileVotes}
{UserService.Instance.myUserInfo &&
!this.props.viewOnly &&
this.postActions(mobile)}
</div>
);
}
@ -1154,7 +1157,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{/* The larger view*/}
<div class="d-none d-sm-block">
<div class="row">
{this.voteBar()}
{!this.props.viewOnly && this.voteBar()}
<div class="col-sm-2 pr-0">
<div class="">{this.thumbnail()}</div>
</div>

1
src/shared/components/post/post-report.tsx
View file

@ -48,6 +48,7 @@ export class PostReport extends Component<PostReportProps, any> {
showCommunity={true}
enableDownvotes={true}
enableNsfw={true}
viewOnly={true}
/>
<div>
{i18n.t("reporter")}: <PersonListing person={r.creator} />

4
src/shared/utils.ts
View file

@ -1105,7 +1105,7 @@ export function updatePostReportRes(
data: PostReportView,
reports: PostReportView[]
) {
let found = reports.find(p => p.post.id == data.post.id);
let found = reports.find(p => p.post_report.id == data.post_report.id);
if (found) {
found.post_report = data.post_report;
}
@ -1115,7 +1115,7 @@ export function updateCommentReportRes(
data: CommentReportView,
reports: CommentReportView[]
) {
let found = reports.find(c => c.comment.id == data.comment.id);
let found = reports.find(c => c.comment_report.id == data.comment_report.id);
if (found) {
found.comment_report = data.comment_report;
}