Merge branch 'dev' of https://github.com/umami-software/umami into dev

umami-software · Oct 13, 2023 · 170a269 · 170a269
2 parents 8cc7657 + 4906986
commit 170a269
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/app/(main)/settings/users/UserWebsites.js b/src/app/(main)/settings/users/UserWebsites.js
@@ -22,7 +22,7 @@ export function UserWebsites({ userId }) {
     <Page loading={isLoading} error={error}>
       {hasData && (
         <WebsitesTable
-          data={data}
+          data={data.data}
           onFilterChange={handleFilterChange}
           onPageChange={handlePageChange}
           onPageSizeChange={handlePageSizeChange}

diff --git a/src/pages/api/users/[id]/websites.ts b/src/pages/api/users/[id]/websites.ts
@@ -30,7 +30,15 @@ export default async (
   await useValidate(schema, req, res);
 
   const { user } = req.auth;
-  const { id: userId, page = 1, query = '', includeTeams, onlyTeams } = req.query;
+  const {
+    id: userId,
+    page = 1,
+    pageSize,
+    orderBy,
+    query = '',
+    includeTeams,
+    onlyTeams,
+  } = req.query;
 
   if (req.method === 'GET') {
     if (!user.isAdmin && user.id !== userId) {
@@ -39,7 +47,9 @@ export default async (
 
     const websites = await getWebsitesByUserId(userId, {
       page,
+      pageSize,
       query,
+      orderBy,
       includeTeams,
       onlyTeams,
     });