highperfocused/open-saas
1
0
Fork 0
mirror of https://github.com/wasp-lang/open-saas.git synced 2025-11-24 21:17:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update diff files

Browse Source
This commit is contained in:
Filip Sodić
2025-02-24 15:04:15 +01:00
parent 00558aca36
commit c42ce2322d
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opensaas-sh/app_diff/src/admin/dashboards/users/UsersTable.tsx.diff
View File

@@ -1,14 +1,14 @@
--- template/app/src/admin/dashboards/users/UsersTable.tsx --- template/app/src/admin/dashboards/users/UsersTable.tsx
+++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx +++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx
@@ -9,6 +9,7 @@ @@ -17,6 +17,7 @@
const [skip, setskip] = useState(0); const [skip, setskip] = useState(0);
const [page, setPage] = useState(1); const [page, setPage] = useState(1);
const [email, setEmail] = useState<string | undefined>(undefined); const [email, setEmail] = useState<string | undefined>(undefined);
+ +
const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined); const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]); const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]);
const { data, isLoading, error } = useQuery(getPaginatedUsers, { const { data, isLoading } = useQuery(getPaginatedUsers, {
@@ -211,7 +212,7 @@ @@ -223,7 +224,7 @@
<p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p> <p className='text-sm text-black dark:text-white'>{user.subscriptionStatus}</p>
</div> </div>
<div className='col-span-2 flex items-center'> <div className='col-span-2 flex items-center'>

27
opensaas-sh/app_diff/src/user/operations.ts.diff
View File

@@ -1,18 +1,27 @@
--- template/app/src/user/operations.ts --- template/app/src/user/operations.ts
+++ opensaas-sh/app/src/user/operations.ts +++ opensaas-sh/app/src/user/operations.ts
@@ -41,7 +41,10 @@ @@ -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 @@
}; };
type GetPaginatedUsersOutput = { type GetPaginatedUsersOutput = {
- users: Pick<User, 'id' | 'email' | 'username' | 'subscriptionStatus' | 'paymentProcessorUserId'>[]; - users: Pick<
+ users: Pick< - User,
+ User, - 'id' | 'email' | 'username' | 'subscriptionStatus' | 'paymentProcessorUserId' | 'isAdmin'
+ 'id' | 'email' | 'username' | 'subscriptionStatus' | 'stripeId' - >[];
+ >[]; + users: Pick<User, 'id' | 'email' | 'username' | 'subscriptionStatus' | 'stripeId' | 'isAdmin'>[];
totalPages: number; totalPages: number;
}; };
@@ -85,6 +88,7 @@ @@ -80,6 +77,7 @@
mode: 'insensitive', mode: 'insensitive',
}, },
isAdmin, isAdmin,
@@ -20,7 +29,7 @@
}, },
{ {
OR: [ OR: [
@@ -108,7 +112,7 @@ @@ -103,7 +101,7 @@
username: true, username: true,
isAdmin: true, isAdmin: true,
subscriptionStatus: true, subscriptionStatus: true,
@@ -29,7 +38,7 @@
}, },
orderBy: { orderBy: {
id: 'desc', id: 'desc',
@@ -124,6 +128,7 @@ @@ -119,6 +117,7 @@
mode: 'insensitive', mode: 'insensitive',
}, },
isAdmin, isAdmin,