diff --git a/src/app/access-control/epeople-registry/eperson-resolver.service.ts b/src/app/access-control/epeople-registry/eperson-resolver.service.ts index e29cf3f187..6c9d7347f7 100644 --- a/src/app/access-control/epeople-registry/eperson-resolver.service.ts +++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts index e92acaaebf..15d384a104 100644 --- a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts +++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; /** * Interface for the route parameters. diff --git a/src/app/admin/admin-notifications/admin-notifications-routes.ts b/src/app/admin/admin-notifications/admin-notifications-routes.ts index 9403314f43..2d85da41bc 100644 --- a/src/app/admin/admin-notifications/admin-notifications-routes.ts +++ b/src/app/admin/admin-notifications/admin-notifications-routes.ts @@ -3,34 +3,19 @@ import { Route } from '@angular/router'; import { AuthenticatedGuard } from '../../core/auth/authenticated.guard'; import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver'; +import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; +import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component'; +import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver'; +import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver'; +import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component'; +import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service'; +import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component'; +import { QualityAssuranceTopicsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service'; +import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component'; import { - AdminNotificationsPublicationClaimPageResolver -} from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; -import { - QualityAssuranceEventsPageComponent -} from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component'; -import { - QualityAssuranceEventsPageResolver -} from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver'; -import { - SourceDataResolver -} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver'; -import { - QualityAssuranceSourcePageComponent -} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component'; -import { - QualityAssuranceSourcePageResolver -} from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service'; -import { - QualityAssuranceTopicsPageComponent -} from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component'; -import { - QualityAssuranceTopicsPageResolver -} from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service'; -import { - AdminNotificationsPublicationClaimPageComponent -} from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component'; -import { PUBLICATION_CLAIMS_PATH, QUALITY_ASSURANCE_EDIT_PATH, } from './admin-notifications-routing-paths'; + PUBLICATION_CLAIMS_PATH, + QUALITY_ASSURANCE_EDIT_PATH, +} from './admin-notifications-routing-paths'; export const ROUTES: Route[] = [ { diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts index 920f9892bb..561491bc64 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts index 2f06acb7eb..fd5e641f52 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts @@ -1,4 +1,11 @@ -import { Component, ComponentRef, ElementRef, OnDestroy, OnInit, ViewChild, } from '@angular/core'; +import { + Component, + ComponentRef, + ElementRef, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service'; import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; @@ -6,18 +13,14 @@ import { Context } from '../../../../../core/shared/context.model'; import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; import { Item } from '../../../../../core/shared/item.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { - DynamicComponentLoaderDirective -} from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; +import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { hasValue } from '../../../../../shared/empty.util'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { getListableObjectComponent, listableObjectComponent, } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { - SearchResultGridElementComponent -} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; +import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component'; diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts index c5f1f15b4b..8ceb4b12bc 100644 --- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts +++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts @@ -1,5 +1,12 @@ import { NgIf } from '@angular/common'; -import { Component, ComponentRef, ElementRef, OnDestroy, OnInit, ViewChild, } from '@angular/core'; +import { + Component, + ComponentRef, + ElementRef, + OnDestroy, + OnInit, + ViewChild, +} from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; @@ -11,29 +18,24 @@ import { RemoteData } from '../../../../../core/data/remote-data'; import { Context } from '../../../../../core/shared/context.model'; import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; import { Item } from '../../../../../core/shared/item.model'; -import { getAllSucceededRemoteData, getRemoteDataPayload, } from '../../../../../core/shared/operators'; +import { + getAllSucceededRemoteData, + getRemoteDataPayload, +} from '../../../../../core/shared/operators'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { - DynamicComponentLoaderDirective -} from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; +import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive'; import { hasValue } from '../../../../../shared/empty.util'; import { getListableObjectComponent, listableObjectComponent, } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { - WorkflowItemSearchResult -} from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; -import { - SearchResultGridElementComponent -} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; +import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; +import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { followLink } from '../../../../../shared/utils/follow-link-config.model'; -import { - WorkflowItemAdminWorkflowActionsComponent -} from '../../actions/workflow-item/workflow-item-admin-workflow-actions.component'; +import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflow-item/workflow-item-admin-workflow-actions.component'; @listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) @Component({ @@ -98,7 +100,7 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S index: 0, injector: undefined, projectableNodes: [ - [this.badges.nativeElement], + [this.badges.nativeElement], [this.buttons.nativeElement], ], }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 94a6015ab5..da6fe26a70 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,40 +1,73 @@ -import { APP_BASE_HREF, CommonModule, DOCUMENT, } from '@angular/common'; -import { HTTP_INTERCEPTORS, HttpClientModule, } from '@angular/common/http'; -import { APP_ID, NgModule } from '@angular/core'; -import { provideRouter, withRouterConfig, } from '@angular/router'; - +import { + APP_BASE_HREF, + CommonModule, + DOCUMENT, +} from '@angular/common'; +import { + HTTP_INTERCEPTORS, + HttpClientModule, +} from '@angular/common/http'; +import { + APP_ID, + NgModule, +} from '@angular/core'; +import { + provideRouter, + withRouterConfig, +} from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; import { EffectsModule } from '@ngrx/effects'; -import { RouterStateSerializer, StoreRouterConnectingModule, } from '@ngrx/router-store'; -import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS, } from '@ngrx/store'; +import { + RouterStateSerializer, + StoreRouterConnectingModule, +} from '@ngrx/router-store'; +import { + MetaReducer, + StoreModule, + USER_PROVIDED_META_REDUCERS, +} from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; import { NgxMaskModule } from 'ngx-mask'; -import { APP_CONFIG, AppConfig, } from '../config/app-config.interface'; +import { + APP_CONFIG, + AppConfig, +} from '../config/app-config.interface'; import { StoreDevModules } from '../config/store/devtools'; import { environment } from '../environments/environment'; import { EagerThemesModule } from '../themes/eager-themes.module'; import { AppComponent } from './app.component'; import { appEffects } from './app.effects'; -import { appMetaReducers, debugMetaReducers, } from './app.metareducers'; -import { appReducers, AppState, storeModuleConfig, } from './app.reducer'; -import { APP_ROUTES, APP_ROUTING_CONF, } from './app-routes'; +import { + appMetaReducers, + debugMetaReducers, +} from './app.metareducers'; +import { + appReducers, + AppState, + storeModuleConfig, +} from './app.reducer'; +import { + APP_ROUTES, + APP_ROUTING_CONF, +} from './app-routes'; import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator'; import { AuthInterceptor } from './core/auth/auth.interceptor'; import { LocaleInterceptor } from './core/locale/locale.interceptor'; import { LogInterceptor } from './core/log/log.interceptor'; -import { models, provideCore, } from './core/provide-core'; +import { + models, + provideCore, +} from './core/provide-core'; import { ClientCookieService } from './core/services/client-cookie.service'; import { ListableModule } from './core/shared/listable.module'; import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor'; import { RootModule } from './root.module'; import { ThemedRootComponent } from './root/themed-root.component'; import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator'; -import { - METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP -} from './shared/metadata-representation/metadata-representation.decorator'; +import { METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP } from './shared/metadata-representation/metadata-representation.decorator'; import { ADVANCED_WORKFLOW_TASK_OPTION_DECORATOR_MAP, WORKFLOW_TASK_OPTION_DECORATOR_MAP, @@ -128,7 +161,7 @@ const PROVIDERS = [ ], providers: [ ...PROVIDERS, - {provide: APP_ID, useValue: 'dspace-angular'}, + { provide: APP_ID, useValue: 'dspace-angular' }, provideCore(), ], bootstrap: [AppComponent], diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts index 92b2a6d2f4..7f6f5c1740 100644 --- a/src/app/bitstream-page/bitstream-page.resolver.ts +++ b/src/app/bitstream-page/bitstream-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts index 0c2d59d8fa..de5af179c4 100644 --- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts +++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts index e685bbae53..a0975be72e 100644 --- a/src/app/browse-by/browse-by-guard.ts +++ b/src/app/browse-by/browse-by-guard.ts @@ -1,15 +1,29 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Data, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; -import { Observable, of as observableOf, } from 'rxjs'; -import { map, switchMap, } from 'rxjs/operators'; +import { + Observable, + of as observableOf, +} from 'rxjs'; +import { + map, + switchMap, +} from 'rxjs/operators'; import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths'; import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service'; import { RemoteData } from '../core/data/remote-data'; import { BrowseDefinition } from '../core/shared/browse-definition.model'; import { getFirstCompletedRemoteData } from '../core/shared/operators'; -import { hasNoValue, hasValue, } from '../shared/empty.util'; +import { + hasNoValue, + hasValue, +} from '../shared/empty.util'; @Injectable({ providedIn: 'root' }) /** diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts index 8fc008d5a3..56d9e91fc1 100644 --- a/src/app/collection-page/collection-page.resolver.ts +++ b/src/app/collection-page/collection-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts index cb5e39e1ec..05f0f050d6 100644 --- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts +++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts index eec3d2a9a1..b505064786 100644 --- a/src/app/community-page/community-page.resolver.ts +++ b/src/app/community-page/community-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/src/app/community-page/create-community-page/create-community-page.guard.ts b/src/app/community-page/create-community-page/create-community-page.guard.ts index 2926645656..a7e8b8f9f5 100644 --- a/src/app/community-page/create-community-page/create-community-page.guard.ts +++ b/src/app/community-page/create-community-page/create-community-page.guard.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/core/auth/auth-blocking.guard.ts b/src/app/core/auth/auth-blocking.guard.ts index d2f350d1f7..a327b66cf9 100644 --- a/src/app/core/auth/auth-blocking.guard.ts +++ b/src/app/core/auth/auth-blocking.guard.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import { select, Store, diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts index e767db991d..a2f426d747 100644 --- a/src/app/core/auth/authenticated.guard.ts +++ b/src/app/core/auth/authenticated.guard.ts @@ -1,5 +1,9 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree , +import { + ActivatedRouteSnapshot, + Router, + RouterStateSnapshot, + UrlTree, } from '@angular/router'; import { select, diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts index eeaef271a6..b6f72f937a 100644 --- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts index 5584c06aee..62004a0d7f 100644 --- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts index ae8b61fa33..d2e5d9682c 100644 --- a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service'; diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts index f8a32b7696..6289d2dd0f 100644 --- a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service'; diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts index c619908303..31df029a0b 100644 --- a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts +++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts @@ -1,7 +1,9 @@ import { Injectable } from '@angular/core'; import { - ActivatedRouteSnapshot, RouterStateSnapshot , + ActivatedRouteSnapshot, + RouterStateSnapshot, } from '@angular/router'; + import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts index 9dfbb74aa6..09eaaacf84 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts @@ -1,11 +1,19 @@ -import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; -import { Observable, of as observableOf, } from 'rxjs'; +import { + ActivatedRouteSnapshot, + ResolveFn, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { + Observable, + of as observableOf, +} from 'rxjs'; -import { AuthorizationDataService } from '../authorization-data.service'; -import { RemoteData } from '../../remote-data'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { AuthService } from '../../../auth/auth.service'; import { DSpaceObject } from '../../../shared/dspace-object.model'; +import { RemoteData } from '../../remote-data'; +import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts index d0feea20e5..4f482d662d 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts @@ -1,11 +1,19 @@ -import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; -import { Observable, of as observableOf, } from 'rxjs'; +import { + ActivatedRouteSnapshot, + ResolveFn, + Router, + RouterStateSnapshot, +} from '@angular/router'; +import { + Observable, + of as observableOf, +} from 'rxjs'; -import { AuthorizationDataService } from '../authorization-data.service'; -import { RemoteData } from '../../remote-data'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { AuthService } from '../../../auth/auth.service'; import { DSpaceObject } from '../../../shared/dspace-object.model'; +import { RemoteData } from '../../remote-data'; +import { AuthorizationDataService } from '../authorization-data.service'; import { FeatureID } from '../feature-id'; import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard'; diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts index 9dd1e2aaf9..bda9c1c995 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts @@ -1,13 +1,21 @@ -import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; -import { RemoteData } from '../../remote-data'; -import { AuthorizationDataService } from '../authorization-data.service'; +import { + ActivatedRouteSnapshot, + ResolveFn, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { hasNoValue, hasValue, } from '../../../../shared/empty.util'; +import { + hasNoValue, + hasValue, +} from '../../../../shared/empty.util'; import { AuthService } from '../../../auth/auth.service'; import { DSpaceObject } from '../../../shared/dspace-object.model'; import { getAllSucceededRemoteDataPayload } from '../../../shared/operators'; +import { RemoteData } from '../../remote-data'; +import { AuthorizationDataService } from '../authorization-data.service'; import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard'; /** diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts index fdd4797db3..229321452f 100644 --- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts +++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts @@ -1,4 +1,5 @@ -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree, diff --git a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts index 8f9534f1aa..2937011a38 100644 --- a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts +++ b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts @@ -1,4 +1,5 @@ -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree, @@ -7,6 +8,7 @@ import { Observable, of as observableOf, } from 'rxjs'; + import { environment } from '../../../environments/environment'; import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators'; diff --git a/src/app/core/feedback/feedback.guard.ts b/src/app/core/feedback/feedback.guard.ts index da46b4c4f0..3170aa4088 100644 --- a/src/app/core/feedback/feedback.guard.ts +++ b/src/app/core/feedback/feedback.guard.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import {ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, } from '@angular/router'; diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts index 4271119ce5..5aab83df31 100644 --- a/src/app/core/reload/reload.guard.ts +++ b/src/app/core/reload/reload.guard.ts @@ -1,7 +1,9 @@ import { Inject, - Injectable,} from '@angular/core'; -import { ActivatedRouteSnapshot, + Injectable, +} from '@angular/core'; +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree, diff --git a/src/app/core/server-check/server-check.guard.ts b/src/app/core/server-check/server-check.guard.ts index 0be393ba29..f023cc3e75 100644 --- a/src/app/core/server-check/server-check.guard.ts +++ b/src/app/core/server-check/server-check.guard.ts @@ -1,7 +1,17 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, NavigationStart, Router, RouterStateSnapshot, UrlTree, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + NavigationStart, + Router, + RouterStateSnapshot, + UrlTree, +} from '@angular/router'; import { Observable } from 'rxjs'; -import { filter, map, take, } from 'rxjs/operators'; +import { + filter, + map, + take, +} from 'rxjs/operators'; import { getPageInternalServerErrorRoute } from '../../app-routing-paths'; import { RootDataService } from '../data/root-data.service'; diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts index 61ccc5a954..2779193fb1 100644 --- a/src/app/core/submission/resolver/submission-object.resolver.ts +++ b/src/app/core/submission/resolver/submission-object.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/src/app/home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts index 05cf5bc208..eafc4b2846 100644 --- a/src/app/home-page/home-page.resolver.ts +++ b/src/app/home-page/home-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/init.service.ts b/src/app/init.service.ts index 56a809d60e..47b2d8b02c 100644 --- a/src/app/init.service.ts +++ b/src/app/init.service.ts @@ -5,27 +5,45 @@ * * http://www.dspace.org/license/ */ -import { select, Store } from '@ngrx/store'; -import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; -import { CorrelationIdService } from './correlation-id/correlation-id.service'; -import { APP_INITIALIZER, Inject, makeStateKey, Provider, TransferState, Type } from '@angular/core'; -import { APP_CONFIG, APP_DATA_SERVICES_MAP, AppConfig, } from '../config/app-config.interface'; +import { + APP_INITIALIZER, + Inject, + makeStateKey, + Provider, + TransferState, + Type, +} from '@angular/core'; +import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; +import { + select, + Store, +} from '@ngrx/store'; +import { TranslateService } from '@ngx-translate/core'; +import isEqual from 'lodash/isEqual'; +import { Observable } from 'rxjs'; +import { + distinctUntilChanged, + find, +} from 'rxjs/operators'; + +import { + APP_CONFIG, + APP_DATA_SERVICES_MAP, + AppConfig, +} from '../config/app-config.interface'; import { environment } from '../environments/environment'; import { AppState } from './app.reducer'; import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; +import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; import { isAuthenticationBlocking } from './core/auth/selectors'; import { LAZY_DATA_SERVICES } from './core/data-services-map'; import { LocaleService } from './core/locale/locale.service'; import { MetadataService } from './core/metadata/metadata.service'; +import { CorrelationIdService } from './correlation-id/correlation-id.service'; import { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; import { MenuService } from './shared/menu/menu.service'; import { ThemeService } from './shared/theme-support/theme.service'; import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider'; -import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; -import { TranslateService } from '@ngx-translate/core'; -import isEqual from 'lodash/isEqual'; -import { Observable } from 'rxjs'; -import { distinctUntilChanged, find, } from 'rxjs/operators'; /** diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts index e20c71887e..9746c654d7 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts @@ -10,7 +10,12 @@ import { waitForAsync, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ActivatedRoute, ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, UrlTree , +import { + ActivatedRoute, + ActivatedRouteSnapshot, + RouterModule, + RouterStateSnapshot, + UrlTree, } from '@angular/router'; import { TranslateLoader, diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts index 49f9a1b1d7..ee71a52a4e 100644 --- a/src/app/item-page/edit-item-page/edit-item-page.component.ts +++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts @@ -1,15 +1,39 @@ -import { AsyncPipe, NgClass, NgForOf, NgIf, } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Injector, OnInit, } from '@angular/core'; -import { ActivatedRoute, CanActivateFn, Route, Router, RouterLink, RouterOutlet, } from '@angular/router'; +import { + AsyncPipe, + NgClass, + NgForOf, + NgIf, +} from '@angular/common'; +import { + ChangeDetectionStrategy, + Component, + Injector, + OnInit, +} from '@angular/core'; +import { + ActivatedRoute, + CanActivateFn, + Route, + Router, + RouterLink, + RouterOutlet, +} from '@angular/router'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; -import { combineLatest as observableCombineLatest, Observable, of as observableOf, } from 'rxjs'; +import { + combineLatest as observableCombineLatest, + Observable, + of as observableOf, +} from 'rxjs'; import { map } from 'rxjs/operators'; -import { fadeIn, fadeInOut } from '../../shared/animations/fade'; import { RemoteData } from '../../core/data/remote-data'; import { GenericConstructor } from '../../core/shared/generic-constructor'; import { Item } from '../../core/shared/item.model'; +import { + fadeIn, + fadeInOut, +} from '../../shared/animations/fade'; import { isNotEmpty } from '../../shared/empty.util'; import { getItemPageRoute } from '../item-page-routing-paths'; @@ -67,7 +91,7 @@ export class EditItemPageComponent implements OnInit { enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<{ canActivate: CanActivateFn; }>) => { - const guard: { + const guard: { canActivate: CanActivateFn; } = this.injector.get<{ canActivate: CanActivateFn; diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts index 12e5b02084..385ba81dc4 100644 --- a/src/app/item-page/item.resolver.ts +++ b/src/app/item-page/item.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts index 27ca368c3d..1f37f2ae67 100644 --- a/src/app/item-page/version-page/version.resolver.ts +++ b/src/app/item-page/version-page/version.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts index d6a81832eb..b1bb92e633 100644 --- a/src/app/lookup-by-id/lookup-guard.ts +++ b/src/app/lookup-by-id/lookup-guard.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts index 5ab2e39297..2be5c3d3d5 100644 --- a/src/app/menu.resolver.ts +++ b/src/app/menu.resolver.ts @@ -1,8 +1,20 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { combineLatest, combineLatest as observableCombineLatest, Observable, } from 'rxjs'; -import { filter, find, map, take, } from 'rxjs/operators'; +import { + combineLatest, + combineLatest as observableCombineLatest, + Observable, +} from 'rxjs'; +import { + filter, + find, + map, + take, +} from 'rxjs/operators'; import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths'; import { BrowseService } from './core/browse/browse.service'; @@ -19,30 +31,14 @@ import { RemoteData } from './core/data/remote-data'; import { BrowseDefinition } from './core/shared/browse-definition.model'; import { ConfigurationProperty } from './core/shared/configuration-property.model'; import { getFirstCompletedRemoteData } from './core/shared/operators'; -import { - ThemedCreateCollectionParentSelectorComponent -} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; -import { - ThemedCreateCommunityParentSelectorComponent -} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; -import { - ThemedCreateItemParentSelectorComponent -} from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; -import { - ThemedEditCollectionSelectorComponent -} from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component'; -import { - ThemedEditCommunitySelectorComponent -} from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component'; -import { - ThemedEditItemSelectorComponent -} from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component'; -import { - ExportBatchSelectorComponent -} from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; -import { - ExportMetadataSelectorComponent -} from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; +import { ThemedCreateCollectionParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; +import { ThemedCreateCommunityParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; +import { ThemedCreateItemParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; +import { ThemedEditCollectionSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component'; +import { ThemedEditCommunitySelectorComponent } from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component'; +import { ThemedEditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component'; +import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; +import { ExportMetadataSelectorComponent } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; import { hasValue } from './shared/empty.util'; import { MenuService } from './shared/menu/menu.service'; import { MenuID } from './shared/menu/menu-id.model'; diff --git a/src/app/my-dspace-page/my-dspace.guard.ts b/src/app/my-dspace-page/my-dspace.guard.ts index 347fce4085..8362bdd7e1 100644 --- a/src/app/my-dspace-page/my-dspace.guard.ts +++ b/src/app/my-dspace-page/my-dspace.guard.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, NavigationExtras, Router, RouterStateSnapshot, diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts index 2978608592..3e1043241f 100644 --- a/src/app/process-page/process-breadcrumb.resolver.ts +++ b/src/app/process-page/process-breadcrumb.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts index b3068d3606..b5b0ccb28e 100644 --- a/src/app/process-page/process-page.resolver.ts +++ b/src/app/process-page/process-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts index cbbd466973..e0982a6e60 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts +++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; /** * Interface for the route parameters. diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts index 5ea6ab3b6b..3374fd619b 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; /** * Interface for the route parameters. diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts index d6d5de110e..8019f57f90 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts @@ -1,5 +1,9 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts index d0fd2b4444..f990a7c24c 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; /** * Interface for the route parameters. diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts index 4b95328311..8bc6261873 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; /** * Interface for the route parameters. diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts index 5f93c9cac4..e301b9a4a0 100644 --- a/src/app/register-email-form/registration.resolver.ts +++ b/src/app/register-email-form/registration.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/register-page/registration.guard.ts b/src/app/register-page/registration.guard.ts index 3af89ce119..54e81b8beb 100644 --- a/src/app/register-page/registration.guard.ts +++ b/src/app/register-page/registration.guard.ts @@ -1,5 +1,9 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + Router, + RouterStateSnapshot, +} from '@angular/router'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts index ec43061980..2661ed4dfb 100644 --- a/src/app/request-copy/request-copy.resolver.ts +++ b/src/app/request-copy/request-copy.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import {ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/search-page/configuration-search-page.guard.ts b/src/app/search-page/configuration-search-page.guard.ts index 5a814a97bc..7b86c2a498 100644 --- a/src/app/search-page/configuration-search-page.guard.ts +++ b/src/app/search-page/configuration-search-page.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, - CanActivate, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts index 694f22181a..c28f37717f 100644 --- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -11,7 +11,8 @@ import { } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { - EventType, NavigationEnd, + EventType, + NavigationEnd, Router, RouterLink, RouterLinkActive, diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts index b3a2828b53..5b39392d6e 100644 --- a/src/app/shared/context-help.directive.ts +++ b/src/app/shared/context-help.directive.ts @@ -1,4 +1,12 @@ -import { ComponentRef, Directive, Input, OnChanges, OnDestroy, TemplateRef, ViewContainerRef, } from '@angular/core'; +import { + ComponentRef, + Directive, + Input, + OnChanges, + OnDestroy, + TemplateRef, + ViewContainerRef, +} from '@angular/core'; import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning'; import { ContextHelpService } from './context-help.service'; diff --git a/src/app/shared/dso-page/dso-edit-menu.resolver.ts b/src/app/shared/dso-page/dso-edit-menu.resolver.ts index 0689a56807..f11c474ea5 100644 --- a/src/app/shared/dso-page/dso-edit-menu.resolver.ts +++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts @@ -1,9 +1,19 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateService } from '@ngx-translate/core'; -import { combineLatest, Observable, of as observableOf, } from 'rxjs'; -import { map, switchMap, } from 'rxjs/operators'; +import { + combineLatest, + Observable, + of as observableOf, +} from 'rxjs'; +import { + map, + switchMap, +} from 'rxjs/operators'; import { getDSORoute } from '../../app-routing-paths'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; @@ -13,10 +23,17 @@ import { ResearcherProfileDataService } from '../../core/profile/researcher-prof import { Collection } from '../../core/shared/collection.model'; import { Community } from '../../core/shared/community.model'; import { Item } from '../../core/shared/item.model'; -import { getFirstCompletedRemoteData, getRemoteDataPayload, } from '../../core/shared/operators'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '../../core/shared/operators'; import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service'; import { URLCombiner } from '../../core/url-combiner/url-combiner'; -import { hasNoValue, hasValue, isNotEmpty, } from '../empty.util'; +import { + hasNoValue, + hasValue, + isNotEmpty, +} from '../empty.util'; import { MenuService } from '../menu/menu.service'; import { MenuID } from '../menu/menu-id.model'; import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts index f3d39becc3..925ca6dbe6 100644 --- a/src/app/shared/form/chips/chips.component.spec.ts +++ b/src/app/shared/form/chips/chips.component.spec.ts @@ -1,6 +1,17 @@ // Load the implementations that should be tested -import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, } from '@angular/core'; -import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing'; +import { + ChangeDetectorRef, + Component, + CUSTOM_ELEMENTS_SCHEMA, +} from '@angular/core'; +import { + ComponentFixture, + fakeAsync, + inject, + TestBed, + tick, + waitForAsync, +} from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts index 21f557cd5c..692e2982f5 100644 --- a/src/app/shared/form/chips/chips.component.ts +++ b/src/app/shared/form/chips/chips.component.ts @@ -1,7 +1,26 @@ -import { AsyncPipe, NgClass, NgForOf, NgIf, } from '@angular/common'; -import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, } from '@angular/core'; -import { NgbTooltip, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateModule, TranslateService, } from '@ngx-translate/core'; +import { + AsyncPipe, + NgClass, + NgForOf, + NgIf, +} from '@angular/common'; +import { + ChangeDetectorRef, + Component, + EventEmitter, + Input, + OnChanges, + Output, + SimpleChanges, +} from '@angular/core'; +import { + NgbTooltip, + NgbTooltipModule, +} from '@ng-bootstrap/ng-bootstrap'; +import { + TranslateModule, + TranslateService, +} from '@ngx-translate/core'; import isObject from 'lodash/isObject'; import { BehaviorSubject } from 'rxjs'; diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts index 518ba93f5a..46b13b1440 100644 --- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts +++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts @@ -1,17 +1,19 @@ -import { Component, Inject, Input, } from '@angular/core'; +import { + Component, + Inject, + Input, +} from '@angular/core'; import { Context } from '../../core/shared/context.model'; import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { - MetadataRepresentationListElementComponent -} from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component'; -import { ThemeService } from '../theme-support/theme.service'; -import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator'; import { MetadataRepresentation, - MetadataRepresentationType + MetadataRepresentationType, } from '../../core/shared/metadata-representation/metadata-representation.model'; import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component'; +import { MetadataRepresentationListElementComponent } from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component'; +import { ThemeService } from '../theme-support/theme.service'; +import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator'; @Component({ selector: 'ds-metadata-representation-loader', diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts index 7cb488322e..2689de0a9d 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts @@ -1,7 +1,9 @@ import { Injectable, - Injector,} from '@angular/core'; -import { ActivatedRouteSnapshot, + Injector, +} from '@angular/core'; +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts index 897aa577ce..e72b061956 100644 --- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts +++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts index ede5b86fd6..1ee59a2232 100644 --- a/src/app/shared/theme-support/themed.component.ts +++ b/src/app/shared/theme-support/themed.component.ts @@ -19,10 +19,19 @@ import { of as observableOf, Subscription, } from 'rxjs'; -import { catchError, map, switchMap, tap, } from 'rxjs/operators'; +import { + catchError, + map, + switchMap, + tap, +} from 'rxjs/operators'; import { GenericConstructor } from '../../core/shared/generic-constructor'; -import { hasNoValue, hasValue, isNotEmpty, } from '../empty.util'; +import { + hasNoValue, + hasValue, + isNotEmpty, +} from '../empty.util'; import { BASE_THEME_NAME } from './theme.constants'; import { ThemeService } from './theme.service'; diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts index d6699dfb88..95297772a3 100644 --- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts +++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts @@ -1,5 +1,12 @@ -import { NgForOf, NgIf, } from '@angular/common'; -import { Component, Input, OnInit, } from '@angular/core'; +import { + NgForOf, + NgIf, +} from '@angular/common'; +import { + Component, + Input, + OnInit, +} from '@angular/core'; import { find } from 'rxjs/operators'; import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; diff --git a/src/app/suggestions-page/suggestions-page.resolver.ts b/src/app/suggestions-page/suggestions-page.resolver.ts index d35eae3c52..3d6d0f7b9d 100644 --- a/src/app/suggestions-page/suggestions-page.resolver.ts +++ b/src/app/suggestions-page/suggestions-page.resolver.ts @@ -1,5 +1,8 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; +import { + ActivatedRouteSnapshot, + RouterStateSnapshot, +} from '@angular/router'; import { Observable } from 'rxjs'; import { find } from 'rxjs/operators'; diff --git a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts index 03d98afaaf..79756f0f7a 100644 --- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts +++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; + import { Item } from '../core/shared/item.model'; import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts index 5269202e03..aa654bfaa5 100644 --- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts +++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts index 547e46f4f8..0bd5193d19 100644 --- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts +++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; + import { Item } from '../core/shared/item.model'; import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts index 9f832d823c..cb0772d475 100644 --- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts +++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, +import { + ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import { Observable } from 'rxjs'; diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 6f545af45c..703da3734c 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -1,35 +1,37 @@ -import { InjectionToken, makeStateKey, Type, } from '@angular/core'; +import { + InjectionToken, + makeStateKey, + Type, +} from '@angular/core'; import { DynamicFormControl } from '@ng-dynamic-forms/core/lib/component/dynamic-form-control-interface'; -import { - AdminNotifyMetricsRow -} from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; +import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model'; import { HALDataService } from '../app/core/data/base/hal-data-service.interface'; import { ActuatorsConfig } from './actuators.config'; -import { Config } from './config.interface'; -import { ServerConfig } from './server-config.interface'; -import { CacheConfig } from './cache-config.interface'; -import { INotificationBoardOptions } from './notifications-config.interfaces'; -import { SubmissionConfig } from './submission-config.interface'; -import { FormConfig } from './form-config.interfaces'; -import { LangConfig } from './lang-config.interface'; -import { ItemConfig } from './item-config.interface'; -import { CollectionPageConfig } from './collection-page-config.interface'; -import { ThemeConfig } from './theme.config'; import { AuthConfig } from './auth-config.interfaces'; import { BrowseByConfig } from './browse-by-config.interface'; import { BundleConfig } from './bundle-config.interface'; +import { CacheConfig } from './cache-config.interface'; +import { CollectionPageConfig } from './collection-page-config.interface'; import { CommunityListConfig } from './community-list-config.interface'; import { CommunityPageConfig } from './community-page-config.interface'; +import { Config } from './config.interface'; import { DiscoverySortConfig } from './discovery-sort.config'; import { FilterVocabularyConfig } from './filter-vocabulary-config'; +import { FormConfig } from './form-config.interfaces'; import { HomeConfig } from './homepage-config.interface'; import { InfoConfig } from './info-config.interface'; +import { ItemConfig } from './item-config.interface'; +import { LangConfig } from './lang-config.interface'; import { MarkdownConfig } from './markdown-config.interface'; import { MediaViewerConfig } from './media-viewer-config.interface'; +import { INotificationBoardOptions } from './notifications-config.interfaces'; import { QualityAssuranceConfig } from './quality-assurance.config'; import { SearchConfig } from './search-page-config.interface'; +import { ServerConfig } from './server-config.interface'; +import { SubmissionConfig } from './submission-config.interface'; import { SuggestionConfig } from './suggestion-config.interfaces'; +import { ThemeConfig } from './theme.config'; import { UIServerConfig } from './ui-server-config.interface'; interface AppConfig extends Config { diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index 363d6c6921..b3439d9f96 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -1,12 +1,30 @@ -import { HttpClient, HttpClientModule, } from '@angular/common/http'; -import { APP_ID, makeStateKey, NgModule, TransferState } from '@angular/core'; +import { + HttpClient, + HttpClientModule, +} from '@angular/common/http'; +import { + APP_ID, + makeStateKey, + NgModule, + TransferState, +} from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { EffectsModule } from '@ngrx/effects'; -import { Action, StoreConfig, StoreModule, } from '@ngrx/store'; +import { + Action, + StoreConfig, + StoreModule, +} from '@ngrx/store'; import { REQUEST } from '@nguniversal/express-engine/tokens'; -import { MissingTranslationHandler, TranslateLoader, TranslateModule, } from '@ngx-translate/core'; -import { Angulartics2GoogleTagManager, Angulartics2RouterlessModule, } from 'angulartics2'; -import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; +import { + MissingTranslationHandler, + TranslateLoader, + TranslateModule, +} from '@ngx-translate/core'; +import { + Angulartics2GoogleTagManager, + Angulartics2RouterlessModule, +} from 'angulartics2'; import { AppComponent } from '../../app/app.component'; import { AppModule } from '../../app/app.module'; @@ -33,6 +51,7 @@ 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 { SubmissionService } from '../../app/submission/submission.service'; +import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; import { BrowserInitService } from './browser-init.service'; export const REQ_KEY = makeStateKey('req'); @@ -67,7 +86,7 @@ export function getRequest(transferState: TransferState): any { ], providers: [ ...BrowserInitService.providers(), - {provide: APP_ID, useValue: 'dspace-angular'}, + { provide: APP_ID, useValue: 'dspace-angular' }, { provide: REQUEST, useFactory: getRequest, diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts index b2c1f019c9..4d577907b0 100644 --- a/src/modules/app/browser-init.service.ts +++ b/src/modules/app/browser-init.service.ts @@ -8,8 +8,8 @@ import { Inject, Injectable, + TransferState, } from '@angular/core'; -import { TransferState } from '@angular/core'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; import { diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts index 3c5db601ee..b3e691d12f 100644 --- a/src/modules/app/server-app.module.ts +++ b/src/modules/app/server-app.module.ts @@ -1,13 +1,30 @@ import { XhrFactory } from '@angular/common'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; -import { APP_ID, NgModule, TransferState } from '@angular/core'; +import { + APP_ID, + NgModule, + TransferState, +} from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ServerModule, ServerTransferStateModule, } from '@angular/platform-server'; +import { + ServerModule, + ServerTransferStateModule, +} from '@angular/platform-server'; import { EffectsModule } from '@ngrx/effects'; -import { Action, StoreConfig, StoreModule, } from '@ngrx/store'; -import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; - -import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag, } from 'angulartics2'; +import { + Action, + StoreConfig, + StoreModule, +} from '@ngrx/store'; +import { + TranslateLoader, + TranslateModule, +} from '@ngx-translate/core'; +import { + Angulartics2, + Angulartics2GoogleAnalytics, + Angulartics2GoogleGlobalSiteTag, +} from 'angulartics2'; import { AppComponent } from '../../app/app.component'; import { AppModule } from '../../app/app.module'; @@ -60,7 +77,7 @@ export function createTranslateLoader(transferState: TransferState) { ], providers: [ ...ServerInitService.providers(), - {provide: APP_ID, useValue: 'dspace-angular'}, + { provide: APP_ID, useValue: 'dspace-angular' }, { provide: Angulartics2, useClass: Angulartics2Mock, diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts index ec976461b8..8849e8f00e 100644 --- a/src/modules/app/server-init.service.ts +++ b/src/modules/app/server-init.service.ts @@ -5,7 +5,10 @@ * * http://www.dspace.org/license/ */ -import { Inject, Injectable, } from '@angular/core'; +import { + Inject, + Injectable, +} from '@angular/core'; import { TransferState } from '@angular/platform-browser'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; @@ -20,7 +23,11 @@ import { InitService } from '../../app/init.service'; import { MenuService } from '../../app/shared/menu/menu.service'; import { ThemeService } from '../../app/shared/theme-support/theme.service'; import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; -import { APP_CONFIG, APP_CONFIG_STATE, AppConfig, } from '../../config/app-config.interface'; +import { + APP_CONFIG, + APP_CONFIG_STATE, + AppConfig, +} from '../../config/app-config.interface'; import { environment } from '../../environments/environment'; /** diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts index 21b3fde5fe..d86251e008 100644 --- a/src/ngx-translate-loaders/translate-server.loader.ts +++ b/src/ngx-translate-loaders/translate-server.loader.ts @@ -1,9 +1,15 @@ import { TransferState } from '@angular/platform-browser'; import { TranslateLoader } from '@ngx-translate/core'; import { readFileSync } from 'fs'; -import { Observable, of as observableOf, } from 'rxjs'; +import { + Observable, + of as observableOf, +} from 'rxjs'; -import { NGX_TRANSLATE_STATE, NgxTranslateState, } from './ngx-translate-state'; +import { + NGX_TRANSLATE_STATE, + NgxTranslateState, +} from './ngx-translate-state'; /** * A TranslateLoader for ngx-translate to parse json5 files server-side, and store them in the diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 9d16ab864f..6cfeafd89e 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -21,18 +21,12 @@ import { BrowseByMetadataComponent } from './app/browse-by/browse-by-metadata/br import { BrowseByTaxonomyComponent } from './app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component'; import { BrowseByTitleComponent } from './app/browse-by/browse-by-title/browse-by-title.component'; import { CollectionPageComponent } from './app/collection-page/collection-page.component'; -import { - EditItemTemplatePageComponent -} from './app/collection-page/edit-item-template-page/edit-item-template-page.component'; +import { EditItemTemplatePageComponent } from './app/collection-page/edit-item-template-page/edit-item-template-page.component'; import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component'; import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component'; import { CommunityPageComponent } from './app/community-page/community-page.component'; -import { - CommunityPageSubCollectionListComponent -} from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component'; -import { - CommunityPageSubCommunityListComponent -} from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component'; +import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component'; +import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component'; import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component'; import { ForbiddenComponent } from './app/forbidden/forbidden.component'; import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component'; @@ -44,32 +38,20 @@ import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedbac import { PrivacyComponent } from './app/info/privacy/privacy.component'; import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component'; import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component'; -import { - FullFileSectionComponent -} from './app/item-page/full/field-components/file-section/full-file-section.component'; +import { FullFileSectionComponent } from './app/item-page/full/field-components/file-section/full-file-section.component'; import { FullItemPageComponent } from './app/item-page/full/full-item-page.component'; import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component'; -import { - MediaViewerImageComponent -} from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component'; -import { - MediaViewerVideoComponent -} from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component'; +import { MediaViewerImageComponent } from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component'; +import { MediaViewerVideoComponent } from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component'; import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component'; -import { - ItemPageTitleFieldComponent -} from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component'; +import { ItemPageTitleFieldComponent } from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component'; import { ItemPageComponent } from './app/item-page/simple/item-page.component'; -import { - MetadataRepresentationListComponent -} from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component'; +import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component'; import { LoginPageComponent } from './app/login-page/login-page.component'; import { LogoutPageComponent } from './app/logout-page/logout-page.component'; import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component'; import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component'; -import { - ExpandableNavbarSectionComponent -} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component'; +import { ExpandableNavbarSectionComponent } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component'; import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component'; import { ProfilePageComponent } from './app/profile-page/profile-page.component'; import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component'; @@ -86,23 +68,13 @@ import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-men import { BrowseByComponent } from './app/shared/browse-by/browse-by.component'; import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component'; import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component'; -import { - DsDynamicLookupRelationExternalSourceTabComponent -} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; -import { - ExternalSourceEntryImportModalComponent -} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; -import { - DsDynamicLookupRelationSearchTabComponent -} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; +import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; +import { ExternalSourceEntryImportModalComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component'; +import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; import { LoadingComponent } from './app/shared/loading/loading.component'; -import { - AccessStatusBadgeComponent -} from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component'; +import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component'; import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component'; -import { - MyDSpaceStatusBadgeComponent -} from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component'; +import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component'; import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component'; import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component'; import { ObjectListComponent } from './app/shared/object-list/object-list.component'; @@ -112,32 +84,18 @@ import { SearchResultsComponent } from './app/shared/search/search-results/searc import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component'; import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component'; import { SearchFormComponent } from './app/shared/search-form/search-form.component'; -import { - CollectionStatisticsPageComponent -} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component'; -import { - CommunityStatisticsPageComponent -} from './app/statistics-page/community-statistics-page/community-statistics-page.component'; +import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component'; +import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component'; import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component'; import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component'; import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component'; -import { - SubmissionImportExternalComponent -} from './app/submission/import-external/submission-import-external.component'; -import { - SubmissionSectionUploadFileComponent -} from './app/submission/sections/upload/file/section-upload-file.component'; +import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component'; +import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component'; import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component'; import { ThumbnailComponent } from './app/thumbnail/thumbnail.component'; -import { - WorkflowItemDeleteComponent -} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; -import { - WorkflowItemSendBackComponent -} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; -import { - WorkspaceItemsDeletePageComponent -} from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component'; +import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; +import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component'; +import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component'; const DECLARATIONS = [ FileSectionComponent,