From 5a7fe948956e69d2784c1b0b488452c4e2a083a5 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Wed, 18 Dec 2024 09:24:22 -0500
Subject: [PATCH 01/15]  add Project request modal with user messaging tab to
 the institutional dashboard

---
 app/adapters/node-request.ts                  |  14 ++
 app/adapters/user-message.ts                  |  13 ++
 .../-components/object-list/component.ts      | 125 +++++++++++++++++
 .../contributors-field/component.ts           |  15 +-
 .../contributors-field/styles.scss            |  14 ++
 .../contributors-field/template.hbs           |   7 +
 .../-components/object-list/styles.scss       |  68 +++++++++
 .../-components/object-list/template.hbs      | 130 ++++++++++++++++++
 app/models/node-request.ts                    |  13 ++
 app/models/user-message.ts                    |  15 ++
 translations/en-us.yml                        |  23 ++++
 11 files changed, 436 insertions(+), 1 deletion(-)
 create mode 100644 app/adapters/node-request.ts
 create mode 100644 app/adapters/user-message.ts
 create mode 100644 app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
 create mode 100644 app/models/node-request.ts
 create mode 100644 app/models/user-message.ts

diff --git a/app/adapters/node-request.ts b/app/adapters/node-request.ts
new file mode 100644
index 00000000000..32f1d140bc2
--- /dev/null
+++ b/app/adapters/node-request.ts
@@ -0,0 +1,14 @@
+// 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 NodeRequestAdapter extends OsfAdapter {
+    @service session;
+
+    urlForCreateRecord(modelName, snapshot) {
+        const nodeId = snapshot.record.target;
+        return `${apiUrl}/v2/nodes/${nodeId}/request/`;
+    }
+}
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/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 53dd0f146d3..c5f5cfb3a6e 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -9,6 +9,13 @@ import InstitutionModel from 'ember-osf-web/models/institution';
 import { SuggestedFilterOperators } from 'ember-osf-web/models/related-property-path';
 import SearchResultModel from 'ember-osf-web/models/search-result';
 import { Filter } from 'osf-components/components/search-page/component';
+import { waitFor } from '@ember/test-waiters';
+import { task } from 'ember-concurrency';
+import Toast from 'ember-toastr/services/toast';
+import Intl from 'ember-intl/services/intl';
+import Store from '@ember-data/store';
+import CurrentUser from 'ember-osf-web/services/current-user';
+
 import config from 'ember-osf-web/config/environment';
 
 const shareDownloadFlag = config.featureFlagNames.shareDownload;
@@ -49,6 +56,20 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     @tracked sortParam?: string;
     @tracked visibleColumns = this.args.columns.map(column => column.name);
     @tracked dirtyVisibleColumns = [...this.visibleColumns]; // track changes to visible columns before they are saved
+    @tracked selectedPermission = 'write';
+    @tracked projectRequestModalShown = false;
+    @tracked activeTab = 'request-access'; // Default tab
+    @tracked messageText = '';
+    @tracked bcc_sender = false;
+    @tracked replyTo = false;
+    @tracked selectedUserId = '';
+    @tracked selectedNodeId = '';
+    @tracked showSendMessagePrompt = false;
+    @service toast!: Toast;
+    @service intl!: Intl;
+    @service store!: Store;
+    @service currentUser!: CurrentUser;
+
 
     get queryOptions() {
         const options = {
@@ -126,6 +147,34 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
         }
     }
 
+    @action
+    openProjectRequestModal(contributor: any) {
+        this.selectedUserId = contributor.user_id;
+        this.selectedNodeId = contributor.node_id;
+        this.projectRequestModalShown = true;
+    }
+
+    @action
+    handleBackToSendMessage() {
+        this.activeTab = 'send-message';
+        this.showSendMessagePrompt = false;
+        setTimeout(() => {
+            this.projectRequestModalShown = true; // Reopen the main modal
+        }, 200);
+
+    }
+
+    @action
+    closeSendMessagePrompt() {
+        this.showSendMessagePrompt = false; // Hide confirmation modal without reopening
+    }
+
+    @action
+    toggleProjectRequestModal() {
+        this.projectRequestModalShown = !this.projectRequestModalShown;
+    }
+
+
     @action
     toggleFilter(property: Filter) {
         this.page = '';
@@ -151,4 +200,80 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     updatePage(newPage: string) {
         this.page = newPage;
     }
+
+    @action
+    updateSelectedPermission(event: Event) {
+        this.selectedPermission = (event.target as HTMLInputElement).value;
+    }
+
+    @action
+    setActiveTab(tabName: string) {
+        this.activeTab = tabName;
+    }
+
+
+    @action
+    resetFields() {
+        this.selectedPermission = 'read';
+        this.bcc_sender = false;
+        this.replyTo = false;
+    }
+
+    @task
+    @waitFor
+    async handleSend() {
+        try {
+            if (this.activeTab === 'send-message') {
+                await this._sendUserMessage();
+            } else if (this.activeTab === 'request-access') {
+                await this._sendNodeRequest();
+            }
+
+            this.toast.success(
+                this.intl.t('institutions.dashboard.object-list.request-project-message-modal.message_sent_success'),
+            );
+            this.resetFields();
+        } catch (error) {
+            const errorDetail = error?.errors?.[0]?.detail || '';
+
+            // Check for the specific error where access requests are disabled
+            if (error.status === 400 && errorDetail.includes('does not have Access Requests enabled')) {
+                setTimeout(() => {
+                    this.showSendMessagePrompt = true; //  timeout to allow the other to exit
+                }, 200);
+            } else {
+                this.toast.error(
+                    this.intl.t('institutions.dashboard.object-list.request-project-message-modal.message_sent_failed'),
+                );
+            }
+        } finally {
+            this.projectRequestModalShown = false; // Close the main modal
+        }
+    }
+
+    async _sendUserMessage() {
+        const userMessage = this.store.createRecord('user-message', {
+            messageText: this.messageText.trim(),
+            messageType: 'institutional_request',
+            bcc_sender: this.bcc_sender,
+            replyTo: this.replyTo,
+            institution: this.args.institution,
+            user: this.selectedUserId,
+        });
+        await userMessage.save();
+    }
+
+    async _sendNodeRequest() {
+        const nodeRequest = this.store.createRecord('node-request', {
+            comment: this.messageText.trim(),
+            requestType: 'institutional_access',
+            requestedPermission: this.selectedPermission,
+            bcc_sender: this.bcc_sender,
+            replyTo: this.replyTo,
+            institution: this.args.institution,
+            message_recipent: this.selectedUserId,
+            target: this.selectedNodeId,
+        });
+        await nodeRequest.save();
+    }
 }
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
index 1c0a69f484b..3bb153f3339 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
@@ -1,6 +1,7 @@
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import Intl from 'ember-intl/services/intl';
+import { action } from '@ember/object';
 
 import InstitutionModel from 'ember-osf-web/models/institution';
 import SearchResultModel from 'ember-osf-web/models/search-result';
@@ -10,6 +11,7 @@ import { getOsfmapObjects, getSingleOsfmapValue, hasOsfmapValue } from 'ember-os
 interface ContributorsFieldArgs {
     searchResult: SearchResultModel;
     institution: InstitutionModel;
+    projectRequestModal: (contributor: any) => void;
 }
 
 const roleIriToTranslationKey: Record<AttributionRoleIris, string> = {
@@ -47,13 +49,24 @@ export default class InstitutionalObjectListContributorsField extends Component<
         return prioritizedAttributions.slice(0, 2).map(attribution => {
             const contributor = getContributorById(contributors, getSingleOsfmapValue(attribution, ['agent']));
             const roleIri: AttributionRoleIris = getSingleOsfmapValue(attribution, ['hadRole']);
+
+            const regex = /([^?#]+)$/; // Regex to extract the final part after the last slash
+            const contributorId = contributor?.['@id']?.match(regex)?.[1] || '';
+
             return {
-                name: getSingleOsfmapValue(contributor,['name']),
+                name: getSingleOsfmapValue(contributor, ['name']) || 'Unknown Contributor',
+                user_id: contributorId,
+                node_id: searchResult.indexCard.get('osfGuid'),
                 url: getSingleOsfmapValue(contributor, ['identifier']),
                 permissionLevel: this.intl.t(roleIriToTranslationKey[roleIri]),
             };
         });
     }
+
+    @action
+    handleOpenModal(contributor: any) {
+        this.args.projectRequestModal(contributor);
+    }
 }
 
 function hasInstitutionAffiliation(contributors: any[], attribution: any, institutionIris: string[]) {
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss b/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
new file mode 100644
index 00000000000..da8d8a88a6a
--- /dev/null
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
@@ -0,0 +1,14 @@
+
+.icon-message {
+    opacity: 0;
+    color: $color-text-blue-dark;
+    background-color: inherit !important;
+    border: 0 !important;
+    box-shadow: 0 !important;
+}
+
+.icon-message:hover {
+    opacity: 1;
+    background-color: inherit !important;
+}
+
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
index 992e6be26a3..e2968eed90a 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
@@ -7,6 +7,13 @@
         </OsfLink>
         {{t 'institutions.dashboard.object-list.table-items.permission-level' permissionLevel=contributor.permissionLevel}}
     </div>
+    <Button
+        local-class='icon-message'
+        aria-label={{t 'institutions.dashboard.request_project_message_modal.open_aira_label'}}
+        {{on 'click' (fn this.handleOpenModal contributor)}}
+    >
+        <FaIcon @icon='comment' />
+    </Button>
 {{else}}
     <div>
         {{t 'institutions.dashboard.object-list.table-items.no-contributors'}}
diff --git a/app/institutions/dashboard/-components/object-list/styles.scss b/app/institutions/dashboard/-components/object-list/styles.scss
index 0677767f4fe..7467ee83e9d 100644
--- a/app/institutions/dashboard/-components/object-list/styles.scss
+++ b/app/institutions/dashboard/-components/object-list/styles.scss
@@ -129,6 +129,74 @@
     padding-left: 10px;
 }
 
+.message-textarea {
+    min-width: 450px;
+    min-height: 280px;
+}
+
+.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;
+}
+
+.radiobox-container {
+    gap: 20px;
+}
+
+.radiobox-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+}
+
+.tab-container {
+    display: flex;
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 1rem;
+}
+
+.tab-button {
+    flex: 1;
+    padding: 10px;
+    text-align: center;
+    cursor: pointer;
+    background: #f9f9f9;
+    border: 0;
+    border-bottom: 2px solid transparent;
+
+    &.active {
+        border-bottom: 2px solid #007bff;
+        font-weight: bold;
+    }
+
+    &:hover {
+        background: #f1f1f1;
+    }
+}
+
+.tab-pane {
+    padding: 1rem;
+    background: #fff;
+}
+
+.request-modal {
+    max-width: min-content;
+}
+
 .download-dropdown-content {
     display: flex;
     flex-direction: column;
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index c4e2ba2c6bb..7ad27732918 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -184,6 +184,7 @@ as |list|>
                                                     <Institutions::Dashboard::-Components::ObjectList::ContributorsField
                                                         @searchResult={{result}}
                                                         @institution={{@institution}}
+                                                        @projectRequestModal={{this.openProjectRequestModal}}
                                                     />
                                                 {{else}}
                                                     {{call (fn column.getValue result)}}
@@ -277,3 +278,132 @@ as |list|>
         {{/if}}
     </Institutions::Dashboard::-Components::InstitutionalDashboardWrapper>
 </IndexCardSearcher>
+<OsfDialog  local-class='request-modal' @isOpen={{this.projectRequestModalShown}} @onClose={{this.toggleProjectRequestModal}} as |dialog|>
+    <dialog.heading>
+        {{t 'institutions.dashboard.object-list.request-project-message-modal.title'}}
+    </dialog.heading>
+    <dialog.main>
+        <div local-class='tab-container'>
+            <Button
+                local-class='tab-button {{if (eq this.activeTab 'request-access') 'active'}}'
+                {{on 'click' (fn this.setActiveTab 'request-access')}}
+            >
+                {{t 'institutions.dashboard.object-list.request-project-message-modal.tabs.request_access'}}
+            </Button>
+            <Button
+                local-class='tab-button {{if (eq this.activeTab 'send-message') 'active'}}'
+                {{on 'click' (fn this.setActiveTab 'send-message')}}
+            >
+                {{t 'institutions.dashboard.object-list.request-project-message-modal.tabs.send_message'}}
+            </Button>
+        </div>
+
+        {{#if (eq this.activeTab 'request-access')}}
+            <div local-class='tab-pane'>
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.request_label'}}
+                </p>
+                <div local-class='radiobox-container'>
+                    <label local-class='radiobox-item'>
+                        <Input
+                            @type='radio'
+                            @name='permission'
+                            @value='admin'
+                            @checked={{eq this.selectedPermission 'admin'}}
+                        />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.admin_permission_label'}}
+                    </label>
+                    <label local-class='radiobox-item'>
+                        <Input
+                            @type='radio'
+                            @name='permission'
+                            @value='write'
+                            @checked={{eq this.selectedPermission 'write'}}
+                        />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.write_permission_label'}}
+                    </label>
+                    <Textarea
+                        local-class='message-textarea'
+                        @value={{this.messageText}}
+                    />
+                    <p local-class='message-label'>
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.closing_message_label' htmlSafe=true adminName=this.currentUser.user.fullName}}
+                    </p>
+                    <div local-class='checkbox-container'>
+                        <label local-class='checkbox-item'>
+                            <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                            {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
+                        </label>
+                        <label local-class='checkbox-item'>
+                            <Input @type='checkbox' @checked={{this.replyTo}} />
+                            {{t 'institutions.dashboard.object-list.request-project-message-modal.reply_to_label'}}
+                        </label>
+                    </div>
+                </div>
+            </div>
+        {{/if}}
+
+        {{#if (eq this.activeTab 'send-message')}}
+            <div local-class='tab-pane'>
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.opening_message_label'}}
+                </p>
+                <Textarea
+                    local-class='message-textarea'
+                    @value={{this.messageText}}
+                />
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.closing_message_label' htmlSafe=true adminName=this.currentUser.user.fullName}}
+                </p>
+                <div local-class='checkbox-container'>
+                    <label local-class='checkbox-item'>
+                        <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
+                    </label>
+                    <label local-class='checkbox-item'>
+                        <Input @type='checkbox' @checked={{this.replyTo}} />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.reply_to_label'}}
+                    </label>
+                </div>
+            </div>
+        {{/if}}
+    </dialog.main>
+    <dialog.footer>
+        <Button
+            @type='secondary'
+            {{on 'click' this.toggleProjectRequestModal}}
+        >
+            {{t 'general.cancel'}}
+        </Button>
+        <Button
+            @type='primary'
+            @disabled={{not this.messageText.trim}}
+            {{on 'click' (queue (perform this.handleSend) dialog.close)}}
+        >
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send'}}
+        </Button>
+    </dialog.footer>
+</OsfDialog>
+<OsfDialog
+    @isOpen={{this.showSendMessagePrompt}}
+    @onClose={{this.closeSendMessagePrompt}}
+    local-class='confirmation-prompt'
+    as |dialog|
+>
+    <dialog.heading>
+        {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.title'}}
+    </dialog.heading>
+    <dialog.main>
+        <p local-class='confirmation-message'>
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.message'}}
+        </p>
+    </dialog.main>
+    <dialog.footer>
+        <Button
+            @type='primary'
+            {{on 'click' this.handleBackToSendMessage}}
+        >
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.back'}}
+        </Button>
+    </dialog.footer>
+</OsfDialog>
diff --git a/app/models/node-request.ts b/app/models/node-request.ts
new file mode 100644
index 00000000000..9f213a8235b
--- /dev/null
+++ b/app/models/node-request.ts
@@ -0,0 +1,13 @@
+// app/models/node-request.js
+import Model, { attr, belongsTo } from '@ember-data/model';
+
+export default class NodeRequestModel extends Model {
+  @attr('string') comment;
+  @attr('string') request_type;
+  @attr('boolean') bcc_sender;
+  @attr('boolean') replyTo;
+  @belongsTo('institution') institution;
+  @belongsTo('user') message_recipent;
+  @belongsTo('node') node;
+
+}
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
new file mode 100644
index 00000000000..9e66b3fa8fb
--- /dev/null
+++ b/app/models/user-message.ts
@@ -0,0 +1,15 @@
+// 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: MessageTypeChoices;
+  @attr('boolean') bcc_sender;
+  @attr('boolean') replyTo;
+  @belongsTo('institution') institution;
+}
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 79d39529dd6..b471f61bcb9 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -884,6 +884,29 @@ institutions:
             first: First
             prev: Prev
             next: Next
+            request-project-message-modal:
+              tabs:
+                request_access: 'Request Access'
+                send_message: 'Send Message'
+              open_aira_label: 'Open Project Request Modal Button'
+              close_aira_label: 'Close Project Request Modal Button'
+              send_aira_label: 'Send Project Request Button'
+              title: 'Contact'
+              message_permission_label: 'Send Message'
+              write_permission_label: 'Read/Write'
+              admin_permission_label: 'Administrative'
+              request_label: 'I am an admin associated with [institution] and I would like to be added to your project as a non-bibliographic contributor in order to assist with metadata curation please add me with the following permissions.'
+              opening_message_label: 'Comments:'
+              closing_message_label: 'Sincerely Yours,<br> {adminName}'
+              message_sent_success: 'Request has been sent'
+              message_sent_failed: 'Request 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'
+              send_message_prompt:
+                title: "Can't Request Access"
+                message: "This user has their request access feature turned off.<br> Reach out to the user via the User tab by pressing the 'Back' button below."
+                back: "Back"
             table-headers:
                 title: Title
                 link: Link

From 0039fc685a09a5ce27b2d055051107850d3c5273 Mon Sep 17 00:00:00 2001
From: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:10:47 -0500
Subject: [PATCH 02/15] Feature/share download integration (#2457)

* [ENG-6823] Explicitly list columns for SHARE download (#2450)

-   Ticket: [ENG-6823]
-   Feature flag: n/a

## Purpose
- Tell SHARE what information to download when downloading institutional dashboard data

## Summary of Changes
- Add a new `propertyPathKey` property to the object-list columns
 - this is used to tell SHARE the format of each column
- Remove `sortKey` property from column, and replace it with `isSortable` boolean property since `sortKey` is the same as `propertyPathKey`

* Use proper key for DOI field download (#2455)
---
 .../-components/object-list/component-test.ts |  3 ++-
 .../-components/object-list/component.ts      | 13 +++++++++++-
 .../-components/object-list/template.hbs      |  6 +++---
 .../dashboard/preprints/controller.ts         | 16 ++++++++++----
 .../dashboard/projects/controller.ts          | 21 +++++++++++++++----
 .../dashboard/registrations/controller.ts     | 20 ++++++++++++++----
 6 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/component-test.ts b/app/institutions/dashboard/-components/object-list/component-test.ts
index 16fda865260..e7fa68b0535 100644
--- a/app/institutions/dashboard/-components/object-list/component-test.ts
+++ b/app/institutions/dashboard/-components/object-list/component-test.ts
@@ -24,8 +24,9 @@ module('Integration | institutions | dashboard | -components | object-list', hoo
         const columns = [
             {
                 name: 'Title',
-                sortKey: 'title',
+                isSortable: true,
                 getValue: () => 'Title of some object',
+                propertyPathKey: 'title',
             },
             {
                 name: 'Description',
diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 53dd0f146d3..9bc701dd089 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -15,8 +15,9 @@ const shareDownloadFlag = config.featureFlagNames.shareDownload;
 
 interface Column {
     name: string;
-    sortKey?: string;
+    isSortable?: boolean;
     sortParam?: string;
+    propertyPathKey?: string;
 }
 interface ValueColumn extends Column {
     getValue(searchResult: SearchResultModel): string;
@@ -92,6 +93,16 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
         cardSearchUrl.searchParams.set('page[size]', '10000');
         cardSearchUrl.searchParams.set('acceptMediatype', format);
         cardSearchUrl.searchParams.set('withFileName', `${this.args.objectType}-search-results`);
+
+        const columnDownloadKeys = this.args.columns.map(column => {
+            if (column.propertyPathKey && this.visibleColumns.includes(column.name)) {
+                return column.propertyPathKey;
+            }
+            return null;
+        });
+        const { resourceType } = this.args.defaultQueryOptions.cardSearchFilter;
+
+        cardSearchUrl.searchParams.set(`fields[${resourceType}]`, columnDownloadKeys.filter(Boolean).join(','));
         return cardSearchUrl.toString();
     }
 
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index c4e2ba2c6bb..46b08b53cf9 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -149,10 +149,10 @@ as |list|>
                                             >
                                                 <span>
                                                     {{column.name}}
-                                                    {{#if column.sortKey}}
+                                                    {{#if column.isSortable}}
                                                         <SortArrow
-                                                            @sortBy={{column.sortKey}}
-                                                            @sortAction={{queue (fn this.updateSortKey column.sortKey column.sortParam) (perform list.searchObjectsTask)}}
+                                                            @sortBy={{column.propertyPathKey}}
+                                                            @sortAction={{queue (fn this.updateSortKey column.propertyPathKey column.sortParam) (perform list.searchObjectsTask)}}
                                                         />
                                                     {{/if}}
                                                 </span>
diff --git a/app/institutions/dashboard/preprints/controller.ts b/app/institutions/dashboard/preprints/controller.ts
index c51f5c42de4..0be2f007559 100644
--- a/app/institutions/dashboard/preprints/controller.ts
+++ b/app/institutions/dashboard/preprints/controller.ts
@@ -17,6 +17,7 @@ export default class InstitutionDashboardPreprints extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -27,24 +28,29 @@ export default class InstitutionDashboardPreprints extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            isSortable: true,
+            propertyPathKey: 'dateCreated',
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            isSortable: true,
+            propertyPathKey: 'dateModified',
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -52,8 +58,9 @@ export default class InstitutionDashboardPreprints extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Download count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.download_count'),
@@ -61,8 +68,9 @@ export default class InstitutionDashboardPreprints extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.downloadCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.downloadCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.downloadCount',
         },
     ];
 
diff --git a/app/institutions/dashboard/projects/controller.ts b/app/institutions/dashboard/projects/controller.ts
index 22e27b6d25e..38514391925 100644
--- a/app/institutions/dashboard/projects/controller.ts
+++ b/app/institutions/dashboard/projects/controller.ts
@@ -17,6 +17,7 @@ export default class InstitutionDashboardProjects extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -27,20 +28,24 @@ export default class InstitutionDashboardProjects extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            propertyPathKey: 'dateCreated',
+            isSortable: true,
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            propertyPathKey: 'dateModified',
+            isSortable: true,
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // Storage location
             name: this.intl.t('institutions.dashboard.object-list.table-headers.storage_location'),
             getValue: searchResult => searchResult.storageRegion,
+            propertyPathKey: 'storageRegion.prefLabel',
         },
         { // Total data stored
             name: this.intl.t('institutions.dashboard.object-list.table-headers.total_data_stored'),
@@ -48,12 +53,14 @@ export default class InstitutionDashboardProjects extends Controller {
                 const byteCount = getSingleOsfmapValue(searchResult.resourceMetadata, ['storageByteCount']);
                 return byteCount ? humanFileSize(byteCount) : this.missingItemPlaceholder;
             },
-            sortKey: 'storageByteCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'storageByteCount',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -61,21 +68,25 @@ export default class InstitutionDashboardProjects extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Resource type
             name: this.intl.t('institutions.dashboard.object-list.table-headers.resource_nature'),
             getValue: searchResult => searchResult.resourceNature || this.missingItemPlaceholder,
+            propertyPathKey: 'resourceNature.displayLabel',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // addons associated
             name: this.intl.t('institutions.dashboard.object-list.table-headers.addons'),
             getValue: searchResult => searchResult.configuredAddonNames.length ?  searchResult.configuredAddonNames :
                 this.missingItemPlaceholder,
+            propertyPathKey: 'hasOsfAddon.prefLabel',
         },
         { // Funder name
             name: this.intl.t('institutions.dashboard.object-list.table-headers.funder_name'),
@@ -85,6 +96,8 @@ export default class InstitutionDashboardProjects extends Controller {
                 }
                 return searchResult.funders.map((funder: { name: string }) => funder.name).join(', ');
             },
+            propertyPathKey: 'funder.name',
+
         },
     ];
 
diff --git a/app/institutions/dashboard/registrations/controller.ts b/app/institutions/dashboard/registrations/controller.ts
index d991172f29f..09bc39639cd 100644
--- a/app/institutions/dashboard/registrations/controller.ts
+++ b/app/institutions/dashboard/registrations/controller.ts
@@ -16,6 +16,7 @@ export default class InstitutionDashboardRegistrations extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -26,20 +27,24 @@ export default class InstitutionDashboardRegistrations extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            isSortable: true,
+            propertyPathKey: 'dateCreated',
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            isSortable: true,
+            propertyPathKey: 'dateModified',
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // Storage location
             name: this.intl.t('institutions.dashboard.object-list.table-headers.storage_location'),
             getValue: searchResult => searchResult.storageRegion,
+            propertyPathKey: 'storageRegion.prefLabel',
         },
         { // Total data stored
             name: this.intl.t('institutions.dashboard.object-list.table-headers.total_data_stored'),
@@ -47,12 +52,14 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 const byteCount = getSingleOsfmapValue(searchResult.resourceMetadata, ['storageByteCount']);
                 return byteCount ? humanFileSize(byteCount) : this.missingItemPlaceholder;
             },
-            sortKey: 'storageByteCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'storageByteCount',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -60,16 +67,19 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Resource type
             name: this.intl.t('institutions.dashboard.object-list.table-headers.resource_nature'),
             getValue: searchResult => searchResult.resourceNature || this.missingItemPlaceholder,
+            propertyPathKey: 'resourceNature.displayLabel',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // Funder name
             name: this.intl.t('institutions.dashboard.object-list.table-headers.funder_name'),
@@ -79,10 +89,12 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 }
                 return searchResult.funders.map((funder: { name: string }) => funder.name).join(', ');
             },
+            propertyPathKey: 'funders.name',
         },
         { // schema
             name: this.intl.t('institutions.dashboard.object-list.table-headers.registration_schema'),
             getValue: searchResult => searchResult.registrationTemplate,
+            propertyPathKey: 'conformsTo.title',
         },
     ];
 

From 660cee207aa9991a51df2544be6436c57be71941 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Mon, 6 Jan 2025 11:25:19 -0500
Subject: [PATCH 03/15] Bump version no. Add CHANGELOG.

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2ff18a28b3..a69fcf130d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [25.01.0] - 2024-12-11
+### Added
+- Update request params for SHARE download
+
 ## [24.10.0] - 2024-12-11
 ### Added
 - Institutional Dashboard Improvements B&I Release
diff --git a/package.json b/package.json
index 253e9ddaddb..e8b3078452c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "24.10.0",
+  "version": "25.01.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

From 002ccc8acc3be192a8605076b59094eb11ef0bb9 Mon Sep 17 00:00:00 2001
From: futa-ikeda <51409893+futa-ikeda@users.noreply.github.com>
Date: Mon, 6 Jan 2025 11:10:47 -0500
Subject: [PATCH 04/15] Feature/share download integration (#2457)

* [ENG-6823] Explicitly list columns for SHARE download (#2450)

-   Ticket: [ENG-6823]
-   Feature flag: n/a

## Purpose
- Tell SHARE what information to download when downloading institutional dashboard data

## Summary of Changes
- Add a new `propertyPathKey` property to the object-list columns
 - this is used to tell SHARE the format of each column
- Remove `sortKey` property from column, and replace it with `isSortable` boolean property since `sortKey` is the same as `propertyPathKey`

* Use proper key for DOI field download (#2455)
---
 .../-components/object-list/component-test.ts |  3 ++-
 .../-components/object-list/component.ts      | 13 +++++++++++-
 .../-components/object-list/template.hbs      |  6 +++---
 .../dashboard/preprints/controller.ts         | 16 ++++++++++----
 .../dashboard/projects/controller.ts          | 21 +++++++++++++++----
 .../dashboard/registrations/controller.ts     | 20 ++++++++++++++----
 6 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/component-test.ts b/app/institutions/dashboard/-components/object-list/component-test.ts
index 16fda865260..e7fa68b0535 100644
--- a/app/institutions/dashboard/-components/object-list/component-test.ts
+++ b/app/institutions/dashboard/-components/object-list/component-test.ts
@@ -24,8 +24,9 @@ module('Integration | institutions | dashboard | -components | object-list', hoo
         const columns = [
             {
                 name: 'Title',
-                sortKey: 'title',
+                isSortable: true,
                 getValue: () => 'Title of some object',
+                propertyPathKey: 'title',
             },
             {
                 name: 'Description',
diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 53dd0f146d3..9bc701dd089 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -15,8 +15,9 @@ const shareDownloadFlag = config.featureFlagNames.shareDownload;
 
 interface Column {
     name: string;
-    sortKey?: string;
+    isSortable?: boolean;
     sortParam?: string;
+    propertyPathKey?: string;
 }
 interface ValueColumn extends Column {
     getValue(searchResult: SearchResultModel): string;
@@ -92,6 +93,16 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
         cardSearchUrl.searchParams.set('page[size]', '10000');
         cardSearchUrl.searchParams.set('acceptMediatype', format);
         cardSearchUrl.searchParams.set('withFileName', `${this.args.objectType}-search-results`);
+
+        const columnDownloadKeys = this.args.columns.map(column => {
+            if (column.propertyPathKey && this.visibleColumns.includes(column.name)) {
+                return column.propertyPathKey;
+            }
+            return null;
+        });
+        const { resourceType } = this.args.defaultQueryOptions.cardSearchFilter;
+
+        cardSearchUrl.searchParams.set(`fields[${resourceType}]`, columnDownloadKeys.filter(Boolean).join(','));
         return cardSearchUrl.toString();
     }
 
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index c4e2ba2c6bb..46b08b53cf9 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -149,10 +149,10 @@ as |list|>
                                             >
                                                 <span>
                                                     {{column.name}}
-                                                    {{#if column.sortKey}}
+                                                    {{#if column.isSortable}}
                                                         <SortArrow
-                                                            @sortBy={{column.sortKey}}
-                                                            @sortAction={{queue (fn this.updateSortKey column.sortKey column.sortParam) (perform list.searchObjectsTask)}}
+                                                            @sortBy={{column.propertyPathKey}}
+                                                            @sortAction={{queue (fn this.updateSortKey column.propertyPathKey column.sortParam) (perform list.searchObjectsTask)}}
                                                         />
                                                     {{/if}}
                                                 </span>
diff --git a/app/institutions/dashboard/preprints/controller.ts b/app/institutions/dashboard/preprints/controller.ts
index c51f5c42de4..0be2f007559 100644
--- a/app/institutions/dashboard/preprints/controller.ts
+++ b/app/institutions/dashboard/preprints/controller.ts
@@ -17,6 +17,7 @@ export default class InstitutionDashboardPreprints extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -27,24 +28,29 @@ export default class InstitutionDashboardPreprints extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            isSortable: true,
+            propertyPathKey: 'dateCreated',
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            isSortable: true,
+            propertyPathKey: 'dateModified',
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -52,8 +58,9 @@ export default class InstitutionDashboardPreprints extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Download count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.download_count'),
@@ -61,8 +68,9 @@ export default class InstitutionDashboardPreprints extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.downloadCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.downloadCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.downloadCount',
         },
     ];
 
diff --git a/app/institutions/dashboard/projects/controller.ts b/app/institutions/dashboard/projects/controller.ts
index 22e27b6d25e..38514391925 100644
--- a/app/institutions/dashboard/projects/controller.ts
+++ b/app/institutions/dashboard/projects/controller.ts
@@ -17,6 +17,7 @@ export default class InstitutionDashboardProjects extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -27,20 +28,24 @@ export default class InstitutionDashboardProjects extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            propertyPathKey: 'dateCreated',
+            isSortable: true,
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            propertyPathKey: 'dateModified',
+            isSortable: true,
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // Storage location
             name: this.intl.t('institutions.dashboard.object-list.table-headers.storage_location'),
             getValue: searchResult => searchResult.storageRegion,
+            propertyPathKey: 'storageRegion.prefLabel',
         },
         { // Total data stored
             name: this.intl.t('institutions.dashboard.object-list.table-headers.total_data_stored'),
@@ -48,12 +53,14 @@ export default class InstitutionDashboardProjects extends Controller {
                 const byteCount = getSingleOsfmapValue(searchResult.resourceMetadata, ['storageByteCount']);
                 return byteCount ? humanFileSize(byteCount) : this.missingItemPlaceholder;
             },
-            sortKey: 'storageByteCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'storageByteCount',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -61,21 +68,25 @@ export default class InstitutionDashboardProjects extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Resource type
             name: this.intl.t('institutions.dashboard.object-list.table-headers.resource_nature'),
             getValue: searchResult => searchResult.resourceNature || this.missingItemPlaceholder,
+            propertyPathKey: 'resourceNature.displayLabel',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // addons associated
             name: this.intl.t('institutions.dashboard.object-list.table-headers.addons'),
             getValue: searchResult => searchResult.configuredAddonNames.length ?  searchResult.configuredAddonNames :
                 this.missingItemPlaceholder,
+            propertyPathKey: 'hasOsfAddon.prefLabel',
         },
         { // Funder name
             name: this.intl.t('institutions.dashboard.object-list.table-headers.funder_name'),
@@ -85,6 +96,8 @@ export default class InstitutionDashboardProjects extends Controller {
                 }
                 return searchResult.funders.map((funder: { name: string }) => funder.name).join(', ');
             },
+            propertyPathKey: 'funder.name',
+
         },
     ];
 
diff --git a/app/institutions/dashboard/registrations/controller.ts b/app/institutions/dashboard/registrations/controller.ts
index d991172f29f..09bc39639cd 100644
--- a/app/institutions/dashboard/registrations/controller.ts
+++ b/app/institutions/dashboard/registrations/controller.ts
@@ -16,6 +16,7 @@ export default class InstitutionDashboardRegistrations extends Controller {
             type: 'link',
             getHref: searchResult => searchResult.indexCard.get('osfIdentifier'),
             getLinkText: searchResult => searchResult.displayTitle,
+            propertyPathKey: 'title',
         },
         { // Link
             name: this.intl.t('institutions.dashboard.object-list.table-headers.link'),
@@ -26,20 +27,24 @@ export default class InstitutionDashboardRegistrations extends Controller {
         { // Date created
             name: this.intl.t('institutions.dashboard.object-list.table-headers.created_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateCreated']),
-            sortKey: 'dateCreated',
+            isSortable: true,
+            propertyPathKey: 'dateCreated',
         },
         { // Date modified
             name: this.intl.t('institutions.dashboard.object-list.table-headers.modified_date'),
             getValue: searchResult => getSingleOsfmapValue(searchResult.resourceMetadata, ['dateModified']),
-            sortKey: 'dateModified',
+            isSortable: true,
+            propertyPathKey: 'dateModified',
         },
         { // DOI
             name: this.intl.t('institutions.dashboard.object-list.table-headers.doi'),
             type: 'doi',
+            propertyPathKey: 'sameAs',
         },
         { // Storage location
             name: this.intl.t('institutions.dashboard.object-list.table-headers.storage_location'),
             getValue: searchResult => searchResult.storageRegion,
+            propertyPathKey: 'storageRegion.prefLabel',
         },
         { // Total data stored
             name: this.intl.t('institutions.dashboard.object-list.table-headers.total_data_stored'),
@@ -47,12 +52,14 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 const byteCount = getSingleOsfmapValue(searchResult.resourceMetadata, ['storageByteCount']);
                 return byteCount ? humanFileSize(byteCount) : this.missingItemPlaceholder;
             },
-            sortKey: 'storageByteCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'storageByteCount',
         },
         { // Contributor name + permissions
             name: this.intl.t('institutions.dashboard.object-list.table-headers.contributor_name'),
             type: 'contributors',
+            propertyPathKey: 'creator.name',
         },
         { // View count
             name: this.intl.t('institutions.dashboard.object-list.table-headers.view_count'),
@@ -60,16 +67,19 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 const metrics = searchResult.usageMetrics;
                 return metrics ? metrics.viewCount : this.missingItemPlaceholder;
             },
-            sortKey: 'usage.viewCount',
+            isSortable: true,
             sortParam: 'integer-value',
+            propertyPathKey: 'usage.viewCount',
         },
         { // Resource type
             name: this.intl.t('institutions.dashboard.object-list.table-headers.resource_nature'),
             getValue: searchResult => searchResult.resourceNature || this.missingItemPlaceholder,
+            propertyPathKey: 'resourceNature.displayLabel',
         },
         { // License
             name: this.intl.t('institutions.dashboard.object-list.table-headers.license'),
             getValue: searchResult => searchResult.license?.name || this.missingItemPlaceholder,
+            propertyPathKey: 'rights.name',
         },
         { // Funder name
             name: this.intl.t('institutions.dashboard.object-list.table-headers.funder_name'),
@@ -79,10 +89,12 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 }
                 return searchResult.funders.map((funder: { name: string }) => funder.name).join(', ');
             },
+            propertyPathKey: 'funders.name',
         },
         { // schema
             name: this.intl.t('institutions.dashboard.object-list.table-headers.registration_schema'),
             getValue: searchResult => searchResult.registrationTemplate,
+            propertyPathKey: 'conformsTo.title',
         },
     ];
 

From bf8ab2c13488982a8d46a987dba2c7158d6225b3 Mon Sep 17 00:00:00 2001
From: Yuhuai Liu <yuhuai@cos.io>
Date: Mon, 6 Jan 2025 11:25:19 -0500
Subject: [PATCH 05/15] Bump version no. Add CHANGELOG.

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2ff18a28b3..a69fcf130d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [25.01.0] - 2024-12-11
+### Added
+- Update request params for SHARE download
+
 ## [24.10.0] - 2024-12-11
 ### Added
 - Institutional Dashboard Improvements B&I Release
diff --git a/package.json b/package.json
index 253e9ddaddb..e8b3078452c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "24.10.0",
+  "version": "25.01.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

From d54a71decc68eee8a6b548b95908362e98db46df Mon Sep 17 00:00:00 2001
From: futa-ikeda <futa.ikeda@gmail.com>
Date: Mon, 6 Jan 2025 14:24:57 -0500
Subject: [PATCH 06/15] Fix funder column propertyPathKey

---
 app/institutions/dashboard/registrations/controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/institutions/dashboard/registrations/controller.ts b/app/institutions/dashboard/registrations/controller.ts
index 09bc39639cd..241b456bf0c 100644
--- a/app/institutions/dashboard/registrations/controller.ts
+++ b/app/institutions/dashboard/registrations/controller.ts
@@ -89,7 +89,7 @@ export default class InstitutionDashboardRegistrations extends Controller {
                 }
                 return searchResult.funders.map((funder: { name: string }) => funder.name).join(', ');
             },
-            propertyPathKey: 'funders.name',
+            propertyPathKey: 'funder.name',
         },
         { // schema
             name: this.intl.t('institutions.dashboard.object-list.table-headers.registration_schema'),

From dae4684e6fec78f252f6c747c055c0e78eb0243f Mon Sep 17 00:00:00 2001
From: Matt Frazier <maf7sm@virginia.edu>
Date: Mon, 6 Jan 2025 15:09:04 -0500
Subject: [PATCH 07/15] Update CHANGELOG, bump version

---
 CHANGELOG.md | 8 +++++++-
 package.json | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a69fcf130d0..73fbef89783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [25.01.0] - 2024-12-11
+## [25.01.1] - 2025-01-06
+### Added
+- Fix funder column propertyPathKey
+
+## [25.01.0] - 2025-01-06
 ### Added
 - Update request params for SHARE download
 
@@ -2014,6 +2018,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[25.01.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/25.01.1
+[25.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/25.01.0
 [24.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.10.0
 [24.09.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.09.1
 [24.09.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/24.09.0
diff --git a/package.json b/package.json
index e8b3078452c..22de84579ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "25.01.0",
+  "version": "25.01.1",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

From 524eef029ad2d1abc431d9ca958cf046757e7209 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Tue, 7 Jan 2025 14:30:47 -0500
Subject: [PATCH 08/15] integrations fixes and refactors

---
 app/adapters/node-request.ts                  |  2 +-
 app/adapters/user-message.ts                  |  2 +-
 .../institutional-users-list/component.ts     |  6 +--
 .../institutional-users-list/template.hbs     |  2 +-
 .../-components/object-list/component.ts      | 50 ++++++++++++-------
 .../contributors-field/component.ts           |  7 +--
 .../-components/object-list/template.hbs      |  6 ++-
 app/models/node-request.ts                    | 12 +++--
 app/models/user-message.ts                    |  2 +-
 translations/en-us.yml                        |  1 +
 10 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/app/adapters/node-request.ts b/app/adapters/node-request.ts
index 32f1d140bc2..c596ccfa3c1 100644
--- a/app/adapters/node-request.ts
+++ b/app/adapters/node-request.ts
@@ -9,6 +9,6 @@ export default class NodeRequestAdapter extends OsfAdapter {
 
     urlForCreateRecord(modelName, snapshot) {
         const nodeId = snapshot.record.target;
-        return `${apiUrl}/v2/nodes/${nodeId}/request/`;
+        return `${apiUrl}/v2/nodes/${nodeId}/requests/`;
     }
 }
diff --git a/app/adapters/user-message.ts b/app/adapters/user-message.ts
index a92b865c714..c5bf0307cbe 100644
--- a/app/adapters/user-message.ts
+++ b/app/adapters/user-message.ts
@@ -7,7 +7,7 @@ import OsfAdapter from './osf-adapter';
 export default class UserMessageAdapter extends OsfAdapter {
     @service session;
     urlForCreateRecord(modelName, snapshot) {
-        const userId = snapshot.record.user;
+        const userId = snapshot.record.messageRecipient;
         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 2268909b0c1..c009306998f 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -43,7 +43,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @tracked filteredUsers = [];
     @tracked messageModalShown = false;
     @tracked messageText = '';
-    @tracked bcc_sender = false;
+    @tracked bccSender = false;
     @tracked replyTo = false;
     @tracked selectedUserId = null;
     @service toast!: Toast;
@@ -291,7 +291,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @action
     resetModalFields() {
         this.messageText = '';
-        this.bcc_sender = false;
+        this.bccSender = false;
         this.replyTo = false;
         this.selectedUserId = null;
     }
@@ -308,7 +308,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
             const userMessage = this.store.createRecord('user-message', {
                 messageText: this.messageText.trim(),
                 messageType: MessageTypeChoices.InstitutionalRequest,
-                bcc_sender: this.bcc_sender,
+                bccSender: this.bccSender,
                 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 a049ed56f45..71b0f3a4525 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -231,7 +231,7 @@
                 </div>
                 <div local-class='checkbox-container'>
                     <label local-class='checkbox-item'>
-                        <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                        <Input @type='checkbox' @checked={{this.bccSender}} />
                         {{t 'institutions.dashboard.send_message_modal.cc_label'}}
                     </label>
                     <label local-class='checkbox-item'>
diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index dfa9021fe99..8af679a60a9 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -15,6 +15,8 @@ import Toast from 'ember-toastr/services/toast';
 import Intl from 'ember-intl/services/intl';
 import Store from '@ember-data/store';
 import CurrentUser from 'ember-osf-web/services/current-user';
+import {MessageTypeChoices} from 'ember-osf-web/models/user-message';
+import {RequestTypeChoices} from 'ember-osf-web/models/node-request';
 
 import config from 'ember-osf-web/config/environment';
 
@@ -61,7 +63,7 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     @tracked projectRequestModalShown = false;
     @tracked activeTab = 'request-access'; // Default tab
     @tracked messageText = '';
-    @tracked bcc_sender = false;
+    @tracked bccSender = false;
     @tracked replyTo = false;
     @tracked selectedUserId = '';
     @tracked selectedNodeId = '';
@@ -160,8 +162,8 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
 
     @action
     openProjectRequestModal(contributor: any) {
-        this.selectedUserId = contributor.user_id;
-        this.selectedNodeId = contributor.node_id;
+        this.selectedUserId = contributor.userId;
+        this.selectedNodeId = contributor.nodeId;
         this.projectRequestModalShown = true;
     }
 
@@ -213,8 +215,8 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     }
 
     @action
-    updateSelectedPermission(event: Event) {
-        this.selectedPermission = (event.target as HTMLInputElement).value;
+    updateSelectedPermission(permission: string) {
+        this.selectedPermission = permission;
     }
 
     @action
@@ -225,8 +227,8 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
 
     @action
     resetFields() {
-        this.selectedPermission = 'read';
-        this.bcc_sender = false;
+        this.selectedPermission = 'write';
+        this.bccSender = false;
         this.replyTo = false;
     }
 
@@ -245,13 +247,20 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
             );
             this.resetFields();
         } catch (error) {
-            const errorDetail = error?.errors?.[0]?.detail || '';
+            const errorDetail = error?.errors?.[0]?.detail.user || error?.errors?.[0]?.detail || '';
+            const errorCode = parseInt(error?.errors?.[0]?.status, 10);
 
-            // Check for the specific error where access requests are disabled
-            if (error.status === 400 && errorDetail.includes('does not have Access Requests enabled')) {
+            if (errorCode === 400 && errorDetail.includes('does not have Access Requests enabled')) {
                 setTimeout(() => {
-                    this.showSendMessagePrompt = true; //  timeout to allow the other to exit
+                    this.showSendMessagePrompt = true; // Timeout to allow the modal to exit
                 }, 200);
+            } else if ([409, 400, 403].includes(errorCode)) {
+                // Handle specific errors
+                this.toast.error(errorDetail);
+            } else if (errorDetail.includes('Request was throttled')) {
+                this.toast.error(errorDetail);
+            } else if (errorDetail === 'You cannot request access to a node you contribute to.') {
+                this.toast.error(errorDetail);
             } else {
                 this.toast.error(
                     this.intl.t('institutions.dashboard.object-list.request-project-message-modal.message_sent_failed'),
@@ -265,11 +274,11 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     async _sendUserMessage() {
         const userMessage = this.store.createRecord('user-message', {
             messageText: this.messageText.trim(),
-            messageType: 'institutional_request',
-            bcc_sender: this.bcc_sender,
+            messageType: MessageTypeChoices.InstitutionalRequest,
+            bccSender: this.bccSender,
             replyTo: this.replyTo,
             institution: this.args.institution,
-            user: this.selectedUserId,
+            messageRecipient: this.selectedUserOsfGuid,
         });
         await userMessage.save();
     }
@@ -277,14 +286,21 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     async _sendNodeRequest() {
         const nodeRequest = this.store.createRecord('node-request', {
             comment: this.messageText.trim(),
-            requestType: 'institutional_access',
+            requestType: RequestTypeChoices.InstitutionalRequest,
             requestedPermission: this.selectedPermission,
-            bcc_sender: this.bcc_sender,
+            bccSender: this.bccSender,
             replyTo: this.replyTo,
             institution: this.args.institution,
-            message_recipent: this.selectedUserId,
+            messageRecipient: this.selectedUserOsfGuid,
             target: this.selectedNodeId,
         });
         await nodeRequest.save();
     }
+
+    get selectedUserOsfGuid() {
+        const url = new URL(this.selectedUserId);
+        const pathSegments = url.pathname.split('/').filter(Boolean);
+        return pathSegments[pathSegments.length - 1] || ''; // Last non-empty segment
+    }
+
 }
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
index 3bb153f3339..90fc51b7fdb 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
@@ -50,13 +50,10 @@ export default class InstitutionalObjectListContributorsField extends Component<
             const contributor = getContributorById(contributors, getSingleOsfmapValue(attribution, ['agent']));
             const roleIri: AttributionRoleIris = getSingleOsfmapValue(attribution, ['hadRole']);
 
-            const regex = /([^?#]+)$/; // Regex to extract the final part after the last slash
-            const contributorId = contributor?.['@id']?.match(regex)?.[1] || '';
-
             return {
                 name: getSingleOsfmapValue(contributor, ['name']) || 'Unknown Contributor',
-                user_id: contributorId,
-                node_id: searchResult.indexCard.get('osfGuid'),
+                userId: contributor['@id'],
+                nodeId: searchResult.indexCard.get('osfGuid'),
                 url: getSingleOsfmapValue(contributor, ['identifier']),
                 permissionLevel: this.intl.t(roleIriToTranslationKey[roleIri]),
             };
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index 4a4fe392e68..02be72a0f12 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -310,6 +310,7 @@ as |list|>
                             @name='permission'
                             @value='admin'
                             @checked={{eq this.selectedPermission 'admin'}}
+                            {{on 'change' (fn this.updateSelectedPermission 'admin')}}
                         />
                         {{t 'institutions.dashboard.object-list.request-project-message-modal.admin_permission_label'}}
                     </label>
@@ -319,6 +320,7 @@ as |list|>
                             @name='permission'
                             @value='write'
                             @checked={{eq this.selectedPermission 'write'}}
+                            {{on 'change' (fn this.updateSelectedPermission 'write')}}
                         />
                         {{t 'institutions.dashboard.object-list.request-project-message-modal.write_permission_label'}}
                     </label>
@@ -331,7 +333,7 @@ as |list|>
                     </p>
                     <div local-class='checkbox-container'>
                         <label local-class='checkbox-item'>
-                            <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                            <Input @type='checkbox' @checked={{this.bccSender}} />
                             {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
                         </label>
                         <label local-class='checkbox-item'>
@@ -357,7 +359,7 @@ as |list|>
                 </p>
                 <div local-class='checkbox-container'>
                     <label local-class='checkbox-item'>
-                        <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                        <Input @type='checkbox' @checked={{this.bccSender}} />
                         {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
                     </label>
                     <label local-class='checkbox-item'>
diff --git a/app/models/node-request.ts b/app/models/node-request.ts
index 9f213a8235b..18af450eaf9 100644
--- a/app/models/node-request.ts
+++ b/app/models/node-request.ts
@@ -1,13 +1,19 @@
 // app/models/node-request.js
 import Model, { attr, belongsTo } from '@ember-data/model';
 
+export enum RequestTypeChoices {
+    AccessRequest = 'access',
+    InstitutionalRequest = 'institutional_request',
+}
+
 export default class NodeRequestModel extends Model {
   @attr('string') comment;
-  @attr('string') request_type;
-  @attr('boolean') bcc_sender;
+  @attr('string') requestedPermission;
+  @attr('string') requestType;
+  @attr('boolean') bccSender;
   @attr('boolean') replyTo;
   @belongsTo('institution') institution;
-  @belongsTo('user') message_recipent;
+  @belongsTo('user') messageRecipent;
   @belongsTo('node') node;
 
 }
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index 9e66b3fa8fb..89e9453756d 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') bcc_sender;
+  @attr('boolean') bccSender;
   @attr('boolean') replyTo;
   @belongsTo('institution') institution;
 }
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 920dfd6ba51..453ce60cee8 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -905,6 +905,7 @@ institutions:
               send_aira_label: 'Send Project Request Button'
               title: 'Contact'
               message_permission_label: 'Send Message'
+              duplicate_request_error: 'Users may not have more than one institutional_request request per node'
               write_permission_label: 'Read/Write'
               admin_permission_label: 'Administrative'
               request_label: 'I am an admin associated with [institution] and I would like to be added to your project as a non-bibliographic contributor in order to assist with metadata curation please add me with the following permissions.'

From 4057df32069dfbed3efc48cf8e5cf64ce6010097 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Tue, 7 Jan 2025 14:39:17 -0500
Subject: [PATCH 09/15] add project request and messaging modal to institution
 dashboard

---
 app/adapters/node-request.ts                  |  14 ++
 app/adapters/user-message.ts                  |   2 +-
 .../institutional-users-list/component.ts     |   6 +-
 .../institutional-users-list/template.hbs     |   2 +-
 .../-components/object-list/component.ts      | 140 ++++++++++++++++++
 .../contributors-field/component.ts           |  11 +-
 .../contributors-field/styles.scss            |  14 ++
 .../contributors-field/template.hbs           |   7 +
 .../-components/object-list/styles.scss       |  68 +++++++++
 .../-components/object-list/template.hbs      | 132 +++++++++++++++++
 app/models/node-request.ts                    |  19 +++
 app/models/user-message.ts                    |   2 +-
 translations/en-us.yml                        |  24 +++
 13 files changed, 434 insertions(+), 7 deletions(-)
 create mode 100644 app/adapters/node-request.ts
 create mode 100644 app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
 create mode 100644 app/models/node-request.ts

diff --git a/app/adapters/node-request.ts b/app/adapters/node-request.ts
new file mode 100644
index 00000000000..c596ccfa3c1
--- /dev/null
+++ b/app/adapters/node-request.ts
@@ -0,0 +1,14 @@
+// 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 NodeRequestAdapter extends OsfAdapter {
+    @service session;
+
+    urlForCreateRecord(modelName, snapshot) {
+        const nodeId = snapshot.record.target;
+        return `${apiUrl}/v2/nodes/${nodeId}/requests/`;
+    }
+}
diff --git a/app/adapters/user-message.ts b/app/adapters/user-message.ts
index a92b865c714..c5bf0307cbe 100644
--- a/app/adapters/user-message.ts
+++ b/app/adapters/user-message.ts
@@ -7,7 +7,7 @@ import OsfAdapter from './osf-adapter';
 export default class UserMessageAdapter extends OsfAdapter {
     @service session;
     urlForCreateRecord(modelName, snapshot) {
-        const userId = snapshot.record.user;
+        const userId = snapshot.record.messageRecipient;
         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 2268909b0c1..c009306998f 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/component.ts
+++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts
@@ -43,7 +43,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @tracked filteredUsers = [];
     @tracked messageModalShown = false;
     @tracked messageText = '';
-    @tracked bcc_sender = false;
+    @tracked bccSender = false;
     @tracked replyTo = false;
     @tracked selectedUserId = null;
     @service toast!: Toast;
@@ -291,7 +291,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
     @action
     resetModalFields() {
         this.messageText = '';
-        this.bcc_sender = false;
+        this.bccSender = false;
         this.replyTo = false;
         this.selectedUserId = null;
     }
@@ -308,7 +308,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
             const userMessage = this.store.createRecord('user-message', {
                 messageText: this.messageText.trim(),
                 messageType: MessageTypeChoices.InstitutionalRequest,
-                bcc_sender: this.bcc_sender,
+                bccSender: this.bccSender,
                 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 a049ed56f45..71b0f3a4525 100644
--- a/app/institutions/dashboard/-components/institutional-users-list/template.hbs
+++ b/app/institutions/dashboard/-components/institutional-users-list/template.hbs
@@ -231,7 +231,7 @@
                 </div>
                 <div local-class='checkbox-container'>
                     <label local-class='checkbox-item'>
-                        <Input @type='checkbox' @checked={{this.bcc_sender}} />
+                        <Input @type='checkbox' @checked={{this.bccSender}} />
                         {{t 'institutions.dashboard.send_message_modal.cc_label'}}
                     </label>
                     <label local-class='checkbox-item'>
diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 53dd0f146d3..8ae75b1e447 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -9,6 +9,15 @@ import InstitutionModel from 'ember-osf-web/models/institution';
 import { SuggestedFilterOperators } from 'ember-osf-web/models/related-property-path';
 import SearchResultModel from 'ember-osf-web/models/search-result';
 import { Filter } from 'osf-components/components/search-page/component';
+import { waitFor } from '@ember/test-waiters';
+import { task } from 'ember-concurrency';
+import Toast from 'ember-toastr/services/toast';
+import Intl from 'ember-intl/services/intl';
+import Store from '@ember-data/store';
+import CurrentUser from 'ember-osf-web/services/current-user';
+import {MessageTypeChoices} from 'ember-osf-web/models/user-message';
+import {RequestTypeChoices} from 'ember-osf-web/models/node-request';
+
 import config from 'ember-osf-web/config/environment';
 
 const shareDownloadFlag = config.featureFlagNames.shareDownload;
@@ -49,6 +58,20 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     @tracked sortParam?: string;
     @tracked visibleColumns = this.args.columns.map(column => column.name);
     @tracked dirtyVisibleColumns = [...this.visibleColumns]; // track changes to visible columns before they are saved
+    @tracked selectedPermissions = 'write';
+    @tracked projectRequestModalShown = false;
+    @tracked activeTab = 'request-access'; // Default tab
+    @tracked messageText = '';
+    @tracked bccSender = false;
+    @tracked replyTo = false;
+    @tracked selectedUserId = '';
+    @tracked selectedNodeId = '';
+    @tracked showSendMessagePrompt = false;
+    @service toast!: Toast;
+    @service intl!: Intl;
+    @service store!: Store;
+    @service currentUser!: CurrentUser;
+
 
     get queryOptions() {
         const options = {
@@ -151,4 +174,121 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     updatePage(newPage: string) {
         this.page = newPage;
     }
+
+    @action
+    openProjectRequestModal(contributor: any) {
+        this.selectedUserId = contributor.userId;
+        this.selectedNodeId = contributor.nodeId;
+        this.projectRequestModalShown = true;
+    }
+
+    @action
+    handleBackToSendMessage() {
+        this.activeTab = 'send-message';
+        this.showSendMessagePrompt = false;
+        setTimeout(() => {
+            this.projectRequestModalShown = true; // Reopen the main modal
+        }, 200);
+
+    }
+
+    @action
+    closeSendMessagePrompt() {
+        this.showSendMessagePrompt = false; // Hide confirmation modal without reopening
+    }
+
+    @action
+    toggleProjectRequestModal() {
+        this.projectRequestModalShown = !this.projectRequestModalShown;
+    }
+
+    @action
+    updateselectedPermissions(permission: string) {
+        this.selectedPermissions = permission;
+    }
+
+    @action
+    setActiveTab(tabName: string) {
+        this.activeTab = tabName;
+    }
+
+
+    @action
+    resetFields() {
+        this.selectedPermissions = 'write';
+        this.bccSender = false;
+        this.replyTo = false;
+    }
+
+    @task
+    @waitFor
+    async handleSend() {
+        try {
+            if (this.activeTab === 'send-message') {
+                await this._sendUserMessage();
+            } else if (this.activeTab === 'request-access') {
+                await this._sendNodeRequest();
+            }
+
+            this.toast.success(
+                this.intl.t('institutions.dashboard.object-list.request-project-message-modal.message_sent_success'),
+            );
+            this.resetFields();
+        } catch (error) {
+            const errorDetail = error?.errors?.[0]?.detail.user || error?.errors?.[0]?.detail || '';
+            const errorCode = parseInt(error?.errors?.[0]?.status, 10);
+
+            if (errorCode === 400 && errorDetail.includes('does not have Access Requests enabled')) {
+                setTimeout(() => {
+                    this.showSendMessagePrompt = true; // Timeout to allow the modal to exit
+                }, 200);
+            } else if ([409, 400, 403].includes(errorCode)) {
+                // Handle specific errors
+                this.toast.error(errorDetail);
+            } else if (errorDetail.includes('Request was throttled')) {
+                this.toast.error(errorDetail);
+            } else if (errorDetail === 'You cannot request access to a node you contribute to.') {
+                this.toast.error(errorDetail);
+            } else {
+                this.toast.error(
+                    this.intl.t('institutions.dashboard.object-list.request-project-message-modal.message_sent_failed'),
+                );
+            }
+        } finally {
+            this.projectRequestModalShown = false; // Close the main modal
+        }
+    }
+
+    async _sendUserMessage() {
+        const userMessage = this.store.createRecord('user-message', {
+            messageText: this.messageText.trim(),
+            messageType: MessageTypeChoices.InstitutionalRequest,
+            bccSender: this.bccSender,
+            replyTo: this.replyTo,
+            institution: this.args.institution,
+            messageRecipient: this.selectedUserOsfGuid,
+        });
+        await userMessage.save();
+    }
+
+    async _sendNodeRequest() {
+        const nodeRequest = this.store.createRecord('node-request', {
+            comment: this.messageText.trim(),
+            requestType: RequestTypeChoices.InstitutionalRequest,
+            requestedPermissions: this.selectedPermissions,
+            bccSender: this.bccSender,
+            replyTo: this.replyTo,
+            institution: this.args.institution,
+            messageRecipient: this.selectedUserOsfGuid,
+            target: this.selectedNodeId,
+        });
+        await nodeRequest.save();
+    }
+
+    get selectedUserOsfGuid() {
+        const url = new URL(this.selectedUserId);
+        const pathSegments = url.pathname.split('/').filter(Boolean);
+        return pathSegments[pathSegments.length - 1] || ''; // Last non-empty segment
+    }
+
 }
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
index 1c0a69f484b..18f38fd83e3 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
@@ -1,6 +1,7 @@
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import Intl from 'ember-intl/services/intl';
+import { action } from '@ember/object';
 
 import InstitutionModel from 'ember-osf-web/models/institution';
 import SearchResultModel from 'ember-osf-web/models/search-result';
@@ -10,6 +11,7 @@ import { getOsfmapObjects, getSingleOsfmapValue, hasOsfmapValue } from 'ember-os
 interface ContributorsFieldArgs {
     searchResult: SearchResultModel;
     institution: InstitutionModel;
+    projectRequestModal: (contributor: any) => void;
 }
 
 const roleIriToTranslationKey: Record<AttributionRoleIris, string> = {
@@ -48,12 +50,19 @@ export default class InstitutionalObjectListContributorsField extends Component<
             const contributor = getContributorById(contributors, getSingleOsfmapValue(attribution, ['agent']));
             const roleIri: AttributionRoleIris = getSingleOsfmapValue(attribution, ['hadRole']);
             return {
-                name: getSingleOsfmapValue(contributor,['name']),
+                name: getSingleOsfmapValue(contributor, ['name']) || 'Unknown Contributor',
+                userId: contributor['@id'],
+                nodeId: searchResult.indexCard.get('osfGuid'),
                 url: getSingleOsfmapValue(contributor, ['identifier']),
                 permissionLevel: this.intl.t(roleIriToTranslationKey[roleIri]),
             };
         });
     }
+
+    @action
+    handleOpenModal(contributor: any) {
+        this.args.projectRequestModal(contributor);
+    }
 }
 
 function hasInstitutionAffiliation(contributors: any[], attribution: any, institutionIris: string[]) {
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss b/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
new file mode 100644
index 00000000000..da8d8a88a6a
--- /dev/null
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/styles.scss
@@ -0,0 +1,14 @@
+
+.icon-message {
+    opacity: 0;
+    color: $color-text-blue-dark;
+    background-color: inherit !important;
+    border: 0 !important;
+    box-shadow: 0 !important;
+}
+
+.icon-message:hover {
+    opacity: 1;
+    background-color: inherit !important;
+}
+
diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
index 992e6be26a3..e2968eed90a 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
@@ -7,6 +7,13 @@
         </OsfLink>
         {{t 'institutions.dashboard.object-list.table-items.permission-level' permissionLevel=contributor.permissionLevel}}
     </div>
+    <Button
+        local-class='icon-message'
+        aria-label={{t 'institutions.dashboard.request_project_message_modal.open_aira_label'}}
+        {{on 'click' (fn this.handleOpenModal contributor)}}
+    >
+        <FaIcon @icon='comment' />
+    </Button>
 {{else}}
     <div>
         {{t 'institutions.dashboard.object-list.table-items.no-contributors'}}
diff --git a/app/institutions/dashboard/-components/object-list/styles.scss b/app/institutions/dashboard/-components/object-list/styles.scss
index 0677767f4fe..7467ee83e9d 100644
--- a/app/institutions/dashboard/-components/object-list/styles.scss
+++ b/app/institutions/dashboard/-components/object-list/styles.scss
@@ -129,6 +129,74 @@
     padding-left: 10px;
 }
 
+.message-textarea {
+    min-width: 450px;
+    min-height: 280px;
+}
+
+.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;
+}
+
+.radiobox-container {
+    gap: 20px;
+}
+
+.radiobox-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-size: 14px;
+}
+
+.tab-container {
+    display: flex;
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 1rem;
+}
+
+.tab-button {
+    flex: 1;
+    padding: 10px;
+    text-align: center;
+    cursor: pointer;
+    background: #f9f9f9;
+    border: 0;
+    border-bottom: 2px solid transparent;
+
+    &.active {
+        border-bottom: 2px solid #007bff;
+        font-weight: bold;
+    }
+
+    &:hover {
+        background: #f1f1f1;
+    }
+}
+
+.tab-pane {
+    padding: 1rem;
+    background: #fff;
+}
+
+.request-modal {
+    max-width: min-content;
+}
+
 .download-dropdown-content {
     display: flex;
     flex-direction: column;
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index c4e2ba2c6bb..8ee43a472a0 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -184,6 +184,7 @@ as |list|>
                                                     <Institutions::Dashboard::-Components::ObjectList::ContributorsField
                                                         @searchResult={{result}}
                                                         @institution={{@institution}}
+                                                        @projectRequestModal={{this.openProjectRequestModal}}
                                                     />
                                                 {{else}}
                                                     {{call (fn column.getValue result)}}
@@ -277,3 +278,134 @@ as |list|>
         {{/if}}
     </Institutions::Dashboard::-Components::InstitutionalDashboardWrapper>
 </IndexCardSearcher>
+<OsfDialog  local-class='request-modal' @isOpen={{this.projectRequestModalShown}} @onClose={{this.toggleProjectRequestModal}} as |dialog|>
+    <dialog.heading>
+        {{t 'institutions.dashboard.object-list.request-project-message-modal.title'}}
+    </dialog.heading>
+    <dialog.main>
+        <div local-class='tab-container'>
+            <Button
+                local-class='tab-button {{if (eq this.activeTab 'request-access') 'active'}}'
+                {{on 'click' (fn this.setActiveTab 'request-access')}}
+            >
+                {{t 'institutions.dashboard.object-list.request-project-message-modal.tabs.request_access'}}
+            </Button>
+            <Button
+                local-class='tab-button {{if (eq this.activeTab 'send-message') 'active'}}'
+                {{on 'click' (fn this.setActiveTab 'send-message')}}
+            >
+                {{t 'institutions.dashboard.object-list.request-project-message-modal.tabs.send_message'}}
+            </Button>
+        </div>
+
+        {{#if (eq this.activeTab 'request-access')}}
+            <div local-class='tab-pane'>
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.request_label'}}
+                </p>
+                <div local-class='radiobox-container'>
+                    <label local-class='radiobox-item'>
+                        <Input
+                            @type='radio'
+                            @name='permission'
+                            @value='admin'
+                            @checked={{eq this.selectedPermissions 'admin'}}
+                            {{on 'change' (fn this.updateselectedPermissions 'admin')}}
+                        />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.admin_permission_label'}}
+                    </label>
+                    <label local-class='radiobox-item'>
+                        <Input
+                            @type='radio'
+                            @name='permission'
+                            @value='write'
+                            @checked={{eq this.selectedPermissions 'write'}}
+                            {{on 'change' (fn this.updateselectedPermissions 'write')}}
+                        />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.write_permission_label'}}
+                    </label>
+                    <Textarea
+                        local-class='message-textarea'
+                        @value={{this.messageText}}
+                    />
+                    <p local-class='message-label'>
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.closing_message_label' htmlSafe=true adminName=this.currentUser.user.fullName}}
+                    </p>
+                    <div local-class='checkbox-container'>
+                        <label local-class='checkbox-item'>
+                            <Input @type='checkbox' @checked={{this.bccSender}} />
+                            {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
+                        </label>
+                        <label local-class='checkbox-item'>
+                            <Input @type='checkbox' @checked={{this.replyTo}} />
+                            {{t 'institutions.dashboard.object-list.request-project-message-modal.reply_to_label'}}
+                        </label>
+                    </div>
+                </div>
+            </div>
+        {{/if}}
+
+        {{#if (eq this.activeTab 'send-message')}}
+            <div local-class='tab-pane'>
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.opening_message_label'}}
+                </p>
+                <Textarea
+                    local-class='message-textarea'
+                    @value={{this.messageText}}
+                />
+                <p local-class='message-label'>
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.closing_message_label' htmlSafe=true adminName=this.currentUser.user.fullName}}
+                </p>
+                <div local-class='checkbox-container'>
+                    <label local-class='checkbox-item'>
+                        <Input @type='checkbox' @checked={{this.bccSender}} />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.cc_label'}}
+                    </label>
+                    <label local-class='checkbox-item'>
+                        <Input @type='checkbox' @checked={{this.replyTo}} />
+                        {{t 'institutions.dashboard.object-list.request-project-message-modal.reply_to_label'}}
+                    </label>
+                </div>
+            </div>
+        {{/if}}
+    </dialog.main>
+    <dialog.footer>
+        <Button
+            @type='secondary'
+            {{on 'click' this.toggleProjectRequestModal}}
+        >
+            {{t 'general.cancel'}}
+        </Button>
+        <Button
+            @type='primary'
+            @disabled={{not this.messageText.trim}}
+            {{on 'click' (queue (perform this.handleSend) dialog.close)}}
+        >
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send'}}
+        </Button>
+    </dialog.footer>
+</OsfDialog>
+<OsfDialog
+    @isOpen={{this.showSendMessagePrompt}}
+    @onClose={{this.closeSendMessagePrompt}}
+    local-class='confirmation-prompt'
+    as |dialog|
+>
+    <dialog.heading>
+        {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.title'}}
+    </dialog.heading>
+    <dialog.main>
+        <p local-class='confirmation-message'>
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.message'}}
+        </p>
+    </dialog.main>
+    <dialog.footer>
+        <Button
+            @type='primary'
+            {{on 'click' this.handleBackToSendMessage}}
+        >
+            {{t 'institutions.dashboard.object-list.request-project-message-modal.send_message_prompt.back'}}
+        </Button>
+    </dialog.footer>
+</OsfDialog>
diff --git a/app/models/node-request.ts b/app/models/node-request.ts
new file mode 100644
index 00000000000..4bcd4e9c887
--- /dev/null
+++ b/app/models/node-request.ts
@@ -0,0 +1,19 @@
+// app/models/node-request.js
+import Model, { attr, belongsTo } from '@ember-data/model';
+
+export enum RequestTypeChoices {
+    AccessRequest = 'access',
+    InstitutionalRequest = 'institutional_request',
+}
+
+export default class NodeRequestModel extends Model {
+  @attr('string') comment;
+  @attr('string') requestedPermissions;
+  @attr('string') requestType;
+  @attr('boolean') bccSender;
+  @attr('boolean') replyTo;
+  @belongsTo('institution') institution;
+  @belongsTo('user') messageRecipent;
+  @belongsTo('node') node;
+
+}
diff --git a/app/models/user-message.ts b/app/models/user-message.ts
index 9e66b3fa8fb..89e9453756d 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') bcc_sender;
+  @attr('boolean') bccSender;
   @attr('boolean') replyTo;
   @belongsTo('institution') institution;
 }
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 922deb56745..453ce60cee8 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -896,6 +896,30 @@ institutions:
             first: First
             prev: Prev
             next: Next
+            request-project-message-modal:
+              tabs:
+                request_access: 'Request Access'
+                send_message: 'Send Message'
+              open_aira_label: 'Open Project Request Modal Button'
+              close_aira_label: 'Close Project Request Modal Button'
+              send_aira_label: 'Send Project Request Button'
+              title: 'Contact'
+              message_permission_label: 'Send Message'
+              duplicate_request_error: 'Users may not have more than one institutional_request request per node'
+              write_permission_label: 'Read/Write'
+              admin_permission_label: 'Administrative'
+              request_label: 'I am an admin associated with [institution] and I would like to be added to your project as a non-bibliographic contributor in order to assist with metadata curation please add me with the following permissions.'
+              opening_message_label: 'Comments:'
+              closing_message_label: 'Sincerely Yours,<br> {adminName}'
+              message_sent_success: 'Request has been sent'
+              message_sent_failed: 'Request 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'
+              send_message_prompt:
+                title: "Can't Request Access"
+                message: "This user has their request access feature turned off.<br> Reach out to the user via the User tab by pressing the 'Back' button below."
+                back: "Back"
             table-headers:
                 title: Title
                 link: Link

From 4b74341adcb788b13dabe88662a4f0249fba8c85 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 9 Jan 2025 08:57:50 -0500
Subject: [PATCH 10/15] Code review cleanup and typos

---
 app/adapters/node-request.ts                         |  1 -
 app/adapters/user-message.ts                         |  1 -
 .../dashboard/-components/object-list/template.hbs   |  3 ++-
 app/models/node-request.ts                           | 12 ++++++++----
 translations/en-us.yml                               |  4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/adapters/node-request.ts b/app/adapters/node-request.ts
index c596ccfa3c1..1c0c73e088a 100644
--- a/app/adapters/node-request.ts
+++ b/app/adapters/node-request.ts
@@ -1,4 +1,3 @@
-// app/adapters/user-message.js
 import { inject as service } from '@ember/service';
 import config from 'ember-osf-web/config/environment';
 const { OSF: { apiUrl } } = config;
diff --git a/app/adapters/user-message.ts b/app/adapters/user-message.ts
index c5bf0307cbe..dad3feb9ef9 100644
--- a/app/adapters/user-message.ts
+++ b/app/adapters/user-message.ts
@@ -1,4 +1,3 @@
-// app/adapters/user-message.js
 import { inject as service } from '@ember/service';
 import config from 'ember-osf-web/config/environment';
 const { OSF: { apiUrl } } = config;
diff --git a/app/institutions/dashboard/-components/object-list/template.hbs b/app/institutions/dashboard/-components/object-list/template.hbs
index 8ee43a472a0..ed912e45ffe 100644
--- a/app/institutions/dashboard/-components/object-list/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/template.hbs
@@ -184,6 +184,7 @@ as |list|>
                                                     <Institutions::Dashboard::-Components::ObjectList::ContributorsField
                                                         @searchResult={{result}}
                                                         @institution={{@institution}}
+                                                        aria-label={{t 'institutions.dashboard.request-project-message-modal.open_aria_label'}}
                                                         @projectRequestModal={{this.openProjectRequestModal}}
                                                     />
                                                 {{else}}
@@ -301,7 +302,7 @@ as |list|>
         {{#if (eq this.activeTab 'request-access')}}
             <div local-class='tab-pane'>
                 <p local-class='message-label'>
-                    {{t 'institutions.dashboard.object-list.request-project-message-modal.request_label'}}
+                    {{t 'institutions.dashboard.object-list.request-project-message-modal.request_label' institution=@institution.name}}
                 </p>
                 <div local-class='radiobox-container'>
                     <label local-class='radiobox-item'>
diff --git a/app/models/node-request.ts b/app/models/node-request.ts
index 4bcd4e9c887..ffae2a5d5bc 100644
--- a/app/models/node-request.ts
+++ b/app/models/node-request.ts
@@ -1,5 +1,10 @@
 // app/models/node-request.js
 import Model, { attr, belongsTo } from '@ember-data/model';
+import { AsyncBelongsTo } from '@ember-data/model';
+import UserModel from 'ember-osf-web/models/user';
+import NodeModel from 'ember-osf-web/models/node';
+import InstitutionModel from 'ember-osf-web/models/institution';
+
 
 export enum RequestTypeChoices {
     AccessRequest = 'access',
@@ -12,8 +17,7 @@ export default class NodeRequestModel extends Model {
   @attr('string') requestType;
   @attr('boolean') bccSender;
   @attr('boolean') replyTo;
-  @belongsTo('institution') institution;
-  @belongsTo('user') messageRecipent;
-  @belongsTo('node') node;
-
+  @belongsTo('institution') institution!: AsyncBelongsTo<InstitutionModel> & InstitutionModel;
+  @belongsTo('user') messageRecipent!: AsyncBelongsTo<UserModel> & UserModel;
+  @belongsTo('node') node!: AsyncBelongsTo<NodeModel> & NodeModel;
 }
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 453ce60cee8..3236246b498 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -900,7 +900,7 @@ institutions:
               tabs:
                 request_access: 'Request Access'
                 send_message: 'Send Message'
-              open_aira_label: 'Open Project Request Modal Button'
+              open_aria_label: 'Open Project Request Modal Button'
               close_aira_label: 'Close Project Request Modal Button'
               send_aira_label: 'Send Project Request Button'
               title: 'Contact'
@@ -908,7 +908,7 @@ institutions:
               duplicate_request_error: 'Users may not have more than one institutional_request request per node'
               write_permission_label: 'Read/Write'
               admin_permission_label: 'Administrative'
-              request_label: 'I am an admin associated with [institution] and I would like to be added to your project as a non-bibliographic contributor in order to assist with metadata curation please add me with the following permissions.'
+              request_label: 'I am an admin associated with {institution} and I would like to be added to your project as a non-bibliographic contributor in order to assist with metadata curation please add me with the following permissions.'
               opening_message_label: 'Comments:'
               closing_message_label: 'Sincerely Yours,<br> {adminName}'
               message_sent_success: 'Request has been sent'

From 983ac69c2dd338ca02465293e50d67f845ddae41 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 9 Jan 2025 09:30:50 -0500
Subject: [PATCH 11/15] clean-up user message pane and make tasks

---
 .../dashboard/-components/object-list/component.ts    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 8ae75b1e447..309c6c9a4de 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -11,6 +11,7 @@ import SearchResultModel from 'ember-osf-web/models/search-result';
 import { Filter } from 'osf-components/components/search-page/component';
 import { waitFor } from '@ember/test-waiters';
 import { task } from 'ember-concurrency';
+import { taskFor } from 'ember-concurrency-ts';
 import Toast from 'ember-toastr/services/toast';
 import Intl from 'ember-intl/services/intl';
 import Store from '@ember-data/store';
@@ -225,9 +226,9 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
     async handleSend() {
         try {
             if (this.activeTab === 'send-message') {
-                await this._sendUserMessage();
+                await taskFor(this._sendUserMessage).perform();
             } else if (this.activeTab === 'request-access') {
-                await this._sendNodeRequest();
+                await taskFor(this._sendNodeRequest).perform();
             }
 
             this.toast.success(
@@ -259,6 +260,8 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
         }
     }
 
+    @task
+    @waitFor
     async _sendUserMessage() {
         const userMessage = this.store.createRecord('user-message', {
             messageText: this.messageText.trim(),
@@ -266,11 +269,13 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
             bccSender: this.bccSender,
             replyTo: this.replyTo,
             institution: this.args.institution,
-            messageRecipient: this.selectedUserOsfGuid,
+            user: this.selectedUserOsfGuid,
         });
         await userMessage.save();
     }
 
+    @task
+    @waitFor
     async _sendNodeRequest() {
         const nodeRequest = this.store.createRecord('node-request', {
             comment: this.messageText.trim(),

From e7f569d28b36392a80a56a49f19430dd1b47a56f Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 9 Jan 2025 11:18:53 -0500
Subject: [PATCH 12/15] use variables for colors

---
 .../dashboard/-components/object-list/styles.scss      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/styles.scss b/app/institutions/dashboard/-components/object-list/styles.scss
index 7467ee83e9d..2885a44dca8 100644
--- a/app/institutions/dashboard/-components/object-list/styles.scss
+++ b/app/institutions/dashboard/-components/object-list/styles.scss
@@ -165,7 +165,7 @@
 
 .tab-container {
     display: flex;
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1px solid $color-border-gray;
     margin-bottom: 1rem;
 }
 
@@ -174,23 +174,23 @@
     padding: 10px;
     text-align: center;
     cursor: pointer;
-    background: #f9f9f9;
+    background: $color-bg-gray;
     border: 0;
     border-bottom: 2px solid transparent;
 
     &.active {
-        border-bottom: 2px solid #007bff;
+        border-bottom: 2px solid $color-border-gray;
         font-weight: bold;
     }
 
     &:hover {
-        background: #f1f1f1;
+        background: $color-bg-gray;
     }
 }
 
 .tab-pane {
     padding: 1rem;
-    background: #fff;
+    background: $color-border-white;
 }
 
 .request-modal {

From 715bee8a8395123334b438e87df8ea3dbdf1b218 Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 9 Jan 2025 11:38:58 -0500
Subject: [PATCH 13/15] clean-up exception handling and include notes

---
 .../dashboard/-components/object-list/component.ts     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/component.ts b/app/institutions/dashboard/-components/object-list/component.ts
index 309c6c9a4de..27fb557e569 100644
--- a/app/institutions/dashboard/-components/object-list/component.ts
+++ b/app/institutions/dashboard/-components/object-list/component.ts
@@ -240,15 +240,15 @@ export default class InstitutionalObjectList extends Component<InstitutionalObje
             const errorCode = parseInt(error?.errors?.[0]?.status, 10);
 
             if (errorCode === 400 && errorDetail.includes('does not have Access Requests enabled')) {
+                // Product wanted special handling for this error that involve a second pop-up modal
+                // Timeout to allow the modal to exit, can't have two OSFDialogs open at same time
                 setTimeout(() => {
                     this.showSendMessagePrompt = true; // Timeout to allow the modal to exit
                 }, 200);
-            } else if ([409, 400, 403].includes(errorCode)) {
-                // Handle specific errors
+            } else if ([400, 403].includes(errorCode)) {
+                // Handle more specific errors 403s could result due if a project quickly switches it's institution
                 this.toast.error(errorDetail);
-            } else if (errorDetail.includes('Request was throttled')) {
-                this.toast.error(errorDetail);
-            } else if (errorDetail === 'You cannot request access to a node you contribute to.') {
+            } else if (errorDetail.includes('Request was throttled')) {  // 429 response not in JSON payload.
                 this.toast.error(errorDetail);
             } else {
                 this.toast.error(

From a92edbf788d176861c9fe146364439c4f82cb53c Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Thu, 9 Jan 2025 11:47:19 -0500
Subject: [PATCH 14/15] add translation to default value for unknown
 contributor

---
 .../-components/object-list/contributors-field/component.ts     | 2 +-
 translations/en-us.yml                                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
index 18f38fd83e3..2ec07d362a3 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/component.ts
@@ -50,7 +50,7 @@ export default class InstitutionalObjectListContributorsField extends Component<
             const contributor = getContributorById(contributors, getSingleOsfmapValue(attribution, ['agent']));
             const roleIri: AttributionRoleIris = getSingleOsfmapValue(attribution, ['hadRole']);
             return {
-                name: getSingleOsfmapValue(contributor, ['name']) || 'Unknown Contributor',
+                name: getSingleOsfmapValue(contributor, ['name']) || this.intl.t('general.unknownContributor'),
                 userId: contributor['@id'],
                 nodeId: searchResult.indexCard.get('osfGuid'),
                 url: getSingleOsfmapValue(contributor, ['identifier']),
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 3236246b498..9a1b9891e69 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -40,6 +40,7 @@ general:
     close: Close
     component: component
     contributors: Contributors
+    unknownContributor: 'Unknown Contributor'
     copy: Copy
     cos: 'Center for Open Science'
     create: Create

From 9a3e0567beca538ecc2904576f655b05680f5ecc Mon Sep 17 00:00:00 2001
From: John Tordoff <>
Date: Fri, 10 Jan 2025 15:48:32 -0500
Subject: [PATCH 15/15] clean-up translation keys

---
 .../-components/object-list/contributors-field/template.hbs     | 2 +-
 translations/en-us.yml                                          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
index e2968eed90a..2750217ec7a 100644
--- a/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
+++ b/app/institutions/dashboard/-components/object-list/contributors-field/template.hbs
@@ -9,7 +9,7 @@
     </div>
     <Button
         local-class='icon-message'
-        aria-label={{t 'institutions.dashboard.request_project_message_modal.open_aira_label'}}
+        aria-label={{t 'institutions.dashboard.request_project_message_modal.open_aria_label'}}
         {{on 'click' (fn this.handleOpenModal contributor)}}
     >
         <FaIcon @icon='comment' />
diff --git a/translations/en-us.yml b/translations/en-us.yml
index 9a1b9891e69..d48ab23fca9 100644
--- a/translations/en-us.yml
+++ b/translations/en-us.yml
@@ -902,8 +902,6 @@ institutions:
                 request_access: 'Request Access'
                 send_message: 'Send Message'
               open_aria_label: 'Open Project Request Modal Button'
-              close_aira_label: 'Close Project Request Modal Button'
-              send_aira_label: 'Send Project Request Button'
               title: 'Contact'
               message_permission_label: 'Send Message'
               duplicate_request_error: 'Users may not have more than one institutional_request request per node'