From 92701703b176a7b47a241ec27a35502458a67c22 Mon Sep 17 00:00:00 2001
From: vladislavkeblysh <vladislav.keblysh@raccoongang.com>
Date: Sat, 21 Oct 2023 14:51:22 +0300
Subject: [PATCH] feat: added validation to assignment fields

---
 .../__snapshots__/index.test.jsx.snap         |   2 +-
 .../AssignmentGradeFilter/hooks.js            |   2 +
 .../AssignmentGradeFilter/hooks.test.js       |  10 +-
 .../AssignmentGradeFilter/index.jsx           |   3 +-
 .../AssignmentGradeFilter/index.test.jsx      |   1 +
 src/components/GradesView/StatusAlerts.jsx    |  81 +++++++-
 .../GradesView/StatusAlerts.messages.js       |  20 ++
 .../GradesView/StatusAlerts.test.jsx          | 184 +++++++++++++++---
 .../__snapshots__/StatusAlerts.test.jsx.snap  |  20 +-
 src/data/redux/hooks/selectors.js             |   1 +
 src/data/redux/hooks/selectors.test.js        |   2 +
 src/data/selectors/app.js                     |  35 +++-
 src/data/selectors/app.test.js                |  61 +++++-
 src/i18n/messages/ar.json                     |   6 +-
 src/i18n/messages/de.json                     |   6 +-
 src/i18n/messages/es_419.json                 |   6 +-
 src/i18n/messages/fa_IR.json                  |   6 +-
 src/i18n/messages/fr.json                     |   6 +-
 src/i18n/messages/fr_CA.json                  |   6 +-
 src/i18n/messages/hi.json                     |   6 +-
 src/i18n/messages/it.json                     |   6 +-
 src/i18n/messages/pt.json                     |   6 +-
 src/i18n/messages/ru.json                     |   6 +-
 src/i18n/messages/uk.json                     |   6 +-
 src/i18n/messages/zh_CN.json                  |   6 +-
 25 files changed, 427 insertions(+), 67 deletions(-)

diff --git a/src/components/GradebookFilters/AssignmentGradeFilter/__snapshots__/index.test.jsx.snap b/src/components/GradebookFilters/AssignmentGradeFilter/__snapshots__/index.test.jsx.snap
index 109d1d7d..39d51b68 100644
--- a/src/components/GradebookFilters/AssignmentGradeFilter/__snapshots__/index.test.jsx.snap
+++ b/src/components/GradebookFilters/AssignmentGradeFilter/__snapshots__/index.test.jsx.snap
@@ -55,7 +55,7 @@ exports[`AssignmentFilter component render without selected assignment snapshot
     className="grade-filter-action"
   >
     <Button
-      disabled={true}
+      disabled={false}
       name="assignmentGradeMinMax"
       type="submit"
       variant="outline-secondary"
diff --git a/src/components/GradebookFilters/AssignmentGradeFilter/hooks.js b/src/components/GradebookFilters/AssignmentGradeFilter/hooks.js
index adaf0a6d..0bd204bc 100644
--- a/src/components/GradebookFilters/AssignmentGradeFilter/hooks.js
+++ b/src/components/GradebookFilters/AssignmentGradeFilter/hooks.js
@@ -7,6 +7,7 @@ const useAssignmentGradeFilterData = ({ updateQueryParams }) => {
   const fetchGrades = thunkActions.grades.useFetchGrades();
   const setFilter = actions.app.useSetLocalFilter();
   const updateAssignmentLimits = actions.filters.useUpdateAssignmentLimits();
+  const isDisabled = !selectors.app.useAreAssignmentGradeFiltersValid() || !selectedAssignment;
 
   const handleSubmit = () => {
     updateAssignmentLimits(localAssignmentLimits);
@@ -27,6 +28,7 @@ const useAssignmentGradeFilterData = ({ updateQueryParams }) => {
     assignmentGradeMin,
     assignmentGradeMax,
     selectedAssignment,
+    isDisabled,
     handleSetMax,
     handleSetMin,
     handleSubmit,
diff --git a/src/components/GradebookFilters/AssignmentGradeFilter/hooks.test.js b/src/components/GradebookFilters/AssignmentGradeFilter/hooks.test.js
index 817f3769..8aa67fb1 100644
--- a/src/components/GradebookFilters/AssignmentGradeFilter/hooks.test.js
+++ b/src/components/GradebookFilters/AssignmentGradeFilter/hooks.test.js
@@ -4,7 +4,10 @@ import useAssignmentGradeFilterData from './hooks';
 
 jest.mock('data/redux/hooks', () => ({
   selectors: {
-    app: { useAssignmentGradeLimits: jest.fn() },
+    app: {
+      useAreAssignmentGradeFiltersValid: jest.fn(),
+      useAssignmentGradeLimits: jest.fn(),
+    },
     filters: { useSelectedAssignmentLabel: jest.fn() },
   },
   actions: {
@@ -20,6 +23,7 @@ let out;
 
 const assignmentGradeLimits = { assignmentGradeMax: 200, assignmentGradeMin: 3 };
 const selectedAssignmentLabel = 'test-assignment-label';
+const useAreAssignmentGradeFiltersValid = false;
 selectors.app.useAssignmentGradeLimits.mockReturnValue(assignmentGradeLimits);
 selectors.filters.useSelectedAssignmentLabel.mockReturnValue(selectedAssignmentLabel);
 
@@ -40,6 +44,7 @@ describe('useAssignmentFilterData hook', () => {
   });
   describe('behavior', () => {
     it('initializes redux hooks', () => {
+      expect(selectors.app.useAreAssignmentGradeFiltersValid).toHaveBeenCalledWith();
       expect(selectors.app.useAssignmentGradeLimits).toHaveBeenCalledWith();
       expect(selectors.filters.useSelectedAssignmentLabel).toHaveBeenCalledWith();
       expect(actions.app.useSetLocalFilter).toHaveBeenCalledWith();
@@ -77,5 +82,8 @@ describe('useAssignmentFilterData hook', () => {
       expect(out.assignmentGradeMax).toEqual(assignmentGradeLimits.assignmentGradeMax);
       expect(out.assignmentGradeMin).toEqual(assignmentGradeLimits.assignmentGradeMin);
     });
+    it('passes isDisabled from hook', () => {
+      expect(out.isDisabled).toEqual(!useAreAssignmentGradeFiltersValid || !selectedAssignmentLabel);
+    });
   });
 });
diff --git a/src/components/GradebookFilters/AssignmentGradeFilter/index.jsx b/src/components/GradebookFilters/AssignmentGradeFilter/index.jsx
index 9b10d5a7..cf31130c 100644
--- a/src/components/GradebookFilters/AssignmentGradeFilter/index.jsx
+++ b/src/components/GradebookFilters/AssignmentGradeFilter/index.jsx
@@ -13,6 +13,7 @@ export const AssignmentGradeFilter = ({ updateQueryParams }) => {
     assignmentGradeMin,
     assignmentGradeMax,
     selectedAssignment,
+    isDisabled,
     handleSetMax,
     handleSetMin,
     handleSubmit,
@@ -39,7 +40,7 @@ export const AssignmentGradeFilter = ({ updateQueryParams }) => {
           type="submit"
           variant="outline-secondary"
           name="assignmentGradeMinMax"
-          disabled={!selectedAssignment}
+          disabled={isDisabled}
           onClick={handleSubmit}
         >
           {formatMessage(messages.apply)}
diff --git a/src/components/GradebookFilters/AssignmentGradeFilter/index.test.jsx b/src/components/GradebookFilters/AssignmentGradeFilter/index.test.jsx
index 332da15e..4af40d6d 100644
--- a/src/components/GradebookFilters/AssignmentGradeFilter/index.test.jsx
+++ b/src/components/GradebookFilters/AssignmentGradeFilter/index.test.jsx
@@ -17,6 +17,7 @@ const hookData = {
   selectedAssignment: 'test-assignment',
   assignmentGradeMax: 300,
   assignmentGradeMin: 23,
+  isDisabled: false,
 };
 useAssignmentGradeFilterData.mockReturnValue(hookData);
 
diff --git a/src/components/GradesView/StatusAlerts.jsx b/src/components/GradesView/StatusAlerts.jsx
index 8331c3f3..ea0d5387 100644
--- a/src/components/GradesView/StatusAlerts.jsx
+++ b/src/components/GradesView/StatusAlerts.jsx
@@ -12,27 +12,69 @@ import messages from './StatusAlerts.messages';
 export class StatusAlerts extends React.Component {
   get isCourseGradeFilterAlertOpen() {
     return (
-      !this.props.limitValidity.isMinValid
-      || !this.props.limitValidity.isMaxValid
+      !this.props.courseLimitValidity.isMinValid
+      || !this.props.courseLimitValidity.isMaxValid
+      || !this.props.courseLimitValidity.isMinLessMaxValid
     );
   }
 
-  get minValidityMessage() {
-    return (this.props.limitValidity.isMinValid)
+  get minCourseValidityMessage() {
+    return (this.props.courseLimitValidity.isMinValid)
       ? ''
       : <FormattedMessage {...messages.minGradeInvalid} />;
   }
 
-  get maxValidityMessage() {
-    return (this.props.limitValidity.isMaxValid)
+  get maxCourseValidityMessage() {
+    return (this.props.courseLimitValidity.isMaxValid)
       ? ''
       : <FormattedMessage {...messages.maxGradeInvalid} />;
   }
 
+  get minLessMaxCourseValidityMessage() {
+    return (this.props.courseLimitValidity.isMinLessMaxValid)
+      ? ''
+      : <FormattedMessage {...messages.minLessMaxGradeInvalid} />;
+  }
+
   get courseGradeFilterAlertDialogText() {
     return (
       <>
-        {this.minValidityMessage} {this.maxValidityMessage}
+        {this.minCourseValidityMessage} {this.maxCourseValidityMessage} {this.minLessMaxCourseValidityMessage}
+      </>
+    );
+  }
+
+  get isAssignmentGradeFilterAlertOpen() {
+    return (
+      !this.props.assignmentLimitValidity.isMinValid
+      || !this.props.assignmentLimitValidity.isMaxValid
+      || !this.props.assignmentLimitValidity.isMinLessMaxValid
+    );
+  }
+
+  get minAssignmentValidityMessage() {
+    return (this.props.assignmentLimitValidity.isMinValid)
+      ? ''
+      : <FormattedMessage {...messages.minAssignmentInvalid} />;
+  }
+
+  get maxAssignmentValidityMessage() {
+    return (this.props.assignmentLimitValidity.isMaxValid)
+      ? ''
+      : <FormattedMessage {...messages.maxAssignmentInvalid} />;
+  }
+
+  get minLessMaxAssignmentValidityMessage() {
+    return (this.props.assignmentLimitValidity.isMinLessMaxValid)
+      ? ''
+      : <FormattedMessage {...messages.minLessMaxAssignmentInvalid} />;
+  }
+
+  get assignmentGradeFilterAlertDialogText() {
+    return (
+      <>
+        {/* eslint-disable-next-line max-len */}
+        {this.minAssignmentValidityMessage} {this.maxAssignmentValidityMessage} {this.minLessMaxAssignmentValidityMessage}
       </>
     );
   }
@@ -40,6 +82,20 @@ export class StatusAlerts extends React.Component {
   render() {
     return (
       <>
+        <Alert
+          variant="success"
+          onClose={this.props.handleCloseSuccessBanner}
+          show={this.props.showSuccessBanner}
+        >
+          <FormattedMessage {...messages.editSuccessAlert} />
+        </Alert>
+        <Alert
+          variant="danger"
+          dismissible={false}
+          show={this.isAssignmentGradeFilterAlertOpen}
+        >
+          {this.assignmentGradeFilterAlertDialogText}
+        </Alert>
         <Alert
           variant="success"
           onClose={this.props.handleCloseSuccessBanner}
@@ -65,15 +121,22 @@ StatusAlerts.defaultProps = {
 StatusAlerts.propTypes = {
   // redux
   handleCloseSuccessBanner: PropTypes.func.isRequired,
-  limitValidity: PropTypes.shape({
+  courseLimitValidity: PropTypes.shape({
+    isMaxValid: PropTypes.bool,
+    isMinValid: PropTypes.bool,
+    isMinLessMaxValid: PropTypes.bool,
+  }).isRequired,
+  assignmentLimitValidity: PropTypes.shape({
     isMaxValid: PropTypes.bool,
     isMinValid: PropTypes.bool,
+    isMinLessMaxValid: PropTypes.bool,
   }).isRequired,
   showSuccessBanner: PropTypes.bool.isRequired,
 };
 
 export const mapStateToProps = (state) => ({
-  limitValidity: selectors.app.courseGradeFilterValidity(state),
+  courseLimitValidity: selectors.app.courseGradeFilterValidity(state),
+  assignmentLimitValidity: selectors.app.assignmentGradeFilterValidity(state),
   showSuccessBanner: selectors.grades.showSuccess(state),
 });
 
diff --git a/src/components/GradesView/StatusAlerts.messages.js b/src/components/GradesView/StatusAlerts.messages.js
index 0e6a8da5..8dda228c 100644
--- a/src/components/GradesView/StatusAlerts.messages.js
+++ b/src/components/GradesView/StatusAlerts.messages.js
@@ -16,6 +16,26 @@ const messages = defineMessages({
     defaultMessage: 'Minimum course grade must be between 0 and 100',
     description: 'An alert text for selecting a minimum course grade less than 0',
   },
+  minLessMaxGradeInvalid: {
+    id: 'gradebook.GradesView.minLessMaxGradeInvalid',
+    defaultMessage: 'Minimum course grade must be less than maximum course grade',
+    description: 'An alert text for selecting a minimum course grade must be less than maximum course grade',
+  },
+  maxAssignmentInvalid: {
+    id: 'gradebook.GradesView.maxAssignmentGradeInvalid',
+    defaultMessage: 'Maximum assignment grade must be between 0 and 100',
+    description: 'An alert text for selecting a maximum assignment grade greater than 100',
+  },
+  minAssignmentInvalid: {
+    id: 'gradebook.GradesView.minAssignmentGradeInvalid',
+    defaultMessage: 'Minimum assignment grade must be between 0 and 100',
+    description: 'An alert text for selecting a minimum assignment grade less than 0',
+  },
+  minLessMaxAssignmentInvalid: {
+    id: 'gradebook.GradesView.minLessMaxAssignmentInvalid',
+    defaultMessage: 'Minimum assignment grade must be less than maximum assignment grade',
+    description: 'An alert text for selecting a minimum assignment grade must be less than maximum assignment grade',
+  },
 });
 
 export default messages;
diff --git a/src/components/GradesView/StatusAlerts.test.jsx b/src/components/GradesView/StatusAlerts.test.jsx
index ba2d7997..2f8a0db1 100644
--- a/src/components/GradesView/StatusAlerts.test.jsx
+++ b/src/components/GradesView/StatusAlerts.test.jsx
@@ -20,6 +20,7 @@ jest.mock('data/selectors', () => ({
   default: {
     app: {
       courseGradeFilterValidity: (state) => ({ courseGradeFilterValidity: state }),
+      assignmentGradeFilterValidity: (state) => ({ assignmentGradeFilterValidity: state }),
     },
     grades: {
       showSuccess: (state) => ({ showSuccess: state }),
@@ -30,9 +31,15 @@ jest.mock('data/selectors', () => ({
 describe('StatusAlerts', () => {
   let props = {
     showSuccessBanner: true,
-    limitValidity: {
+    courseLimitValidity: {
       isMaxValid: true,
       isMinValid: true,
+      isMinLessMaxValid: true,
+    },
+    assignmentLimitValidity: {
+      isMaxValid: true,
+      isMinValid: true,
+      isMinLessMaxValid: true,
     },
   };
 
@@ -47,67 +54,182 @@ describe('StatusAlerts', () => {
     let el;
     it('basic snapshot', () => {
       el = shallow(<StatusAlerts {...props} />);
-      const courseGradeFilterAlertDialogText = 'the quiCk brown does somEthing or other';
+      const courseGradeFilterAlertDialogText = 'Course grade text';
+      const assignmentGradeFilterAlertDialogText = 'Assignment grade text';
       jest.spyOn(
         el.instance(),
         'courseGradeFilterAlertDialogText',
         'get',
       ).mockReturnValue(courseGradeFilterAlertDialogText);
+      jest.spyOn(
+        el.instance(),
+        'assignmentGradeFilterAlertDialogText',
+        'get',
+      ).mockReturnValue(assignmentGradeFilterAlertDialogText);
       expect(el.instance().render()).toMatchSnapshot();
     });
   });
 
-  describe('behavior', () => {
+  describe('behavior course grade', () => {
     it.each([
-      [false, false],
-      [false, true],
-      [true, false],
-      [true, true],
-    ])('min + max course grade validity', (isMinValid, isMaxValid) => {
+      [false, false, false],
+      [false, true, false],
+      [false, false, true],
+      [true, false, false],
+      [true, true, false],
+      [true, true, true],
+    ])('min + max + min less max course grade validity', (isMinValid, isMaxValid, isMinLessMaxValid) => {
       props = {
         ...props,
-        limitValidity: {
+        courseLimitValidity: {
           isMinValid,
           isMaxValid,
+          isMinLessMaxValid,
         },
       };
       const el = shallow(<StatusAlerts {...props} />);
       expect(
         el.instance().isCourseGradeFilterAlertOpen,
       ).toEqual(
-        !isMinValid || !isMaxValid,
+        !isMinValid || !isMaxValid || !isMinLessMaxValid,
       );
-      if (!isMaxValid) {
-        if (!isMinValid) {
-          expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
-            <>
-              <FormattedMessage {...messages.minGradeInvalid} />
-              <FormattedMessage {...messages.maxGradeInvalid} />
-            </>,
-          );
-        } else {
-          expect(
-            el.instance().courseGradeFilterAlertDialogText,
-          // eslint-disable-next-line react/jsx-curly-brace-presence
-          ).toEqual(<>{''}<FormattedMessage {...messages.maxGradeInvalid} /></>);
-        }
-      } else if (!isMinValid) {
-        expect(
-          el.instance().courseGradeFilterAlertDialogText,
-        // eslint-disable-next-line react/jsx-curly-brace-presence
-        ).toEqual(<><FormattedMessage {...messages.minGradeInvalid} />{''}</>);
+      if (!isMinValid && !isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minGradeInvalid} />{' '}
+            <FormattedMessage {...messages.maxGradeInvalid} />{' '}
+            <FormattedMessage {...messages.minLessMaxGradeInvalid} />
+          </>,
+        );
+      }
+      if (!isMinValid && isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minGradeInvalid} />{' '}{''}{' '}
+            <FormattedMessage {...messages.minLessMaxGradeInvalid} />
+          </>,
+        );
+      }
+      if (!isMinValid && !isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minGradeInvalid} />{' '}
+            <FormattedMessage {...messages.maxGradeInvalid} />{' '}{''}
+          </>,
+        );
+      }
+      if (isMinValid && !isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.maxGradeInvalid} />{' '}{''}
+          </>,
+        );
+      }
+      if (!isMinValid && isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            {' '}
+            <FormattedMessage {...messages.minGradeInvalid} />
+            {' '}
+          </>,
+        );
+      }
+      if (isMinValid && isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().courseGradeFilterAlertDialogText).toEqual(
+          <>
+            {''}{' '}{''}{' '}<FormattedMessage {...messages.minLessMaxGradeInvalid} />
+          </>,
+        );
       }
     });
   });
 
+  describe('behavior assignment grade', () => {
+    it.each([
+      [false, false, false],
+      [false, true, false],
+      [false, false, true],
+      [true, false, false],
+      [true, true, false],
+      [true, true, true],
+    ])('min + max + min less max course grade validity', (isMinValid, isMaxValid, isMinLessMaxValid) => {
+      props = {
+        ...props,
+        assignmentLimitValidity: {
+          isMinValid,
+          isMaxValid,
+          isMinLessMaxValid,
+        },
+      };
+      const el = shallow(<StatusAlerts {...props} />);
+      expect(
+        el.instance().isAssignmentGradeFilterAlertOpen,
+      ).toEqual(
+        !isMinValid || !isMaxValid || !isMinLessMaxValid,
+      );
+      if (!isMinValid && !isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minAssignmentInvalid} />{' '}
+            <FormattedMessage {...messages.maxAssignmentInvalid} />{' '}
+            <FormattedMessage {...messages.minLessMaxAssignmentInvalid} />
+          </>,
+        );
+      }
+      if (!isMinValid && isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minAssignmentInvalid} />{' '}{''}{' '}
+            <FormattedMessage {...messages.minLessMaxAssignmentInvalid} />
+          </>,
+        );
+      }
+      if (!isMinValid && !isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.minAssignmentInvalid} />{' '}
+            <FormattedMessage {...messages.maxAssignmentInvalid} />{' '}{''}
+          </>,
+        );
+      }
+      if (isMinValid && !isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            <FormattedMessage {...messages.maxAssignmentInvalid} />{' '}{''}
+          </>,
+        );
+      }
+      if (!isMinValid && isMaxValid && isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            {' '}
+            <FormattedMessage {...messages.minAssignmentInvalid} />
+            {' '}
+          </>,
+        );
+      }
+      if (isMinValid && isMaxValid && !isMinLessMaxValid) {
+        expect(el.instance().assignmentGradeFilterAlertDialogText).toEqual(
+          <>
+            {''}{' '}{''}{' '}<FormattedMessage {...messages.minLessMaxAssignmentInvalid} />
+          </>,
+        );
+      }
+    });
+  });
+
+
   describe('mapStateToProps', () => {
     const testState = { A: 'pple', B: 'anana', C: 'ucumber' };
     let mapped;
     beforeEach(() => {
       mapped = mapStateToProps(testState);
     });
-    test('limitValidity from app.courseGradeFitlerValidity', () => {
-      expect(mapped.limitValidity).toEqual(selectors.app.courseGradeFilterValidity(testState));
+    test('courseLimitValidity from app.courseGradeFitlerValidity', () => {
+      expect(mapped.courseLimitValidity).toEqual(selectors.app.courseGradeFilterValidity(testState));
+    });
+    test('assignmentLimitValidity from app.assignmentGradeFitlerValidity', () => {
+      expect(mapped.assignmentLimitValidity).toEqual(selectors.app.assignmentGradeFilterValidity(testState));
     });
     test('showSuccessBanner from grades.showSuccess', () => {
       expect(mapped.showSuccessBanner).toEqual(selectors.grades.showSuccess(testState));
diff --git a/src/components/GradesView/__snapshots__/StatusAlerts.test.jsx.snap b/src/components/GradesView/__snapshots__/StatusAlerts.test.jsx.snap
index 7edc860a..7d177b21 100644
--- a/src/components/GradesView/__snapshots__/StatusAlerts.test.jsx.snap
+++ b/src/components/GradesView/__snapshots__/StatusAlerts.test.jsx.snap
@@ -18,7 +18,25 @@ exports[`StatusAlerts snapshots basic snapshot 1`] = `
     show={false}
     variant="danger"
   >
-    the quiCk brown does somEthing or other
+    Assignment grade text
+  </Alert>
+  <Alert
+    onClose={[MockFunction handleCloseSuccessBanner]}
+    show={true}
+    variant="success"
+  >
+    <FormattedMessage
+      defaultMessage="The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook."
+      description="An alert text for successfully editing  a grade"
+      id="gradebook.GradesView.editSuccessAlert"
+    />
+  </Alert>
+  <Alert
+    dismissible={false}
+    show={false}
+    variant="danger"
+  >
+    Course grade text
   </Alert>
 </React.Fragment>
 `;
diff --git a/src/data/redux/hooks/selectors.js b/src/data/redux/hooks/selectors.js
index 4b865a65..27090cc3 100644
--- a/src/data/redux/hooks/selectors.js
+++ b/src/data/redux/hooks/selectors.js
@@ -12,6 +12,7 @@ export const root = StrictDict({
 export const app = StrictDict({
   useAssignmentGradeLimits: () => useSelector(selectors.app.assignmentGradeLimits),
   useAreCourseGradeFiltersValid: () => useSelector(selectors.app.areCourseGradeFiltersValid),
+  useAreAssignmentGradeFiltersValid: () => useSelector(selectors.app.areAssignmentGradeFiltersValid),
   useCourseGradeLimits: () => useSelector(selectors.app.courseGradeLimits),
 });
 
diff --git a/src/data/redux/hooks/selectors.test.js b/src/data/redux/hooks/selectors.test.js
index c19ad9a3..afab8909 100644
--- a/src/data/redux/hooks/selectors.test.js
+++ b/src/data/redux/hooks/selectors.test.js
@@ -10,6 +10,7 @@ jest.mock('react-redux', () => ({
 jest.mock('data/selectors', () => ({
   app: {
     assignmentGradeLimits: jest.fn(),
+    areAssignmentGradeFiltersValid: jest.fn(),
     areCourseGradeFiltersValid: jest.fn(),
     courseGradelimits: jest.fn(),
   },
@@ -56,6 +57,7 @@ describe('selector hooks', () => {
     beforeEach(() => { hooks = selectorHooks.app; });
     testHook(hookKeys.useAssignmentGradeLimits, selGroup.assignmentGradeLimits);
     testHook(hookKeys.useAreCourseGradeFiltersValid, selGroup.areCourseGradeFiltersValid);
+    testHook(hookKeys.useAreAssignmentGradeFiltersValid, selGroup.areAssignmentGradeFiltersValid);
     testHook(hookKeys.useCourseGradeLimits, selGroup.courseGradeLimits);
   });
   describe('assignmentTypes', () => {
diff --git a/src/data/selectors/app.js b/src/data/selectors/app.js
index 6fd32bdd..67ef769e 100644
--- a/src/data/selectors/app.js
+++ b/src/data/selectors/app.js
@@ -4,6 +4,25 @@ import simpleSelectorFactory from '../utils';
 import * as module from './app';
 import { minGrade, maxGrade } from './grades';
 
+/**
+ * assignmentGradeFilterValidity(state)
+ * returns { isMaxValid, isMinValid } with each assignment grade limit, verifying they
+ * are between minGrade and maxGrade (0, 100).
+ * @param {object} state - redux state
+ * @return {object} - { isMaxValid, isMinValid, isMinLessMaxValid }
+ */
+export const assignmentGradeFilterValidity = ({ app: { filters } }) => {
+  const isFilterValid = (value) => {
+    const intValue = parseInt(value, 10);
+    return intValue >= minGrade && intValue <= maxGrade;
+  };
+  return {
+    isMaxValid: isFilterValid(filters.assignmentGradeMax),
+    isMinValid: isFilterValid(filters.assignmentGradeMin),
+    isMinLessMaxValid: Number(filters.assignmentGradeMin) <= Number(filters.assignmentGradeMax),
+  };
+};
+
 /**
  * assignmentGradeLimits(state)
  * returns an object of local assignmentGradeMin/Max
@@ -29,6 +48,7 @@ export const courseGradeFilterValidity = ({ app: { filters } }) => {
   return {
     isMaxValid: isFilterValid(filters.courseGradeMax),
     isMinValid: isFilterValid(filters.courseGradeMin),
+    isMinLessMaxValid: Number(filters.courseGradeMin) <= Number(filters.courseGradeMax),
   };
 };
 
@@ -65,7 +85,18 @@ const editUpdateData = ({ app: { modalState } }) => ([{
  */
 const areCourseGradeFiltersValid = (state) => {
   const validity = module.courseGradeFilterValidity(state);
-  return validity.isMinValid && validity.isMaxValid;
+  return validity.isMinValid && validity.isMaxValid && validity.isMinLessMaxValid;
+};
+
+/**
+ * areAssignmentGradeFiltersValid(state)
+ * returns true iff both min and max assignment grade filters are valid (within bounds)
+ * @param {object} state - redux state
+ * @return {bool} - are both filters valid?
+ */
+const areAssignmentGradeFiltersValid = (state) => {
+  const validity = module.assignmentGradeFilterValidity(state);
+  return validity.isMinValid && validity.isMaxValid && validity.isMinLessMaxValid;
 };
 
 const isFilterMenuClosed = ({ app: { filterMenu } }) => (
@@ -107,8 +138,10 @@ const simpleSelectors = simpleSelectorFactory(
 
 export default StrictDict({
   areCourseGradeFiltersValid,
+  areAssignmentGradeFiltersValid,
   assignmentGradeLimits,
   courseGradeFilterValidity,
+  assignmentGradeFilterValidity,
   courseGradeLimits,
   editUpdateData,
   isFilterMenuClosed,
diff --git a/src/data/selectors/app.test.js b/src/data/selectors/app.test.js
index e8d2966d..3da54f57 100644
--- a/src/data/selectors/app.test.js
+++ b/src/data/selectors/app.test.js
@@ -38,21 +38,38 @@ describe('app selectors', () => {
       });
     });
   });
+  describe('assignmentGradeFilterValidity', () => {
+    it('returns true iff the value is between 0 and 100 (inclusive)', () => {
+      const testSelector = (assignmentGradeMax, isMaxValid, assignmentGradeMin, isMinValid, isMinLessMaxValid) => {
+        expect(selectors.assignmentGradeFilterValidity({
+          ...testState,
+          app: {
+            ...testState.app,
+            filters: { ...testState.filters, assignmentGradeMax, assignmentGradeMin },
+          },
+        })).toEqual({ isMaxValid, isMinValid, isMinLessMaxValid });
+      };
+      testSelector(-1, false, 0, true, false);
+      testSelector(0, true, -1, false, true);
+      testSelector(100, true, 101, false, false);
+      testSelector(101, false, 100, true, true);
+    });
+  });
   describe('courseGradeFilterValidity', () => {
     it('returns true iff the value is between 0 and 100 (inclusive)', () => {
-      const testSelector = (courseGradeMax, isMaxValid, courseGradeMin, isMinValid) => {
+      const testSelector = (courseGradeMax, isMaxValid, courseGradeMin, isMinValid, isMinLessMaxValid) => {
         expect(selectors.courseGradeFilterValidity({
           ...testState,
           app: {
             ...testState.app,
             filters: { ...testState.filters, courseGradeMax, courseGradeMin },
           },
-        })).toEqual({ isMaxValid, isMinValid });
+        })).toEqual({ isMaxValid, isMinValid, isMinLessMaxValid });
       };
-      testSelector(-1, false, 0, true);
-      testSelector(0, true, -1, false);
-      testSelector(100, true, 101, false);
-      testSelector(101, false, 100, true);
+      testSelector(-1, false, 0, true, false);
+      testSelector(0, true, -1, false, true);
+      testSelector(100, true, 101, false, false);
+      testSelector(101, false, 100, true, true);
     });
   });
   describe('courseGradeLimits', () => {
@@ -75,20 +92,44 @@ describe('app selectors', () => {
       }]);
     });
   });
+  describe('areAssignmentGradeFiltersValid', () => {
+    const mockValidity = (isMinValid, isMaxValid, isMinLessMaxValid) => {
+      selectors.assignmentGradeFilterValidity = jest.fn(() => ({
+        isMinValid,
+        isMaxValid,
+        isMinLessMaxValid,
+      }));
+    };
+    it('returns true iff assignmentGrade filters are both valid', () => {
+      const old = selectors.assignmentGradeFilterValidity;
+      mockValidity(true, false, false);
+      expect(exportedSelectors.areAssignmentGradeFiltersValid(testState)).toEqual(false);
+      mockValidity(false, true, false);
+      expect(exportedSelectors.areAssignmentGradeFiltersValid(testState)).toEqual(false);
+      mockValidity(false, false, true);
+      expect(exportedSelectors.areAssignmentGradeFiltersValid(testState)).toEqual(false);
+      mockValidity(true, true, true);
+      expect(exportedSelectors.areAssignmentGradeFiltersValid(testState)).toEqual(true);
+      selectors.assignmentGradeFilterValidity = old;
+    });
+  });
   describe('areCourseGradeFiltersValid', () => {
-    const mockValidity = (isMinValid, isMaxValid) => {
+    const mockValidity = (isMinValid, isMaxValid, isMinLessMaxValid) => {
       selectors.courseGradeFilterValidity = jest.fn(() => ({
         isMinValid,
         isMaxValid,
+        isMinLessMaxValid,
       }));
     };
     it('returns true iff courseGrade filters are both valid', () => {
       const old = selectors.courseGradeFilterValidity;
-      mockValidity(false, true);
+      mockValidity(true, false, false);
+      expect(exportedSelectors.areCourseGradeFiltersValid(testState)).toEqual(false);
+      mockValidity(false, true, false);
       expect(exportedSelectors.areCourseGradeFiltersValid(testState)).toEqual(false);
-      mockValidity(true, false);
+      mockValidity(false, false, true);
       expect(exportedSelectors.areCourseGradeFiltersValid(testState)).toEqual(false);
-      mockValidity(true, true);
+      mockValidity(true, true, true);
       expect(exportedSelectors.areCourseGradeFiltersValid(testState)).toEqual(true);
       selectors.courseGradeFilterValidity = old;
     });
diff --git a/src/i18n/messages/ar.json b/src/i18n/messages/ar.json
index f81abdaf..d3ae6333 100644
--- a/src/i18n/messages/ar.json
+++ b/src/i18n/messages/ar.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "تم تعديل الدرجة بنجاح. قد تلاحظ تأخّرًا طفيفا في ظهور التحديثات في دفتر الدرجات.",
   "gradebook.GradesView.maxCourseGradeInvalid": "الدرجة القصوى يجب أن تكون بين 0 و 100",
   "gradebook.GradesView.minCourseGradeInvalid": "الدرجة الدنيا يجب أن تكون بين 0 و 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "الواجب",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "درجة الواجب",
   "gradebook.GradesTab.FilterBadges.assignmentType": "نوع الواجب",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "درجة المساق",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "تضمين أعضاء فريق المساق",
   "gradebook.GradesTab.FilterBadges.track": "المسار"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/de.json b/src/i18n/messages/de.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/de.json
+++ b/src/i18n/messages/de.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/es_419.json b/src/i18n/messages/es_419.json
index ebc10969..ef568098 100644
--- a/src/i18n/messages/es_419.json
+++ b/src/i18n/messages/es_419.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "La calificación ha sido editada de manera exitosa. Podrás apreciar un retraso mínimo mientras se realizan las actualizaciones en el libro de calificaciones. ",
   "gradebook.GradesView.maxCourseGradeInvalid": "La máxima calificación de curso  debe estar entre 0 y 100",
   "gradebook.GradesView.minCourseGradeInvalid": "La calificación de curso mínima debe estar entre 0 y 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Tarea",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Calificación de la tarea",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Tipo de tarea",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Calificación del curso",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Incluir miembros del equipo del curso",
   "gradebook.GradesTab.FilterBadges.track": "Hacer seguimiento"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/fa_IR.json b/src/i18n/messages/fa_IR.json
index 888d43c8..1d3f4348 100644
--- a/src/i18n/messages/fa_IR.json
+++ b/src/i18n/messages/fa_IR.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "نمره با موفقیت ویرایش شد. ممکن است روزآمدسازی کارنامه کمی تأخیر داشته باشد.",
   "gradebook.GradesView.maxCourseGradeInvalid": "حداکثر نمره دوره آموزشی باید بین 0 تا 100 باشد",
   "gradebook.GradesView.minCourseGradeInvalid": "حداقل نمره دوره باید بین 0 تا 100 باشد",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "تکلیف",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "نمره تکلیف",
   "gradebook.GradesTab.FilterBadges.assignmentType": "نوع تکلیف",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "نمره دوره آموزشی",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "شامل اعضای تیم دوره آموزشی",
   "gradebook.GradesTab.FilterBadges.track": "مسیر"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/fr.json b/src/i18n/messages/fr.json
index 700a112b..3e994eb3 100644
--- a/src/i18n/messages/fr.json
+++ b/src/i18n/messages/fr.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "Les notes ont été éditées avec succès. Un délai est possible avant que vous ne constatiez la mise-à-jour dans le carnet de note.",
   "gradebook.GradesView.maxCourseGradeInvalid": "La note maximale du cours doit être entre 0 et 100",
   "gradebook.GradesView.minCourseGradeInvalid": "La note minimale du cours doit être entre 0 et 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Devoir",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Note des devoirs",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Type de travail",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Note du cours",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Inclure les membres de l'équipe de cours",
   "gradebook.GradesTab.FilterBadges.track": "Parcours"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/fr_CA.json b/src/i18n/messages/fr_CA.json
index ca4b9a10..92f47494 100644
--- a/src/i18n/messages/fr_CA.json
+++ b/src/i18n/messages/fr_CA.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "Les notes ont été éditées avec succès. Un délai est possible avant que vous ne constatiez la mise-à-jour dans le carnet de note.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Note maximale du cours doit être entre 0 et 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Note minimale du cours doit être entre 0 et 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Devoir",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Note de devoir",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Type de devoir",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Note du cours",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Inclure les membres de l'équipe de cours",
   "gradebook.GradesTab.FilterBadges.track": "Parcours"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/hi.json b/src/i18n/messages/hi.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/hi.json
+++ b/src/i18n/messages/hi.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/it.json b/src/i18n/messages/it.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/it.json
+++ b/src/i18n/messages/it.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/pt.json b/src/i18n/messages/pt.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/pt.json
+++ b/src/i18n/messages/pt.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/ru.json b/src/i18n/messages/ru.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/ru.json
+++ b/src/i18n/messages/ru.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/uk.json b/src/i18n/messages/uk.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/uk.json
+++ b/src/i18n/messages/uk.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}
diff --git a/src/i18n/messages/zh_CN.json b/src/i18n/messages/zh_CN.json
index f0c5dfc2..a8212c9a 100644
--- a/src/i18n/messages/zh_CN.json
+++ b/src/i18n/messages/zh_CN.json
@@ -63,6 +63,10 @@
   "gradebook.GradesView.editSuccessAlert": "The grade has been successfully edited.  You may see a slight delay before updates appear in the Gradebook.",
   "gradebook.GradesView.maxCourseGradeInvalid": "Maximum course grade must be between 0 and 100",
   "gradebook.GradesView.minCourseGradeInvalid": "Minimum course grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxGradeInvalid": "Minimum course grade must be less than maximum course grade",
+  "gradebook.GradesView.maxAssignmentGradeInvalid": "Maximum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minAssignmentGradeInvalid": "Minimum assignment grade must be between 0 and 100",
+  "gradebook.GradesView.minLessMaxAssignmentInvalid": "Minimum assignment grade must be less than maximum assignment grade",
   "gradebook.GradesTab.FilterBadges.assignment": "Assignment",
   "gradebook.GradesTab.FilterBadges.assignmentGrade": "Assignment Grade",
   "gradebook.GradesTab.FilterBadges.assignmentType": "Assignment Type",
@@ -70,4 +74,4 @@
   "gradebook.GradesTab.FilterBadges.courseGrade": "Course Grade",
   "gradebook.GradesTab.FilterBadges.includeCourseRoleMembers": "Include Course Team Members",
   "gradebook.GradesTab.FilterBadges.track": "Track"
-}
\ No newline at end of file
+}