Skip to content

Refactor grant selection table to be more informative #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markpatton merged 8 commits into from
Jul 16, 2025
Merged

Refactor grant selection table to be more informative #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee3eb21
Fix visiting the grant detail page from the selected grants table in …
markpatton Jul 8, 2025
6f2a367
Refactor the grant selection table in the workflow to be more informa…
markpatton Jul 8, 2025
bfc4e75
Open links to grants in table cells in new tab
markpatton Jul 14, 2025
f06fa4f
Update tests to handle changes to grant selection table
markpatton Jul 14, 2025
691c590
Update app/components/grant-link-newtab-cell/index.hbs
markpatton Jul 14, 2025
46e0d53
Update app/components/submission-funding-table/index.hbs
markpatton Jul 14, 2025
24cb04d
Prevent links to grants in tables from triggering row selection
markpatton Jul 16, 2025
95b261c
Fix some formatting problems with templates
markpatton Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/components/grant-link-newtab-cell/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{{! template-lint-disable no-unknown-arguments-for-builtin-components }}
<LinkTo @route="grants.detail" @model={{@record.id}} @target="_blank">
<LinkTo
@route="grants.detail"
@model={{@record.id}}
target="_blank"
rel="noopener noreferrer"
{{on "click" this.stopPropagation}}
>
{{get @record @column.propertyName}}
</LinkTo>
9 changes: 8 additions & 1 deletion app/components/grant-link-newtab-cell/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
/* eslint-disable ember/no-empty-glimmer-component-classes */
import Component from '@glimmer/component';
import { action } from '@ember/object';

export default class GrantLinkNewtabCell extends Component {}
export default class GrantLinkNewtabCell extends Component {
// Prevent the click from triggering the row selection in the table
@action
stopPropagation(event) {
event.stopPropagation();
}
}
1 change: 0 additions & 1 deletion app/components/grant-title-date-cell/index.hbs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions app/components/grant-title-date-cell/index.js
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion app/components/submission-funding-table/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
@route="grants.detail"
@model={{grant}}
class="text-nowrap"
@target="_blank"
target="_blank"
Comment thread
markpatton marked this conversation as resolved.
rel="noopener noreferrer"
>{{grant.awardNumber}}</LinkTo>
</td>
<td class="projectname-date-column">{{grant.projectName}}
Expand Down
2 changes: 1 addition & 1 deletion app/components/workflow-grants/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
@columns={{this.grantColumns}}
@columnComponents={{hash
grantLinkNewtabCell=(component "grant-link-newtab-cell")
grantTitleDateCell=(component "grant-title-date-cell")
selectRowToggle=(component "select-row-toggle")
dateCell=(component "date-cell")
}}
@themeInstance={{this.themeInstance}}
@showColumnsDropdown={{false}}
Expand Down
25 changes: 22 additions & 3 deletions app/components/workflow-grants/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,28 @@ export default class WorkflowGrants extends Component {
disableSorting: true,
},
{
title: 'Project name (funding period)',
className: 'projectname-date-column',
component: 'grantTitleDateCell',
propertyName: 'projectName',
title: 'Project Name',
className: 'projectname-column',
disableSorting: true,
},
{
propertyName: 'startDate',
title: 'Start',
className: 'date-column',
component: 'dateCell',
disableSorting: true,
},
{
propertyName: 'endDate',
title: 'End',
className: 'date-column',
component: 'dateCell',
disableSorting: true,
},
{
propertyName: 'awardStatus',
title: 'Status',
Comment thread
markpatton marked this conversation as resolved.
disableSorting: true,
},
{
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/grants/detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ export default class GrantDetailsController extends Controller {
};

get itemsCount() {
return this.queuedModel.submissions.meta?.page?.totalRecords;
return this.queuedModel.submissions?.meta?.page?.totalRecords;
}

get pagesCount() {
return this.queuedModel.submissions.meta?.page?.totalPages;
return this.queuedModel.submissions?.meta?.page?.totalPages;
}

@action
Expand Down
38 changes: 19 additions & 19 deletions tests/acceptance/nih-submission-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down Expand Up @@ -220,12 +220,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down Expand Up @@ -390,12 +390,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand All @@ -418,7 +418,7 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
Expand Down Expand Up @@ -532,12 +532,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down Expand Up @@ -669,12 +669,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down Expand Up @@ -728,12 +728,12 @@ module('Acceptance | submission', function (hooks) {
await waitFor('[data-test-workflow-basics-next]');
await click('[data-test-workflow-basics-next]');

await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr:nth-child(10) td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr:nth-child(10) td.projectname-column')
.includesText('Pre-Study of wild-type');
await click('[data-test-grants-selection-table] tbody tr:nth-child(10) td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr:nth-child(10) td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/proxy-submission-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ module('Acceptance | proxy submission', function (hooks) {
await click('[data-test-workflow-basics-next]');

if (hasAccount) {
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await waitFor('[data-test-grants-selection-table] tbody tr td.projectname-column');
assert.strictEqual(currentURL(), '/submissions/new/grants');
assert
.dom('[data-test-grants-selection-table] tbody tr td.projectname-date-column')
.dom('[data-test-grants-selection-table] tbody tr td.projectname-column')
.includesText('Regulation of Synaptic Plasticity in Visual Cortex');
await click('[data-test-grants-selection-table] tbody tr td.projectname-date-column');
await click('[data-test-grants-selection-table] tbody tr td.projectname-column');
await waitFor('[data-test-submission-funding-table] tbody tr td.projectname-date-column');
assert
.dom('[data-test-submission-funding-table] tbody tr td.projectname-date-column')
Expand Down
Loading