From e7e408dacb836312f24da5e080125383861fdb24 Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 9 Sep 2020 17:47:35 +0200 Subject: [PATCH] Add statistics pages - feedback --- src/app/+collection-page/collection-page-routing.module.ts | 2 +- src/app/+community-page/community-page-routing.module.ts | 2 +- src/app/+home-page/home-page-routing.module.ts | 2 +- src/app/+item-page/item-page-routing.module.ts | 2 +- src/app/app-routing.module.ts | 2 +- src/app/core/statistics/models/usage-report.model.ts | 6 ++++++ src/app/core/submission/usage-report-data.service.ts | 3 +++ .../collection-statistics-page.component.scss | 0 .../collection-statistics-page.component.spec.ts | 0 .../collection-statistics-page.component.ts | 0 .../community-statistics-page.component.scss | 0 .../community-statistics-page.component.spec.ts | 0 .../community-statistics-page.component.ts | 0 .../item-statistics-page.component.scss | 0 .../item-statistics-page.component.spec.ts | 0 .../item-statistics-page/item-statistics-page.component.ts | 0 .../site-statistics-page.component.scss | 0 .../site-statistics-page.component.spec.ts | 0 .../site-statistics-page/site-statistics-page.component.ts | 0 .../statistics-page-routing.module.ts | 0 .../statistics-page.module.ts | 0 .../statistics-page/statistics-page.component.html | 0 .../statistics-page/statistics-page.component.scss | 0 .../statistics-page/statistics-page.component.ts | 0 .../statistics-table/statistics-table.component.html | 0 .../statistics-table/statistics-table.component.scss | 0 .../statistics-table/statistics-table.component.spec.ts | 0 .../statistics-table/statistics-table.component.ts | 0 28 files changed, 14 insertions(+), 5 deletions(-) rename src/app/{+statistics-page => statistics-page}/collection-statistics-page/collection-statistics-page.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/collection-statistics-page/collection-statistics-page.component.spec.ts (100%) rename src/app/{+statistics-page => statistics-page}/collection-statistics-page/collection-statistics-page.component.ts (100%) rename src/app/{+statistics-page => statistics-page}/community-statistics-page/community-statistics-page.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/community-statistics-page/community-statistics-page.component.spec.ts (100%) rename src/app/{+statistics-page => statistics-page}/community-statistics-page/community-statistics-page.component.ts (100%) rename src/app/{+statistics-page => statistics-page}/item-statistics-page/item-statistics-page.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/item-statistics-page/item-statistics-page.component.spec.ts (100%) rename src/app/{+statistics-page => statistics-page}/item-statistics-page/item-statistics-page.component.ts (100%) rename src/app/{+statistics-page => statistics-page}/site-statistics-page/site-statistics-page.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/site-statistics-page/site-statistics-page.component.spec.ts (100%) rename src/app/{+statistics-page => statistics-page}/site-statistics-page/site-statistics-page.component.ts (100%) rename src/app/{+statistics-page => statistics-page}/statistics-page-routing.module.ts (100%) rename src/app/{+statistics-page => statistics-page}/statistics-page.module.ts (100%) rename src/app/{+statistics-page => statistics-page}/statistics-page/statistics-page.component.html (100%) rename src/app/{+statistics-page => statistics-page}/statistics-page/statistics-page.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/statistics-page/statistics-page.component.ts (100%) rename src/app/{+statistics-page => statistics-page}/statistics-table/statistics-table.component.html (100%) rename src/app/{+statistics-page => statistics-page}/statistics-table/statistics-table.component.scss (100%) rename src/app/{+statistics-page => statistics-page}/statistics-table/statistics-table.component.spec.ts (100%) rename src/app/{+statistics-page => statistics-page}/statistics-table/statistics-table.component.ts (100%) diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts index 5d5f1de638..4e65d2c96b 100644 --- a/src/app/+collection-page/collection-page-routing.module.ts +++ b/src/app/+collection-page/collection-page-routing.module.ts @@ -75,7 +75,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; data: { menu: { public: [{ - id: 'statistics', + id: 'statistics_collection', active: true, visible: true, model: { diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts index 4e81380190..a8e79e662f 100644 --- a/src/app/+community-page/community-page-routing.module.ts +++ b/src/app/+community-page/community-page-routing.module.ts @@ -51,7 +51,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; data: { menu: { public: [{ - id: 'statistics', + id: 'statistics_community', active: true, visible: true, model: { diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/+home-page/home-page-routing.module.ts index 83f98d4ce1..c94df56643 100644 --- a/src/app/+home-page/home-page-routing.module.ts +++ b/src/app/+home-page/home-page-routing.module.ts @@ -17,7 +17,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; title: 'home.title', menu: { public: [{ - id: 'statistics', + id: 'statistics_site', active: true, visible: true, model: { diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts index a3982a51ce..3e6cf26b1b 100644 --- a/src/app/+item-page/item-page-routing.module.ts +++ b/src/app/+item-page/item-page-routing.module.ts @@ -48,7 +48,7 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model'; data: { menu: { public: [{ - id: 'statistics', + id: 'statistics_item', active: true, visible: true, model: { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6d488789da..ecb27efbb3 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -71,7 +71,7 @@ import { SiteRegisterGuard } from './core/data/feature-authorization/feature-aut { path: UNAUTHORIZED_PATH, component: UnauthorizedComponent }, { path: 'statistics', - loadChildren: './+statistics-page/statistics-page-routing.module#StatisticsPageRoutingModule', + loadChildren: './statistics-page/statistics-page-routing.module#StatisticsPageRoutingModule', }, { path: '**', pathMatch: 'full', component: PageNotFoundComponent }, ]} diff --git a/src/app/core/statistics/models/usage-report.model.ts b/src/app/core/statistics/models/usage-report.model.ts index 633f6dbd18..4350bfd7d8 100644 --- a/src/app/core/statistics/models/usage-report.model.ts +++ b/src/app/core/statistics/models/usage-report.model.ts @@ -7,6 +7,9 @@ import { USAGE_REPORT } from './usage-report.resource-type'; import { HALLink } from '../../shared/hal-link.model'; import { deserialize, autoserializeAs } from 'cerialize'; +/** + * A usage report. + */ @typedObject @inheritSerialization(HALResource) export class UsageReport extends HALResource { @@ -35,6 +38,9 @@ export class UsageReport extends HALResource { }; } +/** + * A statistics data point. + */ export interface Point { id: string; label: string; diff --git a/src/app/core/submission/usage-report-data.service.ts b/src/app/core/submission/usage-report-data.service.ts index f43fdcf1ce..e59451d7dd 100644 --- a/src/app/core/submission/usage-report-data.service.ts +++ b/src/app/core/submission/usage-report-data.service.ts @@ -16,6 +16,9 @@ import { Observable } from 'rxjs'; import { getRemoteDataPayload, getSucceededRemoteData } from '../shared/operators'; import { map } from 'rxjs/operators'; +/** + * A service to retrieve {@link UsageReport}s from the REST API + */ @Injectable() @dataService(USAGE_REPORT) export class UsageReportService extends DataService { diff --git a/src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.scss b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss similarity index 100% rename from src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.scss rename to src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss diff --git a/src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts similarity index 100% rename from src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts rename to src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts diff --git a/src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts similarity index 100% rename from src/app/+statistics-page/collection-statistics-page/collection-statistics-page.component.ts rename to src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts diff --git a/src/app/+statistics-page/community-statistics-page/community-statistics-page.component.scss b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.scss similarity index 100% rename from src/app/+statistics-page/community-statistics-page/community-statistics-page.component.scss rename to src/app/statistics-page/community-statistics-page/community-statistics-page.component.scss diff --git a/src/app/+statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts similarity index 100% rename from src/app/+statistics-page/community-statistics-page/community-statistics-page.component.spec.ts rename to src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts diff --git a/src/app/+statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts similarity index 100% rename from src/app/+statistics-page/community-statistics-page/community-statistics-page.component.ts rename to src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts diff --git a/src/app/+statistics-page/item-statistics-page/item-statistics-page.component.scss b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.scss similarity index 100% rename from src/app/+statistics-page/item-statistics-page/item-statistics-page.component.scss rename to src/app/statistics-page/item-statistics-page/item-statistics-page.component.scss diff --git a/src/app/+statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts similarity index 100% rename from src/app/+statistics-page/item-statistics-page/item-statistics-page.component.spec.ts rename to src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts diff --git a/src/app/+statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts similarity index 100% rename from src/app/+statistics-page/item-statistics-page/item-statistics-page.component.ts rename to src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts diff --git a/src/app/+statistics-page/site-statistics-page/site-statistics-page.component.scss b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.scss similarity index 100% rename from src/app/+statistics-page/site-statistics-page/site-statistics-page.component.scss rename to src/app/statistics-page/site-statistics-page/site-statistics-page.component.scss diff --git a/src/app/+statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts similarity index 100% rename from src/app/+statistics-page/site-statistics-page/site-statistics-page.component.spec.ts rename to src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts diff --git a/src/app/+statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts similarity index 100% rename from src/app/+statistics-page/site-statistics-page/site-statistics-page.component.ts rename to src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts diff --git a/src/app/+statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts similarity index 100% rename from src/app/+statistics-page/statistics-page-routing.module.ts rename to src/app/statistics-page/statistics-page-routing.module.ts diff --git a/src/app/+statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts similarity index 100% rename from src/app/+statistics-page/statistics-page.module.ts rename to src/app/statistics-page/statistics-page.module.ts diff --git a/src/app/+statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html similarity index 100% rename from src/app/+statistics-page/statistics-page/statistics-page.component.html rename to src/app/statistics-page/statistics-page/statistics-page.component.html diff --git a/src/app/+statistics-page/statistics-page/statistics-page.component.scss b/src/app/statistics-page/statistics-page/statistics-page.component.scss similarity index 100% rename from src/app/+statistics-page/statistics-page/statistics-page.component.scss rename to src/app/statistics-page/statistics-page/statistics-page.component.scss diff --git a/src/app/+statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts similarity index 100% rename from src/app/+statistics-page/statistics-page/statistics-page.component.ts rename to src/app/statistics-page/statistics-page/statistics-page.component.ts diff --git a/src/app/+statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html similarity index 100% rename from src/app/+statistics-page/statistics-table/statistics-table.component.html rename to src/app/statistics-page/statistics-table/statistics-table.component.html diff --git a/src/app/+statistics-page/statistics-table/statistics-table.component.scss b/src/app/statistics-page/statistics-table/statistics-table.component.scss similarity index 100% rename from src/app/+statistics-page/statistics-table/statistics-table.component.scss rename to src/app/statistics-page/statistics-table/statistics-table.component.scss diff --git a/src/app/+statistics-page/statistics-table/statistics-table.component.spec.ts b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts similarity index 100% rename from src/app/+statistics-page/statistics-table/statistics-table.component.spec.ts rename to src/app/statistics-page/statistics-table/statistics-table.component.spec.ts diff --git a/src/app/+statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts similarity index 100% rename from src/app/+statistics-page/statistics-table/statistics-table.component.ts rename to src/app/statistics-page/statistics-table/statistics-table.component.ts