Merge pull request #7713 from stopfstedt/5205_leadership_search_up_top

put leadership user search boxes above user lists.
ilios · Mar 14, 2024 · 9788728 · 9788728
2 parents 3b98735 + 97d70e7
commit 9788728
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 167 deletions.
diff --git a/...lios-common/addon-test-support/ilios-common/page-objects/components/leadership-manager.js b/...lios-common/addon-test-support/ilios-common/page-objects/components/leadership-manager.js
@@ -1,10 +1,16 @@
-import { clickable, collection, fillable, hasClass, notHasClass } from 'ember-cli-page-object';
+import {
+  clickable,
+  collection,
+  create,
+  fillable,
+  hasClass,
+  isPresent,
+  notHasClass,
+} from 'ember-cli-page-object';
+import userNameInfo from './user-name-info';
 
-export default {
+const definition = {
   scope: '[data-test-leadership-manager]',
-  selectedDirectors: collection('[data-test-directors] ul li', {
-    remove: clickable('.remove'),
-  }),
   directorSearch: {
     scope: '[data-test-director-search] [data-test-leadership-search]',
     search: fillable('input[type=search]'),
@@ -23,9 +29,6 @@ export default {
       isSelected: notHasClass('clickable'),
     }),
   },
-  selectedAdministrators: collection('[data-test-administrators] ul li', {
-    remove: clickable('.remove'),
-  }),
   studentAdvisorSearch: {
     scope: '[data-test-student-advisor-search] [data-test-leadership-search]',
     search: fillable('input[type=search]'),
@@ -35,7 +38,22 @@ export default {
       isSelected: notHasClass('clickable'),
     }),
   },
+  selectedDirectors: collection('[data-test-directors] ul li', {
+    userNameInfo,
+    remove: clickable('.remove'),
+    isDisabled: isPresent('.disabled-user'),
+  }),
+  selectedAdministrators: collection('[data-test-administrators] ul li', {
+    userNameInfo,
+    remove: clickable('.remove'),
+    isDisabled: isPresent('.disabled-user'),
+  }),
   selectedStudentAdvisors: collection('[data-test-student-advisors] ul li', {
+    userNameInfo,
     remove: clickable('.remove'),
+    isDisabled: isPresent('.disabled-user'),
   }),
 };
+
+export default definition;
+export const component = create(definition);
diff --git a/packages/ilios-common/addon/components/leadership-manager.hbs b/packages/ilios-common/addon/components/leadership-manager.hbs
@@ -20,6 +20,32 @@
       </tr>
     </thead>
     <tbody>
+      <tr>
+        {{#if @showDirectors}}
+          <td data-test-director-search>
+            <LeadershipSearch
+              @existingUsers={{@directors}}
+              @selectUser={{@addDirector}}
+            />
+          </td>
+        {{/if}}
+        {{#if @showAdministrators}}
+          <td data-test-administrator-search>
+            <LeadershipSearch
+              @existingUsers={{@administrators}}
+              @selectUser={{@addAdministrator}}
+            />
+          </td>
+        {{/if}}
+        {{#if @showStudentAdvisors}}
+          <td data-test-student-advisor-search>
+            <LeadershipSearch
+              @existingUsers={{@studentAdvisors}}
+              @selectUser={{@addStudentAdvisor}}
+            />
+          </td>
+        {{/if}}
+      </tr>
       <tr>
         {{#if @showDirectors}}
           <td class="text-top" data-test-directors>
@@ -112,32 +138,6 @@
           </td>
         {{/if}}
       </tr>
-      <tr>
-        {{#if @showDirectors}}
-          <td data-test-director-search>
-            <LeadershipSearch
-              @existingUsers={{@directors}}
-              @selectUser={{@addDirector}}
-            />
-          </td>
-        {{/if}}
-        {{#if @showAdministrators}}
-          <td data-test-administrator-search>
-            <LeadershipSearch
-              @existingUsers={{@administrators}}
-              @selectUser={{@addAdministrator}}
-            />
-          </td>
-        {{/if}}
-        {{#if @showStudentAdvisors}}
-          <td data-test-student-advisor-search>
-            <LeadershipSearch
-              @existingUsers={{@studentAdvisors}}
-              @selectUser={{@addStudentAdvisor}}
-            />
-          </td>
-        {{/if}}
-      </tr>
     </tbody>
   </table>
 </div>
diff --git a/packages/ilios-common/app/styles/ilios-common/components/leadership-manager.scss b/packages/ilios-common/app/styles/ilios-common/components/leadership-manager.scss
@@ -17,7 +17,6 @@
 
   .user-search {
     clear: both;
-    margin: auto;
     position: relative;
     width: 90%;
 

diff --git a/packages/ilios-common/app/styles/ilios-common/components/leadership-search.scss b/packages/ilios-common/app/styles/ilios-common/components/leadership-search.scss
@@ -3,7 +3,6 @@
 
 .leadership-search {
   clear: both;
-  margin: auto;
   position: relative;
   width: 90%;