From 87bb9b1e732d8b4452b3da31139c81676bd44c3b Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Tue, 30 Jan 2024 02:10:23 -0800
Subject: [PATCH] Fixed reports queries.

---
 src/components/hooks/queries/useReports.ts |  6 ++----
 src/components/input/ProfileButton.tsx     |  3 ---
 src/components/metrics/ListTable.tsx       |  1 +
 src/pages/api/reports/index.ts             | 22 +++++++++++++++++-----
 src/queries/admin/report.ts                |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.ts
index c6d4656e..2176411f 100644
--- a/src/components/hooks/queries/useReports.ts
+++ b/src/components/hooks/queries/useReports.ts
@@ -6,11 +6,9 @@ export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?:
   const modified = useCache((state: any) => state?.reports);
   const { get, del, useMutation } = useApi();
   const queryResult = useFilterQuery({
-    queryKey: ['reports', { websiteId, modified }],
+    queryKey: ['reports', { websiteId, teamId, modified }],
     queryFn: (params: any) => {
-      const url = websiteId ? `/websites/${websiteId}/reports` : `/reports`;
-
-      return get(teamId ? `/teams/${teamId}${url}` : url, params);
+      return get('/reports', { websiteId, teamId, ...params });
     },
   });
   const { mutate } = useMutation({ mutationFn: (reportId: string) => del(`/reports/${reportId}`) });
diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsx
index c79d4b6f..11d95a7b 100644
--- a/src/components/input/ProfileButton.tsx
+++ b/src/components/input/ProfileButton.tsx
@@ -29,9 +29,6 @@ export function ProfileButton() {
         <Icon>
           <Icons.Profile />
         </Icon>
-        <Icon size="sm">
-          <Icons.ChevronDown />
-        </Icon>
       </Button>
       <Popup position="bottom" alignment={dir === 'rtl' ? 'start' : 'end'}>
         <Menu onSelect={handleSelect} className={styles.menu}>
diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsx
index fa6bc656..133905e1 100644
--- a/src/components/metrics/ListTable.tsx
+++ b/src/components/metrics/ListTable.tsx
@@ -63,6 +63,7 @@ export function ListTable({
         {data?.length === 0 && <Empty className={styles.empty} />}
         {virtualize && data.length > 0 ? (
           <FixedSizeList
+            width="100%"
             height={itemCount * ITEM_SIZE}
             itemCount={data.length}
             itemSize={ITEM_SIZE}
diff --git a/src/pages/api/reports/index.ts b/src/pages/api/reports/index.ts
index 29456a41..64a29326 100644
--- a/src/pages/api/reports/index.ts
+++ b/src/pages/api/reports/index.ts
@@ -4,7 +4,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
 import { pageInfo } from 'lib/schema';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok } from 'next-basics';
-import { createReport, getUserReports } from 'queries';
+import { createReport, getReports } from 'queries';
 import * as yup from 'yup';
 
 export interface ReportsRequestQuery extends SearchFilter {}
@@ -50,13 +50,25 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    const { page, query, pageSize } = req.query;
-
-    const data = await getUserReports(userId, {
+    const { page, query, pageSize, websiteId, teamId } = req.query;
+    const filters = {
       page,
       pageSize: +pageSize || undefined,
       query,
-    });
+    };
+
+    const data = await getReports(
+      {
+        where: {
+          userId: !(websiteId && teamId) ? userId : undefined,
+          websiteId,
+        },
+        include: {
+          website: true,
+        },
+      },
+      filters,
+    );
 
     return ok(res, data);
   }
diff --git a/src/queries/admin/report.ts b/src/queries/admin/report.ts
index 76f1161b..d996bcbf 100644
--- a/src/queries/admin/report.ts
+++ b/src/queries/admin/report.ts
@@ -24,9 +24,9 @@ export async function getReports(
   const { query, userId, websiteId } = filters;
 
   const where: Prisma.ReportWhereInput = {
-    ...criteria.where,
     userId,
     websiteId,
+    ...criteria.where,
     AND: [
       {
         OR: [