From 6bafc702fd599ce27293eb44142ab7530545695a Mon Sep 17 00:00:00 2001
From: rooki <34943569+Pdzly@users.noreply.github.com>
Date: Fri, 2 Feb 2024 19:38:15 +0100
Subject: [PATCH] Fixed the  reports data

---
 src/hooks/useLemmyReports.js | 19 +++++++++++--------
 src/pages/Reports.jsx        |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useLemmyReports.js b/src/hooks/useLemmyReports.js
index 6d64db34..6ce407b5 100644
--- a/src/hooks/useLemmyReports.js
+++ b/src/hooks/useLemmyReports.js
@@ -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",
@@ -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",
@@ -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",
diff --git a/src/pages/Reports.jsx b/src/pages/Reports.jsx
index f2ca7ef8..705a8e77 100644
--- a/src/pages/Reports.jsx
+++ b/src/pages/Reports.jsx
@@ -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}