fix: ts에러 수정

ASAP-as-soon-as-possible · Jun 25, 2024 · a5361e9 · a5361e9
1 parent 59d24bc
commit a5361e9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/src/pages/OverallSchedule/OverallSchedule.tsx b/src/pages/OverallSchedule/OverallSchedule.tsx
@@ -14,6 +14,9 @@ function OverallSchedule() {
     meetingId,
   );
 
+  // 시간대 선택 단계가 없어질 것을 고려하여 상수값을 설정해놓음
+  const PREFER_TIMES = { startTime: '06:00', endTime: '24:00' };
+
   return (
     <OverallScheduleWrapper>
       <Title memberCount={dataOverallSchedule?.memberCount} totalUserNames={dataOverallSchedule?.totalUserNames}/>
@@ -22,7 +25,7 @@ function OverallSchedule() {
         dataTimetable &&
         dataOverallSchedule && (
           <OverallScheduleTable
-            timeSlots={getAvailableTimes(dataTimetable.preferTimes[0])}
+            timeSlots={getAvailableTimes(PREFER_TIMES)}
             availableDates={dataTimetable.availableDates}
             dataOverallSchedule={dataOverallSchedule}
           />

diff --git a/src/pages/selectSchedule/SelectSchedule.tsx b/src/pages/selectSchedule/SelectSchedule.tsx
@@ -18,6 +18,9 @@ function SelectSchedule() {
   const { meetingId } = useParams();
   const { data, isLoading } = useGetTimetable(meetingId);
 
+  // 시간대 선택 단계가 없어질 것을 고려하여 상수값을 설정해놓음
+  const PREFER_TIMES = { startTime: '06:00', endTime: '24:00' };
+
   return (
     <ScheduleStepContext.Provider value={{ scheduleStep, setScheduleStep }}>
       <SelectScheduleWrapper>
@@ -38,7 +41,7 @@ function SelectSchedule() {
                 padding={scheduleStep === 'selectTimeSlot' ? `0 0 2.6rem` : `4.4rem 0 3.2rem 0`}
               />
               <SelectScheduleTable
-                timeSlots={getAvailableTimes(data.preferTimes[0])}
+                timeSlots={getAvailableTimes(PREFER_TIMES)}
                 availableDates={data.availableDates}
               />
             </>

diff --git a/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx b/src/pages/selectSchedule/components/selectPriority/PriorityDropdown.tsx
@@ -72,8 +72,9 @@ function PriorityDropdown() {
         temp = 0;
         break;
     }
+
     setSelectedSlots((prev: SelectedSlotType) => {
-      const updatedSelectedSlots = Object.entries(prev).map(([key, value]) => {
+      const updatedSelectedSlots = Object.entries(prev).map(([_, value]) => {
         if (value.priority === temp) {
           return { ...value, priority: 0 };
         }

diff --git a/src/pages/selectSchedule/components/selectTimeSlot/hooks/useSlotSelection.ts b/src/pages/selectSchedule/components/selectTimeSlot/hooks/useSlotSelection.ts
@@ -10,7 +10,7 @@ const useSlotSeletion = () => {
     const handleCompleteSlot = (targetSlot: string) => {
         const dateOfStartSlot = startSlot?.substring(0, startSlot.lastIndexOf('/'));
         const dateOfTargetSlot = targetSlot.substring(0, targetSlot.lastIndexOf('/'))
-        if (dateOfStartSlot === dateOfTargetSlot){
+        if (startSlot && dateOfStartSlot === dateOfTargetSlot){
             const newSelectedSlot = {
                 date:dateOfStartSlot,
                 startSlot:startSlot?.substring(startSlot.lastIndexOf('/')+1),
@@ -20,7 +20,9 @@ const useSlotSeletion = () => {
 
             const keys = Object.keys(selectedSlots).map(Number)
             const newKey = keys.length ? Math.max(...keys) + 1 : 0;
-            setSelectedSlots({...selectedSlots, [newKey]:newSelectedSlot})
+            const newSelectedSlots = {...selectedSlots};
+            newSelectedSlots[newKey] = newSelectedSlot;
+            setSelectedSlots(newSelectedSlots)
         }
         setStartSlot(undefined);
     }

diff --git a/src/pages/selectSchedule/contexts/useSelectContext.ts b/src/pages/selectSchedule/contexts/useSelectContext.ts
@@ -1,8 +1,8 @@
-import { createContext, useContext } from 'react';
+import { Dispatch, SetStateAction, createContext, useContext } from 'react';
 
 export interface SelectSlotType {
   date: string;
-  startSlot?: string;
+  startSlot: string;
   endSlot: string;
   priority: number;
 }
@@ -13,9 +13,9 @@ export interface SelectedSlotType {
 
 interface SelectContextType {
   startSlot: string | undefined;
-  setStartSlot: (startSlot?: string) => void;
+  setStartSlot: Dispatch<SetStateAction<SelectContextType['startSlot']>>;
   selectedSlots: SelectedSlotType;
-  setSelectedSlots: (selectedSlots: SelectedSlotType) => void;
+  setSelectedSlots: Dispatch<SetStateAction<SelectedSlotType>>;
 }
 
 export const SelectContext = createContext<SelectContextType>({

diff --git a/src/pages/selectSchedule/utils.ts b/src/pages/selectSchedule/utils.ts
@@ -1,6 +1,6 @@
-import { SelectedSlotType } from 'components/timetableComponents/context';
 import { addMinutes } from 'components/timetableComponents/utils';
 
+import { SelectedSlotType } from './contexts/useSelectContext';
 import { TitlesType } from './types';
 
 export const DURATION = {