Skip to content

Commit ea33c15

Browse files
fix: remove an extra editing xblock modal on unit page (openedx#2111)
1 parent d440394 commit ea33c15

5 files changed

Lines changed: 4 additions & 32 deletions

File tree

src/course-unit/CourseUnit.test.jsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,12 +720,6 @@ describe('<CourseUnit />', () => {
720720
userEvent.click(problemButton);
721721
});
722722

723-
await waitFor(() => {
724-
expect(screen.getByRole('heading', {
725-
name: new RegExp(`${addComponentMessages.blockEditorModalTitle.defaultMessage}`, 'i'),
726-
})).toBeInTheDocument();
727-
});
728-
729723
axiosMock
730724
.onGet(getCourseSectionVerticalApiUrl(blockId))
731725
.reply(200, courseSectionVerticalMock);

src/course-unit/add-component/AddComponent.jsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,7 @@ const AddComponent = ({
254254
/>
255255
</div>
256256
</StandardModal>
257-
<StandardModal
258-
title={intl.formatMessage(messages.blockEditorModalTitle)}
259-
isOpen={isXBlockEditorModalOpen}
260-
onClose={closeXBlockEditorModal}
261-
isOverflowVisible={false}
262-
size="xl"
263-
>
257+
{isXBlockEditorModalOpen && (
264258
<div className="editor-page">
265259
<EditorPage
266260
courseId={courseId}
@@ -272,7 +266,7 @@ const AddComponent = ({
272266
returnFunction={/* istanbul ignore next */ () => onXBlockSave}
273267
/>
274268
</div>
275-
</StandardModal>
269+
)}
276270
</div>
277271
);
278272
}

src/course-unit/add-component/messages.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ const messages = defineMessages({
3636
defaultMessage: 'Select video',
3737
description: 'Video picker modal title.',
3838
},
39-
blockEditorModalTitle: {
40-
id: 'course-authoring.course-unit.modal.block-editor-title.text',
41-
defaultMessage: 'Edit component',
42-
description: 'Block editor modal title.',
43-
},
4439
modalContainerTitle: {
4540
id: 'course-authoring.course-unit.modal.container.title',
4641
defaultMessage: 'Add {componentTitle} component',

src/course-unit/xblock-container-iframe/index.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,7 @@ const XBlockContainerIframe: FC<XBlockContainerIframeProps> = ({
218218
/>
219219
</div>
220220
</StandardModal>
221-
<StandardModal
222-
title={intl.formatMessage(messages.blockEditorModalTitle)}
223-
isOpen={isXBlockEditorModalOpen}
224-
onClose={closeXBlockEditorModal}
225-
isOverflowVisible={false}
226-
size="xl"
227-
>
221+
{isXBlockEditorModalOpen && (
228222
<div className="editor-page">
229223
<EditorPage
230224
courseId={courseId}
@@ -236,7 +230,7 @@ const XBlockContainerIframe: FC<XBlockContainerIframeProps> = ({
236230
returnFunction={/* istanbul ignore next */ () => onXBlockSave}
237231
/>
238232
</div>
239-
</StandardModal>
233+
)}
240234
{Object.keys(accessManagedXBlockData).length ? (
241235
<ConfigureModal
242236
isXBlockComponent

src/course-unit/xblock-container-iframe/messages.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ const messages = defineMessages({
1919
id: 'course-authoring.course-unit.xblock.video-editor.title',
2020
defaultMessage: 'Select video',
2121
},
22-
blockEditorModalTitle: {
23-
id: 'course-authoring.course-unit.xblock.editor.title',
24-
defaultMessage: 'Edit component',
25-
description: 'Block editor modal title.',
26-
},
2722
});
2823

2924
export default messages;

0 commit comments

Comments
 (0)