Merge remote-tracking branch 'origin/master' into braden/units-api

Author: pomegranited

.eslintignore

@@ -60,29 +60,28 @@ jobs:
           PIP_SRC: ${{ runner.temp }}
         run: |
           make test-requirements
-      
+
       - name: Install npm
         env:
           PIP_SRC: ${{ runner.temp }}
-        run: npm ci  
-      
+        run: npm ci
+
       - name: Install python packages
         env:
           PIP_SRC: ${{ runner.temp }}
         run: |
             pip install -e .
-      
+
       - name: Run Quality Tests
         env:
           PIP_SRC: ${{ runner.temp }}
           TARGET_BRANCH: ${{ github.base_ref }}
         run: |
             make pycodestyle
-            npm run lint
             make xsslint
             make pii_check
             make check_keywords
-          
+
       - name: Save Job Artifacts
         if: always()
         uses: actions/upload-artifact@v4

.eslintrc.json

@@ -12,11 +12,11 @@ Open edX Platform
 
 Purpose
 *******
-The `Open edX Platform <https://openedx.org>`_ is a service-oriented platform for authoring and
-delivering online learning at any scale.  The platform is written in
+The `Open edX Platform <https://openedx.org>`_ enables the authoring and
+delivery of online learning at any scale.  The platform is written in
 Python and JavaScript and makes extensive use of the Django
 framework. At the highest level, the platform is composed of a
-monolith, some independently deployable applications (IDAs), and
+modular monolith, some independently deployable applications (IDAs), and
 micro-frontends (MFEs) based on the ReactJS.
 
 This repository hosts the monolith at the center of the Open edX

.github/workflows/quality-checks.yml

@@ -86,9 +86,16 @@ def get_olx_validation_from_artifact():
                 reverse('usertaskstatus-detail', args=[status.uuid])
             )
 
+        # check if this is a course optimizer task
+        is_course_optimizer_task = False
+        course_optimizer_artifact = UserTaskArtifact.objects.filter(status=status, name="BrokenLinks").first()
+        if course_optimizer_artifact:
+            is_course_optimizer_task = True
+
         user_email = status.user.email
         olx_validation_text = get_olx_validation_from_artifact()
-        task_args = [task_name, str(status.state_text), user_email, detail_url, olx_validation_text]
+        task_args = [task_name, str(status.state_text), user_email, detail_url,
+                     olx_validation_text, is_course_optimizer_task]
         try:
             send_task_complete_email.delay(*task_args)
         except Exception:  # pylint: disable=broad-except

README.rst

@@ -21,17 +21,18 @@
 
 @shared_task(bind=True)
 @set_code_owner_attribute
-def send_task_complete_email(self, task_name, task_state_text, dest_addr, detail_url, olx_validation_text=None):
+def send_task_complete_email(self, task_name, task_state_text, dest_addr, detail_url,
+                             olx_validation_text=None, is_course_optimizer_task=False):
     """
     Sending an email to the users when an async task completes.
     """
     retries = self.request.retries
-
     context = {
         'task_name': task_name,
         'task_status': task_state_text,
         'detail_url': detail_url,
         'olx_validation_errors': {},
+        'is_course_optimizer_task': is_course_optimizer_task,
     }
     if olx_validation_text:
         try:

cms/djangoapps/cms_user_tasks/signals.py

@@ -1215,15 +1215,15 @@ def _get_urls(content):
     """
     Finds and returns a list of URLs in the given content.
     Includes strings following 'href=' and 'src='.
-    Excludes strings that are only '#'.
+    Excludes strings that are only '#' or start with 'data:'.
 
     Arguments:
         content (str): entire content of a block
 
     Returns:
         list: urls
     """
-    regex = r'\s+(?:href|src)=["\'](?!#)([^"\']*)["\']'
+    regex = r'\s+(?:href|src)=["\'](?!#|data:)([^"\']*)["\']'
     url_list = re.findall(regex, content)
     return url_list
 

cms/djangoapps/cms_user_tasks/tasks.py

@@ -577,3 +577,28 @@ def test_convert_to_standard_url(self):
                 expected,
                 f"Failed for URL: {url}",
             )
+
+    def test_get_urls(self):
+        """Test _get_urls function for correct URL extraction."""
+
+        content = '''
+            <a href="https://example.com">Link</a>
+            <img src="https://images.com/pic.jpg">
+            <link href="https://fonts.googleapis.com/css?family=Roboto">
+            <a href="#">Home</a>
+            <a href="https://validsite.com">Valid</a>
+            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAA...">
+            <a href="data:application/pdf;base64,JVBERi0xLjQK...">
+            <a href="https://another-valid.com">Another</a>
+            <p>No links here!</p>
+            <img alt="Just an image without src">
+        '''
+
+        expected = [
+            "https://example.com",
+            "https://images.com/pic.jpg",
+            "https://fonts.googleapis.com/css?family=Roboto",
+            "https://validsite.com",
+            "https://another-valid.com"
+        ]
+        self.assertEqual(_get_urls(content), expected)

cms/djangoapps/contentstore/tasks.py

@@ -3,6 +3,10 @@
 
 ${_("Your {task_name} task has completed with the status '{task_status}'. Use this URL to view task details or download any files created: {detail_url}").format(task_name=task_name, task_status=task_status, detail_url=detail_url)}
 
+% elif is_course_optimizer_task:
+
+${_("Your {task_name} task has completed with the status '{task_status}'. Sign in to view the details of your task.").format(task_name=task_name, task_status=task_status)}
+
 % else:
 
 ${_("Your {task_name} task has completed with the status '{task_status}'. Sign in to view the details of your task or download any files created.").format(task_name=task_name, task_status=task_status)}