mirror of
https://github.com/wasp-lang/open-saas.git
synced 2025-05-31 18:20:50 +02:00
Update diff files
This commit is contained in:
parent
e97a3412a5
commit
d67ae93805
@ -1,14 +1,6 @@
|
||||
--- template/app/src/admin/dashboards/users/UsersTable.tsx
|
||||
+++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx
|
||||
@@ -17,6 +17,7 @@
|
||||
const [skip, setskip] = useState(0);
|
||||
const [page, setPage] = useState(1);
|
||||
const [email, setEmail] = useState<string | undefined>(undefined);
|
||||
+
|
||||
const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
|
||||
const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]);
|
||||
const { data, isLoading } = useQuery(getPaginatedUsers, {
|
||||
@@ -223,7 +224,7 @@
|
||||
@@ -202,7 +202,7 @@
|
||||
<p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p>
|
||||
</div>
|
||||
<div className='col-span-2 flex items-center'>
|
||||
|
@ -1,15 +1,6 @@
|
||||
--- template/app/src/user/operations.ts
|
||||
+++ opensaas-sh/app/src/user/operations.ts
|
||||
@@ -2,7 +2,7 @@
|
||||
import { type UpdateIsUserAdminById, type GetPaginatedUsers } from 'wasp/server/operations';
|
||||
import { type User } from 'wasp/entities';
|
||||
import { HttpError } from 'wasp/server';
|
||||
-import { subscriptionStatusSchema, type SubscriptionStatus } from '../payment/plans';
|
||||
+import { subscriptionStatusSchema } from '../payment/plans';
|
||||
import { ensureArgsSchemaOrThrowHttpError } from '../server/validation';
|
||||
|
||||
const updateUserAdminByIdInputSchema = z.object({
|
||||
@@ -33,10 +33,7 @@
|
||||
@@ -34,10 +34,7 @@
|
||||
};
|
||||
|
||||
type GetPaginatedUsersOutput = {
|
||||
@ -21,7 +12,7 @@
|
||||
totalPages: number;
|
||||
};
|
||||
|
||||
@@ -80,6 +77,7 @@
|
||||
@@ -85,6 +82,7 @@
|
||||
mode: 'insensitive',
|
||||
},
|
||||
isAdmin,
|
||||
@ -29,7 +20,7 @@
|
||||
},
|
||||
{
|
||||
OR: [
|
||||
@@ -103,7 +101,7 @@
|
||||
@@ -106,7 +104,7 @@
|
||||
username: true,
|
||||
isAdmin: true,
|
||||
subscriptionStatus: true,
|
||||
@ -37,12 +28,4 @@
|
||||
+ stripeId: true,
|
||||
},
|
||||
orderBy: {
|
||||
id: 'desc',
|
||||
@@ -119,6 +117,7 @@
|
||||
mode: 'insensitive',
|
||||
},
|
||||
isAdmin,
|
||||
+ isMockUser: true,
|
||||
},
|
||||
{
|
||||
OR: [
|
||||
username: 'asc',
|
||||
|
Loading…
x
Reference in New Issue
Block a user