Merge branch 'master' into keblysh/feat/correct-image-for-fb-sharing

Author: vladislavkeblysh

.github/workflows/js-tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        node-version: [ 16 ]
+        node-version: [ 18 ]
         python-version: [ 3.8 ]
 
     steps:
@@ -28,13 +28,13 @@ jobs:
         node-version: ${{ matrix.node-version }}
 
     - name: Setup npm
-      run: npm i -g npm@8.5.x
+      run: npm i -g npm@10.5.x
 
-    - name: Install Firefox 61.0
+    - name: Install Firefox 123.0
       run: |
         sudo apt-get purge firefox
-        wget "https://ftp.mozilla.org/pub/firefox/releases/61.0/linux-x86_64/en-US/firefox-61.0.tar.bz2"
-        tar -xjf firefox-61.0.tar.bz2
+        wget "https://ftp.mozilla.org/pub/firefox/releases/123.0/linux-x86_64/en-US/firefox-123.0.tar.bz2"
+        tar -xjf firefox-123.0.tar.bz2
         sudo mv firefox /opt/firefox
         sudo ln -s /opt/firefox/firefox /usr/bin/firefox
 

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.github/workflows/static-assets-check.yml

@@ -14,8 +14,8 @@ jobs:
       matrix:
         os: [ ubuntu-20.04 ]
         python-version: [ 3.8 ]
-        node-version: [ 16 ]
-        npm-version: [ 8.5.x ]
+        node-version: [ 18 ]
+        npm-version: [ 10.5.x ]
         mongo-version: ["4.4", "7.0"]
 
     services:

.nvmrc

@@ -0,0 +1 @@
+18

Dockerfile

@@ -114,8 +114,8 @@ RUN pip install -r requirements/pip.txt
 RUN pip install -r requirements/edx/base.txt
 
 # Install node and npm
-RUN nodeenv /edx/app/edxapp/nodeenv --node=16.14.0 --prebuilt
-RUN npm install -g npm@8.5.x
+RUN nodeenv /edx/app/edxapp/nodeenv --node=18.19.0 --prebuilt
+RUN npm install -g npm@10.5.x
 
 # This script is used by an npm post-install hook.
 # We copy it into the image now so that it will be available when we run `npm install` in the next step.

cms/envs/common.py

@@ -581,7 +581,7 @@
     'ENABLE_GRADING_METHOD_IN_PROBLEMS': False,
 
     # See annotations in lms/envs/common.py for details.
-    'ENABLE_BLAKE2B_HASHiNG': False,
+    'ENABLE_BLAKE2B_HASHING': False,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE

common/static/common/js/karma.common.conf.js

@@ -49,17 +49,6 @@ var firefox = require('selenium-webdriver/firefox');
 
 var webpackConfig = require(path.join(appRoot, 'webpack.dev.config.js'));
 
-// The following crazy bit is to work around the webpack.optimize.CommonsChunkPlugin
-// plugin. The problem is that it it factors out the code that defines webpackJsonp
-// and puts in in the commons JS, which Karma doesn't know to load first. This is a
-// workaround recommended in the karma-webpack bug report that basically just removes
-// the plugin for the purposes of Karma testing (the plugin is meant to be an
-// optimization only).
-//     https://github.com/webpack-contrib/karma-webpack/issues/24#issuecomment-257613167
-//
-// This should be fixed in v3 of karma-webpack
-var commonsChunkPluginIndex = webpackConfig[0].plugins.findIndex(function(plugin) { return plugin.chunkNames; });
-
 // Files which are needed by all lms/cms suites.
 var commonFiles = {
     libraryFiles: [
@@ -83,10 +72,6 @@ var commonFiles = {
     ]
 };
 
-webpackConfig[0].plugins.splice(commonsChunkPluginIndex, 1);
-
-delete webpackConfig[0].entry;
-
 /**
  * Customize the name attribute in xml testcase element
  * @param {Object} browser

lms/djangoapps/certificates/views/webview.py

@@ -407,14 +407,15 @@ def _update_organization_context(context, course):
     Updates context with organization related info.
     """
     partner_long_name, organization_logo = None, None
-    partner_short_name = course.display_organization if course.display_organization else course.org
+    course_org_display = course.display_organization
     organizations = organizations_api.get_course_organizations(course_key=course.id)
     if organizations:
         # TODO Need to add support for multiple organizations, Currently we are interested in the first one.
         organization = organizations[0]
         partner_long_name = organization.get('name', partner_long_name)
-        partner_short_name = organization.get('short_name', partner_short_name)
+        course_org_display = course_org_display or organization.get('short_name')
         organization_logo = organization.get('logo', None)
+    partner_short_name = course_org_display or course.org
 
     context['organization_long_name'] = partner_long_name
     context['organization_short_name'] = partner_short_name