From 0edaf31008e979f9fd269769d9bf5095baaf1cfc Mon Sep 17 00:00:00 2001
From: Stefan Topfstedt <Stefan.Topfstedt@ucsf.edu>
Date: Thu, 13 Jul 2023 10:03:23 -0700
Subject: [PATCH 1/3] realigns capabilities checks for single user group
 removal/assignment with bulk removal/assignment checks.

---
 .../learner-group/cohort-user-manager.hbs     | 40 +++++++++----------
 app/components/learner-group/user-manager.hbs | 40 +++++++++----------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/app/components/learner-group/cohort-user-manager.hbs b/app/components/learner-group/cohort-user-manager.hbs
index 41a4a1e38e..7612b2f5a3 100644
--- a/app/components/learner-group/cohort-user-manager.hbs
+++ b/app/components/learner-group/cohort-user-manager.hbs
@@ -114,27 +114,25 @@
                   {{/if}}
                 </td>
                 <td class="text-left" colspan="1">
-                  {{#if user.enabled}}
-                    {{#if (includes user this.usersBeingMoved)}}
-                      <LoadingSpinner />
-                    {{else if (and @canUpdate (eq this.selectedUsers.length 0))}}
-                      <button
-                        type="button"
-                        class="inline-button"
-                        {{on "click" (perform this.addSingleUser user)}}
-                        data-test-add-user
-                      >
-                        <FaIcon
-                          @icon="plus"
-                          class="yes"
-                          @title={{t
-                            "general.moveToGroup"
-                            groupTitle=@learnerGroupTitle
-                            count=1
-                          }}
-                        />
-                      </button>
-                    {{/if}}
+                  {{#if (includes user this.usersBeingMoved)}}
+                    <LoadingSpinner />
+                  {{else if (and @canUpdate (or user.enabled this.currentUser.isRoot) (eq this.selectedUsers.length 0))}}
+                    <button
+                      type="button"
+                      class="inline-button"
+                      {{on "click" (perform this.addSingleUser user)}}
+                      data-test-add-user
+                    >
+                      <FaIcon
+                        @icon="plus"
+                        class="yes"
+                        @title={{t
+                          "general.moveToGroup"
+                          groupTitle=@learnerGroupTitle
+                          count=1
+                        }}
+                      />
+                    </button>
                   {{/if}}
                 </td>
               </tr>
diff --git a/app/components/learner-group/user-manager.hbs b/app/components/learner-group/user-manager.hbs
index ef10623a0c..86d17a00bd 100644
--- a/app/components/learner-group/user-manager.hbs
+++ b/app/components/learner-group/user-manager.hbs
@@ -127,8 +127,8 @@
                   <td>
                     {{#if (includes user.content this.usersBeingRemovedFromGroup)}}
                       <LoadingSpinner />
-                    {{else if user.enabled}}
-                      {{#if (eq this.selectedGroupUsers.length 0)}}
+                    {{else}}
+                      {{#if (and (or user.enabled this.currentUser.isRoot) (eq this.selectedGroupUsers.length 0))}}
                         <button
                           type="button"
                           class="link-button"
@@ -268,25 +268,23 @@
                   <td>
                     {{#if (includes user.content this.usersBeingAddedToGroup)}}
                       <LoadingSpinner />
-                    {{else if user.enabled}}
-                      {{#if (eq this.selectedNonGroupUsers.length 0)}}
-                        <button
-                          type="button"
-                          class="link-button"
-                          {{on "click" (perform this.addUserToGroup user.content)}}
-                          data-test-add-user
-                        >
-                          <FaIcon
-                            @icon="plus"
-                            class="yes"
-                            @title={{t
-                              "general.moveToGroup"
-                              groupTitle=@learnerGroupTitle
-                              count=1
-                            }}
-                          />
-                        </button>
-                      {{/if}}
+                    {{else if (and (or user.enabled this.currentUser.isRoot) (eq this.selectedNonGroupUsers.length 0))}}
+                      <button
+                        type="button"
+                        class="link-button"
+                        {{on "click" (perform this.addUserToGroup user.content)}}
+                        data-test-add-user
+                      >
+                        <FaIcon
+                          @icon="plus"
+                          class="yes"
+                          @title={{t
+                            "general.moveToGroup"
+                            groupTitle=@learnerGroupTitle
+                            count=1
+                          }}
+                        />
+                      </button>
                     {{/if}}
                   </td>
                 </tr>

From 1e639417de9311be00a0d87ff2039b712d64e698 Mon Sep 17 00:00:00 2001
From: Stefan Topfstedt <Stefan.Topfstedt@ucsf.edu>
Date: Fri, 14 Jul 2023 10:05:21 -0700
Subject: [PATCH 2/3] rm unnecessary check on whether the current user is root
 or not.

since this check where always paired with a perms check on
the given learner-group, which is always positive if the current user is root, we
can safely remove it.
---
 .../learner-group/cohort-user-manager.hbs     | 10 +++++-----
 app/components/learner-group/user-manager.hbs | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/components/learner-group/cohort-user-manager.hbs b/app/components/learner-group/cohort-user-manager.hbs
index 7612b2f5a3..fbe1d54301 100644
--- a/app/components/learner-group/cohort-user-manager.hbs
+++ b/app/components/learner-group/cohort-user-manager.hbs
@@ -57,7 +57,7 @@
             {{#each (sort-by @sortBy this.filteredUsers) as |user index|}}
               <tr class={{unless user.enabled "disabled-user-account"}}>
                 <td class="text-left" colspan="1">
-                  {{#if (and @canUpdate (or user.enabled this.currentUser.isRoot))}}
+                  {{#if (and @canUpdate user.enabled)}}
                     <input
                       type="checkbox"
                       checked={{includes user this.selectedUsers}}
@@ -75,7 +75,7 @@
                   {{/unless}}
                 </td>
                 <td class="text-left" colspan="4">
-                  {{#if (and @canUpdate (or user.enabled this.currentUser.isRoot))}}
+                  {{#if (and @canUpdate user.enabled)}}
                     <button
                       class="inline-button"
                       type="button"
@@ -88,7 +88,7 @@
                   {{/if}}
                 </td>
                 <td class="text-left" colspan="2">
-                  {{#if (and @canUpdate (or user.enabled this.currentUser.isRoot))}}
+                  {{#if (and @canUpdate user.enabled)}}
                     <button
                       class="inline-button"
                       type="button"
@@ -101,7 +101,7 @@
                   {{/if}}
                 </td>
                 <td class="text-left hide-from-small-screen" colspan="5">
-                  {{#if (and @canUpdate (or user.enabled this.currentUser.isRoot))}}
+                  {{#if (and @canUpdate user.enabled)}}
                     <button
                       class="inline-button"
                       type="button"
@@ -116,7 +116,7 @@
                 <td class="text-left" colspan="1">
                   {{#if (includes user this.usersBeingMoved)}}
                     <LoadingSpinner />
-                  {{else if (and @canUpdate (or user.enabled this.currentUser.isRoot) (eq this.selectedUsers.length 0))}}
+                  {{else if (and @canUpdate user.enabled (eq this.selectedUsers.length 0))}}
                     <button
                       type="button"
                       class="inline-button"
diff --git a/app/components/learner-group/user-manager.hbs b/app/components/learner-group/user-manager.hbs
index 86d17a00bd..6d45596734 100644
--- a/app/components/learner-group/user-manager.hbs
+++ b/app/components/learner-group/user-manager.hbs
@@ -59,7 +59,7 @@
               {{#each (sort-by @sortBy this.groupUsers) as |user index|}}
                 <tr class={{unless user.enabled "disabled-user-account" ""}}>
                   <td class="text-left" colspan="1">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <input
                         aria-labelledby="selected-username-{{index}}-{{templateId}}"
                         type="checkbox"
@@ -77,7 +77,7 @@
                     {{/unless}}
                   </td>
                   <td class="text-left" colspan="4">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -90,7 +90,7 @@
                     {{/if}}
                   </td>
                   <td class="text-left" colspan="2">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -103,7 +103,7 @@
                     {{/if}}
                   </td>
                   <td class="text-left hide-from-small-screen" colspan="5">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -128,7 +128,7 @@
                     {{#if (includes user.content this.usersBeingRemovedFromGroup)}}
                       <LoadingSpinner />
                     {{else}}
-                      {{#if (and (or user.enabled this.currentUser.isRoot) (eq this.selectedGroupUsers.length 0))}}
+                      {{#if (and user.enabled (eq this.selectedGroupUsers.length 0))}}
                         <button
                           type="button"
                           class="link-button"
@@ -200,7 +200,7 @@
               {{#each (sort-by @sortBy this.nonGroupUsers) as |user index|}}
                 <tr class={{unless user.enabled "disabled-user-account" ""}}>
                   <td class="text-left" colspan="1">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <input
                         aria-labelledby="cohort-username-{{index}}-{{templateId}}"
                         type="checkbox"
@@ -218,7 +218,7 @@
                     {{/unless}}
                   </td>
                   <td class="text-left" colspan="4">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -231,7 +231,7 @@
                     {{/if}}
                   </td>
                   <td class="text-left" colspan="2">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -244,7 +244,7 @@
                     {{/if}}
                   </td>
                   <td class="text-left hide-from-small-screen" colspan="5">
-                    {{#if (or user.enabled this.currentUser.isRoot)}}
+                    {{#if user.enabled}}
                       <button
                         class="inline-button"
                         type="button"
@@ -268,7 +268,7 @@
                   <td>
                     {{#if (includes user.content this.usersBeingAddedToGroup)}}
                       <LoadingSpinner />
-                    {{else if (and (or user.enabled this.currentUser.isRoot) (eq this.selectedNonGroupUsers.length 0))}}
+                    {{else if (and user.enabled (eq this.selectedNonGroupUsers.length 0))}}
                       <button
                         type="button"
                         class="link-button"

From 97b29b7ab8f548748a17d5de00a65b036a8af41c Mon Sep 17 00:00:00 2001
From: Stefan Topfstedt <Stefan.Topfstedt@ucsf.edu>
Date: Fri, 14 Jul 2023 11:01:32 -0700
Subject: [PATCH 3/3] losen up perms check to allow non-root user to add/remove
 disabled users to/from learner groups.

---
 .../learner-group/cohort-user-manager.hbs     |  14 +-
 .../learner-group/cohort-user-manager.js      |   9 --
 app/components/learner-group/user-manager.hbs | 128 +++++++-----------
 app/components/learner-group/user-manager.js  |  13 +-
 .../learner-group/cohort-user-manager-test.js |  64 +--------
 .../learner-group/user-manager-test.js        |  86 +-----------
 6 files changed, 65 insertions(+), 249 deletions(-)

diff --git a/app/components/learner-group/cohort-user-manager.hbs b/app/components/learner-group/cohort-user-manager.hbs
index fbe1d54301..dd83dcc10d 100644
--- a/app/components/learner-group/cohort-user-manager.hbs
+++ b/app/components/learner-group/cohort-user-manager.hbs
@@ -23,11 +23,11 @@
                 <Input
                   @type="checkbox"
                   @checked={{and
-                    (includes this.selectableUsers this.selectedUsers)
+                    (includes @users this.selectedUsers)
                     this.selectedUsers.length
                   }}
                   indeterminate={{and
-                    (not (includes this.selectableUsers this.selectedUsers))
+                    (not (includes @users this.selectedUsers))
                     this.selectedUsers.length
                   }}
                   aria-label={{t "general.selectAllOrNone"}}
@@ -57,7 +57,7 @@
             {{#each (sort-by @sortBy this.filteredUsers) as |user index|}}
               <tr class={{unless user.enabled "disabled-user-account"}}>
                 <td class="text-left" colspan="1">
-                  {{#if (and @canUpdate user.enabled)}}
+                  {{#if @canUpdate}}
                     <input
                       type="checkbox"
                       checked={{includes user this.selectedUsers}}
@@ -75,7 +75,7 @@
                   {{/unless}}
                 </td>
                 <td class="text-left" colspan="4">
-                  {{#if (and @canUpdate user.enabled)}}
+                  {{#if @canUpdate}}
                     <button
                       class="inline-button"
                       type="button"
@@ -88,7 +88,7 @@
                   {{/if}}
                 </td>
                 <td class="text-left" colspan="2">
-                  {{#if (and @canUpdate user.enabled)}}
+                  {{#if @canUpdate}}
                     <button
                       class="inline-button"
                       type="button"
@@ -101,7 +101,7 @@
                   {{/if}}
                 </td>
                 <td class="text-left hide-from-small-screen" colspan="5">
-                  {{#if (and @canUpdate user.enabled)}}
+                  {{#if @canUpdate}}
                     <button
                       class="inline-button"
                       type="button"
@@ -116,7 +116,7 @@
                 <td class="text-left" colspan="1">
                   {{#if (includes user this.usersBeingMoved)}}
                     <LoadingSpinner />
-                  {{else if (and @canUpdate user.enabled (eq this.selectedUsers.length 0))}}
+                  {{else if (and @canUpdate (eq this.selectedUsers.length 0))}}
                     <button
                       type="button"
                       class="inline-button"
diff --git a/app/components/learner-group/cohort-user-manager.js b/app/components/learner-group/cohort-user-manager.js
index 760d9284dd..cf60ca1c56 100644
--- a/app/components/learner-group/cohort-user-manager.js
+++ b/app/components/learner-group/cohort-user-manager.js
@@ -15,15 +15,6 @@ export default class LearnerGroupCohortUserManagerComponent extends Component {
     return this.args.sortBy.search(/desc/) === -1;
   }
 
-  get selectableUsers() {
-    if (this.currentUser.isRoot) {
-      return this.args.users;
-    }
-    return this.args.users.filter((user) => {
-      return user.enabled;
-    });
-  }
-
   get filteredUsers() {
     const filter = this.filter.trim().toLowerCase();
 
diff --git a/app/components/learner-group/user-manager.hbs b/app/components/learner-group/user-manager.hbs
index 6d45596734..b2923eebce 100644
--- a/app/components/learner-group/user-manager.hbs
+++ b/app/components/learner-group/user-manager.hbs
@@ -59,14 +59,12 @@
               {{#each (sort-by @sortBy this.groupUsers) as |user index|}}
                 <tr class={{unless user.enabled "disabled-user-account" ""}}>
                   <td class="text-left" colspan="1">
-                    {{#if user.enabled}}
-                      <input
-                        aria-labelledby="selected-username-{{index}}-{{templateId}}"
-                        type="checkbox"
-                        checked={{includes user.content this.selectedGroupUsers}}
-                        {{on "click" (fn this.toggleGroupUserSelection user.content)}}
-                      >
-                    {{/if}}
+                    <input
+                      aria-labelledby="selected-username-{{index}}-{{templateId}}"
+                      type="checkbox"
+                      checked={{includes user.content this.selectedGroupUsers}}
+                      {{on "click" (fn this.toggleGroupUserSelection user.content)}}
+                    >
                     {{#unless user.enabled}}
                       <FaIcon
                         @icon="user-xmark"
@@ -77,43 +75,31 @@
                     {{/unless}}
                   </td>
                   <td class="text-left" colspan="4">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleGroupUserSelection user.content)}}
-                      >
-                        <UserNameInfo id="selected-username-{{index}}-{{templateId}}" @user={{user}} />
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleGroupUserSelection user.content)}}
+                    >
                       <UserNameInfo id="selected-username-{{index}}-{{templateId}}" @user={{user}} />
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left" colspan="2">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleGroupUserSelection user.content)}}
-                      >
-                        {{user.campusId}}
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleGroupUserSelection user.content)}}
+                    >
                       {{user.campusId}}
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left hide-from-small-screen" colspan="5">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleGroupUserSelection user.content)}}
-                      >
-                        {{user.email}}
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleGroupUserSelection user.content)}}
+                    >
                       {{user.email}}
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left" colspan="2">
                     <LinkTo
@@ -128,7 +114,7 @@
                     {{#if (includes user.content this.usersBeingRemovedFromGroup)}}
                       <LoadingSpinner />
                     {{else}}
-                      {{#if (and user.enabled (eq this.selectedGroupUsers.length 0))}}
+                      {{#if (eq this.selectedGroupUsers.length 0)}}
                         <button
                           type="button"
                           class="link-button"
@@ -200,14 +186,12 @@
               {{#each (sort-by @sortBy this.nonGroupUsers) as |user index|}}
                 <tr class={{unless user.enabled "disabled-user-account" ""}}>
                   <td class="text-left" colspan="1">
-                    {{#if user.enabled}}
-                      <input
-                        aria-labelledby="cohort-username-{{index}}-{{templateId}}"
-                        type="checkbox"
-                        checked={{includes user.content this.selectedNonGroupUsers}}
-                        {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
-                      >
-                    {{/if}}
+                    <input
+                      aria-labelledby="cohort-username-{{index}}-{{templateId}}"
+                      type="checkbox"
+                      checked={{includes user.content this.selectedNonGroupUsers}}
+                      {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
+                    >
                     {{#unless user.enabled}}
                       <FaIcon
                         @icon="user-xmark"
@@ -218,43 +202,31 @@
                     {{/unless}}
                   </td>
                   <td class="text-left" colspan="4">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
-                      >
-                        <UserNameInfo id="cohort-username-{{index}}-{{templateId}}" @user={{user}} />
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
+                    >
                       <UserNameInfo id="cohort-username-{{index}}-{{templateId}}" @user={{user}} />
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left" colspan="2">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
-                      >
-                        {{user.campusId}}
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
+                    >
                       {{user.campusId}}
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left hide-from-small-screen" colspan="5">
-                    {{#if user.enabled}}
-                      <button
-                        class="inline-button"
-                        type="button"
-                        {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
-                      >
-                        {{user.email}}
-                      </button>
-                    {{else}}
+                    <button
+                      class="inline-button"
+                      type="button"
+                      {{on "click" (fn this.toggleNonGroupUserSelection user.content)}}
+                    >
                       {{user.email}}
-                    {{/if}}
+                    </button>
                   </td>
                   <td class="text-left" colspan="2">
                     <LinkTo
@@ -268,7 +240,7 @@
                   <td>
                     {{#if (includes user.content this.usersBeingAddedToGroup)}}
                       <LoadingSpinner />
-                    {{else if (and user.enabled (eq this.selectedNonGroupUsers.length 0))}}
+                    {{else if (eq this.selectedNonGroupUsers.length 0)}}
                       <button
                         type="button"
                         class="link-button"
diff --git a/app/components/learner-group/user-manager.js b/app/components/learner-group/user-manager.js
index d1103ae18d..9f2ffde2cd 100644
--- a/app/components/learner-group/user-manager.js
+++ b/app/components/learner-group/user-manager.js
@@ -1,13 +1,10 @@
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { enqueueTask, timeout } from 'ember-concurrency';
 import { mapBy } from 'ilios-common/utils/array-helpers';
 
 export default class LearnerGroupUserManagerComponent extends Component {
-  @service currentUser;
-
   @tracked filter = '';
   @tracked selectedGroupUsers = [];
   @tracked selectedNonGroupUsers = [];
@@ -19,15 +16,7 @@ export default class LearnerGroupUserManagerComponent extends Component {
   }
 
   get selectableUsers() {
-    if (this.currentUser.isRoot) {
-      return mapBy(this.args.users, 'content');
-    }
-    return mapBy(
-      this.args.users.filter((user) => {
-        return user.get('enabled');
-      }),
-      'content'
-    );
+    return mapBy(this.args.users, 'content');
   }
 
   get filteredUsers() {
diff --git a/tests/integration/components/learner-group/cohort-user-manager-test.js b/tests/integration/components/learner-group/cohort-user-manager-test.js
index fef8adf3c5..2dd014ffe7 100644
--- a/tests/integration/components/learner-group/cohort-user-manager-test.js
+++ b/tests/integration/components/learner-group/cohort-user-manager-test.js
@@ -1,4 +1,3 @@
-import Service from '@ember/service';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
@@ -55,9 +54,9 @@ module('Integration | Component | learner-group/cohort-user-manager', function (
     assert.strictEqual(component.users[1].name.userNameInfo.fullName, 'Jackson M. Doggy');
     assert.strictEqual(component.users[1].campusId.text, '123');
     assert.strictEqual(component.users[1].email.text, 'testemail2');
-    assert.notOk(component.users[1].name.isClickable);
-    assert.notOk(component.users[1].campusId.isClickable);
-    assert.notOk(component.users[1].email.isClickable);
+    assert.ok(component.users[1].name.isClickable);
+    assert.ok(component.users[1].campusId.isClickable);
+    assert.ok(component.users[1].email.isClickable);
     assert.ok(component.users[1].isDisabled);
   });
 
@@ -317,63 +316,6 @@ module('Integration | Component | learner-group/cohort-user-manager', function (
     assert.notOk(component.users[2].isSelected);
   });
 
-  test('root users can manage disabled users', async function (assert) {
-    const currentUserMock = Service.extend({
-      isRoot: true,
-    });
-    this.owner.register('service:currentUser', currentUserMock);
-
-    const user = this.server.create('user', { enabled: false });
-    const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
-
-    this.set('users', [userModel]);
-    await render(hbs`<LearnerGroup::CohortUserManager
-      @users={{this.users}}
-      @canUpdate={{true}}
-      @learnerGroupTitle="this group"
-      @topLevelGroupTitle="top level group"
-      @sortBy="firstName"
-      @setSortBy={{(noop)}}
-      @addUserToGroup={{(noop)}}
-      @addUsersToGroup={{(noop)}}
-    />`);
-
-    assert.ok(component.users[0].canBeSelected, 'Checkbox visible');
-    assert.ok(component.users[0].name.isClickable);
-    assert.ok(component.users[0].campusId.isClickable);
-    assert.ok(component.users[0].email.isClickable);
-    assert.ok(component.users[0].isDisabled, 'User is labeled as disabled.');
-  });
-
-  test('non-root users cannot manage disabled users', async function (assert) {
-    const currentUserMock = Service.extend({
-      isRoot: false,
-    });
-    this.owner.register('service:currentUser', currentUserMock);
-
-    const user = this.server.create('user', { enabled: false });
-    const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
-
-    this.set('users', [userModel]);
-
-    await render(hbs`<LearnerGroup::CohortUserManager
-      @users={{this.users}}
-      @canUpdate={{true}}
-      @learnerGroupTitle="this group"
-      @topLevelGroupTitle="top level group"
-      @sortBy="firstName"
-      @setSortBy={{(noop)}}
-      @addUserToGroup={{(noop)}}
-      @addUsersToGroup={{(noop)}}
-    />`);
-
-    assert.notOk(component.users[0].canBeSelected, 'Checkbox visible');
-    assert.notOk(component.users[0].name.isClickable);
-    assert.notOk(component.users[0].campusId.isClickable);
-    assert.notOk(component.users[0].email.isClickable);
-    assert.ok(component.users[0].isDisabled, 'User is labeled as disabled.');
-  });
-
   test('filter users', async function (assert) {
     const user1 = this.server.create('user', {
       firstName: 'Jasper',
diff --git a/tests/integration/components/learner-group/user-manager-test.js b/tests/integration/components/learner-group/user-manager-test.js
index 130754626a..2ab27632e9 100644
--- a/tests/integration/components/learner-group/user-manager-test.js
+++ b/tests/integration/components/learner-group/user-manager-test.js
@@ -1,4 +1,3 @@
-import Service from '@ember/service';
 import ObjectProxy from '@ember/object/proxy';
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
@@ -62,7 +61,6 @@ module('Integration | Component | learner-group/user-manager', function (hooks)
       @addUsersToGroup={{(noop)}}
       @removeUsersFromGroup={{(noop)}}
     />`);
-
     assert.strictEqual(component.groupMembers, 'Members of current group (2)');
     assert.strictEqual(component.allOtherMembers, 'All other members of top group (0)');
     assert.strictEqual(
@@ -82,12 +80,12 @@ module('Integration | Component | learner-group/user-manager', function (hooks)
       component.usersInCurrentGroup[1].name.userNameInfo.fullName,
       'Jackson M. Doggy'
     );
-    assert.notOk(component.usersInCurrentGroup[1].canBeSelected);
+    assert.ok(component.usersInCurrentGroup[1].canBeSelected);
     assert.strictEqual(component.usersInCurrentGroup[1].campusId.text, '123');
     assert.strictEqual(component.usersInCurrentGroup[1].email.text, 'testemail2');
-    assert.notOk(component.usersInCurrentGroup[1].name.isClickable);
-    assert.notOk(component.usersInCurrentGroup[1].campusId.isClickable);
-    assert.notOk(component.usersInCurrentGroup[1].email.isClickable);
+    assert.ok(component.usersInCurrentGroup[1].name.isClickable);
+    assert.ok(component.usersInCurrentGroup[1].campusId.isClickable);
+    assert.ok(component.usersInCurrentGroup[1].email.isClickable);
     assert.ok(component.usersInCurrentGroup[1].isDisabled);
   });
 
@@ -740,82 +738,6 @@ module('Integration | Component | learner-group/user-manager', function (hooks)
     assert.notOk(component.usersNotInCurrentGroup[2].isSelected);
   });
 
-  test('root users can manage disabled users', async function (assert) {
-    assert.expect(2);
-
-    const currentUserMock = Service.extend({ isRoot: true });
-    this.owner.register('service:currentUser', currentUserMock);
-
-    const learnerGroup = this.server.create('learnerGroup', { id: 1 });
-    const user = this.server.create('user', { enabled: false, learnerGroups: [learnerGroup] });
-    const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
-    const learnerGroupModel = await this.owner
-      .lookup('service:store')
-      .findRecord('learner-group', learnerGroup.id);
-    const userModelProxy = ObjectProxy.create({
-      content: userModel,
-      lowestGroupInTree: learnerGroupModel,
-      lowestGroupInTreeTitle: learnerGroupModel.title,
-    });
-
-    this.set('users', [userModelProxy]);
-    this.set('learnerGroup', learnerGroupModel);
-    await render(hbs`<LearnerGroup::UserManager
-      @learnerGroupId={{this.learnerGroup.id}}
-      @learnerGroupTitle="this group"
-      @topLevelGroupTitle="top group"
-      @cohortTitle="this cohort"
-      @users={{this.users}}
-      @sortBy="id"
-      @setSortBy={{(noop)}}
-      @addUserToGroup={{(noop)}}
-      @removeUserFromGroup={{(noop)}}
-      @addUsersToGroup={{(noop)}}
-      @removeUsersFromGroup={{(noop)}}
-    />`);
-
-    assert.ok(component.usersInCurrentGroup[0].canBeSelected, 'Checkbox visible');
-    assert.ok(component.usersInCurrentGroup[0].isDisabled, 'User is labeled as disabled.');
-  });
-
-  test('non-root users cannot manage disabled users', async function (assert) {
-    assert.expect(2);
-
-    const currentUserMock = Service.extend({ isRoot: false });
-    this.owner.register('service:currentUser', currentUserMock);
-
-    const learnerGroup = this.server.create('learnerGroup', { id: 1 });
-    const user = this.server.create('user', { enabled: false, learnerGroups: [learnerGroup] });
-    const userModel = await this.owner.lookup('service:store').findRecord('user', user.id);
-    const learnerGroupModel = await this.owner
-      .lookup('service:store')
-      .findRecord('learner-group', learnerGroup.id);
-    const userModelProxy = ObjectProxy.create({
-      content: userModel,
-      lowestGroupInTree: learnerGroupModel,
-      lowestGroupInTreeTitle: learnerGroupModel.title,
-    });
-
-    this.set('users', [userModelProxy]);
-    this.set('learnerGroup', learnerGroupModel);
-    await render(hbs`<LearnerGroup::UserManager
-      @learnerGroupId={{this.learnerGroup.id}}
-      @learnerGroupTitle="this group"
-      @topLevelGroupTitle="top group"
-      @cohortTitle="this cohort"
-      @users={{this.users}}
-      @sortBy="id"
-      @setSortBy={{(noop)}}
-      @addUserToGroup={{(noop)}}
-      @removeUserFromGroup={{(noop)}}
-      @addUsersToGroup={{(noop)}}
-      @removeUsersFromGroup={{(noop)}}
-    />`);
-
-    assert.notOk(component.usersInCurrentGroup[0].canBeSelected, 'Checkbox visible');
-    assert.ok(component.usersInCurrentGroup[0].isDisabled, 'User is labeled as disabled.');
-  });
-
   test('filter users', async function (assert) {
     const learnerGroup = this.server.create('learnerGroup', { id: 1 });
     const user1 = this.server.create('user', {