Merge branch 'dev' into bugfix/user-website-error

components/pages/settings/users/UserWebsites.js

@@ -2,15 +2,13 @@ import useApi from 'hooks/useApi';
 import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
 import useMessages from 'hooks/useMessages';
 import useApiFilter from 'hooks/useApiFilter';
-import Page from 'components/layout/Page';
-import useConfig from 'hooks/useConfig';
 
 export function UserWebsites({ userId }) {
-  const { cloudMode } = useConfig();
   const { formatMessage, messages } = useMessages();
-  const { filter,  page, pageSize, handlePageSizeChange, handleFilterChange, handlePageChange } = useApiFilter();
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
   const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['user:websites', userId, filter, page, pageSize], () =>
+  const { data, isLoading } = useQuery(['user:websites', userId, filter, page, pageSize], () =>
     get(`/users/${userId}/websites`, {
       filter,
       page,
@@ -20,19 +18,18 @@ export function UserWebsites({ userId }) {
   const hasData = data && data.length !== 0;
 
   return (
-    <Page loading={isLoading} error={error}>
+    <div>
       {hasData && (
-        <WebsitesTable 
+        <WebsitesTable
-          data={data} 
+          data={data}
-          onFilterChange={handleFilterChange} 
+          onFilterChange={handleFilterChange}
-          onPageChange={handlePageChange} 
+          onPageChange={handlePageChange}
           onPageSizeChange={handlePageSizeChange}
           filterValue={filter}
-          showEditButton={!cloudMode}
+        />
-        />)
+      )}
-      }
       {!hasData && formatMessage(messages.noDataAvailable)}
-    </Page>
+    </div>
   );
 }
 

lib/prisma.ts

@@ -185,7 +185,9 @@ function getPageFilters(filters: SearchFilter<any>): [
     orderBy: string;
   },
 ] {
-  const { pageSize = 10, page = 1, orderBy } = filters;
+  const pageSize = filters?.pageSize || 10;
+  const page = filters?.page || 1;
+  const orderBy = filters?.orderBy;
 
   return [
     {

queries/admin/user.ts

@@ -37,7 +37,7 @@ export async function getUserByUsername(username: string, options: GetUserOption
 }
 
 export async function getUsers(
-  UserSearchFilter: UserSearchFilter = {},
+  UserSearchFilter: UserSearchFilter,
   options?: { include?: Prisma.UserInclude },
 ): Promise<FilterResult<User[]>> {
   const { teamId, filter, filterType = USER_FILTER_TYPES.all } = UserSearchFilter;
@@ -72,14 +72,22 @@ export async function getUsers(
     ...UserSearchFilter,
   });
 
-  const users = await prisma.client.user.findMany({
+  const users = await prisma.client.user
-    where: {
+    .findMany({
-      ...where,
+      where: {
-      deletedAt: null,
+        ...where,
-    },
+        deletedAt: null,
-    ...pageFilters,
+      },
-    ...(options?.include && { include: options.include }),
+      ...pageFilters,
-  });
+      ...(options?.include && { include: options.include }),
+    })
+    .then(a => {
+      return a.map(a => {
+        const { password, ...rest } = a;
+
+        return rest;
+      });
+    });
   const count = await prisma.client.user.count({
     where: {
       ...where,