release: v0.3.2 (fix lastLoginAt schema error)

chatpire · May 11, 2024 · ad9d8f3 · ad9d8f3
1 parent fa78ad6
commit ad9d8f3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/app/(panel)/admin/users/users-table.tsx b/src/app/(panel)/admin/users/users-table.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as React from "react";
-import { type UserReadAdmin, UserReadAdminSchema } from "@/schema/user.schema";
+import { type UserReadAdmin, UserReadAdminSchema, UserReadAdminWithLastLoginSchema } from "@/schema/user.schema";
 import { api } from "@/trpc/react";
 import { popupEditPasswordForm } from "@/app/(panel)/_components/edit-password-popup";
 import { DataTable, type DataTableDropdownAction } from "@/components/data-table";
@@ -102,7 +102,7 @@ export function UsersTable() {
       <DataTable
         data={getAllUserQuery.data ?? []}
         filterSearchField={"username"}
-        schema={UserReadAdminSchema}
+        schema={UserReadAdminWithLastLoginSchema}
         rowDropdownActions={rowDropdownActions}
         defaultPageSize={30}
       />

diff --git a/src/schema/user.schema.ts b/src/schema/user.schema.ts
@@ -25,14 +25,17 @@ export type UserCreate = z.infer<typeof UserCreateSchema>;
 
 export const UserReadAdminSchema = UserSchema.omit({
   hashedPassword: true,
-}).merge(
+});
+
+export const UserReadAdminWithLastLoginSchema = UserReadAdminSchema.merge(
   z.object({
     lastLoginAt: z
       .string()
-      .nullable()
+      .nullish()
       .transform((v) => (v ? new Date(v) : null)),
   }),
 );
+
 export type UserReadAdmin = z.infer<typeof UserReadAdminSchema>;
 export const UserReadSchema = UserReadAdminSchema.omit({
   comment: true,

diff --git a/src/server/api/routers/user.ts b/src/server/api/routers/user.ts
@@ -10,6 +10,7 @@ import {
   UserCreateSchema,
   UserRoles,
   UserUpdateAdminSchema,
+  UserReadAdminWithLastLoginSchema,
 } from "@/schema/user.schema";
 import { hashPassword } from "@/lib/password";
 import { writeUserCreateEventLog } from "@/server/actions/write-event-log";
@@ -126,7 +127,7 @@ export const userRouter = createTRPCRouter({
       .from(users)
       .leftJoin(sessions, eq(sessions.userId, users.id))
       .groupBy(users.id);
-    return UserReadAdminSchema.array().parse(results);
+    return UserReadAdminWithLastLoginSchema.array().parse(results);
   }),
 
   editInstanceAbilities: adminProcedure