Merge remote-tracking branch 'origin/master' into nightly

overhangio · Mar 6, 2024 · ab7f492 · ab7f492
2 parents d985d60 + 6e2809a
commit ab7f492
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 2 deletions.
diff --git a/changelog.d/20240206_100528_arbrandes_fix_dev_runtime_config.md b/changelog.d/20240206_100528_arbrandes_fix_dev_runtime_config.md
@@ -0,0 +1 @@
+- [Bugfix] Fix MFE runtime config via site configuration in dev mode (by @arbrandes).
diff --git a/changelog.d/20240220_180043_hina.khadim_mfe_url_issue.md b/changelog.d/20240220_180043_hina.khadim_mfe_url_issue.md
@@ -0,0 +1 @@
+- [BugFix] Fix issue of MFE_HOST url redirection to LMS_HOST (by @hinakhadim)
diff --git a/changelog.d/20240301_160746_romulo_add_course_authoring_url_mfe_config.md b/changelog.d/20240301_160746_romulo_add_course_authoring_url_mfe_config.md
@@ -0,0 +1 @@
+- [Improvement] Adds the "COURSE_AUTHORING_MFE_BASE_URL" to MFE_CONFIG pointing to the Course Authoring MFE address. (by @rpenido)
diff --git a/changelog.d/20240305_113936_moises.gonzalez_fix_dev_settings_rendering.md b/changelog.d/20240305_113936_moises.gonzalez_fix_dev_settings_rendering.md
@@ -0,0 +1 @@
+- [Bugfix] add a missing curly braces in the openedx-lms-development-settings patch
diff --git a/tutormfe/patches/caddyfile b/tutormfe/patches/caddyfile
@@ -1,5 +1,5 @@
 {{ MFE_HOST }}{$default_site_port} {
-    respond / 204
+    redir / {% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ LMS_HOST }}
     request_body {
         max_size 2MB
     }

diff --git a/tutormfe/patches/openedx-lms-development-settings b/tutormfe/patches/openedx-lms-development-settings
@@ -38,6 +38,7 @@ MFE_CONFIG["ACCOUNT_SETTINGS_URL"] = ACCOUNT_MICROFRONTEND_URL
 {% if get_mfe("course-authoring") %}
 MFE_CONFIG["ENABLE_NEW_EDITOR_PAGES"] = True
 MFE_CONFIG["ENABLE_PROGRESS_GRAPH_SETTINGS"] = True
+MFE_CONFIG["COURSE_AUTHORING_MICROFRONTEND_URL"] = "http://{{ MFE_HOST }}:{{ get_mfe("course-authoring")["port"] }}/course-authoring"
 {% endif %}
 
 {% if get_mfe("discussions") %}

diff --git a/tutormfe/patches/openedx-lms-production-settings b/tutormfe/patches/openedx-lms-production-settings
@@ -39,6 +39,7 @@ MFE_CONFIG["ACCOUNT_SETTINGS_URL"] = ACCOUNT_MICROFRONTEND_URL
 {% if get_mfe("course-authoring") %}
 MFE_CONFIG["ENABLE_NEW_EDITOR_PAGES"] = True
 MFE_CONFIG["ENABLE_PROGRESS_GRAPH_SETTINGS"] = True
+MFE_CONFIG["COURSE_AUTHORING_MICROFRONTEND_URL"] = "{% if ENABLE_HTTPS %}https://{% else %}http://{% endif %}{{ MFE_HOST }}/course-authoring"
 {% endif %}
 
 {% if get_mfe("discussions") %}

diff --git a/tutormfe/templates/mfe/apps/mfe/webpack.dev-tutor.config.js b/tutormfe/templates/mfe/apps/mfe/webpack.dev-tutor.config.js
@@ -15,7 +15,10 @@ module.exports = merge(baseDevConfig, {
     // https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md
     allowedHosts: 'all',
     proxy: {
-      '/api/mfe_config/v1' : 'http://{{ LMS_HOST }}:8000',
+      '/api/mfe_config/v1': {
+        target: 'http://{{ LMS_HOST }}:8000',
+        changeOrigin: true,
+      }
     }
   },
 })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] Fix MFE runtime config via site configuration in dev mode (by @arbrandes).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [BugFix] Fix issue of MFE_HOST url redirection to LMS_HOST (by @hinakhadim)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Improvement] Adds the "COURSE_AUTHORING_MFE_BASE_URL" to MFE_CONFIG pointing to the Course Authoring MFE address. (by @rpenido)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] add a missing curly braces in the openedx-lms-development-settings patch