diff --git a/app/institutions/dashboard/-components/institutional-users-list/component.ts b/app/institutions/dashboard/-components/institutional-users-list/component.ts index 1ee14b7a97..26b02326b8 100644 --- a/app/institutions/dashboard/-components/institutional-users-list/component.ts +++ b/app/institutions/dashboard/-components/institutional-users-list/component.ts @@ -20,6 +20,7 @@ interface Column { interface InstitutionalUsersListArgs { institution: InstitutionModel; departmentMetrics: InstitutionDepartmentsModel[]; + totalUsers: number; } export default class InstitutionalUsersList extends Component { @@ -29,6 +30,7 @@ export default class InstitutionalUsersList extends Component {{else}}
+
+ + {{@totalUsers}} + + {{t 'institutions.dashboard.users_list.total_users'}} +
@@ -59,63 +65,65 @@ {{/if}}
- - - {{#let (component 'sort-arrow' - class=(local-class 'sort-arrow') - sortAction=this.sortInstitutionalUsers - sort=this.sort - ) as |SortArrow|}} - - {{#each this.columns as |column|}} - {{#if (includes column.key this.selectedColumns)}} - -
- {{column.label}} - {{#if column.sort_key}} - - - - {{/if}} -
- - {{/if}} - {{/each}} - - {{/let}} -
- - {{#each this.columns as |column|}} - {{#if (includes column.key this.selectedColumns)}} - - {{#if (eq column.type 'user_name')}} - - {{institutionalUser.userName}} - - {{else if (eq column.type 'osf_link')}} - - {{institutionalUser.userGuid}} - - {{else if (eq column.type 'date_by_month')}} - {{moment-format (get institutionalUser column.key) 'MM/YYYY'}} - {{else}} - {{get institutionalUser column.key}} - {{/if}} - - {{/if}} - {{/each}} - - - {{t 'institutions.dashboard.users_list.empty'}} - -
+
+ + + {{#let (component 'sort-arrow' + class=(local-class 'sort-arrow') + sortAction=this.sortInstitutionalUsers + sort=this.sort + ) as |SortArrow|}} + + {{#each this.columns as |column|}} + {{#if (includes column.key this.selectedColumns)}} + +
+ {{column.label}} + {{#if column.sort_key}} + + + + {{/if}} +
+ + {{/if}} + {{/each}} + + {{/let}} +
+ + {{#each this.columns as |column|}} + {{#if (includes column.key this.selectedColumns)}} + + {{#if (eq column.type 'user_name')}} + + {{institutionalUser.userName}} + + {{else if (eq column.type 'osf_link')}} + + {{institutionalUser.userGuid}} + + {{else if (eq column.type 'date_by_month')}} + {{moment-format (get institutionalUser column.key) 'MM/YYYY'}} + {{else}} + {{get institutionalUser column.key}} + {{/if}} + + {{/if}} + {{/each}} + + + {{t 'institutions.dashboard.users_list.empty'}} + +
+
{{/if}} diff --git a/app/institutions/dashboard/users/template.hbs b/app/institutions/dashboard/users/template.hbs index 810b5ba3b9..9bcdf36be8 100644 --- a/app/institutions/dashboard/users/template.hbs +++ b/app/institutions/dashboard/users/template.hbs @@ -4,6 +4,7 @@ diff --git a/translations/en-us.yml b/translations/en-us.yml index 497975f016..bb0247359f 100644 --- a/translations/en-us.yml +++ b/translations/en-us.yml @@ -821,6 +821,7 @@ institutions: month_last_active: 'Last Action' has_orcid: 'Has ORCID' select_columns: 'Customize' + total_users: 'total users' panel: users: 'Total Users' projects: 'OSF Public and Private Projects'