chore: add support for ora mfe url

openedx · Nov 27, 2023 · 6dcdc3c · 6dcdc3c
1 parent 8040408
commit 6dcdc3c
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 22 deletions.
diff --git a/openassessment/__init__.py b/openassessment/__init__.py
@@ -2,4 +2,4 @@
 Initialization Information for Open Assessment Module
 """
 
-__version__ = '6.0.7'
+__version__ = '6.0.8'
diff --git a/openassessment/xblock/openassessmentblock.py b/openassessment/xblock/openassessmentblock.py
@@ -629,6 +629,7 @@ def student_view(self, context=None):  # pylint: disable=unused-argument
             initialize_js_func='OpenAssessmentBlock',
             additional_js_context={
                 "MFE_VIEW_ENABLED": self.mfe_views_enabled and self.mfe_views_supported,
+                "ORA_MICROFRONTEND_URL": getattr(settings, 'ORA_MICROFRONTEND_URL', ''),
             }
         )
 

diff --git a/openassessment/xblock/static/dist/manifest.json b/openassessment/xblock/static/dist/manifest.json
@@ -4,10 +4,10 @@
   "openassessment-editor-textarea.js.map": "/openassessment-editor-textarea.b8f866ba96a1d2ad92a4.js.map",
   "openassessment-editor-tinymce.js": "/openassessment-editor-tinymce.2cc0cab55c3be729265e.js",
   "openassessment-editor-tinymce.js.map": "/openassessment-editor-tinymce.2cc0cab55c3be729265e.js.map",
-  "openassessment-lms.css": "/openassessment-lms.be9ec21845f2d141d3d4.css",
-  "openassessment-lms.js": "/openassessment-lms.be9ec21845f2d141d3d4.js",
-  "openassessment-lms.css.map": "/openassessment-lms.be9ec21845f2d141d3d4.css.map",
-  "openassessment-lms.js.map": "/openassessment-lms.be9ec21845f2d141d3d4.js.map",
+  "openassessment-lms.css": "/openassessment-lms.f4cf2dc4a6bd64c339d3.css",
+  "openassessment-lms.js": "/openassessment-lms.f4cf2dc4a6bd64c339d3.js",
+  "openassessment-lms.css.map": "/openassessment-lms.f4cf2dc4a6bd64c339d3.css.map",
+  "openassessment-lms.js.map": "/openassessment-lms.f4cf2dc4a6bd64c339d3.js.map",
   "openassessment-ltr.css": "/openassessment-ltr.5e4380a9281df732ca84.css",
   "openassessment-ltr.js": "/openassessment-ltr.5e4380a9281df732ca84.js",
   "openassessment-ltr.css.map": "/openassessment-ltr.5e4380a9281df732ca84.css.map",

diff --git a/openassessment/xblock/static/dist/openassessment-editor-textarea.js b/openassessment/xblock/static/dist/openassessment-editor-textarea.js
@@ -63,7 +63,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "1f4cf48400e88d37ff73";
+/******/ 	var hotCurrentHash = "7c5fa44084cb9c1b2b1e";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;

diff --git a/openassessment/xblock/static/dist/openassessment-editor-tinymce.js b/openassessment/xblock/static/dist/openassessment-editor-tinymce.js
@@ -63,7 +63,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "1f4cf48400e88d37ff73";
+/******/ 	var hotCurrentHash = "7c5fa44084cb9c1b2b1e";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;

diff --git a/openassessment/xblock/static/dist/openassessment-lms.be9ec21845f2d141d3d4.css b/openassessment/xblock/static/dist/openassessment-lms.be9ec21845f2d141d3d4.css
diff --git a/openassessment/xblock/static/dist/openassessment-lms.f4cf2dc4a6bd64c339d3.css b/openassessment/xblock/static/dist/openassessment-lms.f4cf2dc4a6bd64c339d3.css
diff --git a/...penassessment-lms.be9ec21845f2d141d3d4.js → ...penassessment-lms.f4cf2dc4a6bd64c339d3.js b/...penassessment-lms.be9ec21845f2d141d3d4.js → ...penassessment-lms.f4cf2dc4a6bd64c339d3.js
diff --git a/openassessment/xblock/static/dist/openassessment-lms.js b/openassessment/xblock/static/dist/openassessment-lms.js
diff --git a/openassessment/xblock/static/dist/openassessment-ltr.js b/openassessment/xblock/static/dist/openassessment-ltr.js
@@ -63,7 +63,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "1f4cf48400e88d37ff73";
+/******/ 	var hotCurrentHash = "7c5fa44084cb9c1b2b1e";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;

diff --git a/openassessment/xblock/static/dist/openassessment-rtl.js b/openassessment/xblock/static/dist/openassessment-rtl.js
@@ -63,7 +63,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "1f4cf48400e88d37ff73";
+/******/ 	var hotCurrentHash = "7c5fa44084cb9c1b2b1e";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;

diff --git a/openassessment/xblock/static/dist/openassessment-studio.js b/openassessment/xblock/static/dist/openassessment-studio.js
diff --git a/openassessment/xblock/static/js/src/lms/oa_base.js b/openassessment/xblock/static/js/src/lms/oa_base.js
@@ -43,7 +43,10 @@ export class BaseView {
       this.element = element;
       this.server = server;
 
-      this.show_mfe_views = data.CONTEXT?.MFE_VIEW_ENABLED && !window.navigator.userAgent.includes('org.edx.mobile');
+      const { ORA_MICROFRONTEND_URL, MFE_VIEW_ENABLED } = data.CONTEXT || {};
+
+      this.ORA_MICROFRONTEND_URL = ORA_MICROFRONTEND_URL;
+      this.show_mfe_views = ORA_MICROFRONTEND_URL && MFE_VIEW_ENABLED && !window.navigator.userAgent.includes('org.edx.mobile');
 
       const oraMfeView = $('#ora-mfe-view', this.element);
       const oraLegacyView = $('#ora-legacy-view', this.element);
@@ -281,9 +284,10 @@ export class BaseView {
 
         const oraMfeIframe = $('#ora-mfe-view>iframe', this.element);
         // TODO: put the ORA MFE URL in a config file
-        oraMfeIframe.attr('src', `http://localhost:1992/xblock/${courseId}/${xblockId}`);
+        oraMfeIframe.attr('src', `${this.ORA_MICROFRONTEND_URL}/xblock/${courseId}/${xblockId}`);
         /* eslint-disable-next-line prefer-arrow-callback */
         oraMfeIframe.on('load', function () {
+          /* eslint-disable-next-line prefer-arrow-callback */
           window.addEventListener('message', function (event) {
             if (event.data.type === 'plugin.resize') {
               const { height } = event.data.payload;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-ora2",
-  "version": "6.0.7",
+  "version": "6.0.8",
   "repository": "https://github.com/openedx/edx-ora2.git",
   "dependencies": {
     "@edx/frontend-build": "^6.1.1",