From 8375eb7f65e936cb31ab1220f89ababad713774c Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Tue, 3 Dec 2024 14:36:51 -0500
Subject: [PATCH 01/12] Add user messaging modal to user's tab on institutional
 dashboard

---
 app/adapters/user-message.ts                  | 13 ++++++
 .../institutional-users-list/component.ts     | 39 ++++++++++++++++
 .../institutional-users-list/styles.scss      | 20 ++++++++
 .../institutional-users-list/template.hbs     | 46 +++++++++++++++++++
 app/models/user-message.ts                    |  8 ++++
 translations/en-us.yml                        |  7 +++
 6 files changed, 133 insertions(+)
 create mode 100644 app/adapters/user-message.ts
 create mode 100644 app/models/user-message.ts

diff --git a/app/adapters/user-message.ts b/app/adapters/user-message.ts
new file mode 100644
index 00000000000..a92b865c714
--- /dev/null
+++ b/app/adapters/user-message.ts
@@ -0,0 +1,13 @@
+// app/adapters/user-message.js
+import { inject as service } from '@ember/service';
+import config from 'ember-osf-web/config/environment';
+const { OSF: { apiUrl } } = config;
+import OsfAdapter from './osf-adapter';
+
+export default class UserMessageAdapter extends OsfAdapter {
+    @service session;
+    urlForCreateRecord(modelName, snapshot) {
+        const userId = snapshot.record.user;
+        return `${apiUrl}/v2/users/${userId}/messages/`;
+    }
+}
diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index 62c32591dc6..cadb989c193 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -26,6 +26,8 @@ interface InstitutionalUsersListArgs {
 export default class InstitutionalUsersList extends Component<InstitutionalUsersListArgs> {
     @service analytics!: Analytics;
     @service intl!: Intl;
+    @service store;
+    @service currentUser!: CurrentUser;
 
     institution?: InstitutionModel;
 
@@ -36,6 +38,10 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @tracked sort = 'user_name';
     @tracked selectedDepartments: string[] = [];
     @tracked filteredUsers = [];
+    @tracked messageModalShown = false;
+    @tracked messageText = '';
+    @tracked selectedUserId = null;
+    @service toast!: Toast;
 
     @tracked columns: Column[] = [
         {
@@ -238,4 +244,37 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         this.hasOrcid = !hasOrcid;
     }
 
+    @action
+    openMessageModal(userId: string) {
+        this.selectedUserId = userId;
+        this.messageModalShown = true;
+    }
+
+    @action
+    updateMessageText(event: Event) {
+        this.messageText = (event.target as HTMLTextAreaElement).value;
+    }
+
+    @action
+    async sendMessage() {
+        if (!this.selectedUserId || !this.messageText.trim()) {
+            return;
+        }
+
+        try {
+            const userMessage = this.store.createRecord('user-message', {
+                messageText: this.messageText.trim(),
+                messageType: 'institutional_request',
+                institution: this.args.institution,
+                user: this.selectedUserId,
+            });
+            await userMessage.save();
+            this.toast.success(this.intl.t('institutions.dashboard.send_message_modal.message_sent_success'));
+        } catch (error) {
+            this.toast.error(this.intl.t('institutions.dashboard.send_message_modal.message_sent_failed'));
+        } finally {
+            this.messageModalShown = false;
+            this.messageText = '';
+        }
+    }
 }
diff --git a/app/institutions/dashboard/-components/institutional-users-list/styles.scss b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
index 3a2c345a0c8..466247b623c 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/styles.scss
+++ b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
@@ -306,3 +306,23 @@ input:checked + .slider::before {
     justify-content: flex-end;
     margin-right: 15px;
 }
+
+
+.icon-message {
+    opacity: 0;
+    color: $color-text-blue-dark;
+    /* !important used to override ember Button border scripting  */
+    background-color: inherit !important;
+    border: 0 !important;
+    box-shadow: 0 !important;
+}
+
+.icon-message:hover {
+    opacity: 1;
+    background-color: inherit !important;
+}
+
+.message-textarea {
+    min-width: 450px;
+    min-height: 280px;
+}
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index c7d7e1d4989..8e214e4509e 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -156,6 +156,12 @@
                             <OsfLink @href={{concat '/' institutionalUser.userGuid '/'}}>
                                 {{institutionalUser.userName}}
                             </OsfLink>
+                            <Button
+                                local-class='icon-message'
+                                {{on 'click' (fn this.openMessageModal institutionalUser.userGuid)}}
+                            >
+                                <FaIcon @icon='comment' />
+                            </Button>
                         {{else if (eq column.type 'osf_link')}}
                             <OsfLink @href={{concat '/' institutionalUser.userGuid '/'}}>
                                 {{institutionalUser.userGuid}}
@@ -185,4 +191,44 @@
             {{t 'institutions.dashboard.users_list.empty'}}
         </list.empty>
     </PaginatedList::HasMany>
+    <OsfDialog
+        @isOpen={{this.messageModalShown}}
+        @onClose={{fn (mut this.messageModalShown) false}}
+        as |dialog|
+    >
+        <dialog.heading>
+            {{t 'institutions.dashboard.send_message_modal.title'}}
+        </dialog.heading>
+        <dialog.main>
+            <div >
+                <div for='message-text'>
+                    {{t 'institutions.dashboard.send_message_modal.opening_message_label'}}
+                </div>
+                <textarea
+                    id='message-text'
+                    local-class='message-textarea'
+                    value={{this.messageText}}
+                    {{on 'input' this.updateMessageText}}
+                ></textarea>
+                <div>
+                    {{t 'institutions.dashboard.send_message_modal.closing_message_label' adminName=this.currentUser.user.fullName}}
+                </div>
+            </div>
+        </dialog.main>
+        <dialog.footer>
+            <Button
+                @type='secondary'
+                {{on 'click' (fn (mut this.messageModalShown) false)}}
+            >
+                {{t 'general.cancel'}}
+            </Button>
+            <Button
+                @type='primary'
+                @disabled={{not this.messageText}}
+                {{on 'click' (queue this.sendMessage dialog.close)}}
+            >
+                {{t 'institutions.dashboard.send_message_modal.send'}}
+            </Button>
+        </dialog.footer>
+    </OsfDialog>
 {{/if}}
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
new file mode 100644
index 00000000000..6233a239942
--- /dev/null
+++ b/app/models/user-message.ts
@@ -0,0 +1,8 @@
+// app/models/user-message.js
+import Model, { attr, belongsTo } from '@ember-data/model';
+
+export default class UserMessageModel extends Model {
+    @attr('string') messageText;
+    @attr('string') messageType;
+    @belongsTo('institution') institution;
+}
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 0416c52097d..b92b4bbdd72 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -799,6 +799,13 @@ institutions:
     search_placeholder: 'Search institutions'
     load_more: 'Load more institutions'
     dashboard:
+        send_message_modal:
+          title: 'Send Email'
+          opening_message_label: 'Comments:'
+          closing_message_label: 'Sincerely Yours, {adminName}'
+          message_sent_success: 'Message has been sent'
+          message_sent_failed: 'Message has failed to send of the issue persists contact your administrator'
+          send: 'Send'
         tabs:
             summary: Summary
             users: Users

From 975af6682e72e865a47eb5953eb5d5bebd1f8269 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Fri, 6 Dec 2024 15:26:45 -0500
Subject: [PATCH 02/12] fix en-us typo

---
 translations/en-us.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/en-us.yml b/translations/en-us.yml
index b92b4bbdd72..c4a53b7504c 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -804,7 +804,7 @@ institutions:
           opening_message_label: 'Comments:'
           closing_message_label: 'Sincerely Yours, {adminName}'
           message_sent_success: 'Message has been sent'
-          message_sent_failed: 'Message has failed to send of the issue persists contact your administrator'
+          message_sent_failed: 'Message has failed to send. If the issue persists contact your administrator'
           send: 'Send'
         tabs:
             summary: Summary

From d09ca7d33b61e9f9ca44f6fba984f7021ef65cb6 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Fri, 6 Dec 2024 15:58:45 -0500
Subject: [PATCH 03/12] add aira-label.

---
 .../-components/institutional-users-list/template.hbs         | 4 ++++
 translations/en-us.yml                                        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 8e214e4509e..82ba9d6b2bd 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -158,6 +158,8 @@
                             </OsfLink>
                             <Button
                                 local-class='icon-message'
+                                aria-label={{t 'institutions.dashboard.send_message_modal.open_aira_label'}}
+
                                 {{on 'click' (fn this.openMessageModal institutionalUser.userGuid)}}
                             >
                                 <FaIcon @icon='comment' />
@@ -217,12 +219,14 @@
         </dialog.main>
         <dialog.footer>
             <Button
+                aria-label={{t 'institutions.dashboard.send_message_modal.close_aira_label'}}
                 @type='secondary'
                 {{on 'click' (fn (mut this.messageModalShown) false)}}
             >
                 {{t 'general.cancel'}}
             </Button>
             <Button
+                aria-label={{t 'institutions.dashboard.send_message_modal.send_aira_label'}}
                 @type='primary'
                 @disabled={{not this.messageText}}
                 {{on 'click' (queue this.sendMessage dialog.close)}}
diff --git a/translations/en-us.yml b/translations/en-us.yml
index c4a53b7504c..46b04ab70b1 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -800,6 +800,9 @@ institutions:
     load_more: 'Load more institutions'
     dashboard:
         send_message_modal:
+          open_aira_label: 'Open User Message Modal Button'
+          close_aira_label: 'Close User Message Modal Button'
+          send_aira_label: 'Send User Message Button'
           title: 'Send Email'
           opening_message_label: 'Comments:'
           closing_message_label: 'Sincerely Yours, {adminName}'

From 0627e1bf7a3d58ac91fd7fc89ed8dda0462b07bb Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 9 Dec 2024 12:34:02 -0500
Subject: [PATCH 04/12] fix label for message box

---
 .../-components/institutional-users-list/styles.scss          | 4 ++++
 .../-components/institutional-users-list/template.hbs         | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/styles.scss b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
index 466247b623c..ec4607f399d 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/styles.scss
+++ b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
@@ -326,3 +326,7 @@ input:checked + .slider::before {
     min-width: 450px;
     min-height: 280px;
 }
+
+.message-label {
+    display: block;
+}
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 82ba9d6b2bd..bd1b00534aa 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -203,9 +203,9 @@
         </dialog.heading>
         <dialog.main>
             <div >
-                <div for='message-text'>
+                <label for='message-text' local-class="message-label">
                     {{t 'institutions.dashboard.send_message_modal.opening_message_label'}}
-                </div>
+                </label>
                 <textarea
                     id='message-text'
                     local-class='message-textarea'

From 7639ea116caf3f8041cd918f7667112d246a6171 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 9 Dec 2024 12:41:46 -0500
Subject: [PATCH 05/12] update sendMessage to task

---
 .../-components/institutional-users-list/component.ts         | 4 +++-
 .../-components/institutional-users-list/template.hbs         | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index cadb989c193..fbf4c2c6804 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -1,3 +1,4 @@
+import { task } from 'ember-concurrency';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -255,7 +256,8 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         this.messageText = (event.target as HTMLTextAreaElement).value;
     }
 
-    @action
+    @task
+    @waitFor
     async sendMessage() {
         if (!this.selectedUserId || !this.messageText.trim()) {
             return;
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index bd1b00534aa..50f3d41ca57 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -203,7 +203,7 @@
         </dialog.heading>
         <dialog.main>
             <div >
-                <label for='message-text' local-class="message-label">
+                <label for='message-text' local-class='message-label'>
                     {{t 'institutions.dashboard.send_message_modal.opening_message_label'}}
                 </label>
                 <textarea
@@ -229,7 +229,7 @@
                 aria-label={{t 'institutions.dashboard.send_message_modal.send_aira_label'}}
                 @type='primary'
                 @disabled={{not this.messageText}}
-                {{on 'click' (queue this.sendMessage dialog.close)}}
+                {{on 'click' (queue (perform this.sendMessage) dialog.close)}}
             >
                 {{t 'institutions.dashboard.send_message_modal.send'}}
             </Button>

From 9eb5df3c7e57463dc4cba1474e669bf62bccb7cb Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 9 Dec 2024 12:56:11 -0500
Subject: [PATCH 06/12] update text area for Ember type area

---
 .../-components/institutional-users-list/template.hbs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 50f3d41ca57..24634fc338d 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -206,12 +206,12 @@
                 <label for='message-text' local-class='message-label'>
                     {{t 'institutions.dashboard.send_message_modal.opening_message_label'}}
                 </label>
-                <textarea
+                <Textarea
                     id='message-text'
                     local-class='message-textarea'
-                    value={{this.messageText}}
-                    {{on 'input' this.updateMessageText}}
-                ></textarea>
+                    @value={{this.messageText}}
+                >
+                </Textarea>
                 <div>
                     {{t 'institutions.dashboard.send_message_modal.closing_message_label' adminName=this.currentUser.user.fullName}}
                 </div>

From abe28527759d61e9a3f3ddaa4258b80ab4727fee Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 9 Dec 2024 13:07:20 -0500
Subject: [PATCH 07/12] Add type annotations for belongs to

---
 app/models/user-message.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index 6233a239942..ae1b6eafcfd 100644
--- a/app/models/user-message.ts
+++ b/app/models/user-message.ts
@@ -4,5 +4,5 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 export default class UserMessageModel extends Model {
     @attr('string') messageText;
     @attr('string') messageType;
-    @belongsTo('institution') institution;
+    @belongsTo('institution') institution: AsyncBelongsTo<InstitutionModel> & InstitutionModel;
 }

From 0d8cd74a94061b06f37f0c383762a3ec1901599f Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 9 Dec 2024 16:26:53 -0500
Subject: [PATCH 08/12] add checkboxes for reply-to and ccing

---
 .../institutional-users-list/component.ts     | 36 ++++++++++++++++---
 .../institutional-users-list/styles.scss      | 14 ++++++++
 .../institutional-users-list/template.hbs     | 33 +++++++++--------
 app/models/user-message.ts                    |  8 +++--
 translations/en-us.yml                        |  2 ++
 5 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index fbf4c2c6804..37531f94749 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -251,15 +251,41 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         this.messageModalShown = true;
     }
 
+    @action
+    toggleMessageModal(userId: string | null = null) {
+        this.messageModalShown = !this.messageModalShown;
+        this.selectedUserId = userId;
+        if (!this.messageModalShown) {
+            this.resetModalFields();
+        }
+    }
+
+    resetModalFields() {
+        this.messageText = '';
+        this.cc = false;
+        this.replyTo = false;
+    }
+
     @action
     updateMessageText(event: Event) {
         this.messageText = (event.target as HTMLTextAreaElement).value;
     }
 
+    @action
+    toggleCc() {
+        this.cc = !this.cc;
+    }
+
+    @action
+    toggleReplyTo() {
+        this.replyTo = !this.replyTo;
+    }
+
     @task
     @waitFor
     async sendMessage() {
-        if (!this.selectedUserId || !this.messageText.trim()) {
+        if (!this.messageText.trim()) {
+            this.toast.error(this.intl.t('error.empty_message'));
             return;
         }
 
@@ -267,16 +293,18 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
             const userMessage = this.store.createRecord('user-message', {
                 messageText: this.messageText.trim(),
                 messageType: 'institutional_request',
+                cc: this.cc,
+                replyTo: this.replyTo,
                 institution: this.args.institution,
                 user: this.selectedUserId,
             });
+
             await userMessage.save();
-            this.toast.success(this.intl.t('institutions.dashboard.send_message_modal.message_sent_success'));
+            this.toast.success(this.intl.t('success.message_sent'));
         } catch (error) {
-            this.toast.error(this.intl.t('institutions.dashboard.send_message_modal.message_sent_failed'));
+            this.toast.error(this.intl.t('error.message_failed'));
         } finally {
             this.messageModalShown = false;
-            this.messageText = '';
         }
     }
 }
diff --git a/app/institutions/dashboard/-components/institutional-users-list/styles.scss b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
index ec4607f399d..0fe4cf502aa 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/styles.scss
+++ b/app/institutions/dashboard/-components/institutional-users-list/styles.scss
@@ -330,3 +330,17 @@ input:checked + .slider::before {
 .message-label {
     display: block;
 }
+
+.checkbox-container {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+    padding: 10px;
+}
+
+.checkbox-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+}
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 24634fc338d..072a9cb643d 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -193,25 +193,30 @@
             {{t 'institutions.dashboard.users_list.empty'}}
         </list.empty>
     </PaginatedList::HasMany>
-    <OsfDialog
-        @isOpen={{this.messageModalShown}}
-        @onClose={{fn (mut this.messageModalShown) false}}
-        as |dialog|
-    >
+    <OsfDialog @isOpen={{this.messageModalShown}} @onClose={{this.toggleMessageModal}} as |dialog|>
         <dialog.heading>
             {{t 'institutions.dashboard.send_message_modal.title'}}
         </dialog.heading>
         <dialog.main>
-            <div >
+            <div>
                 <label for='message-text' local-class='message-label'>
                     {{t 'institutions.dashboard.send_message_modal.opening_message_label'}}
                 </label>
                 <Textarea
-                    id='message-text'
-                    local-class='message-textarea'
-                    @value={{this.messageText}}
-                >
-                </Textarea>
+                  id='message-text'
+                  local-class='message-textarea'
+                  @value={{this.messageText}}
+                />
+                <div local-class='checkbox-container'>
+                    <label local-class='checkbox-item'>
+                        <input type='checkbox' checked={{this.cc}} {{on 'change' this.toggleCc}} />
+                        {{t 'institutions.dashboard.send_message_modal.cc_label'}}
+                    </label>
+                    <label local-class='checkbox-item'>
+                        <input type='checkbox' checked={{this.replyTo}} {{on 'change' this.toggleReplyTo}} />
+                        {{t 'institutions.dashboard.send_message_modal.reply_to_label'}}
+                    </label>
+                </div>
                 <div>
                     {{t 'institutions.dashboard.send_message_modal.closing_message_label' adminName=this.currentUser.user.fullName}}
                 </div>
@@ -219,16 +224,14 @@
         </dialog.main>
         <dialog.footer>
             <Button
-                aria-label={{t 'institutions.dashboard.send_message_modal.close_aira_label'}}
                 @type='secondary'
-                {{on 'click' (fn (mut this.messageModalShown) false)}}
+                {{on 'click' this.toggleMessageModal}}
             >
                 {{t 'general.cancel'}}
             </Button>
             <Button
-                aria-label={{t 'institutions.dashboard.send_message_modal.send_aira_label'}}
                 @type='primary'
-                @disabled={{not this.messageText}}
+                @disabled={{not this.messageText.trim}}
                 {{on 'click' (queue (perform this.sendMessage) dialog.close)}}
             >
                 {{t 'institutions.dashboard.send_message_modal.send'}}
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index ae1b6eafcfd..7f2b90eff38 100644
--- a/app/models/user-message.ts
+++ b/app/models/user-message.ts
@@ -2,7 +2,9 @@
 import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class UserMessageModel extends Model {
-    @attr('string') messageText;
-    @attr('string') messageType;
-    @belongsTo('institution') institution: AsyncBelongsTo<InstitutionModel> & InstitutionModel;
+  @attr('string') messageText;
+  @attr('string') messageType;
+  @attr('boolean') cc;
+  @attr('boolean') replyTo;
+  @belongsTo('institution') institution;
 }
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 46b04ab70b1..a3aaf85b157 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -809,6 +809,8 @@ institutions:
           message_sent_success: 'Message has been sent'
           message_sent_failed: 'Message has failed to send. If the issue persists contact your administrator'
           send: 'Send'
+          cc_label: 'CC sender?'
+          reply_to_label: 'allow reply to sender address?'
         tabs:
             summary: Summary
             users: Users

From fa4ae5e31359a4083eaaef0f81eee3046e593680 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Tue, 10 Dec 2024 13:22:18 -0500
Subject: [PATCH 09/12] update to fit Product language and styling

---
 .../-components/institutional-users-list/template.hbs       | 6 +++---
 translations/en-us.yml                                      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index 072a9cb643d..e4ed80ddd6b 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -207,6 +207,9 @@
                   local-class='message-textarea'
                   @value={{this.messageText}}
                 />
+                <div>
+                    {{t 'institutions.dashboard.send_message_modal.closing_message_label' adminName=this.currentUser.user.fullName htmlSafe=true}}
+                </div>
                 <div local-class='checkbox-container'>
                     <label local-class='checkbox-item'>
                         <input type='checkbox' checked={{this.cc}} {{on 'change' this.toggleCc}} />
@@ -217,9 +220,6 @@
                         {{t 'institutions.dashboard.send_message_modal.reply_to_label'}}
                     </label>
                 </div>
-                <div>
-                    {{t 'institutions.dashboard.send_message_modal.closing_message_label' adminName=this.currentUser.user.fullName}}
-                </div>
             </div>
         </dialog.main>
         <dialog.footer>
diff --git a/translations/en-us.yml b/translations/en-us.yml
index a3aaf85b157..f919d1d83b3 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -805,12 +805,12 @@ institutions:
           send_aira_label: 'Send User Message Button'
           title: 'Send Email'
           opening_message_label: 'Comments:'
-          closing_message_label: 'Sincerely Yours, {adminName}'
+          closing_message_label: 'Sincerely Yours,<br> {adminName}'
           message_sent_success: 'Message has been sent'
           message_sent_failed: 'Message has failed to send. If the issue persists contact your administrator'
           send: 'Send'
-          cc_label: 'CC sender?'
-          reply_to_label: 'allow reply to sender address?'
+          cc_label: 'CC sender'
+          reply_to_label: 'Allow reply to sender address'
         tabs:
             summary: Summary
             users: Users

From 28aadafd88348ed74556699dbf019b354fdf19d0 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 12 Dec 2024 13:56:55 -0500
Subject: [PATCH 10/12] update language and fix modal closing bug.

---
 .../-components/institutional-users-list/component.ts       | 6 ++++--
 .../-components/institutional-users-list/template.hbs       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index 37531f94749..7dd6dcd2372 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -260,10 +260,12 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         }
     }
 
+    @action
     resetModalFields() {
         this.messageText = '';
         this.cc = false;
         this.replyTo = false;
+        this.selectedUserId = null;
     }
 
     @action
@@ -300,9 +302,9 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
             });
 
             await userMessage.save();
-            this.toast.success(this.intl.t('success.message_sent'));
+            this.toast.success(this.intl.t('institutions.dashboard.send_message_modal.message_sent_success'));
         } catch (error) {
-            this.toast.error(this.intl.t('error.message_failed'));
+            this.toast.error(this.intl.t('institutions.dashboard.send_message_modal.message_sent_failed'));
         } finally {
             this.messageModalShown = false;
         }
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index e4ed80ddd6b..c77f7c6937a 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -232,7 +232,9 @@
             <Button
                 @type='primary'
                 @disabled={{not this.messageText.trim}}
-                {{on 'click' (queue (perform this.sendMessage) dialog.close)}}
+                {{on 'click' (queue (perform this.sendMessage))}}
+                {{on 'click' this.toggleMessageModal}}
+
             >
                 {{t 'institutions.dashboard.send_message_modal.send'}}
             </Button>

From d5803a686c20930af6a896cae0a1d3b8e091a42a Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 16 Dec 2024 14:05:41 -0500
Subject: [PATCH 11/12] make message types an enum

---
 .../-components/institutional-users-list/component.ts      | 3 ++-
 app/models/user-message.ts                                 | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index f7c93a393ee..dd8ae9442ec 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -11,6 +11,7 @@ import InstitutionModel from 'ember-osf-web/models/institution';
 import InstitutionDepartmentsModel from 'ember-osf-web/models/institution-department';
 import Analytics from 'ember-osf-web/services/analytics';
 import { RelationshipWithLinks } from 'osf-api';
+import {MessageTypeChoices} from 'ember-osf-web/models/user-message';
 
 interface Column {
     key: string;
@@ -319,7 +320,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
         try {
             const userMessage = this.store.createRecord('user-message', {
                 messageText: this.messageText.trim(),
-                messageType: 'institutional_request',
+                messageType: MessageTypeChoices.InstitutionalRequest,
                 cc: this.cc,
                 replyTo: this.replyTo,
                 institution: this.args.institution,
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index 7f2b90eff38..7154f15fe3c 100644
--- a/app/models/user-message.ts
+++ b/app/models/user-message.ts
@@ -1,9 +1,14 @@
 // app/models/user-message.js
 import Model, { attr, belongsTo } from '@ember-data/model';
 
+export enum MessageTypeChoices {
+    InstitutionalRequest = 'institutional_request',
+}
+
+
 export default class UserMessageModel extends Model {
   @attr('string') messageText;
-  @attr('string') messageType;
+  @attr('string') messageType: MessageTypeChoices;
   @attr('boolean') cc;
   @attr('boolean') replyTo;
   @belongsTo('institution') institution;

From 434288e836d4fda8943fb6da33065dc3283e105c Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Mon, 16 Dec 2024 14:33:44 -0500
Subject: [PATCH 12/12] use proper Ember input tags, remove extra close modal
 command

---
 .../institutional-users-list/component.ts     | 21 ++++---------------
 .../institutional-users-list/template.hbs     |  5 ++---
 app/models/user-message.ts                    |  2 +-
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts
index dd8ae9442ec..2268909b0c1 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -43,6 +43,8 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @tracked filteredUsers = [];
     @tracked messageModalShown = false;
     @tracked messageText = '';
+    @tracked bcc_sender = false;
+    @tracked replyTo = false;
     @tracked selectedUserId = null;
     @service toast!: Toast;
 
@@ -289,26 +291,11 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @action
     resetModalFields() {
         this.messageText = '';
-        this.cc = false;
+        this.bcc_sender = false;
         this.replyTo = false;
         this.selectedUserId = null;
     }
 
-    @action
-    updateMessageText(event: Event) {
-        this.messageText = (event.target as HTMLTextAreaElement).value;
-    }
-
-    @action
-    toggleCc() {
-        this.cc = !this.cc;
-    }
-
-    @action
-    toggleReplyTo() {
-        this.replyTo = !this.replyTo;
-    }
-
     @task
     @waitFor
     async sendMessage() {
@@ -321,7 +308,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
             const userMessage = this.store.createRecord('user-message', {
                 messageText: this.messageText.trim(),
                 messageType: MessageTypeChoices.InstitutionalRequest,
-                cc: this.cc,
+                bcc_sender: this.bcc_sender,
                 replyTo: this.replyTo,
                 institution: this.args.institution,
                 user: this.selectedUserId,
diff --git a/app/institutions/dashboard/-components/institutional-users-list/template.hbs b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
index e95d0256a85..a049ed56f45 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -231,11 +231,11 @@
                 </div>
                 <div local-class='checkbox-container'>
                     <label local-class='checkbox-item'>
-                        <input type='checkbox' checked={{this.cc}} {{on 'change' this.toggleCc}} />
+                        <Input @type='checkbox' @checked={{this.bcc_sender}} />
                         {{t 'institutions.dashboard.send_message_modal.cc_label'}}
                     </label>
                     <label local-class='checkbox-item'>
-                        <input type='checkbox' checked={{this.replyTo}} {{on 'change' this.toggleReplyTo}} />
+                        <Input @type='checkbox' @checked={{this.replyTo}} />
                         {{t 'institutions.dashboard.send_message_modal.reply_to_label'}}
                     </label>
                 </div>
@@ -252,7 +252,6 @@
                 @type='primary'
                 @disabled={{not this.messageText.trim}}
                 {{on 'click' (queue (perform this.sendMessage))}}
-                {{on 'click' this.toggleMessageModal}}
 
             >
                 {{t 'institutions.dashboard.send_message_modal.send'}}
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index 7154f15fe3c..9e66b3fa8fb 100644
--- a/app/models/user-message.ts
+++ b/app/models/user-message.ts
@@ -9,7 +9,7 @@ export enum MessageTypeChoices {
 export default class UserMessageModel extends Model {
   @attr('string') messageText;
   @attr('string') messageType: MessageTypeChoices;
-  @attr('boolean') cc;
+  @attr('boolean') bcc_sender;
   @attr('boolean') replyTo;
   @belongsTo('institution') institution;
 }