Merge pull request #3072 from ever-co/fix/employee-object-and-employe…

…eId-validation Fix: validate employee object and employeeId string format in request…
ever-co · Sep 26, 2024 · 9dff678 · 9dff678
2 parents e1e8819 + 88c84f3
commit 9dff678
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/apps/web/app/hooks/features/useDailyPlan.ts b/apps/web/app/hooks/features/useDailyPlan.ts
@@ -106,7 +106,11 @@ export function useDailyPlan() {
 		async (data: ICreateDailyPlan) => {
 			if (user?.tenantId) {
 				const res = await createQueryCall(
-					{ ...data, organizationTeamId: activeTeam?.id },
+					{
+						...data,
+						organizationTeamId: activeTeam?.id,
+						employeeId: user?.employee?.id
+					},
 					user?.tenantId || ''
 				);
 				//Check if there is an existing plan

diff --git a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
@@ -41,7 +41,7 @@ export function CreateDailyPlanFormModal({
 	) as 'Select' | 'Select & Close';
 
 	const existingPlanDates = useMemo(
-		() => profileDailyPlans.items.map((plan) => new Date(plan.date)),
+		() => profileDailyPlans?.items?.map((plan) => new Date(plan.date)),
 		[profileDailyPlans.items]
 	);
 
@@ -290,12 +290,12 @@ function MembersList({
 									{(member?.employee?.user?.image?.thumbUrl ||
 										member?.employee?.user?.image?.fullUrl ||
 										member?.employee?.user?.imageUrl) &&
-									isValidUrl(
-										member?.employee?.user?.image?.thumbUrl ||
+										isValidUrl(
+											member?.employee?.user?.image?.thumbUrl ||
 											member?.employee?.user?.image?.fullUrl ||
 											member?.employee?.user?.imageUrl ||
 											''
-									) ? (
+										) ? (
 										<Avatar
 											size={36}
 											className="relative cursor-pointer dark:border-[0.25rem] dark:border-[#26272C]"

diff --git a/apps/web/lib/features/task/task-card.tsx b/apps/web/lib/features/task/task-card.tsx
@@ -711,39 +711,39 @@ function TaskCardMenu({
                   {(viewType == 'default' ||
                     (viewType === 'dailyplan' &&
                       planMode === 'Outstanding')) && (
-                    <>
-                      <Divider type="HORIZONTAL" />
-                      <div className="mt-3">
-                        {!taskPlannedToday && (
-                          <li className="mb-2">
-                            <PlanTask
-                              planMode="today"
-                              taskId={task.id}
-                              employeeId={profile?.member?.employeeId ?? ''}
-                              taskPlannedToday={taskPlannedToday}
-                            />
-                          </li>
-                        )}
-                        {!taskPlannedTomorrow && (
+                      <>
+                        <Divider type="HORIZONTAL" />
+                        <div className="mt-3">
+                          {!taskPlannedToday && (
+                            <li className="mb-2">
+                              <PlanTask
+                                planMode="today"
+                                taskId={task.id}
+                                employeeId={profile?.member?.employeeId ?? ''}
+                                taskPlannedToday={taskPlannedToday}
+                              />
+                            </li>
+                          )}
+                          {!taskPlannedTomorrow && (
+                            <li className="mb-2">
+                              <PlanTask
+                                planMode="tomorow"
+                                taskId={task.id}
+                                employeeId={profile?.member?.employeeId ?? ''}
+                                taskPlannedForTomorrow={taskPlannedTomorrow}
+                              />
+                            </li>
+                          )}
                           <li className="mb-2">
                             <PlanTask
-                              planMode="tomorow"
+                              planMode="custom"
                               taskId={task.id}
                               employeeId={profile?.member?.employeeId ?? ''}
-                              taskPlannedForTomorrow={taskPlannedTomorrow}
                             />
                           </li>
-                        )}
-                        <li className="mb-2">
-                          <PlanTask
-                            planMode="custom"
-                            taskId={task.id}
-                            employeeId={profile?.member?.employeeId ?? ''}
-                          />
-                        </li>
-                      </div>
-                    </>
-                  )}
+                        </div>
+                      </>
+                    )}
 
                   {viewType === 'dailyplan' &&
                     (planMode === 'Today Tasks' ||