Skip to content

Fixed the reports data #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed the reports data #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/hooks/useLemmyReports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,22 @@ export default function useLemmyReports() {
console.log("mergedReports", postReportsData, commentReportsData, pmReportsData);

// must have post and comment report data
if (!postReportsData || !commentReportsData || !(pmReportsData || userRole != "admin")) return;

const pmReports = userRole === "admin" ? (pmReportsData || {pages: []}) : {pages: []};
const postReports = postReportsData || {pages: []};
const commentReports = commentReportsData || {pages: []};

if (!pmReportsData) {
console.log("pmReportsError - may not be site admin", pmReportsError);
}

// return if either of these are still loading
if (postReportsLoading || commentReportsLoading || (pmReportsLoading && userRole === "admin")) return;

console.log("mergedReports", postReportsData, commentReportsData, pmReportsData);

if (!pmReportsData) {
console.log("pmReportsError - may not be site admin", pmReportsError);
// pmReportsData.private_message_reports = [];
}

let normalPostReports = mapPagesData(postReportsData.pages, (report) => {
let normalPostReports = mapPagesData(postReports.pages, (report) => {
return {
...report,
type: "post",
Expand All @@ -114,7 +117,7 @@ export default function useLemmyReports() {
});
console.log("normalPostReports", normalPostReports.length);

let normalCommentReports = mapPagesData(commentReportsData.pages, (report) => {
let normalCommentReports = mapPagesData(commentReports.pages, (report) => {
return {
...report,
type: "comment",
Expand All @@ -129,7 +132,7 @@ export default function useLemmyReports() {
let normalPMReports = [];

if (userRole === "admin") {
normalPMReports = mapPagesData(pmReportsData.pages, (report) => {
normalPMReports = mapPagesData(pmReports.pages, (report) => {
return {
...report,
type: "pm",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Reports.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default function Reports() {

<ReportsList reportsList={reportsList} />

{reportsList.length > 0 && !hasNextPageReports && <Divider variant="plain">no more items</Divider>}
{!reportsList || reportsList.length > 0 && !hasNextPageReports && <Divider variant="plain">no more items</Divider>}
{hasNextPageReports && (
<Box
ref={ref}
Expand Down