From df5abfbca0f2a6af140583d5fdffa8fea214c281 Mon Sep 17 00:00:00 2001
From: Hina Khadim <hina.khadim@arbisoft.com>
Date: Mon, 2 Dec 2024 20:17:11 +0500
Subject: [PATCH 1/5] fix: update env.config.jsx according to tutor-mfe#240 PR

---
 .../mfe-env-config-buildtime-definitions}     |  37 ------
 .../patches/mfe-env-config-buildtime-imports  |   4 +
 .../mfe-env-config-runtime-definitions        |   2 +
 tutorindigo/plugin.py                         | 115 ++++++++++--------
 4 files changed, 67 insertions(+), 91 deletions(-)
 rename tutorindigo/{templates/indigo/env.config.jsx => patches/mfe-env-config-buildtime-definitions} (75%)
 create mode 100644 tutorindigo/patches/mfe-env-config-buildtime-imports
 create mode 100644 tutorindigo/patches/mfe-env-config-runtime-definitions

diff --git a/tutorindigo/templates/indigo/env.config.jsx b/tutorindigo/patches/mfe-env-config-buildtime-definitions
similarity index 75%
rename from tutorindigo/templates/indigo/env.config.jsx
rename to tutorindigo/patches/mfe-env-config-buildtime-definitions
index ca3b7044..96bf159b 100644
--- a/tutorindigo/templates/indigo/env.config.jsx
+++ b/tutorindigo/patches/mfe-env-config-buildtime-definitions
@@ -1,9 +1,4 @@
-import React, { useEffect } from 'react';
-import Cookies from 'universal-cookie';
 
-import Footer from '@edly-io/indigo-frontend-component-footer';
-import { getConfig } from '@edx/frontend-platform';
-import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
 
 let themeCookie = 'indigo-toggle-dark';
 let themeCookieExpiry = 90; // days
@@ -70,35 +65,3 @@ const AddDarkTheme = () => {
 
   return (<div />);
 };
-
-const themePluginSlot = {
-  keepDefault: false,
-  plugins: [
-    {
-      op: PLUGIN_OPERATIONS.Insert,
-      widget: {
-        id: 'default_contents',
-        type: DIRECT_PLUGIN,
-        priority: 1,
-        RenderWidget: <Footer />,
-      },
-    },
-    {
-      op: PLUGIN_OPERATIONS.Insert,
-      widget: {
-        id: 'read_theme_cookie',
-        type: DIRECT_PLUGIN,
-        priority: 2,
-        RenderWidget: AddDarkTheme,
-      },
-    },
-  ],
-};
-
-const config = {
-  pluginSlots: {
-    footer_slot: themePluginSlot,
-  },
-};
-
-export default config;
diff --git a/tutorindigo/patches/mfe-env-config-buildtime-imports b/tutorindigo/patches/mfe-env-config-buildtime-imports
new file mode 100644
index 00000000..911c11c7
--- /dev/null
+++ b/tutorindigo/patches/mfe-env-config-buildtime-imports
@@ -0,0 +1,4 @@
+import React, { useEffect } from 'react';
+import Cookies from 'universal-cookie';
+
+import { getConfig } from '@edx/frontend-platform';
diff --git a/tutorindigo/patches/mfe-env-config-runtime-definitions b/tutorindigo/patches/mfe-env-config-runtime-definitions
new file mode 100644
index 00000000..2204c730
--- /dev/null
+++ b/tutorindigo/patches/mfe-env-config-runtime-definitions
@@ -0,0 +1,2 @@
+
+const { default: IndigoFooter } = await import('@edly-io/indigo-frontend-component-footer');
diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py
index 1a3311dd..5cfd3bf6 100644
--- a/tutorindigo/plugin.py
+++ b/tutorindigo/plugin.py
@@ -1,10 +1,12 @@
 from __future__ import annotations
 
 import os
+from glob import glob
 import typing as t
 
 import importlib_resources
 from tutor import hooks
+from tutormfe.hooks import PLUGIN_SLOTS
 from tutor.__about__ import __version_suffix__
 
 from .__about__ import __version__
@@ -102,68 +104,27 @@ def _override_openedx_docker_image(
 hooks.Filters.CONFIG_OVERRIDES.add_items(list(config["overrides"].items()))
 
 
+#  MFEs that are styled using Indigo
+indigo_styled_mfes = ['learning', 'learner-dashboard', 'profile', 'account', 'discussions']
+
 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",
+    [(
+        f"mfe-dockerfile-post-npm-install-{mfe}",
             """
-RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.1.3'
+            
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
-
-COPY indigo/env.config.jsx /openedx/app/
-""",
-        ),
-        (
-            "mfe-dockerfile-post-npm-install-authn",
-            """
-RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
-""",
-        ),
-        # Tutor-Indigo v2.1 targets the styling updates in discussions and learner-dashboard MFE
-        # brand-openedx is related to styling updates while others are for header and footer updates
-        (
-            "mfe-dockerfile-post-npm-install-discussions",
-            """
-RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
 RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.1.3'
-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.1.1'
-RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
-
-COPY indigo/env.config.jsx /openedx/app/
-""",
-        ),
-        (
-            "mfe-dockerfile-post-npm-install-profile",
-            """
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.1.3'
-RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
 
-COPY indigo/env.config.jsx /openedx/app/
 """,
-        ),
-        (
-            "mfe-dockerfile-post-npm-install-account",
-            """
-RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
-RUN npm install '@edx/frontend-component-header@npm:@edly-io/indigo-frontend-component-header@^3.1.3'
-RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
+    ) for  mfe in indigo_styled_mfes]
+)
 
-COPY indigo/env.config.jsx /openedx/app/
-""",
-        ),
-    ]
+hooks.Filters.ENV_PATCHES.add_item(
+    (
+        "mfe-dockerfile-post-npm-install-authn",
+        "RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'",
+    )
 )
 
 # Include js file in lms main.html, main_django.html, and certificate.html
@@ -204,3 +165,49 @@ def _override_openedx_docker_image(
         ),
     ]
 )
+
+
+# Apply patches from tutor-indigo
+for path in glob(
+    os.path.join(
+        str(importlib_resources.files("tutorindigo") / "patches"),
+        "*",
+    )
+):
+    with open(path, encoding="utf-8") as patch_file:
+        hooks.Filters.ENV_PATCHES.add_item(
+            (os.path.basename(path), patch_file.read())
+        )
+
+
+for mfe in indigo_styled_mfes:
+    PLUGIN_SLOTS.add_item(
+        (
+            mfe,
+            "footer_slot",
+            """ 
+            {
+                op: PLUGIN_OPERATIONS.Hide,
+                widgetId: 'default_contents',
+            },
+            {
+                op: PLUGIN_OPERATIONS.Insert,
+                widget: {
+                    id: 'default_contents',
+                    type: DIRECT_PLUGIN,
+                    priority: 1,
+                    RenderWidget: <IndigoFooter />,
+                },
+            },
+            {
+                op: PLUGIN_OPERATIONS.Insert,
+                widget: {
+                    id: 'read_theme_cookie',
+                    type: DIRECT_PLUGIN,
+                    priority: 2,
+                    RenderWidget: AddDarkTheme,
+                },
+            },
+  """
+        ),
+    )

From 3af88284c3bb1d32d3a99c734adf48dc5b1a5244 Mon Sep 17 00:00:00 2001
From: Hina Khadim <hina.khadim@arbisoft.com>
Date: Tue, 10 Dec 2024 12:12:16 +0500
Subject: [PATCH 2/5] chore: install tutor-mfe main branch

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5a023449..51decd62 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,5 +20,6 @@ jobs:
       - name: Install dependencies
         run: |
           pip install .[dev]
+          pip install git+https://github.com/overhangio/tutor-mfe.git@main
       - name: Test lint, types, and format
         run: make test

From 11201f11f491a16c1705f67693ad9e986aa9ea3f Mon Sep 17 00:00:00 2001
From: Hina Khadim <hina.khadim@arbisoft.com>
Date: Tue, 10 Dec 2024 12:54:07 +0500
Subject: [PATCH 3/5] chore: update tutor-mfe install in ci

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 51decd62..0fece904 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,6 @@ jobs:
       - name: Install dependencies
         run: |
           pip install .[dev]
-          pip install git+https://github.com/overhangio/tutor-mfe.git@main
+          pip install git+https://github.com/overhangio/tutor-mfe.git@main#egg=tutor-mfe
       - name: Test lint, types, and format
         run: make test

From a123dbbf34c774ea2f0a4ce237a1b26329d46b53 Mon Sep 17 00:00:00 2001
From: Hina Khadim <hina.khadim@arbisoft.com>
Date: Tue, 10 Dec 2024 12:58:38 +0500
Subject: [PATCH 4/5] chore: fix tutor-mfe pip install

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0fece904..e78ba603 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,6 @@ jobs:
       - name: Install dependencies
         run: |
           pip install .[dev]
-          pip install git+https://github.com/overhangio/tutor-mfe.git@main#egg=tutor-mfe
+          pip install --upgrade --editable git+https://github.com/overhangio/tutor-mfe.git@main#egg=tutor-mfe
       - name: Test lint, types, and format
         run: make test

From 1cb86bda018929392d2368ca021f1add875c3851 Mon Sep 17 00:00:00 2001
From: Hina Khadim <hina.khadim@arbisoft.com>
Date: Tue, 10 Dec 2024 14:04:44 +0500
Subject: [PATCH 5/5] chore: fixing formatting using black'

---
 tutorindigo/plugin.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py
index 5cfd3bf6..64d29009 100644
--- a/tutorindigo/plugin.py
+++ b/tutorindigo/plugin.py
@@ -105,11 +105,18 @@ def _override_openedx_docker_image(
 
 
 #  MFEs that are styled using Indigo
-indigo_styled_mfes = ['learning', 'learner-dashboard', 'profile', 'account', 'discussions']
+indigo_styled_mfes = [
+    "learning",
+    "learner-dashboard",
+    "profile",
+    "account",
+    "discussions",
+]
 
 hooks.Filters.ENV_PATCHES.add_items(
-    [(
-        f"mfe-dockerfile-post-npm-install-{mfe}",
+    [
+        (
+            f"mfe-dockerfile-post-npm-install-{mfe}",
             """
             
 RUN npm install @edly-io/indigo-frontend-component-footer@^2.0.0
@@ -117,7 +124,9 @@ def _override_openedx_docker_image(
 RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^2.1.1'
 
 """,
-    ) for  mfe in indigo_styled_mfes]
+        )
+        for mfe in indigo_styled_mfes
+    ]
 )
 
 hooks.Filters.ENV_PATCHES.add_item(
@@ -175,9 +184,7 @@ def _override_openedx_docker_image(
     )
 ):
     with open(path, encoding="utf-8") as patch_file:
-        hooks.Filters.ENV_PATCHES.add_item(
-            (os.path.basename(path), patch_file.read())
-        )
+        hooks.Filters.ENV_PATCHES.add_item((os.path.basename(path), patch_file.read()))
 
 
 for mfe in indigo_styled_mfes:
@@ -208,6 +215,6 @@ def _override_openedx_docker_image(
                     RenderWidget: AddDarkTheme,
                 },
             },
-  """
+  """,
         ),
     )