From d8df4383cfe53f54eec8308128ebddc8b014a82b Mon Sep 17 00:00:00 2001
From: HMS17 <hms243@cornell.edu>
Date: Fri, 30 Aug 2024 18:54:58 -0400
Subject: [PATCH 1/2] [BI-2295] - Allow Experimental Collaborators To View
 Collaborators

---
 src/assets/scss/main.scss                           |  6 ------
 src/config/ability.ts                               |  4 ++--
 .../ExperimentDetails.vue                           | 13 ++++++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 3cb958230..dac8261ce 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -945,12 +945,6 @@ tr:nth-child(odd) td.db-filled {
   margin-right: 10px;
 }
 
-.remove-collaborator-button {
-  background: none;
-  border: none;
-  cursor: pointer;
-}
-
 .sub-entity-dataset-modal, .experiment-observations-download-button, .experiment-observation-add-collaborator-button, .experiment-observation-remove-collaborator-button {
   .modal {
     .modal-card {
diff --git a/src/config/ability.ts b/src/config/ability.ts
index 531ec7d9a..b91c01900 100644
--- a/src/config/ability.ts
+++ b/src/config/ability.ts
@@ -58,7 +58,7 @@ const rolePermissions: Record<string, DefinePermissions> = {
     can('access', 'ProgramAdministration');
     can('access', 'BrAPI');
     can('access', 'JobManagement');
-    can('create', 'Collaborator');
+    can('manage', 'Collaborator');
 
   },
   systemadministrator(user, { can }) {
@@ -78,7 +78,7 @@ const rolePermissions: Record<string, DefinePermissions> = {
     can('access', 'ProgramAdministration');
     can('access', 'BrAPI');
     can('access', 'JobManagement');
-    can('create', 'Collaborator');
+    can('manage', 'Collaborator');
 
   }
 };
diff --git a/src/views/experiments-and-observations/ExperimentDetails.vue b/src/views/experiments-and-observations/ExperimentDetails.vue
index 36e73b7a2..8b27f93c7 100644
--- a/src/views/experiments-and-observations/ExperimentDetails.vue
+++ b/src/views/experiments-and-observations/ExperimentDetails.vue
@@ -98,10 +98,13 @@
               <b class="collaborators-label">Collaborators:</b>
               <ul class="collaborators-list">
                 <li v-for="collaborator in collaborators" :key="collaborator.collaboratorId" class="collaborator-item">
-                  <span class="collaborator-info">{{ collaborator.name }}</span>
-                  <span class="collaborator-info">{{ collaborator.email }}</span>
-                  <button v-on:click="removeCollaborator(collaborator)" class="remove-collaborator-button">
-                    <i class="fas fa-minus-circle"></i>
+                  <span class="collaborator-info has-text-right">{{ collaborator.name }}</span>
+                  <span class="collaborator-info">{{"(" + collaborator.email + ")"}}</span>
+                  <button
+                    v-show="$ability.can('manage', 'Collaborator')"
+                    v-on:click="removeCollaborator(collaborator)"
+                    type="button"
+                    class="delete">
                   </button>
                 </li>
               </ul>
@@ -201,7 +204,7 @@ export default class ExperimentDetails extends ProgramsBase {
   private actions: ActionMenuItem[] = [
       new ActionMenuItem('experiment-import-file', 'import-file', 'Import file', this.$ability.can('create', 'Import')),
       new ActionMenuItem('experiment-download-file', 'download-file', 'Download file'),
-      new ActionMenuItem('experiment-add-collaborator', 'add-collaborator', 'Add Collaborator',  this.$ability.can('create', 'Collaborator')),
+      new ActionMenuItem('experiment-add-collaborator', 'add-collaborator', 'Add Collaborator',  this.$ability.can('manage', 'Collaborator')),
       // new ActionMenuItem('experiment-create-sub-entity-dataset', 'create-sub-entity-dataset', 'Create Sub-Entity Dataset')
   ];
 

From 3c93a8e8011e3ba9c001f49f6341a5deb1ddfa20 Mon Sep 17 00:00:00 2001
From: HMS17 <hms243@cornell.edu>
Date: Wed, 4 Sep 2024 11:32:36 -0400
Subject: [PATCH 2/2] [BI-2295] - Accessibility bolded link

---
 src/components/experiments/ExperimentAddCollaboratorModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/experiments/ExperimentAddCollaboratorModal.vue b/src/components/experiments/ExperimentAddCollaboratorModal.vue
index 05e9f2067..7a2d92b93 100644
--- a/src/components/experiments/ExperimentAddCollaboratorModal.vue
+++ b/src/components/experiments/ExperimentAddCollaboratorModal.vue
@@ -27,7 +27,7 @@
     v-on:show-error-notification="$emit('show-error-notification', $event)"
   >
     <template #form>
-      <p>An experimental collaborator will be granted read, download, and BrAPI pull access to this experiment {{experiment.trialName}}. If the collaborator is not available from the dropdown menu, they will need to be added. <router-link v-bind:to="{name: 'program-users', params:{programId: activeProgram.id}}">Program Administration > Users</router-link></p>
+      <p>An experimental collaborator will be granted read, download, and BrAPI pull access to this experiment {{experiment.trialName}}. If the collaborator is not available from the dropdown menu, they will need to be added. <router-link class="customize-for-accessibility" v-bind:to="{name: 'program-users', params:{programId: activeProgram.id}}">Program Administration > Users</router-link></p>
       <div class="columns mb-4">
         <!-- Collaborator Select -->
         <div class="column control">