Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: open mfe modal editor of new duplicated xblock (#36641)

Browse Source 
When duplicating an xblock in the authoring MFE, the iframe was opening its own editor modal instead of the MFE modal.
This commit is contained in:
Daniel Valenzuela
2025-05-20 17:29:32 -04:00
committed by GitHub
parent 1002f5f91b
commit c20e6ec7f3
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/djangoapps/contentstore/rest_api/v1/serializers/course_waffle_flags.py
View File

@@ -29,6 +29,7 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
use_new_group_configurations_page = serializers.SerializerMethodField()
enable_course_optimizer = serializers.SerializerMethodField()
use_react_markdown_editor = serializers.SerializerMethodField()
use_video_gallery_flow = serializers.SerializerMethodField()
def get_course_key(self):
"""
@@ -160,3 +161,9 @@ class CourseWaffleFlagsSerializer(serializers.Serializer):
"""
course_key = self.get_course_key()
return toggles.use_react_markdown_editor(course_key)
def get_use_video_gallery_flow(self, obj):
"""
Method to get the use_video_gallery_flow waffle flag
"""
return toggles.use_video_gallery_flow()

3
cms/djangoapps/contentstore/rest_api/v1/views/course_waffle_flags.py
View File

@@ -61,8 +61,9 @@ class CourseWaffleFlagsView(APIView):
"use_new_course_team_page": true,
"use_new_certificates_page": true,
"use_new_textbooks_page": true,
"use_new_group_configurations_page": true
"use_new_group_configurations_page": true,
"use_react_markdown_editor": true,
"use_video_gallery_flow": true
}
```
"""

1
cms/djangoapps/contentstore/rest_api/v1/views/tests/test_course_waffle_flags.py
View File

@@ -34,6 +34,7 @@ class CourseWaffleFlagsViewTest(CourseTestCase):
'use_new_updates_page': True,
'use_new_video_uploads_page': False,
'use_react_markdown_editor': False,
'use_video_gallery_flow': False,
}
def setUp(self):

23
cms/static/js/views/pages/container.js
View File

@@ -64,6 +64,8 @@ function($, _, Backbone, gettext, BasePage,
this.isLibraryPage = this.model.attributes.category === 'library';
this.isLibraryContentPage = this.model.attributes.category === 'library_content';
this.isSplitTestContentPage = this.model.attributes.category === 'split_test';
this.isVerticalContentPage = this.model.attributes.category === 'vertical';
this.nameEditor = new XBlockStringFieldEditor({
el: this.$('.wrapper-xblock-field'),
model: this.model
@@ -160,6 +162,9 @@ function($, _, Backbone, gettext, BasePage,
case 'completeManageXBlockAccess':
this.refreshXBlock(xblockElement, false);
break;
case 'completeXBlockDuplicating':
this.refreshXBlock(xblockElement, true, true);
break;
case 'completeXBlockMoving':
xblockWrapper.hide();
break;
@@ -1153,15 +1158,7 @@ function($, _, Backbone, gettext, BasePage,
|| (useNewVideoEditor === 'True' && blockType.includes('video'))
|| (useNewProblemEditor === 'True' && blockType.includes('problem')))
){
var destinationUrl;
if (useVideoGalleryFlow === 'True' && blockType.includes('video')) {
destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/course-videos/' + encodeURI(data.locator);
}
else {
destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/' + blockType[1] + '/' + encodeURI(data.locator);
}
if (this.options.isIframeEmbed && this.isSplitTestContentPage) {
if (this.options.isIframeEmbed && (this.isSplitTestContentPage || this.isVerticalContentPage)) {
return this.postMessageToParent({
type: 'handleRedirectToXBlockEditPage',
message: 'Redirect to xBlock edit page',
@@ -1171,7 +1168,13 @@ function($, _, Backbone, gettext, BasePage,
},
});
}
var destinationUrl;
if (useVideoGalleryFlow === 'True' && blockType.includes('video')) {
destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/course-videos/' + encodeURI(data.locator);
}
else {
destinationUrl = this.$('.xblock-header-primary').attr("authoring_MFE_base_url") + '/' + blockType[1] + '/' + encodeURI(data.locator);
}
window.location.href = destinationUrl;
return;
}