fix(users): added 5 more columns options (#390)

* fix(users): added 5 more columns options * fix(summary): fixed charts numbers display

Author: nsemets

src/app/features/admin-institutions/components/admin-table/admin-table.component.html

@@ -123,10 +123,12 @@
  }
  </a>
  } @else {
- @if (col.dateFormat) {
+ @if (col.dateFormat && rowData[col.field]) {
  {{ getCellValue(rowData[col.field]) | date: col.dateFormat }}
- } @else {
+ } @else if (!col.dateFormat && rowData[col.field]) {
  {{ getCellValue(rowData[col.field]) }}
+ } @else {
+ {{ rowData[col.field] ?? '-' }}
  }
  }
 

src/app/features/admin-institutions/constants/user-table-columns.constant.ts

@@ -1,4 +1,4 @@
-import { TableColumn } from '@osf/features/admin-institutions/models';
+import { TableColumn } from '../models';
 
 export const userTableColumns: TableColumn[] = [
  {
@@ -20,4 +20,24 @@ export const userTableColumns: TableColumn[] = [
  { field: 'publicRegistrationCount', header: 'adminInstitutions.summary.publicRegistrations', sortable: true },
  { field: 'embargoedRegistrationCount', header: 'adminInstitutions.summary.embargoedRegistrations', sortable: true },
  { field: 'publishedPreprintCount', header: 'adminInstitutions.institutionUsers.preprints', sortable: true },
+ { field: 'publicFileCount', header: 'adminInstitutions.institutionUsers.filesOnOsf', sortable: true },
+ { field: 'totalDataStored', header: 'adminInstitutions.institutionUsers.totalDataStored', sortable: true },
+ {
+ field: 'accountCreationDate',
+ header: 'adminInstitutions.institutionUsers.accountCreated',
+ sortable: true,
+ dateFormat: 'dd/MM/yyyy',
+ },
+ {
+ field: 'monthLasLogin',
+ header: 'adminInstitutions.institutionUsers.lastLogin',
+ sortable: true,
+ dateFormat: 'dd/MM/yyyy',
+ },
+ {
+ field: 'monthLastActive',
+ header: 'adminInstitutions.institutionUsers.lastActive',
+ sortable: true,
+ dateFormat: 'dd/MM/yyyy',
+ },
 ];

src/app/features/admin-institutions/mappers/institution-user-to-table-data.mapper.ts

@@ -24,5 +24,10 @@ export function mapUserToTableCellData(user: InstitutionUser): TableCellData {
  publicRegistrationCount: user.publicRegistrationCount,
  embargoedRegistrationCount: user.embargoedRegistrationCount,
  publishedPreprintCount: user.publishedPreprintCount,
+ publicFileCount: user.publicFileCount,
+ totalDataStored: user.storageByteCount ? `${(user.storageByteCount / (1024 * 1024)).toFixed(1)} MB` : '0 B',
+ monthLasLogin: user.monthLasLogin,
+ monthLastActive: user.monthLastActive,
+ accountCreationDate: user.accountCreationDate,
  };
 }

src/app/features/admin-institutions/mappers/institution-users.mapper.ts

@@ -1,8 +1,4 @@
-import {
- InstitutionUser,
- InstitutionUserDataJsonApi,
- InstitutionUsersJsonApi,
-} from '@osf/features/admin-institutions/models';
+import { InstitutionUser, InstitutionUserDataJsonApi, InstitutionUsersJsonApi } from '../models';
 
 export function mapInstitutionUsers(jsonApiData: InstitutionUsersJsonApi): InstitutionUser[] {
  return jsonApiData.data.map((user: InstitutionUserDataJsonApi) => ({
@@ -16,5 +12,11 @@ export function mapInstitutionUsers(jsonApiData: InstitutionUsersJsonApi): Insti
  publicRegistrationCount: user.attributes.public_registration_count,
  embargoedRegistrationCount: user.attributes.embargoed_registration_count,
  publishedPreprintCount: user.attributes.published_preprint_count,
+ monthLasLogin: user.attributes.month_last_login,
+ monthLastActive: user.attributes.month_last_active,
+ accountCreationDate: user.attributes.account_creation_date,
+ storageByteCount: user.attributes.storage_byte_count,
+ reportYearMonth: user.attributes.report_yearmonth,
+ publicFileCount: user.attributes.public_file_count,
  }));
 }

src/app/features/admin-institutions/models/institution-user.model.ts

@@ -9,4 +9,10 @@ export interface InstitutionUser {
  publicRegistrationCount: number;
  embargoedRegistrationCount: number;
  publishedPreprintCount: number;
+ monthLasLogin: string;
+ monthLastActive: string;
+ accountCreationDate: string;
+ storageByteCount: number;
+ publicFileCount: number;
+ reportYearMonth: string;
 }

src/app/features/admin-institutions/models/institution-users-json-api.model.ts

@@ -9,6 +9,13 @@ export interface InstitutionUserAttributesJsonApi {
  public_registration_count: number;
  embargoed_registration_count: number;
  published_preprint_count: number;
+ account_creation_date: string;
+ contacts: unknown[];
+ month_last_active: string;
+ month_last_login: string;
+ public_file_count: number;
+ report_yearmonth: string;
+ storage_byte_count: number;
 }
 
 export interface InstitutionUserRelationshipDataJsonApi {

src/app/features/admin-institutions/pages/institutions-summary/institutions-summary.component.ts

@@ -158,9 +158,9 @@ export class InstitutionsSummaryComponent implements OnInit {
  ];
 
  this.osfProjectsLabels = [
- 'resourceCard.labels.publicRegistrations',
+ 'adminInstitutions.summary.publicRegistrations',
  'adminInstitutions.summary.embargoedRegistrations',
- 'resourceCard.labels.publicProjects',
+ 'adminInstitutions.summary.publicProjects',
  'adminInstitutions.summary.privateProjects',
  'common.search.tabs.preprints',
  ].map((el) => this.translateService.instant(el));

src/app/features/admin-institutions/pages/institutions-users/institutions-users.component.ts

@@ -68,9 +68,7 @@ export class InstitutionsUsersComponent {
 
  currentUser = select(UserSelectors.getCurrentUser);
 
- tableData = computed(() => {
- return this.users().map((user: InstitutionUser): TableCellData => mapUserToTableCellData(user));
- });
+ tableData = computed(() => this.users().map((user: InstitutionUser): TableCellData => mapUserToTableCellData(user)));
 
  amountText = computed(() => {
  const count = this.totalCount();

src/app/shared/components/bar-chart/bar-chart.component.html

@@ -20,9 +20,14 @@ <h4>{{ title() | translate }}</h4>
  <p-accordion-content>
  <div class="content">
  @for (label of labels(); let i = $index; track i) {
- <li class="flex align-items-center mb-2 gap-2">
- <div class="w-1rem h-1rem" [style.background-color]="getColor(i)"></div>
- <span>{{ label }}</span>
+ <li class="flex align-items-center justify-content-between gap-3 mb-2">
+ <div class="flex align-items-center gap-2">
+ <div class="w-1rem h-1rem" [style.background-color]="getColor(i)"></div>
+ <span>{{ label }}</span>
+ </div>
+ @if (datasets().length) {
+ <span>{{ datasets()[0].data[i] }}</span>
+ }
  </li>
  }
  </div>

src/app/shared/components/doughnut-chart/doughnut-chart.component.html

@@ -20,9 +20,14 @@ <h4>{{ title() | translate }}</h4>
  <p-accordion-content>
  <div class="content">
  @for (label of labels(); let i = $index; track i) {
- <li class="flex align-items-center mb-2 gap-2">
- <div class="w-1rem h-1rem" [style.background-color]="getColor(i)"></div>
- <span>{{ label }}</span>
+ <li class="flex align-items-center justify-content-between gap-3 mb-2">
+ <div class="flex align-items-center gap-2">
+ <div class="w-1rem h-1rem" [style.background-color]="getColor(i)"></div>
+ <span>{{ label }}</span>
+ </div>
+ @if (datasets().length) {
+ <span>{{ datasets()[0].data[i] }}</span>
+ }
  </li>
  }
  </div>