From 84c92678da5974bc0e15f9a6a1fee4876e4c90f6 Mon Sep 17 00:00:00 2001
From: hinakhadim <hina.khadim@arbisoft.com>
Date: Fri, 16 Aug 2024 16:09:44 +0500
Subject: [PATCH 1/3] fix: account-mfe bug

---
 tutorindigo/plugin.py                       | 19 +++++++++++----
 tutorindigo/templates/indigo/env.config.jsx | 27 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 tutorindigo/templates/indigo/env.config.jsx

diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py
index 982983f16..1659e31bc 100644
--- a/tutorindigo/plugin.py
+++ b/tutorindigo/plugin.py
@@ -108,7 +108,9 @@ def _override_openedx_docker_image(
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
-RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^2.0.0'
+RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
+
+COPY indigo/env.config.jsx /openedx/app/
 """,
         ),
         (
@@ -124,14 +126,18 @@ def _override_openedx_docker_image(
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
-RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^2.0.0'
+RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
+
+COPY indigo/env.config.jsx /openedx/app/
 """,
         ),
         (
             "mfe-dockerfile-post-npm-install-learner-dashboard",
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
-RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^2.0.0'
+RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
+
+COPY indigo/env.config.jsx /openedx/app/
 """,
         ),
         (
@@ -139,8 +145,9 @@ def _override_openedx_docker_image(
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
-RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^2.0.0'
+RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
+COPY indigo/env.config.jsx /openedx/app/
 """,
         ),
         (
@@ -148,7 +155,9 @@ def _override_openedx_docker_image(
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
-RUN npm install '@edx/frontend-component-footer@npm:@edly-io/indigo-frontend-component-footer@^2.0.0'
+RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
+
+COPY indigo/env.config.jsx /openedx/app/
 """,
         ),
     ]
diff --git a/tutorindigo/templates/indigo/env.config.jsx b/tutorindigo/templates/indigo/env.config.jsx
new file mode 100644
index 000000000..d43741b27
--- /dev/null
+++ b/tutorindigo/templates/indigo/env.config.jsx
@@ -0,0 +1,27 @@
+import React, { useEffect } from 'react';
+
+import Footer from '@edly-io/indigo-frontend-component-footer';
+import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
+
+const themePluginSlot = {
+  keepDefault: false,
+  plugins: [
+    {
+      op: PLUGIN_OPERATIONS.Insert,
+      widget: {
+        id: 'default_contents',
+        type: DIRECT_PLUGIN,
+        priority: 1,
+        RenderWidget: <Footer />,
+      },
+    }
+  ],
+};
+
+const config = {
+  pluginSlots: {
+    footer_slot: themePluginSlot,
+  },
+};
+
+export default config;
\ No newline at end of file

From 392966d6744fcf84d959999975b8db01cf0ed61e Mon Sep 17 00:00:00 2001
From: hinakhadim <hina.khadim@arbisoft.com>
Date: Fri, 16 Aug 2024 17:28:30 +0500
Subject: [PATCH 2/3] fix: account-mfe bug 2

---
 tutorindigo/plugin.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py
index 1659e31bc..e41b6883a 100644
--- a/tutorindigo/plugin.py
+++ b/tutorindigo/plugin.py
@@ -47,6 +47,7 @@
 hooks.Filters.ENV_TEMPLATE_TARGETS.add_items(
     [
         ("indigo", "build/openedx/themes"),
+        ("indigo/env.config.jsx", "plugins/mfe/build/mfe"),
     ],
 )
 
@@ -107,7 +108,7 @@ def _override_openedx_docker_image(
             "mfe-dockerfile-post-npm-install-learning",
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
+RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@~3.0.0'
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
 COPY indigo/env.config.jsx /openedx/app/
@@ -125,7 +126,7 @@ def _override_openedx_docker_image(
             "mfe-dockerfile-post-npm-install-discussions",
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
+RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@~3.0.0'
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
 COPY indigo/env.config.jsx /openedx/app/
@@ -144,7 +145,7 @@ def _override_openedx_docker_image(
             "mfe-dockerfile-post-npm-install-profile",
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
+RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@~3.0.0'
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
 COPY indigo/env.config.jsx /openedx/app/
@@ -154,7 +155,7 @@ def _override_openedx_docker_image(
             "mfe-dockerfile-post-npm-install-account",
             """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.0.0'{% if INDIGO_ENABLE_DARK_THEME %} --theme=dark{% endif %}
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.0.0'
+RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@~3.0.0'
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
 COPY indigo/env.config.jsx /openedx/app/

From 9fe312f3bae5e88f2918566660dbdcff4aae8a62 Mon Sep 17 00:00:00 2001
From: hinakhadim <hina.khadim@arbisoft.com>
Date: Tue, 27 Aug 2024 12:43:10 +0500
Subject: [PATCH 3/3] refactor: remove unused useEffect in env.config.jsx and
 add comment

---
 tutorindigo/plugin.py                       | 2 ++
 tutorindigo/templates/indigo/env.config.jsx | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py
index e41b6883a..918c20658 100644
--- a/tutorindigo/plugin.py
+++ b/tutorindigo/plugin.py
@@ -104,6 +104,8 @@ def _override_openedx_docker_image(
 
 hooks.Filters.ENV_PATCHES.add_items(
     [
+        # MFE will install header version 3.0.x and will include indigo-footer as a
+        # separate package for use in env.config.jsx
         (
             "mfe-dockerfile-post-npm-install-learning",
             """
diff --git a/tutorindigo/templates/indigo/env.config.jsx b/tutorindigo/templates/indigo/env.config.jsx
index d43741b27..87b96313c 100644
--- a/tutorindigo/templates/indigo/env.config.jsx
+++ b/tutorindigo/templates/indigo/env.config.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 
 import Footer from '@edly-io/indigo-frontend-component-footer';
 import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
@@ -24,4 +24,4 @@ const config = {
   },
 };
 
-export default config;
\ No newline at end of file
+export default config;