From eeadefec73cb9a5b4c38eebbf9240295dd4cf3b6 Mon Sep 17 00:00:00 2001 From: PKulkoRaccoonGang Date: Tue, 7 May 2024 17:15:17 +0300 Subject: [PATCH] refactor: tests refactoring --- src/course-unit/CourseUnit.jsx | 5 ++--- src/course-unit/CourseUnit.test.jsx | 7 +++++-- src/course-unit/course-xblock/CourseXBlock.jsx | 4 ++-- src/course-unit/data/api.js | 4 +--- src/course-unit/data/thunk.js | 4 +--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/course-unit/CourseUnit.jsx b/src/course-unit/CourseUnit.jsx index dc7a4bae5a..5ebf803b85 100644 --- a/src/course-unit/CourseUnit.jsx +++ b/src/course-unit/CourseUnit.jsx @@ -73,8 +73,7 @@ const CourseUnit = ({ courseId }) => { const initialXBlocksData = useMemo(() => courseVerticalChildren.children ?? [], [courseVerticalChildren.children]); const [unitXBlocks, setUnitXBlocks] = useState(initialXBlocksData); - // const unitData = useSelector(state => state.courseUnit); - // console.log('unitData ===>', unitData); + useEffect(() => { document.title = getPageHeadTitle('', unitTitle); }, [unitTitle]); @@ -99,7 +98,7 @@ const CourseUnit = ({ courseId }) => { ); } - console.log('movedXBlockParams =======>', movedXBlockParams); + const finalizeXBlockOrder = () => (newXBlocks) => { handleXBlockDragAndDrop(newXBlocks.map(xBlock => xBlock.id), () => { setUnitXBlocks(initialXBlocksData); diff --git a/src/course-unit/CourseUnit.test.jsx b/src/course-unit/CourseUnit.test.jsx index 1eeb02823d..026bc45404 100644 --- a/src/course-unit/CourseUnit.test.jsx +++ b/src/course-unit/CourseUnit.test.jsx @@ -27,14 +27,17 @@ import { } from './data/thunk'; import initializeStore from '../store'; import { - clipboardMockResponse, courseCreateXblockMock, courseSectionVerticalMock, courseUnitIndexMock, courseUnitMock, courseVerticalChildrenMock, + clipboardMockResponse, } from './__mocks__'; -import { clipboardUnit, clipboardXBlock } from '../__mocks__'; +import { + clipboardUnit, + clipboardXBlock, +} from '../__mocks__'; import { executeThunk } from '../utils'; import deleteModalMessages from '../generic/delete-modal/messages'; import pasteComponentMessages from '../generic/clipboard/paste-component/messages'; diff --git a/src/course-unit/course-xblock/CourseXBlock.jsx b/src/course-unit/course-xblock/CourseXBlock.jsx index 7ae4f25710..ac7b4e8d1e 100644 --- a/src/course-unit/course-xblock/CourseXBlock.jsx +++ b/src/course-unit/course-xblock/CourseXBlock.jsx @@ -9,13 +9,13 @@ import { EditOutline as EditIcon, MoreVert as MoveVertIcon } from '@openedx/para import { useIntl } from '@edx/frontend-platform/i18n'; import { useNavigate, useSearchParams } from 'react-router-dom'; +import { getCanEdit, getCourseId } from '../data/selectors'; import { useOverflowControl } from '../../generic/hooks'; import DeleteModal from '../../generic/delete-modal/DeleteModal'; import ConfigureModal from '../../generic/configure-modal/ConfigureModal'; import SortableItem from '../../generic/drag-helper/SortableItem'; import { scrollToElement } from '../../course-outline/utils'; import { COURSE_BLOCK_NAMES } from '../../constants'; -import { getCanEdit, getCourseId } from '../data/selectors'; import { copyToClipboard } from '../../generic/data/thunks'; import { fetchCourseUnitQuery, fetchCourseVerticalChildrenData } from '../data/thunk'; import { updateMovedXBlockParams } from '../data/slice'; @@ -48,7 +48,7 @@ const CourseXBlock = ({ useEffect(() => { const handleMessage = (event) => { const { method, params } = event.data; - console.log('method ===>', method); + if (method === 'close_modal') { toggleLegacyEditModal(false); dispatch(fetchCourseVerticalChildrenData(blockId)); diff --git a/src/course-unit/data/api.js b/src/course-unit/data/api.js index e0a03698d3..dd1a2e42c8 100644 --- a/src/course-unit/data/api.js +++ b/src/course-unit/data/api.js @@ -19,10 +19,9 @@ export const postXBlockBaseApiUrl = () => `${getStudioBaseUrl()}/xblock/`; * @returns {Promise} */ export async function getCourseUnitData(unitId) { - const { data } = await getAuthenticatedHttpClient() .get(getCourseUnitApiUrl(unitId)); - console.log('getCourseUnitData', data); + return camelCaseObject(data); } @@ -157,7 +156,6 @@ export async function duplicateUnitItem(itemId, XBlockId) { * @returns {Promise} - A promise that resolves to the response data from the server. */ export async function rollbackUnitItem(itemId, xblockId) { - console.log('HELLOOOOOOOOO'); const { data } = await getAuthenticatedHttpClient() .patch(postXBlockBaseApiUrl(), { parent_locator: itemId, diff --git a/src/course-unit/data/thunk.js b/src/course-unit/data/thunk.js index 323e820644..d4dd68d7ad 100644 --- a/src/course-unit/data/thunk.js +++ b/src/course-unit/data/thunk.js @@ -260,14 +260,12 @@ export function rollbackUnitItemQuery(itemId, xblockId, title) { await rollbackUnitItem(itemId, xblockId); const newCourseVerticalChildren = await getCourseVerticalChildren(itemId); dispatch(updateCourseVerticalChildren(newCourseVerticalChildren)); + dispatch(updateMovedXBlockParams({ title, isSuccess: true, isUndo: true })); const courseUnit = await getCourseUnitData(itemId); - dispatch(fetchCourseItemSuccess(courseUnit)); dispatch(hideProcessingNotification()); dispatch(updateSavingStatus({ status: RequestStatus.SUCCESSFUL })); - dispatch(updateMovedXBlockParams({ title, isSuccess: true, isUndo: true })); } catch (error) { - console.log('HEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEYHEY', error); dispatch(hideProcessingNotification()); dispatch(updateSavingStatus({ status: RequestStatus.FAILED })); }