Skip to content

[ENG-6617][ENG-6618] Language and styling #2416

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
futa-ikeda merged 3 commits into from
Dec 2, 2024
Merged

[ENG-6617][ENG-6618] Language and styling #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b761799
Reword 'private' registrations to 'embargoed' registrations
futa-ikeda Nov 26, 2024
de72872
Make download report hover text easier to read
futa-ikeda Nov 26, 2024
ce70db2
More test updates
futa-ikeda Nov 27, 2024
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: 4 additions & 4 deletions app/institutions/dashboard/-components/chart-kpi-wrapper/component-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper
.doesNotExist();
});

test('it calculates the Public vs Private Registration data correctly', async function(assert) {
test('it calculates the Public vs Embargoed Registration data correctly', async function(assert) {
// Given the component is rendered
await render(hbs`
<Institutions::Dashboard::-Components::ChartKpiWrapper
Expand All @@ -127,7 +127,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper

// And the title is verified
assert.dom(`${parentDom} [data-test-chart-title]`)
.hasText('Public vs Private Registrations');
.hasText('Public vs Embargoed Registrations');

// And the expanded data position 0 name is verified
assert.dom(`${parentDom} [data-test-expanded-name="0"]`)
Expand All @@ -139,7 +139,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper

// And the expanded data position 1 name is verified
assert.dom(`${parentDom} [data-test-expanded-name="1"]`)
.hasText('Private Registrations');
.hasText('Embargoed Registrations');

// And the expanded data position 1 total is verified
assert.dom(`${parentDom} [data-test-expanded-total="1"]`)
Expand Down Expand Up @@ -200,7 +200,7 @@ module('Integration | institutions | dashboard | -components | kpi-chart-wrapper

// And the expanded data position 4 name is verified
assert.dom(`${parentDom} [data-test-expanded-name="4"]`)
.hasText('Private Registrations');
.hasText('Embargoed Registrations');

// And the expanded data position 4 total is verified
assert.dom(`${parentDom} [data-test-expanded-total="4"]`)
Expand Down
6 changes: 3 additions & 3 deletions app/institutions/dashboard/-components/chart-kpi-wrapper/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class ChartKpiWrapperComponent extends Component<TotalCountChartW
chartType: 'doughnut',
},
{
title: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.title'),
title: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.title'),
chartData: this.calculateRegistrations(metrics.summaryMetrics),
chartType: 'doughnut',
},
Expand Down Expand Up @@ -133,11 +133,11 @@ export default class ChartKpiWrapperComponent extends Component<TotalCountChartW
private calculateRegistrations(summaryMetrics: InstitutionSummaryMetricModel): ChartDataModel[] {
return [
{
label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.public'),
label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.public'),
total: summaryMetrics.publicRegistrationCount,
} as ChartDataModel,
{
label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-private-registrations.private'),
label: this.intl.t('institutions.dashboard.kpi-chart.public-vs-embargoed-registrations.embargoed'),
total: summaryMetrics.embargoedRegistrationCount,
} as ChartDataModel,
];
Expand Down
2 changes: 1 addition & 1 deletion app/institutions/dashboard/-components/institutional-users-list/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default class InstitutionalUsersList extends Component<InstitutionalUsers
{
key: 'embargoedRegistrationCount',
sort_key: 'embargoed_registration_count',
label: this.intl.t('institutions.dashboard.users_list.private_registration_count'),
label: this.intl.t('institutions.dashboard.users_list.embargoed_registration_count'),
selected: true,
type: 'string',
},
Expand Down
7 changes: 4 additions & 3 deletions app/institutions/dashboard/-components/institutional-users-list/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,16 @@ input:checked + .slider::before {
padding-left: 10px;
align-content: center;

div {
color: #2d6a9f;
}

.download-dropdown {
margin-left: 3px;
}
}

.download-dropdown-trigger {
color: $color-link-dark;
}

.flex {
display: flex;
align-items: center;
Expand Down
8 changes: 4 additions & 4 deletions translations/en-us.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ institutions:
private_projects: 'Private Projects'
empty: 'No users found matching search criteria.'
public_registration_count: 'Public Registrations'
private_registration_count: 'Private Registrations'
embargoed_registration_count: 'Embargoed Registrations'
published_preprint_count: 'Preprints'
orcid: ORCID
osf_link: 'OSF Link'
Expand Down Expand Up @@ -861,10 +861,10 @@ institutions:
title: 'Public vs Private Projects'
public: 'Public Projects'
private: 'Private Projects'
public-vs-private-registrations:
title: 'Public vs Private Registrations'
public-vs-embargoed-registrations:
title: 'Public vs Embargoed Registrations'
public: 'Public Registrations'
private: 'Private Registrations'
embargoed: 'Embargoed Registrations'
total-osf-objects:
title: 'Total OSF Objects'
preprints: 'Preprints'
Expand Down
Loading