Shows the option to remove a student from the course

fixes CNVS-22983

Test Plan:
* Go to a course with students
* As a teacher, click the item cog to open the dropdown for a student
* You should see the option to remove them from the course if the student
  was manually enrolled by the teacher.
* The option should also be visible if your user has admin permission
  and the student was enrolled via sis
* The option should be hidden if your user has default teacher permissions
  and the student was enrolled via sis
Change-Id: Icfacc377edcb82b5c4aeddab6b20e47d1f0e7f70
Reviewed-on: https://gerrit.instructure.com/62627
Reviewed-by: Jon Willesen <jonw@instructure.com>
Tested-by: Jenkins
QA-Review: Charles Kimball <ckimball@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>

Author: Dan Minkevitch

app/coffeescripts/bundles/roster.coffee

@@ -37,7 +37,7 @@ require [
 ], (I18n, {Model}, CreateUserList, Role, CreateUsersView, RoleSelectView, rosterUsersTemplate, RosterUserCollection, RolesCollection, SectionCollection, GroupCategoryCollection, InputFilterView, PaginatedCollectionView, RosterUserView, RosterView, RosterTabsView, ResendInvitationsView, $) ->
 
   fetchOptions =
-    include: ['avatar_url', 'enrollments', 'email', 'observed_users']
+    include: ['avatar_url', 'enrollments', 'email', 'observed_users', 'can_be_removed']
     per_page: 50
   users = new RosterUserCollection null,
     course_id: ENV.context_asset_string.split('_')[1]

app/coffeescripts/views/courses/roster/RosterUserView.coffee

@@ -50,7 +50,7 @@ define [
       json.url = "#{ENV.COURSE_ROOT_URL}/users/#{@model.get('id')}"
       json.isObserver = @model.hasEnrollmentType('ObserverEnrollment')
       json.isPending = @model.pending(@model.currentRole)
-      json.canRemoveStudents = ENV.permissions.manage_students and _.all @model.get('enrollments'), (e) -> !e.sis_source_id
+      json.canRemoveStudents = ENV.permissions.manage_students and _.any @model.get('enrollments'), (e) -> e.can_be_removed
       json.canEditSections = not _.isEmpty @model.sectionEditableEnrollments()
       json.canLinkStudents = json.isObserver && !ENV.course.concluded
       json.canViewLoginIdColumn = ENV.permissions.manage_admin_users or ENV.permissions.manage_students

lib/api/v1/user.rb

@@ -222,6 +222,10 @@ def enrollment_json(enrollment, user, session, includes = [], opts = {})
       if includes.include?('observed_users') && enrollment.observer? && enrollment.associated_user && !enrollment.associated_user.deleted?
         json[:observed_user] = user_json(enrollment.associated_user, user, session, user_includes, @context, enrollment.associated_user.not_ended_enrollments.all_student.shard(enrollment).where(:course_id => enrollment.course_id))
       end
+      if includes.include?('can_be_removed')
+        json[:can_be_removed] = (!enrollment.defined_by_sis? || context.grants_right?(@current_user, session, :manage_account_settings)) &&
+                                  enrollment.can_be_deleted_by(@current_user, @context, session)
+      end
     end
   end
 

spec/selenium/people_spec.rb

@@ -31,10 +31,9 @@ def create_student_group(group_text = "new student group")
     expect(f('#category_list')).to include_text(group_text)
   end
 
-  def enroll_student(student, sis_source_id: nil)
+  def enroll_student(student)
     e1 = @course.enroll_student(student)
     e1.workflow_state = 'active'
-    e1.sis_source_id = sis_source_id if sis_source_id
     e1.save!
     @course.reload
   end
@@ -82,10 +81,6 @@ def open_dropdown_menu(selector: nil, option: nil, displayed: true)
 
       enroll_student(@student_1)
 
-      #add second student as if enrolled via SIS
-      @sis_student = create_user('sis_student@test.com')
-      enroll_student(@sis_student, sis_source_id: 'oh hai')
-
       #adding users for tests to work correctly
 
       #teacher user
@@ -113,10 +108,6 @@ def open_dropdown_menu(selector: nil, option: nil, displayed: true)
       open_dropdown_menu(option: 'removeFromCourse')
     end
 
-    it "should not display the option to remove a student if enrolled via SIS" do
-      open_dropdown_menu(selector: '.rosterUser:nth-child(2)', option: 'removeFromCourse', displayed: false)
-    end
-
     it "should display activity report on clicking Student Interaction button", priority: "1", test_id: 244446 do
       fln("Student Interactions Report").click
       wait_for_ajaximations