From 6b57ce3e537c9e59f39fbe449133ac5acf94fd22 Mon Sep 17 00:00:00 2001 From: PKulkoRaccoonGang Date: Mon, 26 Feb 2024 10:28:46 +0200 Subject: [PATCH] refactor: refactoring after review --- src/course-unit/CourseUnit.jsx | 4 ++-- src/course-unit/data/slice.js | 4 ++-- src/course-unit/header-title/HeaderTitle.jsx | 6 +++--- src/course-unit/header-title/HeaderTitle.test.jsx | 8 ++++---- src/course-unit/hooks.jsx | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/course-unit/CourseUnit.jsx b/src/course-unit/CourseUnit.jsx index a18be65da..ac3e8a21a 100644 --- a/src/course-unit/CourseUnit.jsx +++ b/src/course-unit/CourseUnit.jsx @@ -29,7 +29,7 @@ const CourseUnit = ({ courseId }) => { unitTitle, isQueryPending, savingStatus, - isEditTitleFormOpen, + isTitleEditFormOpen, isErrorAlert, isInternetConnectionAlertFailed, handleTitleEditSubmit, @@ -62,7 +62,7 @@ const CourseUnit = ({ courseId }) => { title={( diff --git a/src/course-unit/data/slice.js b/src/course-unit/data/slice.js index 44a50f3a9..7f243c511 100644 --- a/src/course-unit/data/slice.js +++ b/src/course-unit/data/slice.js @@ -8,7 +8,7 @@ const slice = createSlice({ initialState: { savingStatus: '', isQueryPending: false, - isEditTitleFormOpen: false, + isTitleEditFormOpen: false, loadingStatus: { fetchUnitLoadingStatus: RequestStatus.IN_PROGRESS, courseSectionVerticalLoadingStatus: RequestStatus.IN_PROGRESS, @@ -30,7 +30,7 @@ const slice = createSlice({ state.isQueryPending = payload; }, changeEditTitleFormOpen: (state, { payload }) => { - state.isEditTitleFormOpen = payload; + state.isTitleEditFormOpen = payload; }, updateSavingStatus: (state, { payload }) => { state.savingStatus = payload.status; diff --git a/src/course-unit/header-title/HeaderTitle.jsx b/src/course-unit/header-title/HeaderTitle.jsx index 4c7879065..9afdd60f1 100644 --- a/src/course-unit/header-title/HeaderTitle.jsx +++ b/src/course-unit/header-title/HeaderTitle.jsx @@ -13,7 +13,7 @@ import messages from './messages'; const HeaderTitle = ({ unitTitle, - isEditTitleFormOpen, + isTitleEditFormOpen, handleTitleEdit, handleTitleEditSubmit, }) => { @@ -28,7 +28,7 @@ const HeaderTitle = ({ return (
- {isEditTitleFormOpen ? ( + {isTitleEditFormOpen ? ( e && e.focus()} @@ -63,7 +63,7 @@ const HeaderTitle = ({ HeaderTitle.propTypes = { unitTitle: PropTypes.string.isRequired, - isEditTitleFormOpen: PropTypes.bool.isRequired, + isTitleEditFormOpen: PropTypes.bool.isRequired, handleTitleEdit: PropTypes.func.isRequired, handleTitleEditSubmit: PropTypes.func.isRequired, }; diff --git a/src/course-unit/header-title/HeaderTitle.test.jsx b/src/course-unit/header-title/HeaderTitle.test.jsx index 0c3bf134c..b5014f89c 100644 --- a/src/course-unit/header-title/HeaderTitle.test.jsx +++ b/src/course-unit/header-title/HeaderTitle.test.jsx @@ -9,7 +9,7 @@ import HeaderTitle from './HeaderTitle'; import messages from './messages'; const unitTitle = 'Getting Started'; -const isEditTitleFormOpen = false; +const isTitleEditFormOpen = false; const handleTitleEdit = jest.fn(); const handleTitleEditSubmit = jest.fn(); let store; @@ -19,7 +19,7 @@ const renderComponent = (props) => render( ', () => { it('render HeaderTitle with open edit form', () => { const { getByRole } = renderComponent({ - isEditTitleFormOpen: true, + isTitleEditFormOpen: true, }); expect(getByRole('textbox', { name: messages.ariaLabelButtonEdit.defaultMessage })).toBeInTheDocument(); @@ -71,7 +71,7 @@ describe('', () => { it('calls saving title by clicking outside or press Enter key', async () => { const { getByRole } = renderComponent({ - isEditTitleFormOpen: true, + isTitleEditFormOpen: true, }); const titleField = getByRole('textbox', { name: messages.ariaLabelButtonEdit.defaultMessage }); diff --git a/src/course-unit/hooks.jsx b/src/course-unit/hooks.jsx index e72b9e3ef..7c7a01fc9 100644 --- a/src/course-unit/hooks.jsx +++ b/src/course-unit/hooks.jsx @@ -29,7 +29,7 @@ export const useCourseUnit = ({ courseId, blockId }) => { const loadingStatus = useSelector(getLoadingStatus); const { draftPreviewLink, publishedPreviewLink } = useSelector(getCourseSectionVertical); const navigate = useNavigate(); - const isEditTitleFormOpen = useSelector(state => state.courseUnit.isEditTitleFormOpen); + const isTitleEditFormOpen = useSelector(state => state.courseUnit.isTitleEditFormOpen); const isQueryPending = useSelector(state => state.courseUnit.isQueryPending); const unitTitle = courseUnit.metadata?.displayName || ''; @@ -49,7 +49,7 @@ export const useCourseUnit = ({ courseId, blockId }) => { }; const handleTitleEdit = () => { - dispatch(changeEditTitleFormOpen(!isEditTitleFormOpen)); + dispatch(changeEditTitleFormOpen(!isTitleEditFormOpen)); }; const handleTitleEditSubmit = (displayName) => { @@ -95,7 +95,7 @@ export const useCourseUnit = ({ courseId, blockId }) => { isErrorAlert, isLoading: loadingStatus.fetchUnitLoadingStatus === RequestStatus.IN_PROGRESS || loadingStatus.courseSectionVerticalLoadingStatus === RequestStatus.IN_PROGRESS, - isEditTitleFormOpen, + isTitleEditFormOpen, isInternetConnectionAlertFailed: savingStatus === RequestStatus.FAILED, handleInternetConnectionFailed, headerNavigationsActions,