resolved comments

pennlabs · Oct 17, 2023 · cb1ae22 · cb1ae22
1 parent e2a1a79
commit cb1ae22
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/frontend/plan/components/modals/AddScheduleFriendsModalInterior.tsx b/frontend/plan/components/modals/AddScheduleFriendsModalInterior.tsx
@@ -21,7 +21,7 @@ interface AddScheduleFriendsModalInteriorProps {
     defaultValue: string;
     placeholder: string;
     overwriteDefault: boolean;
-    mode: string;
+    requestType: string;
     activeFriendName: string;
 }
 
@@ -35,7 +35,7 @@ const AddScheduleFriendsModalInterior = ({
     defaultValue,
     placeholder,
     overwriteDefault = false,
-    mode,
+    requestType,
     activeFriendName,
 }: AddScheduleFriendsModalInteriorProps) => {
     const [inputRef, setInputRef] = useState<HTMLInputElement | null>(null);
@@ -48,7 +48,7 @@ const AddScheduleFriendsModalInterior = ({
             user,
             userInput,
             existingData as string[],
-            mode,
+            requestType,
             changed,
             setErrorObj
         );
@@ -60,7 +60,7 @@ const AddScheduleFriendsModalInterior = ({
         }
 
         if (!errorObj.error) {
-            if (mode == "friend") {
+            if (requestType == "friend") {
                 sendFriendRequest(
                     user,
                     inputRef.value,
@@ -82,7 +82,7 @@ const AddScheduleFriendsModalInterior = ({
                         }
                     }
                 );
-            } else if (mode == "schedule") {
+            } else if (requestType == "schedule") {
                 namingFunction(inputRef.value);
                 close();
             }

diff --git a/frontend/plan/components/modals/model_content_generator.js b/frontend/plan/components/modals/model_content_generator.js
@@ -36,15 +36,15 @@ export const generateModalInterior = (reduxState) => {
                 <NameScheduleModalInterior
                     buttonName="Rename"
                     existingData={Object.keys(reduxState.schedule.schedules)}
-                    mode="schedule"
+                    requestType="schedule"
                 />
             );
         case "CREATE_SCHEDULE":
             return (
                 <NameScheduleModalInterior
                     buttonName="Create"
                     existingData={Object.keys(reduxState.schedule.schedules)}
-                    mode="schedule"
+                    requestType="schedule"
                 />
             );
         case "ADD_FRIEND":
@@ -53,7 +53,7 @@ export const generateModalInterior = (reduxState) => {
                     user={reduxState.login.user}
                     buttonName="Request"
                     existingData={reduxState.friendships.acceptedFriends}
-                    mode="friend"
+                    requestType="friend"
                     placeholder="Enter your friend's PennKey"
                     activeFriendName={
                         reduxState.friendships.activeFriend.username

diff --git a/frontend/plan/reducers/schedule.js b/frontend/plan/reducers/schedule.js
@@ -135,10 +135,7 @@ const handleUpdateSchedulesOnFrontend = (state, schedulesFromBackend) => {
 
     schedulesFromBackend.forEach((scheduleFromBackend) => {
         if (
-            newState.deletedSchedules.reduce(
-                (acc, schedule) => acc || schedule === scheduleFromBackend.name,
-                false
-            )
+            newState.deletedSchedules.find((schedule) => schedule === scheduleFromBackend.name)
         ) {
             return;
         }
@@ -304,12 +301,8 @@ export const schedule = (state = initialState, action) => {
         case DELETE_SCHEDULE_ON_FRONTEND:
             return handleScheduleDeletion(state, action.scheduleName);
         case DELETION_ATTEMPTED:
-            return {
-                ...state,
-                deletedSchedules: state.deletedSchedules.push(
-                    action.scheduleName
-                ),
-            };
+            state.deletedSchedules.push(action.scheduleName)
+            return {...state};
         case CREATE_CART_ON_FRONTEND:
             return {
                 ...state,