inline cyoe interface

- inline cyoe interface in assignments, discussions, quizzes
- integrate into form validation, saving

refs CYOE-183

Test plan:
Tested in conjunction with g/83054 from conditional-release
For each of assignment, discussion topics, quizzes
1.  Verify that normal usage is unaffected (including in non-CYOE-enabled
    environment)
2.  Verify that CYOE content is saved alongside main canvas content
3.  Verify that errors in saving CYOE prevent full saves in Canvas

Change-Id: I4a15ca3b1440c9596c4a0e91da3b386ca05781a8
Reviewed-on: https://gerrit.instructure.com/82930
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
QA-Review: Jahnavi Yetukuri <jyetukuri@instructure.com>
Product-Review: Michael Brewer-Davis <mbd@instructure.com>

Author: Michael Brewer-Davis

app/coffeescripts/bundles/assignment_edit.coffee

@@ -41,11 +41,6 @@ require [
     else
       '#edit_assignment_header'
 
-  editHeaderView = new EditHeaderView
-    el: headerEl
-    model: assignment
-  editHeaderView.render()
-
   editView = new EditView
     el: '#edit_assignment_form'
     model: assignment
@@ -57,4 +52,11 @@ require [
       'js-assignment-overrides': new OverrideView
         model: dueDateList
         views: {}
-  editView.render()
+
+  editHeaderView = new EditHeaderView
+    el: headerEl
+    model: assignment
+    views:
+      'edit_assignment_form': editView
+
+  editHeaderView.render()

app/coffeescripts/views/DiscussionTopics/EditView.coffee

@@ -53,6 +53,7 @@ ConditionalRelease) ->
       'change #use_for_grading' : 'toggleGradingDependentOptions'
       'change #discussion_topic_assignment_points_possible' : 'handlePointsChange'
       'change' : 'onChange'
+      'tabsbeforeactivate #discussion-edit-view' : 'onTabChange'
     )
 
     messages:
@@ -66,7 +67,7 @@ ConditionalRelease) ->
       @assignment = @model.get("assignment")
       @initialPointsPossible = @assignment.pointsPossible()
       @dueDateOverrideView = options.views['js-assignment-overrides']
-      @model.on 'sync', =>
+      @on 'success', =>
         @unwatchUnload()
         window.location = @model.get 'html_url'
       super
@@ -255,6 +256,18 @@ ConditionalRelease) ->
       @$('.attachmentRow').remove()
       @$('[name="attachment"]').show().focus()
 
+    saveFormData: =>
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        super.pipe (data, status, xhr) =>
+          assignment = data.assignment if data.set_assignment
+          @conditionalReleaseEditor.updateAssignment(assignment)
+          # Restore expected promise values
+          @conditionalReleaseEditor.save().pipe(
+            => new $.Deferred().resolve(data, status, xhr).promise()
+            (err) => new $.Deferred().reject(xhr, err).promise())
+      else
+        super
+
     submit: (event) =>
       event.preventDefault()
       event.stopPropagation()
@@ -308,6 +321,10 @@ ConditionalRelease) ->
       if @isAnnouncement()
         unless data.message?.length > 0
           errors['message'] = [{type: 'message_required_error', message: I18n.t("A message is required")}]
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        crErrors = @conditionalReleaseEditor.validateBeforeSave()
+        errors['conditional_release'] = crErrors if crErrors
+
       errors
 
     _validatePointsPossible: (data, errors) =>
@@ -325,6 +342,13 @@ ConditionalRelease) ->
       # before calling super
       # see getFormValues in DueDateView.coffee
       delete errors.assignmentOverrides
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        # switch to a tab with errors
+        if errors['conditional_release']
+          @$discussionEditView.tabs("option", "active", 1)
+          @$conditionalReleaseTarget.get(0).scrollIntoView()
+        else
+          @$discussionEditView.tabs("option", "active", 0)
       super(errors)
 
     toggleGradingDependentOptions: ->
@@ -348,4 +372,10 @@ ConditionalRelease) ->
     onChange: ->
       if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED && !@assignmentDirty
         @assignmentDirty = true
-        @conditionalReleaseEditor.setProps({ assignmentDirty: true })
+
+    onTabChange: ->
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED && @assignmentDirty
+        assignmentData = @getFormData().assignment?.attributes
+        @conditionalReleaseEditor.updateAssignment(assignmentData)
+        @assignmentDirty = false
+      true

app/coffeescripts/views/assignments/EditHeaderView.coffee

@@ -14,27 +14,27 @@ define [
     events:
       'click .delete_assignment_link': 'onDelete'
       'change #grading_type_selector': 'onGradingTypeUpdate'
-      'change' : 'onChange'
+      'tabsbeforeactivate': 'onTabChange'
+
 
     messages:
       confirm: I18n.t('confirms.delete_assignment', 'Are you sure you want to delete this assignment?')
 
     els:
       '#edit-assignment-header-tabs': '$headerTabs'
       '#edit-assignment-header-cr-tabs': '$headerTabsCr'
-      '#conditional-release-target': '$conditionalReleaseTarget'
+
+    initialize: (options) ->
+      super
+      @editView = options.views['edit_assignment_form']
+      @editView.on 'show-errors', @onShowErrors
 
     afterRender: ->
       # doubled for conditional release
       @$headerTabs.tabs()
       @$headerTabsCr.tabs()
-
       if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
         @toggleConditionalReleaseTab(@model.gradingType())
-        @conditionalReleaseEditor = ConditionalRelease.attach(
-          @$conditionalReleaseTarget.get(0),
-          I18n.t('assignment'),
-          ENV.CONDITIONAL_RELEASE_ENV)
 
     onDelete: (e) =>
       e.preventDefault()
@@ -64,12 +64,19 @@ define [
         else
           @$headerTabsCr.tabs("option", "disabled", false)
 
+    onTabChange: ->
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        @editView.updateConditionalRelease()
+
+    onShowErrors: (errors) =>
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        if errors['conditional_release']
+          @$headerTabsCr.tabs("option", "active", 1)
+          @editView.$conditionalReleaseTarget.get(0).scrollIntoView()
+        else
+          @$headerTabsCr.tabs("option", "active", 0)
+
     toJSON: ->
       json = @model.toView()
       json['CONDITIONAL_RELEASE_SERVICE_ENABLED'] = ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
       json
-
-    onChange: ->
-      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED && !@assignmentDirty
-        @assignmentDirty = true
-        @conditionalReleaseEditor.setProps({ assignmentDirty: true })

app/coffeescripts/views/assignments/EditView.coffee

@@ -15,12 +15,14 @@ define [
   'compiled/views/assignments/GroupCategorySelector'
   'compiled/jquery/toggleAccessibly'
   'compiled/views/editor/KeyboardShortcuts'
+  'jsx/shared/conditional_release/ConditionalRelease'
   'jqueryui/dialog'
   'jquery.toJSON'
   'compiled/jquery.rails_flash_notifications'
 ], (INST, I18n, ValidatedFormView, _, $, RichContentEditor, template,
 userSettings, TurnitinSettings, TurnitinSettingsDialog, preventDefault, MissingDateDialog,
-AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardShortcuts) ->
+AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardShortcuts,
+ConditionalRelease) ->
 
   RichContentEditor.preloadRemoteModule()
 
@@ -56,6 +58,7 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
     PEER_REVIEWS_BOX = '#assignment_peer_reviews'
     GROUP_CATEGORY_BOX = '#has_group_category'
     MODERATED_GRADING_BOX = '#assignment_moderated_grading'
+    CONDITIONAL_RELEASE_TARGET = '#conditional_release_target'
 
     els: _.extend({}, @::els, do ->
       els = {}
@@ -82,6 +85,7 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       els["#{ASSIGNMENT_POINTS_POSSIBLE}"] = '$assignmentPointsPossible'
       els["#{ASSIGNMENT_POINTS_CHANGE_WARN}"] = '$pointsChangeWarning'
       els["#{MODERATED_GRADING_BOX}"] = '$moderatedGradingBox'
+      els["#{CONDITIONAL_RELEASE_TARGET}"] = '$conditionalReleaseTarget'
       els
     )
 
@@ -99,6 +103,8 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       events["change #{PEER_REVIEWS_BOX}"] = 'handleModeratedGradingChange'
       events["change #{GROUP_CATEGORY_BOX}"] = 'handleModeratedGradingChange'
       events["change #{MODERATED_GRADING_BOX}"] = 'handleModeratedGradingChange'
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        events["change"] = 'onChange'
       events
     )
 
@@ -112,8 +118,10 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       @assignment = @model
       @setDefaultsIfNew()
       @dueDateOverrideView = options.views['js-assignment-overrides']
-      @model.on 'sync', -> window.location = @get 'html_url'
+      @on 'success', => window.location = @model.get 'html_url'
       @gradingTypeSelector.on 'change:gradingType', @handleGradingTypeChange
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        @gradingTypeSelector.on 'change:gradingType', @onChange
 
     handleCancel: (ev) =>
       ev.preventDefault()
@@ -236,6 +244,11 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       @handleModeratedGradingChange()
       if ENV?.HAS_GRADED_SUBMISSIONS
         @disableCheckbox(@$moderatedGradingBox, I18n.t("Moderated grading setting cannot be changed if graded submissions exist"))
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        @conditionalReleaseEditor = ConditionalRelease.attach(
+          @$conditionalReleaseTarget.get(0),
+          I18n.t('assignment'),
+          ENV.CONDITIONAL_RELEASE_ENV)
       this
 
     toJSON: =>
@@ -245,6 +258,7 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
         postToSISEnabled: ENV?.POST_TO_SIS or false
         isLargeRoster: ENV?.IS_LARGE_ROSTER or false
         submissionTypesFrozen: _.include(data.frozenAttributes, 'submission_types')
+        conditionalReleaseServiceEnabled: ENV?.CONDITIONAL_RELEASE_SERVICE_ENABLED or false
 
     # separated out so we can easily stub it
     scrollSidebar: $.scrollSidebar
@@ -283,6 +297,17 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       data.published = true if @shouldPublish
       return data
 
+    saveFormData: =>
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        super.pipe (data, status, xhr) =>
+          @conditionalReleaseEditor.updateAssignment(data)
+          # Restore expected promise values
+          @conditionalReleaseEditor.save().pipe(
+            => new $.Deferred().resolve(data, status, xhr).promise()
+            (err) => new $.Deferred().reject(xhr, err).promise())
+      else
+        super
+
     submit: (event) =>
       event.preventDefault()
       event.stopPropagation()
@@ -355,6 +380,7 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       # see getFormValues in DueDateView.coffee
       delete errors.assignmentOverrides
       super(errors)
+      @trigger 'show-errors', errors
 
     validateBeforeSave: (data, errors) =>
       errors = @_validateTitle data, errors
@@ -369,6 +395,9 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
       data2 =
         assignment_overrides: @dueDateOverrideView.getAllDates()
       errors = @dueDateOverrideView.validateBeforeSave(data2,errors)
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED
+        crErrors = @conditionalReleaseEditor.validateBeforeSave()
+        errors['conditional_release'] = crErrors if crErrors
       errors
 
     _validateTitle: (data, errors) =>
@@ -424,3 +453,13 @@ AssignmentGroupSelector, GroupCategorySelector, toggleAccessibly, RCEKeyboardSho
           message: I18n.t 'External Tool URL cannot be left blank'
         ]
       errors
+
+    onChange: ->
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED && !@assignmentDirty
+        @assignmentDirty = true
+
+    updateConditionalRelease: ->
+      if ENV.CONDITIONAL_RELEASE_SERVICE_ENABLED && @assignmentDirty
+        assignmentData = @getFormData()
+        @conditionalReleaseEditor.updateAssignment(assignmentData)
+        @assignmentDirty = false

app/controllers/assignments_controller.rb

@@ -450,7 +450,6 @@ def edit
       append_sis_data(hash)
       js_env(hash)
       conditional_release_js_env(@assignment)
-      @padless = true
       render :edit
     end
   end