Merge remote-tracking branch 'origin/dev' into dev

src/queries/admin/report.ts

@@ -142,6 +142,7 @@ export async function getReports(
     ...pageFilters,
     ...(options?.include && { include: options.include }),
   });
+
   const count = await prisma.client.report.count({
     where,
   });

src/queries/admin/team.ts

@@ -135,6 +135,7 @@ export async function getTeams(
     ...pageFilters,
     ...(options?.include && { include: options?.include }),
   });
+
   const count = await prisma.client.team.count({ where });
 
   return { data: teams, count, ...getParameters };

src/queries/admin/website.ts

@@ -107,7 +107,8 @@ export async function getWebsites(
     ...pageFilters,
     ...(options?.include && { include: options.include }),
   });
-  const count = await prisma.client.website.count({ where });
+
+  const count = await prisma.client.website.count({ where: { ...where, deletedAt: null } });
 
   return { data: websites, count, ...getParameters };
 }