diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts deleted file mode 100644 index e1ca4dc7a1..0000000000 --- a/src/app/statistics-page/statistics-page.module.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; - -import { UsageReportDataService } from '../core/statistics/usage-report-data.service'; -import { StatisticsModule } from '../statistics/statistics.module'; -import { CollectionStatisticsPageComponent } from './collection-statistics-page/collection-statistics-page.component'; -import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component'; -import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component'; -import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component'; -import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component'; -import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component'; -import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component'; -import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component'; -import { StatisticsTableComponent } from './statistics-table/statistics-table.component'; - -const components = [ - StatisticsTableComponent, - SiteStatisticsPageComponent, - ItemStatisticsPageComponent, - CollectionStatisticsPageComponent, - CommunityStatisticsPageComponent, - ThemedCollectionStatisticsPageComponent, - ThemedCommunityStatisticsPageComponent, - ThemedItemStatisticsPageComponent, - ThemedSiteStatisticsPageComponent, -]; - -@NgModule({ - imports: [ - CommonModule, - StatisticsModule.forRoot(), - ...components, - ], - providers: [ - UsageReportDataService, - ], - exports: components, -}) - -/** - * This module handles all components and pipes that are necessary for the search page - */ -export class StatisticsPageModule { -} diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts deleted file mode 100644 index ccaaa8f240..0000000000 --- a/src/app/statistics/statistics.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { - ModuleWithProviders, - NgModule, -} from '@angular/core'; - -import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component'; -import { StatisticsEndpoint } from './statistics-endpoint.model'; - -/** - * Declaration needed to make sure all decorator functions are called in time - */ -export const models = [ - StatisticsEndpoint, -]; - -@NgModule({ - imports: [ - CommonModule, - ViewTrackerComponent, - ], - exports: [ - ViewTrackerComponent, - ], -}) -/** - * This module handles the statistics - */ -export class StatisticsModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: StatisticsModule, - }; - } -} diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index d35a6e1df2..cb8431beb8 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -50,12 +50,11 @@ import { HardRedirectService } from '../../app/core/services/hard-redirect.servi import { ReferrerService } from '../../app/core/services/referrer.service'; import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service'; import { KlaroService } from '../../app/shared/cookies/klaro.service'; +import { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper'; import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service'; -import { StatisticsModule } from '../../app/statistics/statistics.module'; import { SubmissionService } from '../../app/submission/submission.service'; import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; import { BrowserInitService } from './browser-init.service'; -import { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper'; export const REQ_KEY = makeStateKey('req'); @@ -76,7 +75,6 @@ export function getRequest(transferState: TransferState): any { HttpClientModule, // forRoot ensures the providers are only created once IdlePreloadModule.forRoot(), - StatisticsModule.forRoot(), Angulartics2RouterlessModule.forRoot(), BrowserAnimationsModule, StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig), diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 7d630d7821..74885b55c6 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -14,8 +14,6 @@ import { IdlePreloadModule } from 'angular-idle-preload'; import { AppModule } from '../../app/app.module'; import { RootModule } from '../../app/root.module'; -import { StatisticsModule } from '../../app/statistics/statistics.module'; -import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; import { SubmissionModule } from '../../app/submission/submission.module'; import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module'; import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component'; @@ -200,8 +198,6 @@ const DECLARATIONS = [ NgbModule, RouterModule, ScrollToModule, - StatisticsModule, - StatisticsPageModule, StoreModule, StoreRouterConnectingModule, TranslateModule, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index 5cfc988000..3acf9bdac9 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -13,8 +13,6 @@ import { IdlePreloadModule } from 'angular-idle-preload'; import { AppModule } from '../../app/app.module'; import { RootModule } from '../../app/root.module'; -import { StatisticsModule } from '../../app/statistics/statistics.module'; -import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; import { SubmissionModule } from '../../app/submission/submission.module'; const DECLARATIONS = [ @@ -32,8 +30,6 @@ const DECLARATIONS = [ NgbModule, RouterModule, ScrollToModule, - StatisticsModule, - StatisticsPageModule, StoreModule, StoreRouterConnectingModule, TranslateModule,