From 805fb3964a0eeae3642d58a5a3dc00f48ff147c0 Mon Sep 17 00:00:00 2001
From: ff <ff@example.com>
Date: Sun, 12 Apr 2026 12:13:57 -0400
Subject: [PATCH] fix: staff edit error and column order on appointment page

---
 apps/Backend/src/routes/staffs.ts                  | 3 ++-
 apps/Backend/src/storage/staff-storage.ts          | 2 +-
 apps/Frontend/src/components/staffs/staff-form.tsx | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/Backend/src/routes/staffs.ts b/apps/Backend/src/routes/staffs.ts
index ae74855..21a4a9c 100755
--- a/apps/Backend/src/routes/staffs.ts
+++ b/apps/Backend/src/routes/staffs.ts
@@ -49,7 +49,8 @@ router.put("/:id", async (req: Request, res: Response): Promise<any> => {
       return res.status(400).send("Invalid staff ID");
     }
 
-    const validatedData = staffUpdateSchema.parse(req.body);
+    const { userId: _userId, id: _id, createdAt: _createdAt, ...updateBody } = req.body;
+    const validatedData = staffUpdateSchema.parse(updateBody);
     const updatedStaff = await storage.updateStaff(
       parsedStaffId,
       validatedData
diff --git a/apps/Backend/src/storage/staff-storage.ts b/apps/Backend/src/storage/staff-storage.ts
index 57ec3a3..7b4d035 100755
--- a/apps/Backend/src/storage/staff-storage.ts
+++ b/apps/Backend/src/storage/staff-storage.ts
@@ -19,7 +19,7 @@ export const staffStorage: IStorage = {
   },
 
   async getAllStaff(): Promise<Staff[]> {
-    const staff = await db.staff.findMany();
+    const staff = await db.staff.findMany({ orderBy: { id: "asc" } });
     return staff;
   },
 
diff --git a/apps/Frontend/src/components/staffs/staff-form.tsx b/apps/Frontend/src/components/staffs/staff-form.tsx
index c4cf27d..cae14b2 100755
--- a/apps/Frontend/src/components/staffs/staff-form.tsx
+++ b/apps/Frontend/src/components/staffs/staff-form.tsx
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react";
 
 interface StaffFormProps {
   initialData?: Partial<Staff>;
-  onSubmit: (data: Omit<Staff, "id">) => void;
+  onSubmit: (data: Omit<Staff, "id" | "userId" | "createdAt">) => void;
   onCancel: () => void;
   isLoading?: boolean;
 }
@@ -18,7 +18,6 @@ export function StaffForm({
   const [email, setEmail] = useState("");
   const [role, setRole] = useState("Staff");
   const [phone, setPhone] = useState("");
-  const [userId, setUserId] = useState<number | undefined>(undefined);
 
   const [hasTypedRole, setHasTypedRole] = useState(false);
 
@@ -44,7 +43,6 @@ export function StaffForm({
       email: email.trim() || undefined,
       role: role.trim(),
       phone: phone.trim() || undefined,
-      userId: userId || 0,
     });
   };