[DURACOM-234] lint fix

This commit is contained in:
Andrea Barbasso
2024-03-15 13:19:00 +01:00
parent 0c3dd8d946
commit c75c5f1199
72 changed files with 561 additions and 292 deletions

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
/** /**
* Interface for the route parameters. * Interface for the route parameters.

View File

@@ -3,34 +3,19 @@ import { Route } from '@angular/router';
import { AuthenticatedGuard } from '../../core/auth/authenticated.guard'; import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver'; import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-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 { import {
AdminNotificationsPublicationClaimPageResolver PUBLICATION_CLAIMS_PATH,
} from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service'; QUALITY_ASSURANCE_EDIT_PATH,
import { } from './admin-notifications-routing-paths';
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';
export const ROUTES: Route[] = [ export const ROUTES: Route[] = [
{ {

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -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 { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.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 { GenericConstructor } from '../../../../../core/shared/generic-constructor';
import { Item } from '../../../../../core/shared/item.model'; import { Item } from '../../../../../core/shared/item.model';
import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model';
import { import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
DynamicComponentLoaderDirective
} from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
import { hasValue } from '../../../../../shared/empty.util'; import { hasValue } from '../../../../../shared/empty.util';
import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
import { import {
getListableObjectComponent, getListableObjectComponent,
listableObjectComponent, listableObjectComponent,
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
import { import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
SearchResultGridElementComponent
} from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
import { ThemeService } from '../../../../../shared/theme-support/theme.service'; import { ThemeService } from '../../../../../shared/theme-support/theme.service';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component'; import { ItemAdminSearchResultActionsComponent } from '../../item-admin-search-result-actions.component';

View File

@@ -1,5 +1,12 @@
import { NgIf } from '@angular/common'; 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 { TranslateModule } from '@ngx-translate/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
@@ -11,29 +18,24 @@ import { RemoteData } from '../../../../../core/data/remote-data';
import { Context } from '../../../../../core/shared/context.model'; import { Context } from '../../../../../core/shared/context.model';
import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
import { Item } from '../../../../../core/shared/item.model'; 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 { ViewMode } from '../../../../../core/shared/view-mode.model';
import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
import { import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
DynamicComponentLoaderDirective
} from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
import { hasValue } from '../../../../../shared/empty.util'; import { hasValue } from '../../../../../shared/empty.util';
import { import {
getListableObjectComponent, getListableObjectComponent,
listableObjectComponent, listableObjectComponent,
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
import { import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
WorkflowItemSearchResult import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
} 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 { ThemeService } from '../../../../../shared/theme-support/theme.service';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
import { followLink } from '../../../../../shared/utils/follow-link-config.model'; import { followLink } from '../../../../../shared/utils/follow-link-config.model';
import { import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflow-item/workflow-item-admin-workflow-actions.component';
WorkflowItemAdminWorkflowActionsComponent
} from '../../actions/workflow-item/workflow-item-admin-workflow-actions.component';
@listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) @listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
@Component({ @Component({
@@ -98,7 +100,7 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
index: 0, index: 0,
injector: undefined, injector: undefined,
projectableNodes: [ projectableNodes: [
[this.badges.nativeElement], [this.badges.nativeElement],
[this.buttons.nativeElement], [this.buttons.nativeElement],
], ],
}, },

View File

@@ -1,40 +1,73 @@
import { APP_BASE_HREF, CommonModule, DOCUMENT, } from '@angular/common'; import {
import { HTTP_INTERCEPTORS, HttpClientModule, } from '@angular/common/http'; APP_BASE_HREF,
import { APP_ID, NgModule } from '@angular/core'; CommonModule,
import { provideRouter, withRouterConfig, } from '@angular/router'; 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 { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core'; import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { RouterStateSerializer, StoreRouterConnectingModule, } from '@ngrx/router-store'; import {
import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS, } from '@ngrx/store'; RouterStateSerializer,
StoreRouterConnectingModule,
} from '@ngrx/router-store';
import {
MetaReducer,
StoreModule,
USER_PROVIDED_META_REDUCERS,
} from '@ngrx/store';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to'; import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
import { NgxMaskModule } from 'ngx-mask'; 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 { StoreDevModules } from '../config/store/devtools';
import { environment } from '../environments/environment'; import { environment } from '../environments/environment';
import { EagerThemesModule } from '../themes/eager-themes.module'; import { EagerThemesModule } from '../themes/eager-themes.module';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { appEffects } from './app.effects'; import { appEffects } from './app.effects';
import { appMetaReducers, debugMetaReducers, } from './app.metareducers'; import {
import { appReducers, AppState, storeModuleConfig, } from './app.reducer'; appMetaReducers,
import { APP_ROUTES, APP_ROUTING_CONF, } from './app-routes'; 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 { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
import { AuthInterceptor } from './core/auth/auth.interceptor'; import { AuthInterceptor } from './core/auth/auth.interceptor';
import { LocaleInterceptor } from './core/locale/locale.interceptor'; import { LocaleInterceptor } from './core/locale/locale.interceptor';
import { LogInterceptor } from './core/log/log.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 { ClientCookieService } from './core/services/client-cookie.service';
import { ListableModule } from './core/shared/listable.module'; import { ListableModule } from './core/shared/listable.module';
import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor'; import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
import { RootModule } from './root.module'; import { RootModule } from './root.module';
import { ThemedRootComponent } from './root/themed-root.component'; import { ThemedRootComponent } from './root/themed-root.component';
import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator'; import { AUTH_METHOD_FOR_DECORATOR_MAP } from './shared/log-in/methods/log-in.methods-decorator';
import { import { METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP } from './shared/metadata-representation/metadata-representation.decorator';
METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP
} from './shared/metadata-representation/metadata-representation.decorator';
import { import {
ADVANCED_WORKFLOW_TASK_OPTION_DECORATOR_MAP, ADVANCED_WORKFLOW_TASK_OPTION_DECORATOR_MAP,
WORKFLOW_TASK_OPTION_DECORATOR_MAP, WORKFLOW_TASK_OPTION_DECORATOR_MAP,
@@ -128,7 +161,7 @@ const PROVIDERS = [
], ],
providers: [ providers: [
...PROVIDERS, ...PROVIDERS,
{provide: APP_ID, useValue: 'dspace-angular'}, { provide: APP_ID, useValue: 'dspace-angular' },
provideCore(), provideCore(),
], ],
bootstrap: [AppComponent], bootstrap: [AppComponent],

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,15 +1,29 @@
import { Injectable } from '@angular/core'; 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 { TranslateService } from '@ngx-translate/core';
import { Observable, of as observableOf, } from 'rxjs'; import {
import { map, switchMap, } from 'rxjs/operators'; Observable,
of as observableOf,
} from 'rxjs';
import {
map,
switchMap,
} from 'rxjs/operators';
import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths'; import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service';
import { RemoteData } from '../core/data/remote-data'; import { RemoteData } from '../core/data/remote-data';
import { BrowseDefinition } from '../core/shared/browse-definition.model'; import { BrowseDefinition } from '../core/shared/browse-definition.model';
import { getFirstCompletedRemoteData } from '../core/shared/operators'; import { getFirstCompletedRemoteData } from '../core/shared/operators';
import { hasNoValue, hasValue, } from '../shared/empty.util'; import {
hasNoValue,
hasValue,
} from '../shared/empty.util';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
/** /**

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,5 +1,4 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { import {
select, select,
Store, Store,

View File

@@ -1,5 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree , import {
ActivatedRouteSnapshot,
Router,
RouterStateSnapshot,
UrlTree,
} from '@angular/router'; } from '@angular/router';
import { import {
select, select,

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; 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 { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service'; import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; 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 { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service'; import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service';

View File

@@ -1,7 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { import {
ActivatedRouteSnapshot, RouterStateSnapshot , ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model'; import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service'; import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';

View File

@@ -1,11 +1,19 @@
import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; import {
import { Observable, of as observableOf, } from 'rxjs'; 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 { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { AuthService } from '../../../auth/auth.service'; import { AuthService } from '../../../auth/auth.service';
import { DSpaceObject } from '../../../shared/dspace-object.model'; import { DSpaceObject } from '../../../shared/dspace-object.model';
import { RemoteData } from '../../remote-data';
import { AuthorizationDataService } from '../authorization-data.service';
import { FeatureID } from '../feature-id'; import { FeatureID } from '../feature-id';
import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard'; import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard';

View File

@@ -1,11 +1,19 @@
import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; import {
import { Observable, of as observableOf, } from 'rxjs'; 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 { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { AuthService } from '../../../auth/auth.service'; import { AuthService } from '../../../auth/auth.service';
import { DSpaceObject } from '../../../shared/dspace-object.model'; import { DSpaceObject } from '../../../shared/dspace-object.model';
import { RemoteData } from '../../remote-data';
import { AuthorizationDataService } from '../authorization-data.service';
import { FeatureID } from '../feature-id'; import { FeatureID } from '../feature-id';
import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard'; import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';

View File

@@ -1,13 +1,21 @@
import { ActivatedRouteSnapshot, ResolveFn, Router, RouterStateSnapshot, } from '@angular/router'; import {
import { RemoteData } from '../../remote-data'; ActivatedRouteSnapshot,
import { AuthorizationDataService } from '../authorization-data.service'; ResolveFn,
Router,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; 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 { AuthService } from '../../../auth/auth.service';
import { DSpaceObject } from '../../../shared/dspace-object.model'; import { DSpaceObject } from '../../../shared/dspace-object.model';
import { getAllSucceededRemoteDataPayload } from '../../../shared/operators'; import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
import { RemoteData } from '../../remote-data';
import { AuthorizationDataService } from '../authorization-data.service';
import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard'; import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
/** /**

View File

@@ -1,4 +1,5 @@
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
UrlTree, UrlTree,

View File

@@ -1,4 +1,5 @@
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
UrlTree, UrlTree,
@@ -7,6 +8,7 @@ import {
Observable, Observable,
of as observableOf, of as observableOf,
} from 'rxjs'; } from 'rxjs';
import { environment } from '../../../environments/environment'; import { environment } from '../../../environments/environment';
import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators'; import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
UrlTree, UrlTree,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,7 +1,9 @@
import { import {
Inject, Inject,
Injectable,} from '@angular/core'; Injectable,
import { ActivatedRouteSnapshot, } from '@angular/core';
import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
UrlTree, UrlTree,

View File

@@ -1,7 +1,17 @@
import { Injectable } from '@angular/core'; 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 { Observable } from 'rxjs';
import { filter, map, take, } from 'rxjs/operators'; import {
filter,
map,
take,
} from 'rxjs/operators';
import { getPageInternalServerErrorRoute } from '../../app-routing-paths'; import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
import { RootDataService } from '../data/root-data.service'; import { RootDataService } from '../data/root-data.service';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -5,27 +5,45 @@
* *
* http://www.dspace.org/license/ * http://www.dspace.org/license/
*/ */
import { select, Store } from '@ngrx/store'; import {
import { CheckAuthenticationTokenAction } from './core/auth/auth.actions'; APP_INITIALIZER,
import { CorrelationIdService } from './correlation-id/correlation-id.service'; Inject,
import { APP_INITIALIZER, Inject, makeStateKey, Provider, TransferState, Type } from '@angular/core'; makeStateKey,
import { APP_CONFIG, APP_DATA_SERVICES_MAP, AppConfig, } from '../config/app-config.interface'; 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 { environment } from '../environments/environment';
import { AppState } from './app.reducer'; import { AppState } from './app.reducer';
import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service'; import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
import { isAuthenticationBlocking } from './core/auth/selectors'; import { isAuthenticationBlocking } from './core/auth/selectors';
import { LAZY_DATA_SERVICES } from './core/data-services-map'; import { LAZY_DATA_SERVICES } from './core/data-services-map';
import { LocaleService } from './core/locale/locale.service'; import { LocaleService } from './core/locale/locale.service';
import { MetadataService } from './core/metadata/metadata.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 { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn';
import { MenuService } from './shared/menu/menu.service'; import { MenuService } from './shared/menu/menu.service';
import { ThemeService } from './shared/theme-support/theme.service'; import { ThemeService } from './shared/theme-support/theme.service';
import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider'; 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';
/** /**

View File

@@ -10,7 +10,12 @@ import {
waitForAsync, waitForAsync,
} from '@angular/core/testing'; } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { ActivatedRoute, ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, UrlTree , import {
ActivatedRoute,
ActivatedRouteSnapshot,
RouterModule,
RouterStateSnapshot,
UrlTree,
} from '@angular/router'; } from '@angular/router';
import { import {
TranslateLoader, TranslateLoader,

View File

@@ -1,15 +1,39 @@
import { AsyncPipe, NgClass, NgForOf, NgIf, } from '@angular/common'; import {
import { ChangeDetectionStrategy, Component, Injector, OnInit, } from '@angular/core'; AsyncPipe,
import { ActivatedRoute, CanActivateFn, Route, Router, RouterLink, RouterOutlet, } from '@angular/router'; 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 { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core'; 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 { map } from 'rxjs/operators';
import { fadeIn, fadeInOut } from '../../shared/animations/fade';
import { RemoteData } from '../../core/data/remote-data'; import { RemoteData } from '../../core/data/remote-data';
import { GenericConstructor } from '../../core/shared/generic-constructor'; import { GenericConstructor } from '../../core/shared/generic-constructor';
import { Item } from '../../core/shared/item.model'; import { Item } from '../../core/shared/item.model';
import {
fadeIn,
fadeInOut,
} from '../../shared/animations/fade';
import { isNotEmpty } from '../../shared/empty.util'; import { isNotEmpty } from '../../shared/empty.util';
import { getItemPageRoute } from '../item-page-routing-paths'; import { getItemPageRoute } from '../item-page-routing-paths';
@@ -67,7 +91,7 @@ export class EditItemPageComponent implements OnInit {
enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<{ enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<{
canActivate: CanActivateFn; canActivate: CanActivateFn;
}>) => { }>) => {
const guard: { const guard: {
canActivate: CanActivateFn; canActivate: CanActivateFn;
} = this.injector.get<{ } = this.injector.get<{
canActivate: CanActivateFn; canActivate: CanActivateFn;

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';

View File

@@ -1,8 +1,20 @@
import { Injectable } from '@angular/core'; 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 { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { combineLatest, combineLatest as observableCombineLatest, Observable, } from 'rxjs'; import {
import { filter, find, map, take, } from 'rxjs/operators'; 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 { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
import { BrowseService } from './core/browse/browse.service'; 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 { BrowseDefinition } from './core/shared/browse-definition.model';
import { ConfigurationProperty } from './core/shared/configuration-property.model'; import { ConfigurationProperty } from './core/shared/configuration-property.model';
import { getFirstCompletedRemoteData } from './core/shared/operators'; import { getFirstCompletedRemoteData } from './core/shared/operators';
import { import { ThemedCreateCollectionParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
ThemedCreateCollectionParentSelectorComponent import { ThemedCreateCommunityParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; import { ThemedCreateItemParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
import { import { ThemedEditCollectionSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
ThemedCreateCommunityParentSelectorComponent import { ThemedEditCommunitySelectorComponent } from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; import { ThemedEditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
import { import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
ThemedCreateItemParentSelectorComponent import { ExportMetadataSelectorComponent } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
} 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 { hasValue } from './shared/empty.util';
import { MenuService } from './shared/menu/menu.service'; import { MenuService } from './shared/menu/menu.service';
import { MenuID } from './shared/menu/menu-id.model'; import { MenuID } from './shared/menu/menu-id.model';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
NavigationExtras, NavigationExtras,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
/** /**
* Interface for the route parameters. * Interface for the route parameters.

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
/** /**
* Interface for the route parameters. * Interface for the route parameters.

View File

@@ -1,5 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
Router,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
/** /**
* Interface for the route parameters. * Interface for the route parameters.

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
/** /**
* Interface for the route parameters. * Interface for the route parameters.

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
Router,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import {ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
CanActivate, ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -11,7 +11,8 @@ import {
} from '@angular/core'; } from '@angular/core';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { import {
EventType, NavigationEnd, EventType,
NavigationEnd,
Router, Router,
RouterLink, RouterLink,
RouterLinkActive, RouterLinkActive,

View File

@@ -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 { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
import { ContextHelpService } from './context-help.service'; import { ContextHelpService } from './context-help.service';

View File

@@ -1,9 +1,19 @@
import { Injectable } from '@angular/core'; 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 { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { combineLatest, Observable, of as observableOf, } from 'rxjs'; import {
import { map, switchMap, } from 'rxjs/operators'; combineLatest,
Observable,
of as observableOf,
} from 'rxjs';
import {
map,
switchMap,
} from 'rxjs/operators';
import { getDSORoute } from '../../app-routing-paths'; import { getDSORoute } from '../../app-routing-paths';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; 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 { Collection } from '../../core/shared/collection.model';
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { Item } from '../../core/shared/item.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 { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
import { URLCombiner } from '../../core/url-combiner/url-combiner'; 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 { MenuService } from '../menu/menu.service';
import { MenuID } from '../menu/menu-id.model'; import { MenuID } from '../menu/menu-id.model';
import { LinkMenuItemModel } from '../menu/menu-item/models/link.model'; import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';

View File

@@ -1,6 +1,17 @@
// Load the implementations that should be tested // Load the implementations that should be tested
import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, } from '@angular/core'; import {
import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing'; 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 { By } from '@angular/platform-browser';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';

View File

@@ -1,7 +1,26 @@
import { AsyncPipe, NgClass, NgForOf, NgIf, } from '@angular/common'; import {
import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, } from '@angular/core'; AsyncPipe,
import { NgbTooltip, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap'; NgClass,
import { TranslateModule, TranslateService, } from '@ngx-translate/core'; 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 isObject from 'lodash/isObject';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';

View File

@@ -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 { Context } from '../../core/shared/context.model';
import { GenericConstructor } from '../../core/shared/generic-constructor'; 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 { import {
MetadataRepresentation, MetadataRepresentation,
MetadataRepresentationType MetadataRepresentationType,
} from '../../core/shared/metadata-representation/metadata-representation.model'; } from '../../core/shared/metadata-representation/metadata-representation.model';
import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component'; 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({ @Component({
selector: 'ds-metadata-representation-loader', selector: 'ds-metadata-representation-loader',

View File

@@ -1,7 +1,9 @@
import { import {
Injectable, Injectable,
Injector,} from '@angular/core'; Injector,
import { ActivatedRouteSnapshot, } from '@angular/core';
import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
Router, Router,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';

View File

@@ -19,10 +19,19 @@ import {
of as observableOf, of as observableOf,
Subscription, Subscription,
} from 'rxjs'; } 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 { 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 { BASE_THEME_NAME } from './theme.constants';
import { ThemeService } from './theme.service'; import { ThemeService } from './theme.service';

View File

@@ -1,5 +1,12 @@
import { NgForOf, NgIf, } from '@angular/common'; import {
import { Component, Input, OnInit, } from '@angular/core'; NgForOf,
NgIf,
} from '@angular/common';
import {
Component,
Input,
OnInit,
} from '@angular/core';
import { find } from 'rxjs/operators'; import { find } from 'rxjs/operators';
import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';

View File

@@ -1,5 +1,8 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, RouterStateSnapshot, } from '@angular/router'; import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { find } from 'rxjs/operators'; import { find } from 'rxjs/operators';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Item } from '../core/shared/item.model'; import { Item } from '../core/shared/item.model';
import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service'; import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { Item } from '../core/shared/item.model'; import { Item } from '../core/shared/item.model';
import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver'; import { SubmissionObjectResolver } from '../core/submission/resolver/submission-object.resolver';
import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service'; import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';

View File

@@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, import {
ActivatedRouteSnapshot,
RouterStateSnapshot, RouterStateSnapshot,
} from '@angular/router'; } from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';

View File

@@ -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 { DynamicFormControl } from '@ng-dynamic-forms/core/lib/component/dynamic-form-control-interface';
import { import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
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 { HALDataService } from '../app/core/data/base/hal-data-service.interface';
import { ActuatorsConfig } from './actuators.config'; 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 { AuthConfig } from './auth-config.interfaces';
import { BrowseByConfig } from './browse-by-config.interface'; import { BrowseByConfig } from './browse-by-config.interface';
import { BundleConfig } from './bundle-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 { CommunityListConfig } from './community-list-config.interface';
import { CommunityPageConfig } from './community-page-config.interface'; import { CommunityPageConfig } from './community-page-config.interface';
import { Config } from './config.interface';
import { DiscoverySortConfig } from './discovery-sort.config'; import { DiscoverySortConfig } from './discovery-sort.config';
import { FilterVocabularyConfig } from './filter-vocabulary-config'; import { FilterVocabularyConfig } from './filter-vocabulary-config';
import { FormConfig } from './form-config.interfaces';
import { HomeConfig } from './homepage-config.interface'; import { HomeConfig } from './homepage-config.interface';
import { InfoConfig } from './info-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 { MarkdownConfig } from './markdown-config.interface';
import { MediaViewerConfig } from './media-viewer-config.interface'; import { MediaViewerConfig } from './media-viewer-config.interface';
import { INotificationBoardOptions } from './notifications-config.interfaces';
import { QualityAssuranceConfig } from './quality-assurance.config'; import { QualityAssuranceConfig } from './quality-assurance.config';
import { SearchConfig } from './search-page-config.interface'; 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 { SuggestionConfig } from './suggestion-config.interfaces';
import { ThemeConfig } from './theme.config';
import { UIServerConfig } from './ui-server-config.interface'; import { UIServerConfig } from './ui-server-config.interface';
interface AppConfig extends Config { interface AppConfig extends Config {

View File

@@ -1,12 +1,30 @@
import { HttpClient, HttpClientModule, } from '@angular/common/http'; import {
import { APP_ID, makeStateKey, NgModule, TransferState } from '@angular/core'; HttpClient,
HttpClientModule,
} from '@angular/common/http';
import {
APP_ID,
makeStateKey,
NgModule,
TransferState,
} from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { EffectsModule } from '@ngrx/effects'; 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 { REQUEST } from '@nguniversal/express-engine/tokens';
import { MissingTranslationHandler, TranslateLoader, TranslateModule, } from '@ngx-translate/core'; import {
import { Angulartics2GoogleTagManager, Angulartics2RouterlessModule, } from 'angulartics2'; MissingTranslationHandler,
import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; TranslateLoader,
TranslateModule,
} from '@ngx-translate/core';
import {
Angulartics2GoogleTagManager,
Angulartics2RouterlessModule,
} from 'angulartics2';
import { AppComponent } from '../../app/app.component'; import { AppComponent } from '../../app/app.component';
import { AppModule } from '../../app/app.module'; 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 { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper';
import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service'; import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
import { SubmissionService } from '../../app/submission/submission.service'; import { SubmissionService } from '../../app/submission/submission.service';
import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
import { BrowserInitService } from './browser-init.service'; import { BrowserInitService } from './browser-init.service';
export const REQ_KEY = makeStateKey<string>('req'); export const REQ_KEY = makeStateKey<string>('req');
@@ -67,7 +86,7 @@ export function getRequest(transferState: TransferState): any {
], ],
providers: [ providers: [
...BrowserInitService.providers(), ...BrowserInitService.providers(),
{provide: APP_ID, useValue: 'dspace-angular'}, { provide: APP_ID, useValue: 'dspace-angular' },
{ {
provide: REQUEST, provide: REQUEST,
useFactory: getRequest, useFactory: getRequest,

View File

@@ -8,8 +8,8 @@
import { import {
Inject, Inject,
Injectable, Injectable,
TransferState,
} from '@angular/core'; } from '@angular/core';
import { TransferState } from '@angular/core';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { import {

View File

@@ -1,13 +1,30 @@
import { XhrFactory } from '@angular/common'; import { XhrFactory } from '@angular/common';
import { HTTP_INTERCEPTORS } from '@angular/common/http'; 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 { 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 { EffectsModule } from '@ngrx/effects';
import { Action, StoreConfig, StoreModule, } from '@ngrx/store'; import {
import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; Action,
StoreConfig,
import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag, } from 'angulartics2'; StoreModule,
} from '@ngrx/store';
import {
TranslateLoader,
TranslateModule,
} from '@ngx-translate/core';
import {
Angulartics2,
Angulartics2GoogleAnalytics,
Angulartics2GoogleGlobalSiteTag,
} from 'angulartics2';
import { AppComponent } from '../../app/app.component'; import { AppComponent } from '../../app/app.component';
import { AppModule } from '../../app/app.module'; import { AppModule } from '../../app/app.module';
@@ -60,7 +77,7 @@ export function createTranslateLoader(transferState: TransferState) {
], ],
providers: [ providers: [
...ServerInitService.providers(), ...ServerInitService.providers(),
{provide: APP_ID, useValue: 'dspace-angular'}, { provide: APP_ID, useValue: 'dspace-angular' },
{ {
provide: Angulartics2, provide: Angulartics2,
useClass: Angulartics2Mock, useClass: Angulartics2Mock,

View File

@@ -5,7 +5,10 @@
* *
* http://www.dspace.org/license/ * http://www.dspace.org/license/
*/ */
import { Inject, Injectable, } from '@angular/core'; import {
Inject,
Injectable,
} from '@angular/core';
import { TransferState } from '@angular/platform-browser'; import { TransferState } from '@angular/platform-browser';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core'; 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 { MenuService } from '../../app/shared/menu/menu.service';
import { ThemeService } from '../../app/shared/theme-support/theme.service'; import { ThemeService } from '../../app/shared/theme-support/theme.service';
import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider'; 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'; import { environment } from '../../environments/environment';
/** /**

View File

@@ -1,9 +1,15 @@
import { TransferState } from '@angular/platform-browser'; import { TransferState } from '@angular/platform-browser';
import { TranslateLoader } from '@ngx-translate/core'; import { TranslateLoader } from '@ngx-translate/core';
import { readFileSync } from 'fs'; 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 * A TranslateLoader for ngx-translate to parse json5 files server-side, and store them in the

View File

@@ -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 { 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 { BrowseByTitleComponent } from './app/browse-by/browse-by-title/browse-by-title.component';
import { CollectionPageComponent } from './app/collection-page/collection-page.component'; import { CollectionPageComponent } from './app/collection-page/collection-page.component';
import { import { EditItemTemplatePageComponent } from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
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 { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component'; import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component';
import { CommunityPageComponent } from './app/community-page/community-page.component'; import { CommunityPageComponent } from './app/community-page/community-page.component';
import { import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
CommunityPageSubCollectionListComponent import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
} 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 { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
import { ForbiddenComponent } from './app/forbidden/forbidden.component'; import { ForbiddenComponent } from './app/forbidden/forbidden.component';
import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.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 { PrivacyComponent } from './app/info/privacy/privacy.component';
import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.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 { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
import { import { FullFileSectionComponent } from './app/item-page/full/field-components/file-section/full-file-section.component';
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 { FullItemPageComponent } from './app/item-page/full/full-item-page.component';
import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component'; import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component';
import { import { MediaViewerImageComponent } from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
MediaViewerImageComponent import { MediaViewerVideoComponent } from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
} 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 { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
import { import { ItemPageTitleFieldComponent } from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
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 { ItemPageComponent } from './app/item-page/simple/item-page.component';
import { import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
MetadataRepresentationListComponent
} from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
import { LoginPageComponent } from './app/login-page/login-page.component'; import { LoginPageComponent } from './app/login-page/login-page.component';
import { LogoutPageComponent } from './app/logout-page/logout-page.component'; import { LogoutPageComponent } from './app/logout-page/logout-page.component';
import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component'; import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component'; import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
import { import { ExpandableNavbarSectionComponent } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
ExpandableNavbarSectionComponent
} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component'; import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
import { ProfilePageComponent } from './app/profile-page/profile-page.component'; import { ProfilePageComponent } from './app/profile-page/profile-page.component';
import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.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 { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-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 { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
import { import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
DsDynamicLookupRelationExternalSourceTabComponent 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';
} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-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 { LoadingComponent } from './app/shared/loading/loading.component';
import { import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
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 { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
import { import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
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 { 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 { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
import { ObjectListComponent } from './app/shared/object-list/object-list.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 { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component'; import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
import { SearchFormComponent } from './app/shared/search-form/search-form.component'; import { SearchFormComponent } from './app/shared/search-form/search-form.component';
import { import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
CollectionStatisticsPageComponent import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
} 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 { 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 { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component'; import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
import { import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
SubmissionImportExternalComponent import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component';
} 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 { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
import { ThumbnailComponent } from './app/thumbnail/thumbnail.component'; import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
import { import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
WorkflowItemDeleteComponent import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component'; import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-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 = [ const DECLARATIONS = [
FileSectionComponent, FileSectionComponent,