fix: cast progress graph configuration to string (#495) (#516)

(cherry picked from commit 51e5e7126c)

.env

@@ -28,3 +28,4 @@ ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
 ENABLE_NEW_EDITOR_PAGES=true
 BBB_LEARN_MORE_URL=''
+ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=false

.env.development

@@ -30,3 +30,4 @@ ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
 ENABLE_NEW_EDITOR_PAGES=true
 BBB_LEARN_MORE_URL=''
+ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=false

.env.test

@@ -29,3 +29,4 @@ ENABLE_PROGRESS_GRAPH_SETTINGS=false
 ENABLE_TEAM_TYPE_SETTING=false
 ENABLE_NEW_EDITOR_PAGES=true
 BBB_LEARN_MORE_URL=''
+ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN=true

.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/validate.yml

@@ -9,14 +9,13 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ env.NODE_VER }}
     - run: make validate.ci
     - name: Upload coverage
       uses: codecov/codecov-action@v3

.nvmrc

@@ -1 +1 @@
-v16
+18

package.json

@@ -37,7 +37,7 @@
     "@edx/frontend-component-footer": "11.1.1",
     "@edx/frontend-lib-content-components": "^1.131.0",
     "@edx/frontend-platform": "2.5.1",
-    "@edx/paragon": "^20.28.0",
+    "@edx/paragon": "^20.38.0",
     "@fortawesome/fontawesome-svg-core": "1.2.28",
     "@fortawesome/free-brands-svg-icons": "5.11.2",
     "@fortawesome/free-regular-svg-icons": "5.11.2",
@@ -66,7 +66,7 @@
   },
   "devDependencies": {
     "@edx/browserslist-config": "1.0.0",
-    "@edx/frontend-build": "12.3.0",
+    "@edx/frontend-build": "12.8.38",
     "@edx/reactifex": "^1.0.3",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "12.1.1",

src/pages-and-resources/progress/Settings.jsx

@@ -10,7 +10,7 @@ import messages from './messages';
 
 const ProgressSettings = ({ intl, onClose }) => {
   const [disableProgressGraph, saveSetting] = useAppSetting('disableProgressGraph');
-  const showProgressGraphSetting = getConfig().ENABLE_PROGRESS_GRAPH_SETTINGS.toLowerCase() === 'true';
+  const showProgressGraphSetting = getConfig().ENABLE_PROGRESS_GRAPH_SETTINGS.toString().toLowerCase() === 'true';
 
   const handleSettingsSave = (values) => {
     if (showProgressGraphSetting) { saveSetting(!values.enableProgressGraph); }

src/studio-header/Header.jsx

@@ -48,9 +48,11 @@ const Header = ({
           <div className="mb-1 small">
             <a rel="noopener" href={`${config.STUDIO_BASE_URL}/textbooks/${courseId}`}>{intl.formatMessage(messages['header.links.textbooks'])}</a>
           </div>
+          {process.env.ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN === 'true' && (
             <div className="mb-1 small">
               <a rel="noopener" href={`${config.STUDIO_BASE_URL}/videos/${courseId}`}>{intl.formatMessage(messages['header.links.videoUploads'])}</a>
             </div>
+          )}
         </>
       ),
     },

src/studio-header/Header.test.jsx

@@ -6,6 +6,7 @@ import { AppContext } from '@edx/frontend-platform/react';
 import { Context as ResponsiveContext } from 'react-responsive';
 import {
   cleanup,
+  fireEvent,
   render,
   screen,
 } from '@testing-library/react';
@@ -104,6 +105,46 @@ describe('<Header />', () => {
     expect(screen.getByTestId('edx-header-logo'));
   });
 
+  it('renders Video Uploads link', () => {
+    process.env.ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN = 'true';
+
+    const component = createComponent(
+      1280, (
+        <Header
+          courseId="course-v1:edX+DemoX+Demo_Course"
+          courseNumber="DemoX"
+          courseOrg="edX"
+          courseTitle="Demonstration Course"
+        />
+      ),
+    );
+
+    render(component);
+    fireEvent.click(screen.getByText('Content'));
+
+    expect(screen.getByText('Video Uploads')).toBeInTheDocument();
+  });
+
+  it('does not render Video Uploads link', () => {
+    process.env.ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN = 'false';
+
+    const component = createComponent(
+      1280, (
+        <Header
+          courseId="course-v1:edX+DemoX+Demo_Course"
+          courseNumber="DemoX"
+          courseOrg="edX"
+          courseTitle="Demonstration Course"
+        />
+      ),
+    );
+
+    render(component);
+    fireEvent.click(screen.getByText('Content'));
+
+    expect(screen.queryByText('Video Uploads')).toBeNull();
+  });
+
   afterEach(() => {
     cleanup();
   });