#3934 fix editing task + fix editing vendor

Author: wavehassman

src/backend/src/controllers/reimbursement-requests.controllers.ts

@@ -496,14 +496,14 @@ export default class ReimbursementRequestsController {
       const editedVendor = await ReimbursementRequestService.editVendor(
         name,
         vendorId,
-        username,
-        password,
-        discountCode,
         taxExempt,
         twoFactorContacts,
-        notes,
         req.currentUser,
-        req.organization
+        req.organization,
+        username,
+        password,
+        discountCode,
+        notes
       );
       res.status(200).json(editedVendor);
     } catch (error: unknown) {

src/backend/src/routes/reimbursement-requests.routes.ts

@@ -96,13 +96,13 @@ reimbursementRequestsRouter.get('/reimbursements', ReimbursementRequestControlle
 reimbursementRequestsRouter.post(
   '/:vendorId/vendors/edit',
   nonEmptyString(body('name')),
-  nonEmptyString(body('username')).optional(),
-  nonEmptyString(body('password')).optional(),
-  nonEmptyString(body('discountCode')).optional(),
+  nonEmptyString(body('username')).optional({ checkFalsy: true }),
+  nonEmptyString(body('password')).optional({ checkFalsy: true }),
+  nonEmptyString(body('discountCode')).optional({ checkFalsy: true }),
   body('taxExempt').isBoolean(),
   body('twoFactorContacts').isArray(),
   nonEmptyString(body('twoFactorContacts.*')),
-  nonEmptyString(body('notes')).optional(),
+  nonEmptyString(body('notes')).optional({ checkFalsy: true }),
   validateInputs,
   ReimbursementRequestController.editVendor
 );

src/backend/src/routes/tasks.routes.ts

@@ -42,7 +42,7 @@ tasksRouter.post(
 tasksRouter.post(
   '/:taskId/edit',
   nonEmptyString(body('title')),
-  nonEmptyString(body('notes')),
+  body('notes').isString(),
   isOptionalDateOnly(body('deadline')),
   isOptionalDateOnly(body('startDate')),
   isTaskPriority(body('priority')),

src/backend/src/services/reimbursement-requests.services.ts

@@ -1510,14 +1510,14 @@ export default class ReimbursementRequestService {
   static async editVendor(
     name: string,
     vendorId: string,
-    username: string,
-    password: string,
-    discountCode: string,
     taxExempt: boolean,
     twoFactorContacts: string[],
-    notes: string,
     submitter: User,
-    organization: Organization
+    organization: Organization,
+    username?: string,
+    password?: string,
+    discountCode?: string,
+    notes?: string
   ): Promise<Vendor> {
     const existingVendor = await prisma.vendor.findUnique({
       where: { vendorId, dateDeleted: null },

src/frontend/src/pages/CalendarPage/TaskClickPopup.tsx

@@ -64,7 +64,8 @@ export const TaskClickContent: React.FC<TaskClickContentProps> = ({ task, onClos
         notes: data.notes,
         priority: data.priority,
         startDate: data.startDate,
-        deadline: data.deadline
+        deadline: data.deadline,
+        wbsNum: task.wbsNum
       });
       await editAssignees({
         taskId: task.taskId,

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskCard.tsx

@@ -77,9 +77,7 @@ export const TaskCard = ({
     wpWbsNum
   }: EditTaskFormInput) => {
     try {
-      // uses the project's wbs element id as fallback if no wp was selected
-      const targetWbsNum =
-        wpWbsNum ?? (task.wbsNum.workPackageNumber !== 0 ? { ...wbsNum, workPackageNumber: 0 } : undefined);
+      const targetWbsNum = wpWbsNum ?? task.wbsNum;
 
       await editTask({
         taskId,