Migrate files with compatibility issues

Author: RichDom2185

src/commons/editor/EditorContainer.tsx

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { pick } from 'es-toolkit';
 import React from 'react';
 
 import SourcecastEditor, {
@@ -40,7 +40,7 @@ export const convertEditorTabStateToProps = (
   return {
     editorTabIndex,
     editorValue: editorTab.value,
-    ..._.pick(editorTab, 'filePath', 'highlightedLines', 'breakpoints', 'newCursorPosition')
+    ...pick(editorTab, ['filePath', 'highlightedLines', 'breakpoints', 'newCursorPosition'])
   };
 };
 

src/commons/mocks/StoreMocks.ts

@@ -1,5 +1,5 @@
 import { Store } from '@reduxjs/toolkit';
-import _ from 'lodash';
+import { isObject, mergeWith } from 'es-toolkit/compat';
 import mockStore from 'redux-mock-store';
 
 import {
@@ -40,13 +40,13 @@ export function mockInitialStore(
   };
 
   const lodashMergeCustomizer = (objValue: any, srcValue: any) => {
-    if (_.isObject(objValue)) {
+    if (isObject(objValue)) {
       return {
         ...objValue, // destination object
         ...srcValue // overrides
       };
     }
   };
 
-  return createStore(_.mergeWith(state, overrides, lodashMergeCustomizer));
+  return createStore(mergeWith(state, overrides, lodashMergeCustomizer));
 }

src/commons/sagas/BackendSaga.ts

@@ -151,7 +151,7 @@ const newBackendSagaOne = combineSagaHandlers({
   },
   [SessionActions.handleSamlRedirect.type]: function* (action) {
     const { jwtCookie } = action.payload;
-    const tokens = _.mapKeys(JSON.parse(jwtCookie), (v, k) => _.camelCase(k)) as Tokens;
+    const tokens = mapKeys(JSON.parse(jwtCookie), (v, k) => camelCase(k)) as Tokens;
 
     yield put(actions.setTokens(tokens));
     yield put(actions.fetchUserAndCourse());

src/commons/sagas/RemoteExecutionSaga.ts

@@ -1,8 +1,8 @@
 import { SlingClient } from '@sourceacademy/sling-client';
+import { pickBy } from 'es-toolkit/compat';
 import { assemble, compileFiles, type Context } from 'js-slang';
 import { ExceptionError } from 'js-slang/dist/errors/errors';
 import { Chapter, Variant } from 'js-slang/dist/types';
-import _ from 'lodash';
 import { call, put, race, select, take } from 'redux-saga/effects';
 import RemoteExecutionActions from 'src/features/remoteExecution/RemoteExecutionActions';
 import {
@@ -126,7 +126,7 @@ const RemoteExecutionSaga = combineSagaHandlers({
             device: {
               ...currentSession.device,
               peripherals: {
-                ..._.pickBy(
+                ...pickBy(
                   currentSession.device.peripherals,
                   p => Date.now() - p.lastUpdated < 3000
                 ),

src/commons/utils/RequestHelper.tsx

@@ -1,5 +1,5 @@
 import { Button } from '@blueprintjs/core';
-import _ from 'lodash';
+import { cloneDeep } from 'es-toolkit';
 import { assessmentFullPathRegex } from 'src/features/academy/AcademyTypes';
 import { store } from 'src/pages/createStore';
 
@@ -87,7 +87,7 @@ export const request = async (
       }
 
       store.dispatch(actions.setTokens(newTokens));
-      const updatedFetchOptions = _.cloneDeep(fetchOptions);
+      const updatedFetchOptions = cloneDeep(fetchOptions);
       updatedFetchOptions.headers.set('Authorization', `Bearer ${newTokens.accessToken}`);
 
       const retriedResp = await fetch(`${Constants.backendUrl}/v2/${path}`, updatedFetchOptions);

src/features/game/chapter/GameChapterHelpers.ts

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { sortBy } from 'es-toolkit/compat';
 import { request } from 'src/commons/utils/RequestHelper';
 
 import { store } from '../../../pages/createStore';
@@ -19,7 +19,7 @@ export async function fetchGameChapters(): Promise<GameChapter[]> {
   });
   if (!response) return [];
   const chapterDetails = response.status === 200 ? await response.json() : [];
-  const sortedChapters = _.sortBy(chapterDetails, chapterDetail => new Date(chapterDetail.openAt));
+  const sortedChapters = sortBy(chapterDetails, chapterDetail => new Date(chapterDetail.openAt));
   sortedChapters.forEach(chapter => (chapter.filenames = chapter.filenames.map(toTxtPath)));
   return sortedChapters;
 }

src/features/game/save/GameSaveRequests.ts

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isEmpty } from 'es-toolkit/compat';
 import Constants from 'src/commons/utils/Constants';
 
 import SourceAcademyGame from '../SourceAcademyGame';
@@ -44,7 +44,7 @@ export async function loadData(): Promise<FullSaveState> {
   const message = await resp.text();
 
   const json = JSON.parse(message).courseRegistration?.gameStates;
-  return _.isEmpty(json) ? createEmptySaveState() : json;
+  return isEmpty(json) ? createEmptySaveState() : json;
 }
 
 /**

src/features/game/utils/StyleUtils.ts

@@ -1,4 +1,5 @@
-import _ from 'lodash';
+import { mapValues } from 'es-toolkit';
+import { times } from 'es-toolkit/compat';
 
 import { screenSize } from '../commons/CommonConstants';
 
@@ -21,7 +22,7 @@ export const Color = {
 };
 
 const hex = (str: string) => parseInt(str.slice(1), 16);
-export const HexColor = _.mapValues(Color, hex);
+export const HexColor = mapValues(Color, hex);
 
 type TableFormatPosConfig = {
   direction?: Direction;
@@ -64,7 +65,7 @@ export function calcTableFormatPos({
   let itemsPerList = numItemLimit || numOfItems;
   const numOfLists = Math.ceil(numOfItems / itemsPerList);
 
-  return _.times(numOfItems, itemNumber => {
+  return times(numOfItems, itemNumber => {
     const itemIndexInList = itemNumber % itemsPerList;
     const listIndex = Math.floor(itemNumber / itemsPerList);
 

src/features/gameSimulator/GameSimulatorService.ts

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { sortBy } from 'es-toolkit/compat';
 
 import { sendAdminStoryRequest, sendAssetRequest, sendStoryRequest } from './GameSimulatorRequest';
 import { ChapterDetail } from './GameSimulatorTypes';
@@ -114,7 +114,7 @@ export async function uploadAssetToS3(file: File, folderName: string) {
 export async function fetchChapters(): Promise<ChapterDetail[]> {
   const response = await sendStoryRequest('', 'GET');
   const chapterDetails = response.status === 200 ? await response.json() : [];
-  return _.sortBy(chapterDetails, (chapterDetail: ChapterDetail) => new Date(chapterDetail.openAt));
+  return sortBy(chapterDetails, (chapterDetail: ChapterDetail) => new Date(chapterDetail.openAt));
 }
 
 /**