diff --git a/ui/features/screenreader_gradebook/ember/components/fast_select_component.js b/ui/features/screenreader_gradebook/ember/components/fast_select_component.js index 68cbd00ce1d..8f1205a2852 100644 --- a/ui/features/screenreader_gradebook/ember/components/fast_select_component.js +++ b/ui/features/screenreader_gradebook/ember/components/fast_select_component.js @@ -42,16 +42,21 @@ const FastSelectComponent = Component.extend({ }, valueDidChange: function () { - const {items} = this - const {value} = this let selected = null - if (value && items) { - selected = items.findBy(this.valuePath, value) + if (this.value && this.items) { + selected = this.items.findBy(this.valuePath, this.value) } - set(this, 'selected', selected) - } - .observes('value') - .on('init'), + set(this, 'selected', selected || null) + }.observes('value'), + + initialize: function () { + const value = this.value || this.valueDefault + let selected + if (value && this.items) { + selected = this.items.findBy(this.valuePath, value) + } + set(this, 'selected', selected || null) + }.on('init'), itemsWillChange: function () { const {items} = this @@ -109,7 +114,7 @@ const FastSelectComponent = Component.extend({ this.arrayDidChange(this.items, 0, 0, get(this.items, 'length')) }.observes('labelPath'), - arrayDidChange(items, start, removeCount, addCount) { + arrayDidChange(items, start, _removeCount, addCount) { let value const select = get(this, 'element') const hasDefault = get(this, 'hasDefaultOption') @@ -127,7 +132,7 @@ const FastSelectComponent = Component.extend({ const option = doc.createElement('option') option.textContent = label option.value = value - if (this.value === value) { + if ((this.value || this.valueDefault) === value) { option.selected = true set(this, 'selected', item) } diff --git a/ui/features/screenreader_gradebook/ember/controllers/screenreader_gradebook_controller.js b/ui/features/screenreader_gradebook/ember/controllers/screenreader_gradebook_controller.js index abfbc4d49ae..69f9a6bdb88 100644 --- a/ui/features/screenreader_gradebook/ember/controllers/screenreader_gradebook_controller.js +++ b/ui/features/screenreader_gradebook/ember/controllers/screenreader_gradebook_controller.js @@ -85,7 +85,7 @@ function studentsUniqByEnrollments(...args) { array.pushObject(student) return array }, - removedItem(array, enrollment, _, instanceMeta) { + removedItem(array, enrollment, __, instanceMeta) { const student = array.findBy('id', enrollment.user_id) student.sections.removeObject(enrollment.course_section_id) @@ -177,7 +177,7 @@ const ScreenreaderGradebookController = Ember.ObjectController.extend({ } })(), - selectedGradingPeriod: function (key, newValue) { + selectedGradingPeriod: function (_key, newValue) { let savedGP const savedGradingPeriodId = userSettings.contextGet('gradebook_current_grading_period') if (savedGradingPeriodId) { @@ -418,6 +418,7 @@ const ScreenreaderGradebookController = Ember.ObjectController.extend({ () => $.ajaxJSON(`/api/v1/progress/${attachmentProgress.progress_id}`, 'GET').then(response => { if (response.workflow_state === 'completed') { + // eslint-disable-next-line promise/catch-or-return $.ajaxJSON( `/api/v1/users/${ENV.current_user_id}/files/${attachmentProgress.attachment_id}`, 'GET' @@ -478,7 +479,7 @@ const ScreenreaderGradebookController = Ember.ObjectController.extend({ learningMasteryEnabled: ENV.GRADEBOOK_OPTIONS.outcome_gradebook_enabled, } const component = React.createElement(GradebookSelector, props) - return ReactDOM.render(component, mountPoint) + ReactDOM.render(component, mountPoint) }.on('init'), willDestroy() { diff --git a/ui/features/screenreader_gradebook/jst/settings/grading_period_select.hbs b/ui/features/screenreader_gradebook/jst/settings/grading_period_select.hbs index 31a818995bd..409571099f8 100644 --- a/ui/features/screenreader_gradebook/jst/settings/grading_period_select.hbs +++ b/ui/features/screenreader_gradebook/jst/settings/grading_period_select.hbs @@ -6,16 +6,18 @@