Merge pull request #362 from raccoongang/fix/fix-responsive-issues

fix: fix sidebar scrolling and adaptation for mobile

.env

@@ -32,4 +32,3 @@ ENTERPRISE_MARKETING_UTM_CAMPAIGN=''
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM=''
 APP_ID=''
 MFE_CONFIG_API_URL=''
-DISPLAY_FEEDBACK_WIDGET='true'

.env.development

@@ -39,4 +39,3 @@ ENTERPRISE_MARKETING_UTM_CAMPAIGN='example.com Referral'
 ENTERPRISE_MARKETING_FOOTER_UTM_MEDIUM='Footer'
 APP_ID=''
 MFE_CONFIG_API_URL=''
-DISPLAY_FEEDBACK_WIDGET='false'

.eslintignore

@@ -3,4 +3,3 @@ dist/
 node_modules/
 src/postcss.config.js
 src/segment.js
-src/lightning.js

.github/workflows/ci.yml

@@ -11,22 +11,18 @@ on:
 jobs:
   test:
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        node: [16]
-        npm: [8.5.x]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
 
     - name: Setup Nodejs
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
-
-    - name: Install npm 8.5.x
-      run: npm install -g npm@${{ matrix.npm }}
+        node-version: ${{ env.NODE_VER }}
 
     - name: Install dependencies
       run: npm ci

.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/npm-publish.yml

@@ -15,10 +15,13 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Nodejs Env
+        run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: ${{ env.NODE_VER }}
 
       - name: Install dependencies
         run: npm ci

.nvmrc

@@ -0,0 +1 @@
+18.15

Makefile

@@ -4,7 +4,6 @@ npm-install-%: ## install specified % npm package
 export TRANSIFEX_RESOURCE = frontend-app-gradebook
 transifex_langs = "ar,de,es_419,fa_IR,fr,fr_CA,hi,it,pt,ru,uk,zh_CN"
 
-intl_imports = ./node_modules/.bin/intl-imports.js
 transifex_utils = ./node_modules/.bin/transifex-utils.js
 i18n = ./src/i18n
 transifex_input = $(i18n)/transifex_input.json
@@ -55,23 +54,9 @@ push_translations:
 	# Pushing comments to Transifex...
 	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
 
-ifeq ($(OPENEDX_ATLAS_PULL),)
 # Pulls translations from Transifex.
 pull_translations:
 	tx pull -t -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
-pull_translations:
-	rm -rf src/i18n/messages
-	mkdir src/i18n/messages
-	cd src/i18n/messages \
-	  && atlas pull --filter=$(transifex_langs) \
-	           translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
-	           translations/frontend-component-header/src/i18n/messages:frontend-component-header \
-	           translations/frontend-app-gradebook/src/i18n/messages:frontend-app-gradebook
-
-	$(intl_imports) frontend-component-header frontend-component-footer frontend-app-gradebook
-endif
 
 # This target is used by CI.
 validate-no-uncommitted-package-lock-changes:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edx/frontend-app-gradebook",
-  "version": "1.6.2",
+  "version": "1.6.1",
   "description": "edx editable gradebook-ui to manipulate grade overrides on subsections",
   "repository": {
     "type": "git",
@@ -28,10 +28,10 @@
     "extends @edx/browserslist-config"
   ],
   "dependencies": {
-    "@edx/brand": "npm:@edx/brand-openedx@^1.2.0",
-    "@edx/frontend-component-footer": "^12.0.0",
-    "@edx/frontend-component-header": "^4.0.0",
-    "@edx/frontend-platform": "^4.2.0",
+    "@edx/brand": "npm:@edx/brand-edx.org@^1.3.2",
+    "@edx/frontend-component-footer": "^11.1.1",
+    "@edx/frontend-component-header": "^3.1.1",
+    "@edx/frontend-platform": "2.5.0",
     "@edx/paragon": "^19.25.4",
     "@edx/reactifex": "^2.1.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.25",
@@ -47,11 +47,12 @@
     "enzyme-to-json": "^3.6.2",
     "font-awesome": "4.7.0",
     "history": "4.10.1",
-    "prop-types": "15.8.1",
+    "prop-types": "15.7.2",
     "query-string": "6.13.0",
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet": "^6.1.0",
+    "react-intl": "^2.9.0",
     "react-redux": "^7.1.1",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
@@ -67,7 +68,7 @@
   },
   "devDependencies": {
     "@edx/browserslist-config": "^1.1.1",
-    "@edx/frontend-build": "^12.4.15",
+    "@edx/frontend-build": "12.8.27",
     "@testing-library/react": "^12.1.0",
     "axios": "0.21.2",
     "axios-mock-adapter": "^1.17.0",

src/components/GradebookHeader/__snapshots__/test.jsx.snap

@@ -29,7 +29,9 @@ exports[`GradebookHeader component snapshots default values (grades frozen, cann
   <div
     className="subtitle-row d-flex justify-content-between align-items-center"
   >
-    <h2>
+    <h2
+      className="text-break"
+    >
       fakeID
     </h2>
   </div>
@@ -75,7 +77,9 @@ exports[`GradebookHeader component snapshots grades frozen, can view. grades fro
   <div
     className="subtitle-row d-flex justify-content-between align-items-center"
   >
-    <h2>
+    <h2
+      className="text-break"
+    >
       fakeID
     </h2>
   </div>
@@ -121,7 +125,9 @@ exports[`GradebookHeader component snapshots grades frozen, cannot view unauthor
   <div
     className="subtitle-row d-flex justify-content-between align-items-center"
   >
-    <h2>
+    <h2
+      className="text-break"
+    >
       fakeID
     </h2>
   </div>
@@ -177,7 +183,9 @@ exports[`GradebookHeader component snapshots show bulk management, active view i
   <div
     className="subtitle-row d-flex justify-content-between align-items-center"
   >
-    <h2>
+    <h2
+      className="text-break"
+    >
       fakeID
     </h2>
     <Button
@@ -233,7 +241,9 @@ exports[`GradebookHeader component snapshots show bulk management, active view i
   <div
     className="subtitle-row d-flex justify-content-between align-items-center"
   >
-    <h2>
+    <h2
+      className="text-break"
+    >
       fakeID
     </h2>
     <Button

src/components/GradebookHeader/index.jsx

@@ -47,7 +47,7 @@ export class GradebookHeader extends React.Component {
           <FormattedMessage {...messages.gradebook} />
         </h1>
         <div className="subtitle-row d-flex justify-content-between align-items-center">
-          <h2>{this.props.courseId}</h2>
+          <h2 className="text-break">{this.props.courseId}</h2>
           { this.props.showBulkManagement && (
             <Button
               variant="tertiary"

src/components/GradesView/EditModal/OverrideTable/AdjustedGradeInput.jsx

@@ -7,7 +7,7 @@ import { Form } from '@edx/paragon';
 
 import selectors from 'data/selectors';
 import actions from 'data/actions';
-import { getLocalizedSlash } from 'i18n/utils';
+import { getLocalizedSlash } from 'i18n';
 
 /**
  * <AdjustedGradeInput />

src/components/GradesView/FilterMenuToggle.jsx

@@ -19,7 +19,7 @@ export const FilterMenuToggle = ({ toggleFilterDrawer }) => (
     className="btn-primary align-self-start"
     onClick={toggleFilterDrawer}
   >
-    <Icon className="fa fa-filter" /> <FormattedMessage {...messages.editFilters} />
+    <Icon className="fa fa-filter mr-1" /> <FormattedMessage {...messages.editFilters} />
   </Button>
 );
 

src/components/GradesView/GradebookTable/Fields.jsx

@@ -29,16 +29,16 @@ Username.propTypes = {
 };
 
 /**
- * Fields.Text
- * Simple label field for text value.
- * @param {string} value - value for display
+ * Fields.Email
+ * Simple label field for email value.
+ * @param {string} email - email for display
  */
-const Text = ({ value }) => (<span className="wrap-text-in-cell">{value}</span>);
-Text.propTypes = {
-  value: PropTypes.string.isRequired,
+const Email = ({ email }) => <span className="wrap-text-in-cell">{email}</span>;
+Email.propTypes = {
+  email: PropTypes.string.isRequired,
 };
 
 export default StrictDict({
-  Text,
+  Email,
   Username,
 });

src/components/GradesView/GradebookTable/Fields.test.jsx

@@ -41,13 +41,13 @@ describe('Gradebook Table Fields', () => {
     });
   });
 
-  describe('Text', () => {
-    const value = 'myTag@place.com';
+  describe('Email', () => {
+    const email = 'myTag@place.com';
     test('snapshot', () => {
-      expect(shallow(<Fields.Text value={value} />)).toMatchSnapshot();
+      expect(shallow(<Fields.Email email={email} />)).toMatchSnapshot();
     });
-    test('wraps entry value', () => {
-      expect(shallow(<Fields.Text value={value} />).text()).toEqual(value);
+    test('wraps entry email', () => {
+      expect(shallow(<Fields.Email email={email} />).text()).toEqual(email);
     });
   });
 });

src/components/GradesView/GradebookTable/LabelReplacements.jsx

@@ -45,13 +45,6 @@ const TotalGradeLabelReplacement = () => (
   </div>
 );
 
-/**
- * Asterisk to display next to heading labels that are only used for masters students
- */
-const mastersOnlyFieldAsterisk = (
-  <span className="font-weight-normal">*</span>
-);
-
 /**
  * <UsernameLabelReplacement />
  * Username column header.  Lists that Student Key is possibly available
@@ -63,24 +56,11 @@ const UsernameLabelReplacement = () => (
     </div>
     <div className="font-weight-normal student-key">
       <FormattedMessage {...messages.studentKeyLabel} />
-      { mastersOnlyFieldAsterisk }
     </div>
   </div>
 );
 
-/**
- * <MastersOnlyLabelReplacement {message}>
- * Column header for fields that are only available for masters students
- */
-const MastersOnlyLabelReplacement = (message) => (
-  <div>
-    <FormattedMessage {...message} />
-    { mastersOnlyFieldAsterisk }
-  </div>
-);
-
 export default StrictDict({
   TotalGradeLabelReplacement,
   UsernameLabelReplacement,
-  MastersOnlyLabelReplacement,
 });

src/components/GradesView/GradebookTable/LabelReplacements.test.jsx

@@ -9,7 +9,6 @@ import LabelReplacements from './LabelReplacements';
 const {
   TotalGradeLabelReplacement,
   UsernameLabelReplacement,
-  MastersOnlyLabelReplacement,
 } = LabelReplacements;
 
 jest.mock('@edx/paragon', () => ({
@@ -36,16 +35,6 @@ describe('LabelReplacements', () => {
       expect(shallow(<UsernameLabelReplacement />)).toMatchSnapshot();
     });
   });
-  describe('MastersOnlyLabelReplacement', () => {
-    test('snapshot', () => {
-      const message = {
-        id: 'id',
-        defaultMessage: 'defaultMessAge',
-        description: 'desCripTion',
-      };
-      expect(shallow(<MastersOnlyLabelReplacement {...message} />)).toMatchSnapshot();
-    });
-  });
 });
 
 describe('snapshot', () => {

src/components/GradesView/GradebookTable/__snapshots__/Fields.test.jsx.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Gradebook Table Fields Text snapshot 1`] = `
+exports[`Gradebook Table Fields Email snapshot 1`] = `
 <span
   className="wrap-text-in-cell"
 >

src/components/GradesView/GradebookTable/__snapshots__/LabelReplacements.test.jsx.snap

@@ -1,20 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LabelReplacements MastersOnlyLabelReplacement snapshot 1`] = `
-<div>
-  <FormattedMessage
-    defaultMessage="defaultMessAge"
-    description="desCripTion"
-    id="id"
-  />
-  <span
-    className="font-weight-normal"
-  >
-    *
-  </span>
-</div>
-`;
-
 exports[`LabelReplacements TotalGradeLabelReplacement displays overlay tooltip 1`] = `
 <Tooltip
   id="course-grade-tooltip"
@@ -88,15 +73,10 @@ exports[`LabelReplacements UsernameLabelReplacement snapshot 1`] = `
     className="font-weight-normal student-key"
   >
     <FormattedMessage
-      defaultMessage="Student Key"
+      defaultMessage="Student Key*"
       description="Gradebook table Student Key label"
       id="gradebook.GradesView.table.labels.studentKey"
     />
-    <span
-      className="font-weight-normal"
-    >
-      *
-    </span>
   </div>
 </div>
 `;

src/components/GradesView/GradebookTable/__snapshots__/test.jsx.snap

@@ -13,16 +13,8 @@ exports[`GradebookTable component snapshot - fields1 and 2 between email and tot
           "accessor": "Username",
         },
         Object {
-          "Header": <MastersOnlyLabelReplacement
-            defaultMessage="Full Name"
-            description="Gradebook table full name column header"
-            id="gradebook.GradesView.table.headings.fullName"
-          />,
-          "accessor": "Full Name",
-        },
-        Object {
-          "Header": <MastersOnlyLabelReplacement
-            defaultMessage="Email"
+          "Header": <FormattedMessage
+            defaultMessage="Email*"
             description="Gradebook table email column header"
             id="gradebook.GradesView.table.headings.email"
           />,

src/components/GradesView/GradebookTable/index.jsx

@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import { DataTable } from '@edx/paragon';
-import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
+import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import selectors from 'data/selectors';
 import { Headings } from 'data/constants/grades';
-import { getLocalizedPercentSign } from 'i18n/utils';
+import { getLocalizedPercentSign } from 'i18n';
 
 import messages from './messages';
 import Fields from './Fields';
@@ -38,9 +38,7 @@ export class GradebookTable extends React.Component {
     } else if (heading === Headings.username) {
       label = <LabelReplacements.UsernameLabelReplacement />;
     } else if (heading === Headings.email) {
-      label = <LabelReplacements.MastersOnlyLabelReplacement {...messages.emailHeading} />;
-    } else if (heading === Headings.fullName) {
-      label = <LabelReplacements.MastersOnlyLabelReplacement {...messages.fullNameHeading} />;
+      label = <FormattedMessage {...messages.emailHeading} />;
     } else {
       label = heading;
     }
@@ -51,8 +49,7 @@ export class GradebookTable extends React.Component {
     [Headings.username]: (
       <Fields.Username username={entry.username} userKey={entry.external_user_key} />
     ),
-    [Headings.fullName]: (<Fields.Text value={entry.full_name} />),
-    [Headings.email]: (<Fields.Text value={entry.email} />),
+    [Headings.email]: (<Fields.Email email={entry.email} />),
     [Headings.totalGrade]: `${roundGrade(entry.percent * 100)}${getLocalizedPercentSign()}`,
     ...entry.section_breakdown.reduce((acc, subsection) => ({
       ...acc,

src/components/GradesView/GradebookTable/messages.js

@@ -1,14 +1,9 @@
 import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
-  fullNameHeading: {
-    id: 'gradebook.GradesView.table.headings.fullName',
-    defaultMessage: 'Full Name',
-    description: 'Gradebook table full name column header',
-  },
   emailHeading: {
     id: 'gradebook.GradesView.table.headings.email',
-    defaultMessage: 'Email',
+    defaultMessage: 'Email*',
     description: 'Gradebook table email column header',
   },
   totalGradeHeading: {
@@ -23,7 +18,7 @@ const messages = defineMessages({
   },
   studentKeyLabel: {
     id: 'gradebook.GradesView.table.labels.studentKey',
-    defaultMessage: 'Student Key',
+    defaultMessage: 'Student Key*',
     description: 'Gradebook table Student Key label',
   },
   usernameLabel: {

src/components/GradesView/GradebookTable/test.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { DataTable } from '@edx/paragon';
+import { FormattedMessage } from '@edx/frontend-platform/i18n';
 
 import selectors from 'data/selectors';
 import { Headings } from 'data/constants/grades';
@@ -21,7 +22,7 @@ jest.mock('./Fields', () => ({
   __esModule: true,
   default: {
     Username: () => 'Fields.Username',
-    Text: () => 'Fields.Text',
+    Email: () => 'Fields.Email',
   },
 }));
 jest.mock('./LabelReplacements', () => ({
@@ -29,7 +30,6 @@ jest.mock('./LabelReplacements', () => ({
   default: {
     TotalGradeLabelReplacement: () => 'TotalGradeLabelReplacement',
     UsernameLabelReplacement: () => 'UsernameLabelReplacement',
-    MastersOnlyLabelReplacement: () => 'MastersOnlyLabelReplacement',
   },
 }));
 jest.mock('./GradeButton', () => 'GradeButton');
@@ -75,7 +75,6 @@ describe('GradebookTable', () => {
       ],
       headings: [
         Headings.username,
-        Headings.fullName,
         Headings.email,
         fields.field1,
         fields.field2,
@@ -105,22 +104,17 @@ describe('GradebookTable', () => {
         expect(heading.accessor).toEqual(Headings.username);
         expect(heading.Header.type).toEqual(LabelReplacements.UsernameLabelReplacement);
       });
-      test('full name sets key and Header from header', () => {
-        const heading = headings[1];
-        expect(heading.accessor).toEqual(Headings.fullName);
-        expect(heading.Header).toEqual(<LabelReplacements.MastersOnlyLabelReplacement {...messages.fullNameHeading} />);
-      });
       test('email sets key and Header from header', () => {
-        const heading = headings[2];
+        const heading = headings[1];
         expect(heading.accessor).toEqual(Headings.email);
-        expect(heading.Header).toEqual(<LabelReplacements.MastersOnlyLabelReplacement {...messages.emailHeading} />);
+        expect(heading.Header).toEqual(<FormattedMessage {...messages.emailHeading} />);
       });
       test('subsections set key and Header from header', () => {
-        expect(headings[3]).toEqual({ accessor: fields.field1, Header: fields.field1 });
-        expect(headings[4]).toEqual({ accessor: fields.field2, Header: fields.field2 });
+        expect(headings[2]).toEqual({ accessor: fields.field1, Header: fields.field1 });
+        expect(headings[3]).toEqual({ accessor: fields.field2, Header: fields.field2 });
       });
       test('totalGrade sets key and replaces Header with component', () => {
-        const heading = headings[5];
+        const heading = headings[4];
         expect(heading.accessor).toEqual(Headings.totalGrade);
         expect(heading.Header.type).toEqual(LabelReplacements.TotalGradeLabelReplacement);
       });
@@ -145,15 +139,10 @@ describe('GradebookTable', () => {
             userKey: entry.external_user_key,
           });
         });
-        test('fullName set to Text Field', () => {
-          const field = row[Headings.fullName];
-          expect(field.type).toEqual(Fields.Text);
-          expect(field.props).toEqual({ value: entry.full_name });
-        });
-        test('email set to Text Field', () => {
+        test('email set to Email Field', () => {
           const field = row[Headings.email];
-          expect(field.type).toEqual(Fields.Text);
-          expect(field.props).toEqual({ value: entry.email });
+          expect(field.type).toEqual(Fields.Email);
+          expect(field.props).toEqual({ email: entry.email });
         });
         test('totalGrade set to rounded percent grade * 100', () => {
           expect(

src/components/GradesView/GradesView.scss

@@ -46,6 +46,7 @@
 }
 .grade-history-header{
     float: left;
+    min-width: 170px;
 }
 
 .grade-history-assignment{
@@ -65,7 +66,7 @@
 .gradebook-container {
     width: 100%;
     overflow-x: auto;
-    height: 600px;
+    max-height: 600px;
     overflow-y: auto;
     position: relative;
 }
@@ -122,3 +123,34 @@ select#ScoreView.form-control {
         border-right-color: $black;
     }
 }
+
+#edit-filters-btn {
+    @include media-breakpoint-down(xs) {
+        width: 100%;
+        margin-bottom: 1rem;
+    }
+}
+
+.search-container {
+    @include media-breakpoint-down(xs) {
+        width: 100%;
+    }
+}
+
+.pgn__modal-body-content .pgn__data-table-layout-wrapper {
+    @include media-breakpoint-down(sm) {
+        clear: both;
+        padding: 1rem 0;
+    }
+}
+
+.page-gradebook {
+    position: relative;
+
+    .sidebar-container {
+        position: relative;
+    }
+    aside.sidebar {
+        overflow: auto;
+    }
+}

src/components/GradesView/SearchControls.jsx

@@ -40,7 +40,7 @@ export class SearchControls extends React.Component {
 
   render() {
     return (
-      <div>
+      <div className="search-container">
         <SearchField
           onSubmit={this.onSubmit}
           inputLabel={<FormattedMessage {...messages.label} />}

src/components/GradesView/__snapshots__/FilterMenuToggle.test.jsx.snap

@@ -7,7 +7,7 @@ exports[`FilterMenuToggle component snapshots basic snapshot 1`] = `
   onClick={[MockFunction this.props.toggleFilterDrawer]}
 >
   <Icon
-    className="fa fa-filter"
+    className="fa fa-filter mr-1"
   />
    
   <FormattedMessage

src/components/GradesView/__snapshots__/SearchControls.test.jsx.snap

@@ -1,7 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SearchControls Component Snapshots basic snapshot 1`] = `
-<div>
+<div
+  className="search-container"
+>
   <SearchField
     inputLabel={
       <FormattedMessage

src/components/GradesView/__snapshots__/test.jsx.snap

@@ -14,7 +14,7 @@ exports[`GradesView Component snapshots basic snapshot 1`] = `
     />
   </h3>
   <div
-    className="d-flex justify-content-between"
+    className="d-flex justify-content-between flex-wrap"
   >
     <FilterMenuToggle />
     <SearchControls />

src/components/GradesView/index.jsx

@@ -50,7 +50,7 @@ export class GradesView extends React.Component {
           <FormattedMessage {...messages.filterStepHeading} />
         </h3>
 
-        <div className="d-flex justify-content-between">
+        <div className="d-flex justify-content-between flex-wrap">
           <FilterMenuToggle />
           <SearchControls />
         </div>

src/data/constants/grades.js

@@ -3,7 +3,6 @@ import { StrictDict } from 'utils';
 const EMAIL_HEADING = 'Email';
 const TOTAL_COURSE_GRADE_HEADING = 'Total Grade (%)';
 const USERNAME_HEADING = 'Username';
-const FULL_NAME_HEADING = 'Full Name';
 
 const GradeFormats = StrictDict({
   absolute: 'absolute',
@@ -11,17 +10,15 @@ const GradeFormats = StrictDict({
 });
 
 const Headings = StrictDict({
-  email: EMAIL_HEADING,
-  totalGrade: TOTAL_COURSE_GRADE_HEADING,
-  username: USERNAME_HEADING,
-  fullName: FULL_NAME_HEADING,
+  email: 'Email',
+  totalGrade: 'Total Grade (%)',
+  username: 'Username',
 });
 
 export {
   EMAIL_HEADING,
   TOTAL_COURSE_GRADE_HEADING,
   USERNAME_HEADING,
-  FULL_NAME_HEADING,
   GradeFormats,
   Headings,
 };

src/data/selectors/grades.js

@@ -3,7 +3,7 @@ import { StrictDict } from 'utils';
 
 import { Headings, GradeFormats } from 'data/constants/grades';
 import { formatDateForDisplay } from 'data/actions/utils';
-import { getLocalizedSlash } from 'i18n/utils';
+import { getLocalizedSlash } from 'i18n';
 import simpleSelectorFactory from '../utils';
 import * as module from './grades';
 
@@ -105,17 +105,12 @@ export const headingMapper = (category, label = 'All') => {
   } else {
     filter = filters.byLabel;
   }
-  const {
-    username,
-    fullName,
-    email,
-    totalGrade,
-  } = Headings;
+  const { username, email, totalGrade } = Headings;
   const filteredLabels = (entry) => entry.filter(filter).map(s => s.label);
 
   return (entry) => (
     entry
-      ? [username, fullName, email, ...filteredLabels(entry), totalGrade]
+      ? [username, email, ...filteredLabels(entry), totalGrade]
       : []
   );
 };

src/data/selectors/grades.test.js

@@ -1,9 +1,4 @@
-import {
-  EMAIL_HEADING,
-  FULL_NAME_HEADING,
-  TOTAL_COURSE_GRADE_HEADING,
-  USERNAME_HEADING,
-} from '../constants/grades';
+import { EMAIL_HEADING, TOTAL_COURSE_GRADE_HEADING, USERNAME_HEADING } from '../constants/grades';
 import { formatDateForDisplay } from '../actions/utils';
 import * as selectors from './grades';
 import exportedSelectors from './grades';
@@ -184,7 +179,6 @@ describe('grades selectors', () => {
   describe('headingMapper', () => {
     const expectedHeaders = (subsectionLabels) => ([
       USERNAME_HEADING,
-      FULL_NAME_HEADING,
       EMAIL_HEADING,
       ...subsectionLabels,
       TOTAL_COURSE_GRADE_HEADING,

src/i18n/index.jsx

@@ -1,6 +1,4 @@
-import { messages as footerMessages } from '@edx/frontend-component-footer';
-import { messages as headerMessages } from '@edx/frontend-component-header';
-
+import { getLocale, isRtl } from '@edx/frontend-platform/i18n';
 import arMessages from './messages/ar.json';
 import deMessages from './messages/de.json';
 import es419Messages from './messages/es_419.json';
@@ -15,7 +13,7 @@ import ukMessages from './messages/uk.json';
 import zhcnMessages from './messages/zh_CN.json';
 // no need to import en messages-- they are in the defaultMessage field
 
-const appMessages = {
+const messages = {
   ar: arMessages,
   'es-419': es419Messages,
   'fa-ir': faIRMessages,
@@ -30,8 +28,25 @@ const appMessages = {
   uk: ukMessages,
 };
 
-export default [
-  footerMessages,
-  headerMessages,
-  appMessages,
-];
+export const getLocalizedSlash = () => {
+  // For fractional grades
+  // if we are in a LTR language, we want to use a forward slash.
+  // If we are in a RTL language, we want to use a backslash instead
+  if (isRtl(getLocale())) {
+    return '\\';
+  }
+  return '/';
+};
+
+export const getLocalizedPercentSign = () => {
+  // LTR languages put the percent to the right of a number.
+  // RTL languages put the percent sign to the left of the number.
+  // We can place a non-printing unicode right-to-left marker next to the percent
+  // sign to make it print to the left of the number if we are currently in a LTR language
+  if (isRtl(getLocale())) {
+    return '\u200f%';
+  }
+  return '%';
+};
+
+export default messages;

src/i18n/index.test.jsx

@@ -1,5 +1,5 @@
 import { isRtl } from '@edx/frontend-platform/i18n';
-import { getLocalizedSlash, getLocalizedPercentSign } from './utils';
+import { getLocalizedSlash, getLocalizedPercentSign } from './index';
 
 jest.mock('@edx/frontend-platform/i18n', () => ({
   isRtl: jest.fn(),

src/i18n/utils.js

@@ -1,22 +0,0 @@
-import { getLocale, isRtl } from '@edx/frontend-platform/i18n';
-
-export const getLocalizedSlash = () => {
-  // For fractional grades
-  // if we are in a LTR language, we want to use a forward slash.
-  // If we are in a RTL language, we want to use a backslash instead
-  if (isRtl(getLocale())) {
-    return '\\';
-  }
-  return '/';
-};
-
-export const getLocalizedPercentSign = () => {
-  // LTR languages put the percent to the right of a number.
-  // RTL languages put the percent sign to the left of the number.
-  // We can place a non-printing unicode right-to-left marker next to the percent
-  // sign to make it print to the left of the number if we are currently in a LTR language
-  if (isRtl(getLocale())) {
-    return '\u200f%';
-  }
-  return '%';
-};

src/index.jsx

@@ -10,13 +10,13 @@ import {
   mergeConfig,
   subscribe,
 } from '@edx/frontend-platform';
-import lightning from './lightning';
+import { messages as headerMessages } from '@edx/frontend-component-header';
+import { messages as footerMessages } from '@edx/frontend-component-footer';
 
-import messages from './i18n';
+import appMessages from './i18n';
 import App from './App';
 
 subscribe(APP_READY, () => {
-  lightning();
   ReactDOM.render(<App />, document.getElementById('root'));
 });
 
@@ -37,6 +37,10 @@ initialize({
       });
     },
   },
-  messages,
+  messages: [
+    appMessages,
+    headerMessages,
+    footerMessages,
+  ],
   requireAuthenticatedUser: true,
 });

src/index.test.jsx

@@ -7,8 +7,10 @@ import {
   mergeConfig,
   subscribe,
 } from '@edx/frontend-platform';
+import { messages as headerMessages } from '@edx/frontend-component-header';
+import { messages as footerMessages } from '@edx/frontend-component-footer';
 
-import messages from './i18n';
+import appMessages from './i18n';
 import App from './App';
 import '.';
 
@@ -21,6 +23,12 @@ jest.mock('@edx/frontend-platform', () => ({
   mergeConfig: jest.fn(),
   subscribe: jest.fn(),
 }));
+jest.mock('@edx/frontend-component-header', () => ({
+  messages: ['some', 'messages'],
+}));
+jest.mock('@edx/frontend-component-footer', () => ({
+  messages: ['some', 'messages'],
+}));
 jest.mock('./App', () => 'App');
 
 describe('app registry', () => {
@@ -42,7 +50,7 @@ describe('app registry', () => {
   });
   test('initialize is called with requireAuthenticatedUser, messages, and a config handler', () => {
     expect(initialize).toHaveBeenCalledWith({
-      messages,
+      messages: [appMessages, headerMessages, footerMessages],
       requireAuthenticatedUser: true,
       handlers: {
         config: expect.any(Function),

src/lightning.js

@@ -1,131 +0,0 @@
-module.exports = () => {
-  if (process.env.DISPLAY_FEEDBACK_WIDGET === "true") {
-    window.lightningjs ||
-      (function (n) {
-        var e = "lightningjs";
-        function t(e, t) {
-          var r, i, a, o, d, c;
-          return (
-            t && (t += (/\?/.test(t) ? "&" : "?") + "lv=1"),
-            n[e] ||
-              ((r = window),
-              (i = document),
-              (a = e),
-              (o = i.location.protocol),
-              (d = "load"),
-              (c = 0),
-              (function () {
-                n[a] = function () {
-                  var t = arguments,
-                    i = this,
-                    o = ++c,
-                    d = (i && i != r && i.id) || 0;
-                  function s() {
-                    return (s.id = o), n[a].apply(s, arguments);
-                  }
-                  return (
-                    (e.s = e.s || []).push([o, d, t]),
-                    (s.then = function (n, t, r) {
-                      var i = (e.fh[o] = e.fh[o] || []),
-                        a = (e.eh[o] = e.eh[o] || []),
-                        d = (e.ph[o] = e.ph[o] || []);
-                      return n && i.push(n), t && a.push(t), r && d.push(r), s;
-                    }),
-                    s
-                  );
-                };
-                var e = (n[a]._ = {});
-                function s() {
-                  e.P(d), (e.w = 1), n[a]("_load");
-                }
-                (e.fh = {}),
-                  (e.eh = {}),
-                  (e.ph = {}),
-                  (e.l = t
-                    ? t.replace(/^\/\//, ("https:" == o ? o : "http:") + "//")
-                    : t),
-                  (e.p = { 0: +new Date() }),
-                  (e.P = function (n) {
-                    e.p[n] = new Date() - e.p[0];
-                  }),
-                  e.w && s(),
-                  r.addEventListener
-                    ? r.addEventListener(d, s, !1)
-                    : r.attachEvent("onload", s);
-                var l = function () {
-                  function n() {
-                    return [
-                      "<!DOCTYPE ",
-                      o,
-                      "><",
-                      o,
-                      "><head></head><",
-                      t,
-                      "><",
-                      r,
-                      ' src="',
-                      e.l,
-                      '"></',
-                      r,
-                      "></",
-                      t,
-                      "></",
-                      o,
-                      ">",
-                    ].join("");
-                  }
-                  var t = "body",
-                    r = "script",
-                    o = "html",
-                    d = i[t];
-                  if (!d) return setTimeout(l, 100);
-                  e.P(1);
-                  var c,
-                    s = i.createElement("div"),
-                    h = s.appendChild(i.createElement("div")),
-                    u = i.createElement("iframe");
-                  (s.style.display = "none"),
-                    (d.insertBefore(s, d.firstChild).id = "lightningjs-" + a),
-                    (u.frameBorder = "0"),
-                    (u.id = "lightningjs-frame-" + a),
-                    /MSIE[ ]+6/.test(navigator.userAgent) &&
-                      (u.src = "javascript:false"),
-                    (u.allowTransparency = "true"),
-                    h.appendChild(u);
-                  try {
-                    u.contentWindow.document.open();
-                  } catch (n) {
-                    (e.domain = i.domain),
-                      (c =
-                        "javascript:var d=document.open();d.domain='" +
-                        i.domain +
-                        "';"),
-                      (u.src = c + "void(0);");
-                  }
-                  try {
-                    var p = u.contentWindow.document;
-                    p.write(n()), p.close();
-                  } catch (e) {
-                    u.src =
-                      c +
-                      'd.write("' +
-                      n().replace(/"/g, String.fromCharCode(92) + '"') +
-                      '");d.close();';
-                  }
-                  e.P(2);
-                };
-                e.l && l();
-              })()),
-            (n[e].lv = "1"),
-            n[e]
-          );
-        }
-        var r = (window.lightningjs = t(e));
-        (r.require = t), (r.modules = n);
-      })({});
-    window.usabilla_live = lightningjs.require(
-      "usabilla_live",
-      "//w.usabilla.com/a13a22d8ea20.js"
-    );
-  }
-};

src/setupTest.js

@@ -32,13 +32,6 @@ jest.mock('@edx/frontend-platform/i18n', () => {
   };
 });
 
-jest.mock('@edx/frontend-component-header', () => ({
-  messages: ['some', 'messages'],
-}));
-jest.mock('@edx/frontend-component-footer', () => ({
-  messages: ['some', 'messages'],
-}));
-
 jest.mock('@edx/paragon', () => jest.requireActual('testUtils').mockNestedComponents({
   Alert: 'Alert',
   ActionRow: 'ActionRow',