[DURACOM-191] remove SharedModule

This commit is contained in:
Andrea Barbasso
2024-01-09 09:23:20 +01:00
parent 031e12f76b
commit ac366bcc54
109 changed files with 271 additions and 755 deletions

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { SharedModule } from '../shared/shared.module';
import { AccessControlRoutingModule } from './access-control-routing.module'; import { AccessControlRoutingModule } from './access-control-routing.module';
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component'; import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component'; import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
@@ -30,7 +29,6 @@ export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
RouterModule, RouterModule,
AccessControlRoutingModule, AccessControlRoutingModule,
FormModule, FormModule,

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CoreModule } from '../../core/core.module'; import { CoreModule } from '../../core/core.module';
import { SharedModule } from '../../shared/shared.module';
import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module'; import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component'; import { AdminQualityAssuranceTopicsPageComponent } from './admin-quality-assurance-topics-page/admin-quality-assurance-topics-page.component';
import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component'; import { AdminQualityAssuranceEventsPageComponent } from './admin-quality-assurance-events-page/admin-quality-assurance-events-page.component';
@@ -11,7 +10,6 @@ import {NotificationsModule} from '../../notifications/notifications.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
CoreModule.forRoot(), CoreModule.forRoot(),
AdminNotificationsRoutingModule, AdminNotificationsRoutingModule,
NotificationsModule, NotificationsModule,

View File

@@ -4,7 +4,6 @@ import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component'; import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { SharedModule } from '../../shared/shared.module';
import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component'; import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component'; import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module'; import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
@@ -13,7 +12,6 @@ import { FormModule } from '../../shared/form/form.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
RouterModule, RouterModule,
BitstreamFormatsModule, BitstreamFormatsModule,
AdminRegistriesRoutingModule, AdminRegistriesRoutingModule,

View File

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { BitstreamFormatsComponent } from './bitstream-formats.component'; import { BitstreamFormatsComponent } from './bitstream-formats.component';
import { SharedModule } from '../../../shared/shared.module';
import { FormatFormComponent } from './format-form/format-form.component'; import { FormatFormComponent } from './format-form/format-form.component';
import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component'; import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module'; import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
@@ -12,7 +11,6 @@ import { FormModule } from '../../../shared/form/form.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
RouterModule, RouterModule,
BitstreamFormatsRoutingModule, BitstreamFormatsRoutingModule,
FormModule, FormModule,

View File

@@ -2,7 +2,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
import { SharedModule } from '../../../../../shared/shared.module';
import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component'; import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
@@ -47,7 +46,6 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
NoopAnimationsModule, NoopAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
SharedModule,
CollectionAdminSearchResultGridElementComponent CollectionAdminSearchResultGridElementComponent
], ],
providers: [ providers: [

View File

@@ -5,7 +5,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
import { SharedModule } from '../../../../../shared/shared.module';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model';
@@ -49,7 +48,6 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
NoopAnimationsModule, NoopAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
SharedModule,
CommunityAdminSearchResultGridElementComponent CommunityAdminSearchResultGridElementComponent
], ],
providers: [ providers: [

View File

@@ -8,7 +8,6 @@ import { RemoteData } from '../../../../../core/data/remote-data';
import { Bitstream } from '../../../../../core/shared/bitstream.model'; import { Bitstream } from '../../../../../core/shared/bitstream.model';
import { Item } from '../../../../../core/shared/item.model'; import { Item } from '../../../../../core/shared/item.model';
import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
import { SharedModule } from '../../../../../shared/shared.module';
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model';
@@ -62,7 +61,6 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
NoopAnimationsModule, NoopAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
SharedModule,
ItemAdminSearchResultGridElementComponent ItemAdminSearchResultGridElementComponent
], ],
providers: [ providers: [

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { AdminSearchPageComponent } from './admin-search-page.component'; import { AdminSearchPageComponent } from './admin-search-page.component';
import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component'; import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component'; import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
@@ -26,7 +25,6 @@ const ENTRY_COMPONENTS = [
@NgModule({ @NgModule({
imports: [ imports: [
SearchModule, SearchModule,
SharedModule.withEntryComponents(),
JournalEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(),
AdminSearchPageComponent, AdminSearchPageComponent,
@@ -40,7 +38,7 @@ export class AdminSearchModule {
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {
ngModule: SharedModule, ngModule: AdminSearchModule,
providers: ENTRY_COMPONENTS.map((component) => ({provide: component})) providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
}; };
} }

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { import {
WorkflowItemSearchResultAdminWorkflowGridElementComponent WorkflowItemSearchResultAdminWorkflowGridElementComponent
} from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component'; } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
@@ -39,7 +38,6 @@ const ENTRY_COMPONENTS = [
@NgModule({ @NgModule({
imports: [ imports: [
SearchModule, SearchModule,
SharedModule.withEntryComponents(),
AdminWorkflowPageComponent, AdminWorkflowPageComponent,
SupervisionOrderGroupSelectorComponent, SupervisionOrderGroupSelectorComponent,
SupervisionOrderStatusComponent, SupervisionOrderStatusComponent,
@@ -58,7 +56,7 @@ export class AdminWorkflowModuleModule {
*/ */
static withEntryComponents() { static withEntryComponents() {
return { return {
ngModule: SharedModule, ngModule: AdminWorkflowModuleModule,
providers: ENTRY_COMPONENTS.map((component) => ({provide: component})) providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
}; };
} }

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { AccessControlModule } from '../access-control/access-control.module'; import { AccessControlModule } from '../access-control/access-control.module';
import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component'; import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
import { AdminRegistriesModule } from './admin-registries/admin-registries.module'; import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
@@ -27,7 +26,6 @@ const ENTRY_COMPONENTS = [
AccessControlModule, AccessControlModule,
AdminSearchModule.withEntryComponents(), AdminSearchModule.withEntryComponents(),
AdminWorkflowModuleModule.withEntryComponents(), AdminWorkflowModuleModule.withEntryComponents(),
SharedModule,
UiSwitchModule, UiSwitchModule,
UploadModule, UploadModule,
AdminCurationTasksComponent, AdminCurationTasksComponent,

View File

@@ -19,7 +19,6 @@ import { appReducers, AppState, storeModuleConfig } from './app.reducer';
import { ClientCookieService } from './core/services/client-cookie.service'; import { ClientCookieService } from './core/services/client-cookie.service';
import { NavbarModule } from './navbar/navbar.module'; import { NavbarModule } from './navbar/navbar.module';
import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer'; import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
import { SharedModule } from './shared/shared.module';
import { environment } from '../environments/environment'; import { environment } from '../environments/environment';
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';
@@ -31,6 +30,7 @@ import { StoreDevModules } from '../config/store/devtools';
import { RootModule } from './root.module'; import { RootModule } from './root.module';
import { models, provideCore } from './core/provide-core'; import { models, provideCore } from './core/provide-core';
import { ThemedRootComponent } from './root/themed-root.component'; import { ThemedRootComponent } from './root/themed-root.component';
import { listableObjects } from './core/provide-listable-objects';
export function getConfig() { export function getConfig() {
return environment; return environment;
@@ -48,7 +48,6 @@ export function getMetaReducers(appConfig: AppConfig): MetaReducer<AppState>[] {
const IMPORTS = [ const IMPORTS = [
CommonModule, CommonModule,
SharedModule,
NavbarModule, NavbarModule,
HttpClientModule, HttpClientModule,
AppRoutingModule, AppRoutingModule,
@@ -127,4 +126,5 @@ export class AppModule {
/* Use models object so all decorators are actually called */ /* Use models object so all decorators are actually called */
modelList = models; modelList = models;
listableObjects = listableObjects;
} }

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component'; import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
import { BitstreamPageRoutingModule } from './bitstream-page-routing.module'; import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component'; import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
@@ -15,7 +14,6 @@ import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-e
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
BitstreamPageRoutingModule, BitstreamPageRoutingModule,
FormModule, FormModule,
ResourcePoliciesModule, ResourcePoliciesModule,

View File

@@ -14,7 +14,6 @@ import { ThemedBrowseByTaxonomyPageComponent } from './browse-by-taxonomy-page/t
import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module'; import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
import { DsoPageModule } from '../shared/dso-page/dso-page.module'; import { DsoPageModule } from '../shared/dso-page/dso-page.module';
import { FormModule } from '../shared/form/form.module'; import { FormModule } from '../shared/form/form.module';
import { SharedModule } from '../shared/shared.module';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator // put only entry components that use custom decorator
@@ -38,7 +37,6 @@ const ENTRY_COMPONENTS = [
FormModule, FormModule,
BrowseBySwitcherComponent, BrowseBySwitcherComponent,
ThemedBrowseBySwitcherComponent, ThemedBrowseBySwitcherComponent,
SharedModule,
...ENTRY_COMPONENTS ...ENTRY_COMPONENTS
], ],
exports: [ exports: [

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CollectionFormComponent } from './collection-form.component'; import { CollectionFormComponent } from './collection-form.component';
import { SharedModule } from '../../shared/shared.module';
import { ComcolModule } from '../../shared/comcol/comcol.module'; import { ComcolModule } from '../../shared/comcol/comcol.module';
import { FormModule } from '../../shared/form/form.module'; import { FormModule } from '../../shared/form/form.module';
@@ -9,7 +8,6 @@ import { FormModule } from '../../shared/form/form.module';
imports: [ imports: [
ComcolModule, ComcolModule,
FormModule, FormModule,
SharedModule,
CollectionFormComponent CollectionFormComponent
], ],
exports: [ exports: [

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { CollectionPageComponent } from './collection-page.component'; import { CollectionPageComponent } from './collection-page.component';
import { CollectionPageRoutingModule } from './collection-page-routing.module'; import { CollectionPageRoutingModule } from './collection-page-routing.module';
@@ -22,7 +21,6 @@ import { DsoPageModule } from '../shared/dso-page/dso-page.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
CollectionPageRoutingModule, CollectionPageRoutingModule,
StatisticsModule.forRoot(), StatisticsModule.forRoot(),
EditItemPageModule, EditItemPageModule,

View File

@@ -5,7 +5,6 @@ import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { RouteService } from '../../core/services/route.service'; import { RouteService } from '../../core/services/route.service';
import { SharedModule } from '../../shared/shared.module';
import { CollectionDataService } from '../../core/data/collection-data.service'; import { CollectionDataService } from '../../core/data/collection-data.service';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
@@ -25,7 +24,7 @@ describe('CreateCollectionPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
return TestBed.configureTestingModule({ return TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, CreateCollectionPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, CreateCollectionPageComponent],
providers: [ providers: [
{ provide: DSONameService, useValue: new DSONameServiceMock() }, { provide: DSONameService, useValue: new DSONameServiceMock() },
{ provide: CollectionDataService, useValue: {} }, { provide: CollectionDataService, useValue: {} },

View File

@@ -4,7 +4,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../shared/notifications/notifications.service';
import { DeleteCollectionPageComponent } from './delete-collection-page.component'; import { DeleteCollectionPageComponent } from './delete-collection-page.component';
@@ -19,7 +18,7 @@ describe('DeleteCollectionPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, DeleteCollectionPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, DeleteCollectionPageComponent],
providers: [ providers: [
{ provide: DSONameService, useValue: new DSONameServiceMock() }, { provide: DSONameService, useValue: new DSONameServiceMock() },
{ provide: CollectionDataService, useValue: {} }, { provide: CollectionDataService, useValue: {} },

View File

@@ -1,6 +1,5 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { CollectionDataService } from '../../../core/data/collection-data.service'; import { CollectionDataService } from '../../../core/data/collection-data.service';
@@ -63,7 +62,7 @@ describe('CollectionMetadataComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, CollectionMetadataComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, CollectionMetadataComponent],
providers: [ providers: [
{ provide: CollectionDataService, useValue: {} }, { provide: CollectionDataService, useValue: {} },
{ provide: ItemTemplateDataService, useValue: itemTemplateServiceStub }, { provide: ItemTemplateDataService, useValue: itemTemplateServiceStub },

View File

@@ -6,7 +6,6 @@ import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { CollectionRolesComponent } from './collection-roles.component'; import { CollectionRolesComponent } from './collection-roles.component';
import { Collection } from '../../../core/shared/collection.model'; import { Collection } from '../../../core/shared/collection.model';
import { SharedModule } from '../../../shared/shared.module';
import { GroupDataService } from '../../../core/eperson/group-data.service'; import { GroupDataService } from '../../../core/eperson/group-data.service';
import { RequestService } from '../../../core/data/request.service'; import { RequestService } from '../../../core/data/request.service';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
@@ -71,7 +70,6 @@ describe('CollectionRolesComponent', () => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
ComcolModule, ComcolModule,
SharedModule,
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
TranslateModule.forRoot(), TranslateModule.forRoot(),
NoopAnimationsModule, NoopAnimationsModule,

View File

@@ -5,7 +5,6 @@ import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { EditCollectionPageComponent } from './edit-collection-page.component'; import { EditCollectionPageComponent } from './edit-collection-page.component';
import { SharedModule } from '../../shared/shared.module';
import { CollectionDataService } from '../../core/data/collection-data.service'; import { CollectionDataService } from '../../core/data/collection-data.service';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
@@ -38,7 +37,7 @@ describe('EditCollectionPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, EditCollectionPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, EditCollectionPageComponent],
providers: [ providers: [
{ provide: CollectionDataService, useValue: {} }, { provide: CollectionDataService, useValue: {} },
{ provide: ActivatedRoute, useValue: routeStub }, { provide: ActivatedRoute, useValue: routeStub },

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { EditCollectionPageComponent } from './edit-collection-page.component'; import { EditCollectionPageComponent } from './edit-collection-page.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../../shared/shared.module';
import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module'; import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component'; import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
import { CollectionRolesComponent } from './collection-roles/collection-roles.component'; import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
@@ -24,7 +23,6 @@ import { AccessControlFormModule } from '../../shared/access-control-form-contai
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
EditCollectionPageRoutingModule, EditCollectionPageRoutingModule,
CollectionFormModule, CollectionFormModule,
ResourcePoliciesModule, ResourcePoliciesModule,

View File

@@ -1,7 +1,6 @@
import { EditItemTemplatePageComponent } from './edit-item-template-page.component'; import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared/shared.module';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ItemTemplateDataService } from '../../core/data/item-template-data.service'; import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
@@ -32,7 +31,7 @@ describe('EditItemTemplatePageComponent', () => {
findByCollectionID: createSuccessfulRemoteDataObject$({}) findByCollectionID: createSuccessfulRemoteDataObject$({})
}); });
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, EditItemTemplatePageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, EditItemTemplatePageComponent],
providers: [ providers: [
{ provide: ItemTemplateDataService, useValue: itemTemplateService }, { provide: ItemTemplateDataService, useValue: itemTemplateService },
{ provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } }, { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },

View File

@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { CommunityListPageComponent } from './community-list-page.component'; import { CommunityListPageComponent } from './community-list-page.component';
import { CommunityListPageRoutingModule } from './community-list-page.routing.module'; import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
import { CommunityListComponent } from './community-list/community-list.component'; import { CommunityListComponent } from './community-list/community-list.component';
@@ -21,7 +20,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
CommunityListPageRoutingModule, CommunityListPageRoutingModule,
CdkTreeModule, CdkTreeModule,
...DECLARATIONS ...DECLARATIONS

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommunityFormComponent } from './community-form.component'; import { CommunityFormComponent } from './community-form.component';
import { SharedModule } from '../../shared/shared.module';
import { ComcolModule } from '../../shared/comcol/comcol.module'; import { ComcolModule } from '../../shared/comcol/comcol.module';
import { FormModule } from '../../shared/form/form.module'; import { FormModule } from '../../shared/form/form.module';
@@ -9,7 +8,6 @@ import { FormModule } from '../../shared/form/form.module';
imports: [ imports: [
ComcolModule, ComcolModule,
FormModule, FormModule,
SharedModule,
CommunityFormComponent CommunityFormComponent
], ],
exports: [ exports: [

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { CommunityPageComponent } from './community-page.component'; import { CommunityPageComponent } from './community-page.component';
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component'; import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
@@ -33,7 +32,6 @@ const DECLARATIONS = [CommunityPageComponent,
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
CommunityPageRoutingModule, CommunityPageRoutingModule,
StatisticsModule.forRoot(), StatisticsModule.forRoot(),
CommunityFormModule, CommunityFormModule,

View File

@@ -5,7 +5,6 @@ import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { RouteService } from '../../core/services/route.service'; import { RouteService } from '../../core/services/route.service';
import { SharedModule } from '../../shared/shared.module';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
import { CreateCommunityPageComponent } from './create-community-page.component'; import { CreateCommunityPageComponent } from './create-community-page.component';
@@ -22,7 +21,7 @@ describe('CreateCommunityPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, CreateCommunityPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, CreateCommunityPageComponent],
providers: [ providers: [
{ provide: CommunityDataService, useValue: { findById: () => observableOf({}) } }, { provide: CommunityDataService, useValue: { findById: () => observableOf({}) } },
{ provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } }, { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },

View File

@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
import { NotificationsService } from '../../shared/notifications/notifications.service'; import { NotificationsService } from '../../shared/notifications/notifications.service';
import { SharedModule } from '../../shared/shared.module';
import { DeleteCommunityPageComponent } from './delete-community-page.component'; import { DeleteCommunityPageComponent } from './delete-community-page.component';
import { RequestService } from '../../core/data/request.service'; import { RequestService } from '../../core/data/request.service';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
@@ -19,7 +18,7 @@ describe('DeleteCommunityPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, DeleteCommunityPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, DeleteCommunityPageComponent],
providers: [ providers: [
{ provide: DSONameService, useValue: new DSONameServiceMock() }, { provide: DSONameService, useValue: new DSONameServiceMock() },
{ provide: CommunityDataService, useValue: {} }, { provide: CommunityDataService, useValue: {} },

View File

@@ -1,6 +1,5 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
@@ -18,7 +17,7 @@ describe('CommunityMetadataComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, CommunityMetadataComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, CommunityMetadataComponent],
providers: [ providers: [
{ provide: CommunityDataService, useValue: {} }, { provide: CommunityDataService, useValue: {} },
{ provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } }, { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },

View File

@@ -8,7 +8,6 @@ import { Community } from '../../../core/shared/community.model';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { RequestService } from '../../../core/data/request.service'; import { RequestService } from '../../../core/data/request.service';
import { GroupDataService } from '../../../core/eperson/group-data.service'; import { GroupDataService } from '../../../core/eperson/group-data.service';
import { SharedModule } from '../../../shared/shared.module';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -56,7 +55,6 @@ describe('CommunityRolesComponent', () => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
ComcolModule, ComcolModule,
SharedModule,
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
TranslateModule.forRoot(), TranslateModule.forRoot(),
NoopAnimationsModule, NoopAnimationsModule,

View File

@@ -4,7 +4,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { EditCommunityPageComponent } from './edit-community-page.component'; import { EditCommunityPageComponent } from './edit-community-page.component';
import { CommunityDataService } from '../../core/data/community-data.service'; import { CommunityDataService } from '../../core/data/community-data.service';
@@ -38,7 +37,7 @@ describe('EditCommunityPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule, EditCommunityPageComponent], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule, EditCommunityPageComponent],
providers: [ providers: [
{ provide: CommunityDataService, useValue: {} }, { provide: CommunityDataService, useValue: {} },
{ provide: ActivatedRoute, useValue: routeStub }, { provide: ActivatedRoute, useValue: routeStub },

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../../shared/shared.module';
import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module'; import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
import { EditCommunityPageComponent } from './edit-community-page.component'; import { EditCommunityPageComponent } from './edit-community-page.component';
import { CommunityCurateComponent } from './community-curate/community-curate.component'; import { CommunityCurateComponent } from './community-curate/community-curate.component';
@@ -21,7 +20,6 @@ import {
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
EditCommunityPageRoutingModule, EditCommunityPageRoutingModule,
CommunityFormModule, CommunityFormModule,
ComcolModule, ComcolModule,

View File

@@ -9,7 +9,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component'; import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { SharedModule } from '../../shared/shared.module';
import { CollectionDataService } from '../../core/data/collection-data.service'; import { CollectionDataService } from '../../core/data/collection-data.service';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { buildPaginatedList } from '../../core/data/paginated-list.model';
@@ -149,7 +148,6 @@ describe('CommunityPageSubCollectionList Component', () => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
SharedModule,
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
NgbModule, NgbModule,
NoopAnimationsModule, NoopAnimationsModule,

View File

@@ -11,7 +11,6 @@ import { CommunityPageSubCommunityListComponent } from './community-page-sub-com
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { buildPaginatedList } from '../../core/data/paginated-list.model';
import { PageInfo } from '../../core/shared/page-info.model'; import { PageInfo } from '../../core/shared/page-info.model';
import { SharedModule } from '../../shared/shared.module';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowService } from '../../shared/host-window.service';
import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
@@ -150,7 +149,6 @@ describe('CommunityPageSubCommunityListComponent Component', () => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
SharedModule,
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
NgbModule, NgbModule,
NoopAnimationsModule, NoopAnimationsModule,

View File

@@ -0,0 +1,244 @@
import { BundleListElementComponent } from '../shared/object-list/bundle-list-element/bundle-list-element.component';
import {
CollectionListElementComponent
} from '../shared/object-list/collection-list-element/collection-list-element.component';
import {
CommunityListElementComponent
} from '../shared/object-list/community-list-element/community-list-element.component';
import {
SearchResultListElementComponent
} from '../shared/object-list/search-result-list-element/search-result-list-element.component';
import {
CommunitySearchResultListElementComponent
} from '../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
import {
CollectionSearchResultListElementComponent
} from '../shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
import {
CollectionGridElementComponent
} from '../shared/object-grid/collection-grid-element/collection-grid-element.component';
import {
CommunityGridElementComponent
} from '../shared/object-grid/community-grid-element/community-grid-element.component';
import {
CommunitySearchResultGridElementComponent
} from '../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
import {
CollectionSearchResultGridElementComponent
} from '../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
import {
SearchResultGridElementComponent
} from '../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
import {
ItemListElementComponent
} from '../shared/object-list/item-list-element/item-types/item/item-list-element.component';
import {
ItemGridElementComponent
} from '../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
import { BitstreamListItemComponent } from '../shared/object-list/bitstream-list-item/bitstream-list-item.component';
import {
ItemSearchResultListElementComponent
} from '../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
import {
ItemSearchResultGridElementComponent
} from '../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
import {
BrowseEntryListElementComponent
} from '../shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
import {
SearchResultDetailElementComponent
} from '../shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
import { StartsWithDateComponent } from '../shared/starts-with/date/starts-with-date.component';
import { StartsWithTextComponent } from '../shared/starts-with/text/starts-with-text.component';
import {
CreateCommunityParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
import {
ThemedCreateCommunityParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
import {
CreateCollectionParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
import {
ThemedCreateCollectionParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
import {
CreateItemParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
import {
ThemedCreateItemParentSelectorComponent
} from '../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
import {
EditCommunitySelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
import {
ThemedEditCommunitySelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
import {
EditCollectionSelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
import {
ThemedEditCollectionSelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
import {
EditItemSelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
import {
ThemedEditItemSelectorComponent
} from '../shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
import {
PlainTextMetadataListElementComponent
} from '../shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
import {
BrowseLinkMetadataListElementComponent
} from '../shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
import {
ItemMetadataListElementComponent
} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
import {
MetadataRepresentationListElementComponent
} from '../shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component';
import {
ItemMetadataRepresentationListElementComponent
} from '../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
import { LogInPasswordComponent } from '../shared/log-in/methods/password/log-in-password.component';
import {
LogInExternalProviderComponent
} from '../shared/log-in/methods/log-in-external-provider/log-in-external-provider.component';
import {
ClaimedTaskActionsDeclineTaskComponent
} from '../shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
import { CollectionDropdownComponent } from '../shared/collection-dropdown/collection-dropdown.component';
import { ThemedCollectionDropdownComponent } from '../shared/collection-dropdown/themed-collection-dropdown.component';
import { FileDownloadLinkComponent } from '../shared/file-download-link/file-download-link.component';
import { ThemedFileDownloadLinkComponent } from '../shared/file-download-link/themed-file-download-link.component';
import { CurationFormComponent } from '../curation-form/curation-form.component';
import {
ExportMetadataSelectorComponent
} from '../shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
import {
ImportBatchSelectorComponent
} from '../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
import {
ExportBatchSelectorComponent
} from '../shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
import { ConfirmationModalComponent } from '../shared/confirmation-modal/confirmation-modal.component';
import {
SidebarSearchListElementComponent
} from '../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
import {
PublicationSidebarSearchListElementComponent
} from '../shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
import {
CollectionSidebarSearchListElementComponent
} from '../shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
import {
CommunitySidebarSearchListElementComponent
} from '../shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
import { ScopeSelectorModalComponent } from '../shared/search-form/scope-selector-modal/scope-selector-modal.component';
import {
ListableNotificationObjectComponent
} from '../shared/object-list/listable-notification-object/listable-notification-object.component';
import {
AdvancedClaimedTaskActionSelectReviewerComponent
} from '../shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
import {
AdvancedClaimedTaskActionRatingComponent
} from '../shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
import { EpersonGroupListComponent } from '../shared/eperson-group-list/eperson-group-list.component';
import {
EpersonSearchBoxComponent
} from '../shared/eperson-group-list/eperson-search-box/eperson-search-box.component';
import { GroupSearchBoxComponent } from '../shared/eperson-group-list/group-search-box/group-search-box.component';
// export const provideCore = () => {
// console.log('provideCore');
// return makeEnvironmentProviders([
// {provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient]},
//
// importProvidersFrom(
// StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
// EffectsModule.forFeature(coreEffects)
// ),
// ]);
// };
//
// /**
// * When not in production, endpoint responses can be mocked for testing purposes
// * If there is no mock version available for the endpoint, the actual REST response will be used just like in production mode
// */
// export const restServiceFactory = (mocks: ResponseMapMock, http: HttpClient) => {
// if (environment.production) {
// return new DspaceRestService(http);
// } else {
// return new EndpointMockingRestService(mocks, http);
// }
// };
/**
* Declaration needed to make sure all decorator functions are called in time
*/
export const listableObjects =
[
BundleListElementComponent,
CollectionListElementComponent,
CommunityListElementComponent,
SearchResultListElementComponent,
CommunitySearchResultListElementComponent,
CollectionSearchResultListElementComponent,
CollectionGridElementComponent,
CommunityGridElementComponent,
CommunitySearchResultGridElementComponent,
CollectionSearchResultGridElementComponent,
SearchResultGridElementComponent,
ItemListElementComponent,
ItemGridElementComponent,
BitstreamListItemComponent,
ItemSearchResultListElementComponent,
ItemSearchResultGridElementComponent,
BrowseEntryListElementComponent,
SearchResultDetailElementComponent,
StartsWithDateComponent,
StartsWithTextComponent,
CreateCommunityParentSelectorComponent,
ThemedCreateCommunityParentSelectorComponent,
CreateCollectionParentSelectorComponent,
ThemedCreateCollectionParentSelectorComponent,
CreateItemParentSelectorComponent,
ThemedCreateItemParentSelectorComponent,
EditCommunitySelectorComponent,
ThemedEditCommunitySelectorComponent,
EditCollectionSelectorComponent,
ThemedEditCollectionSelectorComponent,
EditItemSelectorComponent,
ThemedEditItemSelectorComponent,
PlainTextMetadataListElementComponent,
BrowseLinkMetadataListElementComponent,
ItemMetadataListElementComponent,
MetadataRepresentationListElementComponent,
ItemMetadataRepresentationListElementComponent,
LogInPasswordComponent,
LogInExternalProviderComponent,
ClaimedTaskActionsDeclineTaskComponent,
CollectionDropdownComponent,
ThemedCollectionDropdownComponent,
FileDownloadLinkComponent,
ThemedFileDownloadLinkComponent,
CurationFormComponent,
ExportMetadataSelectorComponent,
ImportBatchSelectorComponent,
ExportBatchSelectorComponent,
ConfirmationModalComponent,
SidebarSearchListElementComponent,
PublicationSidebarSearchListElementComponent,
CollectionSidebarSearchListElementComponent,
CommunitySidebarSearchListElementComponent,
ScopeSelectorModalComponent,
ListableNotificationObjectComponent,
AdvancedClaimedTaskActionSelectReviewerComponent,
AdvancedClaimedTaskActionRatingComponent,
EpersonGroupListComponent,
EpersonSearchBoxComponent,
GroupSearchBoxComponent
];

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component'; import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component'; import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component'; import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
@@ -10,7 +9,6 @@ import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-e
@NgModule({ @NgModule({
imports: [ imports: [
SharedModule,
DsoEditMetadataComponent, DsoEditMetadataComponent,
ThemedDsoEditMetadataComponent, ThemedDsoEditMetadataComponent,
MetadataFieldSelectorComponent, MetadataFieldSelectorComponent,

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../../shared/shared.module';
import { JournalComponent } from './item-pages/journal/journal.component'; import { JournalComponent } from './item-pages/journal/journal.component';
import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component'; import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component';
import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component'; import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component';
@@ -49,7 +48,6 @@ const ENTRY_COMPONENTS = [
imports: [ imports: [
CommonModule, CommonModule,
ItemSharedModule, ItemSharedModule,
SharedModule,
ResultsBackButtonModule, ResultsBackButtonModule,
DsoPageModule, DsoPageModule,
...ENTRY_COMPONENTS ...ENTRY_COMPONENTS

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
import { SharedModule } from '../../shared/shared.module';
import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component'; import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
import { PersonComponent } from './item-pages/person/person.component'; import { PersonComponent } from './item-pages/person/person.component';
import { ProjectComponent } from './item-pages/project/project.component'; import { ProjectComponent } from './item-pages/project/project.component';
@@ -72,7 +71,6 @@ const COMPONENTS = [
imports: [ imports: [
CommonModule, CommonModule,
ItemSharedModule, ItemSharedModule,
SharedModule,
NgbTooltipModule, NgbTooltipModule,
ResultsBackButtonModule, ResultsBackButtonModule,
DsoPageModule, DsoPageModule,

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component'; import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
import { ForgotPasswordRoutingModule } from './forgot-password-routing.module'; import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module'; import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
@@ -12,7 +11,6 @@ import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgo
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
ForgotPasswordRoutingModule, ForgotPasswordRoutingModule,
RegisterEmailFormModule, RegisterEmailFormModule,
ProfilePageModule, ProfilePageModule,

View File

@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { HealthPageRoutingModule } from './health-page.routing.module'; import { HealthPageRoutingModule } from './health-page.routing.module';
import { HealthPanelComponent } from './health-panel/health-panel.component'; import { HealthPanelComponent } from './health-panel/health-panel.component';
import { HealthStatusComponent } from './health-panel/health-status/health-status.component'; import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
import { SharedModule } from '../shared/shared.module';
import { HealthPageComponent } from './health-page.component'; import { HealthPageComponent } from './health-page.component';
import { HealthComponentComponent } from './health-panel/health-component/health-component.component'; import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
import { HealthInfoComponent } from './health-info/health-info.component'; import { HealthInfoComponent } from './health-info/health-info.component';
@@ -19,7 +18,6 @@ import { HealthInfoComponentComponent } from './health-info/health-info-componen
CommonModule, CommonModule,
HealthPageRoutingModule, HealthPageRoutingModule,
NgbModule, NgbModule,
SharedModule,
TranslateModule, TranslateModule,
HealthPageComponent, HealthPageComponent,
HealthPanelComponent, HealthPanelComponent,

View File

@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { HomeNewsComponent } from './home-news/home-news.component'; import { HomeNewsComponent } from './home-news/home-news.component';
import { HomePageRoutingModule } from './home-page-routing.module'; import { HomePageRoutingModule } from './home-page-routing.module';
@@ -27,7 +26,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule.withEntryComponents(),
JournalEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(),
HomePageRoutingModule, HomePageRoutingModule,

View File

@@ -11,7 +11,6 @@ import { TopLevelCommunityListComponent } from './top-level-community-list.compo
import { Community } from '../../core/shared/community.model'; import { Community } from '../../core/shared/community.model';
import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { buildPaginatedList } from '../../core/data/paginated-list.model';
import { PageInfo } from '../../core/shared/page-info.model'; import { PageInfo } from '../../core/shared/page-info.model';
import { SharedModule } from '../../shared/shared.module';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { HostWindowService } from '../../shared/host-window.service'; import { HostWindowService } from '../../shared/host-window.service';
import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub'; import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
@@ -143,7 +142,6 @@ describe('TopLevelCommunityList Component', () => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
SharedModule,
RouterTestingModule.withRoutes([]), RouterTestingModule.withRoutes([]),
NgbModule, NgbModule,
NoopAnimationsModule, NoopAnimationsModule,

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { ImportExternalRoutingModule } from './import-external-routing.module'; import { ImportExternalRoutingModule } from './import-external-routing.module';
import { SubmissionModule } from '../submission/submission.module'; import { SubmissionModule } from '../submission/submission.module';
import { ImportExternalPageComponent } from './import-external-page.component'; import { ImportExternalPageComponent } from './import-external-page.component';
@@ -11,7 +10,6 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule.withEntryComponents(),
ImportExternalRoutingModule, ImportExternalRoutingModule,
SubmissionModule, SubmissionModule,
JournalEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(),

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component'; import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
import { InfoRoutingModule } from './info-routing.module'; import { InfoRoutingModule } from './info-routing.module';
import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component'; import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
@@ -31,7 +30,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
InfoRoutingModule, InfoRoutingModule,
...DECLARATIONS ...DECLARATIONS
], ],

View File

@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { SharedModule } from '../../shared/shared.module';
import { EditItemPageRoutingModule } from './edit-item-page.routing.module'; import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
import { EditItemPageComponent } from './edit-item-page.component'; import { EditItemPageComponent } from './edit-item-page.component';
import { ItemStatusComponent } from './item-status/item-status.component'; import { ItemStatusComponent } from './item-status/item-status.component';
@@ -53,7 +52,6 @@ import {
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
NgbTooltipModule, NgbTooltipModule,
EditItemPageRoutingModule, EditItemPageRoutingModule,
SearchPageModule, SearchPageModule,

View File

@@ -11,7 +11,6 @@ import { RelationshipType } from '../../../../core/shared/item-relationships/rel
import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
import { Item } from '../../../../core/shared/item.model'; import { Item } from '../../../../core/shared/item.model';
import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service'; import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
import { SharedModule } from '../../../../shared/shared.module';
import { EditRelationshipListComponent } from './edit-relationship-list.component'; import { EditRelationshipListComponent } from './edit-relationship-list.component';
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { createPaginatedList } from '../../../../shared/testing/utils.test';
@@ -229,7 +228,7 @@ describe('EditRelationshipListComponent', () => {
}; };
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [SharedModule, TranslateModule.forRoot(), EditRelationshipListComponent], imports: [TranslateModule.forRoot(), EditRelationshipListComponent],
providers: [ providers: [
provideMockStore({initialState}), provideMockStore({initialState}),
{ provide: ObjectUpdatesService, useValue: objectUpdatesService }, { provide: ObjectUpdatesService, useValue: objectUpdatesService },

View File

@@ -19,7 +19,6 @@ import { Item } from '../../../core/shared/item.model';
import { NotificationType } from '../../../shared/notifications/models/notification-type'; import { NotificationType } from '../../../shared/notifications/models/notification-type';
import { INotification, Notification } from '../../../shared/notifications/models/notification.model'; import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { SharedModule } from '../../../shared/shared.module';
import { RouterStub } from '../../../shared/testing/router.stub'; import { RouterStub } from '../../../shared/testing/router.stub';
import { ItemRelationshipsComponent } from './item-relationships.component'; import { ItemRelationshipsComponent } from './item-relationships.component';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
@@ -210,7 +209,7 @@ describe('ItemRelationshipsComponent', () => {
scheduler = getTestScheduler(); scheduler = getTestScheduler();
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [SharedModule, TranslateModule.forRoot(), ItemRelationshipsComponent], imports: [TranslateModule.forRoot(), ItemRelationshipsComponent],
providers: [ providers: [
{ provide: ThemeService, useValue: getMockThemeService() }, { provide: ThemeService, useValue: getMockThemeService() },
{ provide: ItemDataService, useValue: itemService }, { provide: ItemDataService, useValue: itemService },

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { ItemPageComponent } from './simple/item-page.component'; import { ItemPageComponent } from './simple/item-page.component';
import { ItemPageRoutingModule } from './item-page-routing.module'; import { ItemPageRoutingModule } from './item-page-routing.module';
@@ -108,7 +107,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule.withEntryComponents(),
ItemPageRoutingModule, ItemPageRoutingModule,
EditItemPageModule, EditItemPageModule,
ItemVersionsModule, ItemVersionsModule,

View File

@@ -2,7 +2,6 @@ import { RelatedEntitiesSearchComponent } from './simple/related-entities/relate
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SearchModule } from '../shared/search/search.module'; import { SearchModule } from '../shared/search/search.module';
import { SharedModule } from '../shared/shared.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component'; import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
@@ -38,7 +37,6 @@ const COMPONENTS = [
imports: [ imports: [
CommonModule, CommonModule,
SearchModule, SearchModule,
SharedModule,
TranslateModule, TranslateModule,
...COMPONENTS ...COMPONENTS
], ],

View File

@@ -3,7 +3,6 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component'; import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock'; import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
import { SharedModule } from '../../../../../shared/shared.module';
import { APP_CONFIG } from '../../../../../../config/app-config.interface'; import { APP_CONFIG } from '../../../../../../config/app-config.interface';
import { environment } from '../../../../../../environments/environment'; import { environment } from '../../../../../../environments/environment';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
@@ -23,7 +22,6 @@ describe('ItemPageAbstractFieldComponent', () => {
useClass: TranslateLoaderMock useClass: TranslateLoaderMock
} }
}), }),
SharedModule,
ItemPageAbstractFieldComponent ItemPageAbstractFieldComponent
], ],
providers: [ providers: [

View File

@@ -10,7 +10,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-dat
import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { createPaginatedList } from '../../../../shared/testing/utils.test';
import { environment } from '../../../../../environments/environment'; import { environment } from '../../../../../environments/environment';
import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe'; import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
import { SharedModule } from '../../../../shared/shared.module';
import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { APP_CONFIG } from '../../../../../config/app-config.interface';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
@@ -47,7 +46,6 @@ describe('ItemPageFieldComponent', () => {
useClass: TranslateLoaderMock useClass: TranslateLoaderMock
} }
}), }),
SharedModule,
ItemPageFieldComponent, MetadataValuesComponent ItemPageFieldComponent, MetadataValuesComponent
], ],
providers: [ providers: [

View File

@@ -7,7 +7,6 @@
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../../shared/shared.module';
import { ItemVersionsComponent } from './item-versions.component'; import { ItemVersionsComponent } from './item-versions.component';
import { ItemVersionsNoticeComponent } from './notice/item-versions-notice.component'; import { ItemVersionsNoticeComponent } from './notice/item-versions-notice.component';
@@ -18,7 +17,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
SharedModule,
...DECLARATIONS ...DECLARATIONS
], ],
exports: [ exports: [

View File

@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { LoginPageComponent } from './login-page.component'; import { LoginPageComponent } from './login-page.component';
import { LoginPageRoutingModule } from './login-page-routing.module'; import { LoginPageRoutingModule } from './login-page-routing.module';
import { ThemedLoginPageComponent } from './themed-login-page.component'; import { ThemedLoginPageComponent } from './themed-login-page.component';
@@ -9,7 +8,6 @@ import { ThemedLoginPageComponent } from './themed-login-page.component';
imports: [ imports: [
LoginPageRoutingModule, LoginPageRoutingModule,
CommonModule, CommonModule,
SharedModule,
LoginPageComponent, LoginPageComponent,
ThemedLoginPageComponent ThemedLoginPageComponent
] ]

View File

@@ -1,6 +1,5 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { LogoutPageComponent } from './logout-page.component'; import { LogoutPageComponent } from './logout-page.component';
import { LogoutPageRoutingModule } from './logout-page-routing.module'; import { LogoutPageRoutingModule } from './logout-page-routing.module';
import { ThemedLogoutPageComponent } from './themed-logout-page.component'; import { ThemedLogoutPageComponent } from './themed-logout-page.component';
@@ -9,7 +8,6 @@ import { ThemedLogoutPageComponent } from './themed-logout-page.component';
imports: [ imports: [
LogoutPageRoutingModule, LogoutPageRoutingModule,
CommonModule, CommonModule,
SharedModule,
LogoutPageComponent, LogoutPageComponent,
ThemedLogoutPageComponent ThemedLogoutPageComponent
] ]

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { LookupRoutingModule } from './lookup-by-id-routing.module'; import { LookupRoutingModule } from './lookup-by-id-routing.module';
import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component'; import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component';
import { DsoRedirectService } from '../core/data/dso-redirect.service'; import { DsoRedirectService } from '../core/data/dso-redirect.service';
@@ -10,7 +9,6 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
imports: [ imports: [
LookupRoutingModule, LookupRoutingModule,
CommonModule, CommonModule,
SharedModule,
ObjectNotFoundComponent, ObjectNotFoundComponent,
ThemedObjectNotFoundComponent ThemedObjectNotFoundComponent
], ],

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module'; import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
import { MyDSpacePageComponent } from './my-dspace-page.component'; import { MyDSpacePageComponent } from './my-dspace-page.component';
@@ -28,7 +27,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
SearchModule, SearchModule,
MyDspacePageRoutingModule, MyDspacePageRoutingModule,
MyDspaceSearchModule.withEntryComponents(), MyDspaceSearchModule.withEntryComponents(),

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module'; import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component'; import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
@@ -56,7 +55,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
MyDspacePageRoutingModule, MyDspacePageRoutingModule,
MyDSpaceActionsModule, MyDSpaceActionsModule,
ResearchEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(),

View File

@@ -9,7 +9,6 @@ import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/ex
import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component'; import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
import { NavbarComponent } from './navbar.component'; import { NavbarComponent } from './navbar.component';
import { MenuModule } from '../shared/menu/menu.module'; import { MenuModule } from '../shared/menu/menu.module';
import { SharedModule } from '../shared/shared.module';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { ThemedNavbarComponent } from './themed-navbar.component'; import { ThemedNavbarComponent } from './themed-navbar.component';
@@ -27,7 +26,6 @@ const ENTRY_COMPONENTS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
MenuModule, MenuModule,
FormsModule, FormsModule,
EffectsModule.forFeature(effects), EffectsModule.forFeature(effects),

View File

@@ -4,7 +4,6 @@ import { Action, StoreConfig, StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects'; import { EffectsModule } from '@ngrx/effects';
import { CoreModule } from '../core/core.module'; import { CoreModule } from '../core/core.module';
import { SharedModule } from '../shared/shared.module';
import { storeModuleConfig } from '../app.reducer'; import { storeModuleConfig } from '../app.reducer';
import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component'; import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component'; import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
@@ -29,7 +28,6 @@ import {
const MODULES = [ const MODULES = [
CommonModule, CommonModule,
SharedModule,
SearchModule, SearchModule,
CoreModule.forRoot(), CoreModule.forRoot(),
StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>), StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { NewProcessComponent } from './new/new-process.component'; import { NewProcessComponent } from './new/new-process.component';
import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component'; import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
import { ScriptHelpComponent } from './form/script-help/script-help.component'; import { ScriptHelpComponent } from './form/script-help/script-help.component';
@@ -19,7 +18,6 @@ import { ProcessFormComponent } from './form/process-form.component';
@NgModule({ @NgModule({
imports: [ imports: [
SharedModule,
NewProcessComponent, NewProcessComponent,
ScriptsSelectComponent, ScriptsSelectComponent,
ScriptHelpComponent, ScriptHelpComponent,

View File

@@ -1,12 +1,10 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { ProcessPageRoutingModule } from './process-page-routing.module'; import { ProcessPageRoutingModule } from './process-page-routing.module';
import { ProcessPageSharedModule } from './process-page-shared.module'; import { ProcessPageSharedModule } from './process-page-shared.module';
@NgModule({ @NgModule({
imports: [ imports: [
ProcessPageRoutingModule, ProcessPageRoutingModule,
SharedModule,
ProcessPageSharedModule, ProcessPageSharedModule,
], ],
declarations: [ declarations: [

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { ProfilePageRoutingModule } from './profile-page-routing.module'; import { ProfilePageRoutingModule } from './profile-page-routing.module';
import { ProfilePageComponent } from './profile-page.component'; import { ProfilePageComponent } from './profile-page.component';
import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component'; import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
@@ -18,7 +17,6 @@ import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profi
imports: [ imports: [
ProfilePageRoutingModule, ProfilePageRoutingModule,
CommonModule, CommonModule,
SharedModule,
FormModule, FormModule,
UiSwitchModule, UiSwitchModule,
ProfilePageComponent, ProfilePageComponent,

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { RegisterEmailFormComponent } from './register-email-form.component'; import { RegisterEmailFormComponent } from './register-email-form.component';
import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component'; import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component';
@@ -12,7 +11,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
...DECLARATIONS, ...DECLARATIONS,
], ],
providers: [], providers: [],

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { RegisterPageRoutingModule } from './register-page-routing.module'; import { RegisterPageRoutingModule } from './register-page-routing.module';
import { RegisterEmailComponent } from './register-email/register-email.component'; import { RegisterEmailComponent } from './register-email/register-email.component';
import { CreateProfileComponent } from './create-profile/create-profile.component'; import { CreateProfileComponent } from './create-profile/create-profile.component';
@@ -12,7 +11,6 @@ import { ThemedRegisterEmailComponent } from './register-email/themed-register-e
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
RegisterPageRoutingModule, RegisterPageRoutingModule,
RegisterEmailFormModule, RegisterEmailFormModule,
ProfilePageModule, ProfilePageModule,

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component'; import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
import { RequestCopyRoutingModule } from './request-copy-routing.module'; import { RequestCopyRoutingModule } from './request-copy-routing.module';
import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component'; import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
@@ -13,7 +12,6 @@ import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-gra
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
RequestCopyRoutingModule, RequestCopyRoutingModule,
GrantDenyRequestCopyComponent, GrantDenyRequestCopyComponent,
DenyRequestCopyComponent, DenyRequestCopyComponent,

View File

@@ -20,7 +20,6 @@ import { NotificationComponent } from './shared/notifications/notification/notif
import { import {
NotificationsBoardComponent NotificationsBoardComponent
} from './shared/notifications/notifications-board/notifications-board.component'; } from './shared/notifications/notifications-board/notifications-board.component';
import { SharedModule } from './shared/shared.module';
import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component'; import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
import { ForbiddenComponent } from './forbidden/forbidden.component'; import { ForbiddenComponent } from './forbidden/forbidden.component';
import { RootComponent } from './root/root.component'; import { RootComponent } from './root/root.component';
@@ -47,7 +46,6 @@ import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.mod
const IMPORTS = [ const IMPORTS = [
CommonModule, CommonModule,
SharedModule.withEntryComponents(),
NavbarModule, NavbarModule,
SystemWideAlertModule, SystemWideAlertModule,
NgbModule, NgbModule,

View File

@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { SidebarService } from '../shared/sidebar/sidebar.service'; import { SidebarService } from '../shared/sidebar/sidebar.service';
import { ConfigurationSearchPageGuard } from './configuration-search-page.guard'; import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
import { StatisticsModule } from '../statistics/statistics.module'; import { StatisticsModule } from '../statistics/statistics.module';
@@ -21,7 +20,6 @@ const components = [
imports: [ imports: [
CommonModule, CommonModule,
SearchModule, SearchModule,
SharedModule.withEntryComponents(),
StatisticsModule.forRoot(), StatisticsModule.forRoot(),
JournalEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(),
ResearchEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(),

View File

@@ -5,7 +5,6 @@ import {TranslateModule} from '@ngx-translate/core';
import {UiSwitchModule} from 'ngx-ui-switch'; import {UiSwitchModule} from 'ngx-ui-switch';
import {AccessControlArrayFormComponent} from './access-control-array-form/access-control-array-form.component'; import {AccessControlArrayFormComponent} from './access-control-array-form/access-control-array-form.component';
import {SharedModule} from '../shared.module';
import { import {
ItemAccessControlSelectBitstreamsModalComponent ItemAccessControlSelectBitstreamsModalComponent
} from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component'; } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
@@ -16,7 +15,6 @@ import {ToDatePipe} from './access-control-array-form/to-date.pipe';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
TranslateModule, TranslateModule,
UiSwitchModule, UiSwitchModule,
NgbDatepickerModule, NgbDatepickerModule,

View File

@@ -44,7 +44,6 @@ import { ConfigurationProperty } from '../../core/shared/configuration-property.
import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub'; import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
import { getMockThemeService } from '../mocks/theme-service.mock'; import { getMockThemeService } from '../mocks/theme-service.mock';
import { SharedModule } from '../shared.module';
import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module'; import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module'; import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
@@ -119,7 +118,6 @@ describe('BrowseByComponent', () => {
BrowseByRoutingModule, BrowseByRoutingModule,
AccessControlRoutingModule, AccessControlRoutingModule,
CommonModule, CommonModule,
SharedModule,
NgbModule, NgbModule,
TranslateModule.forRoot({ TranslateModule.forRoot({
loader: { loader: {

View File

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { BrowseByComponent } from './browse-by.component'; import { BrowseByComponent } from './browse-by.component';
import { ThemedBrowseByComponent } from './themed-browse-by.component'; import { ThemedBrowseByComponent } from './themed-browse-by.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared.module';
import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module'; import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module'; import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module'; import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
@@ -18,12 +17,10 @@ const DECLARATIONS = [
BrowseByRoutingModule, BrowseByRoutingModule,
AccessControlRoutingModule, AccessControlRoutingModule,
CommonModule, CommonModule,
SharedModule,
...DECLARATIONS, ...DECLARATIONS,
], ],
exports: [ exports: [
...DECLARATIONS, ...DECLARATIONS,
SharedModule,
] ]
}) })
export class SharedBrowseByModule { } export class SharedBrowseByModule { }

View File

@@ -5,7 +5,6 @@ import { Router } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { Community } from '../../../../core/shared/community.model'; import { Community } from '../../../../core/shared/community.model';
import { SharedModule } from '../../../shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -97,7 +96,7 @@ describe('CreateComColPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
initializeVars(); initializeVars();
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule],
providers: [ providers: [
{ provide: ComColDataService, useValue: communityDataServiceStub }, { provide: ComColDataService, useValue: communityDataServiceStub },
{ provide: CommunityDataService, useValue: communityDataServiceStub }, { provide: CommunityDataService, useValue: communityDataServiceStub },

View File

@@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { Community } from '../../../../core/shared/community.model'; import { Community } from '../../../../core/shared/community.model';
import { SharedModule } from '../../../shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -86,7 +85,7 @@ describe('DeleteComColPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
initializeVars(); initializeVars();
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule],
providers: [ providers: [
{ provide: ComColDataService, useValue: dsoDataService }, { provide: ComColDataService, useValue: dsoDataService },
{ provide: Router, useValue: routerStub }, { provide: Router, useValue: routerStub },

View File

@@ -8,7 +8,6 @@ import { of as observableOf } from 'rxjs';
import { ComColDataService } from '../../../../../core/data/comcol-data.service'; import { ComColDataService } from '../../../../../core/data/comcol-data.service';
import { Community } from '../../../../../core/shared/community.model'; import { Community } from '../../../../../core/shared/community.model';
import { NotificationsService } from '../../../../notifications/notifications.service'; import { NotificationsService } from '../../../../notifications/notifications.service';
import { SharedModule } from '../../../../shared.module';
import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub'; import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
import { import {
createFailedRemoteDataObject$, createFailedRemoteDataObject$,
@@ -71,7 +70,7 @@ describe('ComColMetadataComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
initializeVars(); initializeVars();
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule],
providers: [ providers: [
{ provide: ComColDataService, useValue: communityDataServiceStub }, { provide: ComColDataService, useValue: communityDataServiceStub },
{ provide: Router, useValue: routerStub }, { provide: Router, useValue: routerStub },

View File

@@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { Community } from '../../../../core/shared/community.model'; import { Community } from '../../../../core/shared/community.model';
import { SharedModule } from '../../../shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core'; import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -62,7 +61,7 @@ describe('EditComColPageComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
initializeVars(); initializeVars();
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule], imports: [TranslateModule.forRoot(), CommonModule, RouterTestingModule],
providers: [ providers: [
{ provide: Router, useValue: routerStub }, { provide: Router, useValue: routerStub },
{ provide: ActivatedRoute, useValue: routeStub }, { provide: ActivatedRoute, useValue: routeStub },

View File

@@ -13,7 +13,6 @@ import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/del
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component'; import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component';
import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component'; import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
import { SharedModule } from '../shared.module';
import { FormModule } from '../form/form.module'; import { FormModule } from '../form/form.module';
import { UploadModule } from '../upload/upload.module'; import { UploadModule } from '../upload/upload.module';
@@ -36,7 +35,6 @@ const COMPONENTS = [
imports: [ imports: [
CommonModule, CommonModule,
FormModule, FormModule,
SharedModule,
UploadModule, UploadModule,
...COMPONENTS ...COMPONENTS
], ],

View File

@@ -43,7 +43,6 @@ import {
DsDynamicFormControlContainerComponent, DsDynamicFormControlContainerComponent,
dsDynamicFormControlMapFn dsDynamicFormControlMapFn
} from './ds-dynamic-form-control-container.component'; } from './ds-dynamic-form-control-container.component';
import { SharedModule } from '../../../shared.module';
import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model'; import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model'; import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model'; import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
@@ -211,7 +210,6 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
ReactiveFormsModule, ReactiveFormsModule,
NgbModule, NgbModule,
DynamicFormsCoreModule.forRoot(), DynamicFormsCoreModule.forRoot(),
SharedModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
NgxMaskModule.forRoot(), NgxMaskModule.forRoot(),
], ],

View File

@@ -18,7 +18,6 @@ import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models
import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component'; import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component'; import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component'; import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
import { SharedModule } from '../shared.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SearchModule } from '../search/search.module'; import { SearchModule } from '../search/search.module';
import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core'; import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
@@ -85,7 +84,6 @@ const DIRECTIVES = [
DynamicFormsCoreModule, DynamicFormsCoreModule,
DynamicFormsNGBootstrapUIModule, DynamicFormsNGBootstrapUIModule,
SearchModule, SearchModule,
SharedModule,
TranslateModule, TranslateModule,
SortablejsModule, SortablejsModule,
NgxMaskModule.forRoot(), NgxMaskModule.forRoot(),

View File

@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { LogInContainerComponent } from './log-in-container.component'; import { LogInContainerComponent } from './log-in-container.component';
import { authReducer } from '../../../core/auth/auth.reducer'; import { authReducer } from '../../../core/auth/auth.reducer';
import { SharedModule } from '../../shared.module';
import { AuthService } from '../../../core/auth/auth.service'; import { AuthService } from '../../../core/auth/auth.service';
import { AuthMethod } from '../../../core/auth/models/auth.method'; import { AuthMethod } from '../../../core/auth/models/auth.method';
import { AuthServiceStub } from '../../testing/auth-service.stub'; import { AuthServiceStub } from '../../testing/auth-service.stub';
@@ -38,7 +37,6 @@ describe('LogInContainerComponent', () => {
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
StoreModule.forRoot(authReducer), StoreModule.forRoot(authReducer),
SharedModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
RouterTestingModule, RouterTestingModule,
TestComponent TestComponent
@@ -116,7 +114,6 @@ describe('LogInContainerComponent', () => {
standalone: true, standalone: true,
imports: [FormsModule, imports: [FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
SharedModule,
RouterTestingModule] RouterTestingModule]
}) })
class TestComponent { class TestComponent {

View File

@@ -10,7 +10,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { AuthService } from '../../core/auth/auth.service'; import { AuthService } from '../../core/auth/auth.service';
import { authMethodsMock, AuthServiceStub } from '../testing/auth-service.stub'; import { authMethodsMock, AuthServiceStub } from '../testing/auth-service.stub';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { SharedModule } from '../shared.module';
import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref'; import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
import { ActivatedRouteStub } from '../testing/active-router.stub'; import { ActivatedRouteStub } from '../testing/active-router.stub';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
@@ -63,7 +62,6 @@ describe('LogInComponent', () => {
} }
}), }),
RouterTestingModule, RouterTestingModule,
SharedModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
TestComponent TestComponent
], ],
@@ -138,8 +136,7 @@ describe('LogInComponent', () => {
standalone: true, standalone: true,
imports: [FormsModule, imports: [FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
RouterTestingModule, RouterTestingModule]
SharedModule]
}) })
class TestComponent { class TestComponent {

View File

@@ -7,7 +7,6 @@
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared.module';
import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component'; import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component'; import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component'; import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
@@ -42,7 +41,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
...DECLARATIONS ...DECLARATIONS
], ],
providers: [ providers: [

View File

@@ -2,7 +2,6 @@ import {CommonModule} from '@angular/common';
import {ComponentFixture, TestBed} from '@angular/core/testing'; import {ComponentFixture, TestBed} from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing'; import {RouterTestingModule} from '@angular/router/testing';
import {TranslateModule} from '@ngx-translate/core'; import {TranslateModule} from '@ngx-translate/core';
import {SharedModule} from '../../shared.module';
import {BitstreamListItemComponent} from './bitstream-list-item.component'; import {BitstreamListItemComponent} from './bitstream-list-item.component';
import {DSONameService} from '../../../core/breadcrumbs/dso-name.service'; import {DSONameService} from '../../../core/breadcrumbs/dso-name.service';
@@ -14,7 +13,7 @@ describe('BitstreamListItemComponent', () => {
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [CommonModule, SharedModule, TranslateModule, RouterTestingModule, BitstreamListItemComponent], imports: [CommonModule, TranslateModule, RouterTestingModule, BitstreamListItemComponent],
providers: [{ provide: DSONameService, useValue: new DSONameServiceMock() }] providers: [{ provide: DSONameService, useValue: new DSONameServiceMock() }]
}) })
.compileComponents(); .compileComponents();

View File

@@ -2,7 +2,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared.module';
import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub'; import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
import { ObjectSelectService } from '../object-select.service'; import { ObjectSelectService } from '../object-select.service';
import { HostWindowService } from '../../host-window.service'; import { HostWindowService } from '../../host-window.service';
@@ -72,7 +71,7 @@ describe('CollectionSelectComponent', () => {
const paginationService = new PaginationServiceStub(); const paginationService = new PaginationServiceStub();
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
providers: [ providers: [
{ provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockCollectionList[1].id]) }, { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockCollectionList[1].id]) },
{ provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },

View File

@@ -4,7 +4,6 @@ import { RouterTestingModule } from '@angular/router/testing';
import { Item } from '../../../core/shared/item.model'; import { Item } from '../../../core/shared/item.model';
import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared.module';
import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub'; import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
import { ObjectSelectService } from '../object-select.service'; import { ObjectSelectService } from '../object-select.service';
import { HostWindowService } from '../../host-window.service'; import { HostWindowService } from '../../host-window.service';
@@ -97,7 +96,7 @@ describe('ItemSelectComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])], imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
providers: [ providers: [
{ provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) }, { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
{ provide: HostWindowService, useValue: new HostWindowServiceStub(0) }, { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },

View File

@@ -11,7 +11,6 @@ import { FormModule } from '../form/form.module';
import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver'; import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver';
import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver'; import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { SharedModule } from '../shared.module';
import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component'; import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
const COMPONENTS = [ const COMPONENTS = [
@@ -33,7 +32,6 @@ const PROVIDERS = [
CommonModule, CommonModule,
FormModule, FormModule,
TranslateModule, TranslateModule,
SharedModule,
...COMPONENTS ...COMPONENTS
], ],
providers: [ providers: [

View File

@@ -25,7 +25,6 @@ import { FacetValues } from './models/facet-values.model';
import { SearchResult } from './models/search-result.model'; import { SearchResult } from './models/search-result.model';
import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core'; import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
import { MissingTranslationHelper } from '../translate/missing-translation.helper'; import { MissingTranslationHelper } from '../translate/missing-translation.helper';
import { SharedModule } from '../shared.module';
import { SearchResultsComponent } from './search-results/search-results.component'; import { SearchResultsComponent } from './search-results/search-results.component';
import { SearchComponent } from './search.component'; import { SearchComponent } from './search.component';
import { ThemedSearchComponent } from './themed-search.component'; import { ThemedSearchComponent } from './themed-search.component';
@@ -93,7 +92,6 @@ export const MODELS = [
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper }, missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
useDefaultLang: true useDefaultLang: true
}), }),
SharedModule.withEntryComponents(),
NouisliderModule, NouisliderModule,
...COMPONENTS ...COMPONENTS
], ],

View File

@@ -1,534 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { DragDropModule } from '@angular/cdk/drag-drop';
import {
NgbDropdownModule,
NgbNavModule,
NgbPaginationModule,
NgbTooltipModule,
NgbTypeaheadModule,
} from '@ng-bootstrap/ng-bootstrap';
import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
import {
ExportMetadataSelectorComponent
} from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
import {
ExportBatchSelectorComponent
} from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
import {
ImportBatchSelectorComponent
} from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
import { EnumKeysPipe } from './utils/enum-keys-pipe';
import { FileSizePipe } from './utils/file-size-pipe';
import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
import { SafeUrlPipe } from './utils/safe-url-pipe';
import { ConsolePipe } from './utils/console.pipe';
import {
CollectionListElementComponent
} from './object-list/collection-list-element/collection-list-element.component';
import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
import {
SearchResultListElementComponent
} from './object-list/search-result-list-element/search-result-list-element.component';
import { ObjectListComponent } from './object-list/object-list.component';
import { ThemedObjectListComponent } from './object-list/themed-object-list.component';
import {
CollectionGridElementComponent
} from './object-grid/collection-grid-element/collection-grid-element.component';
import { CommunityGridElementComponent } from './object-grid/community-grid-element/community-grid-element.component';
import {
AbstractListableElementComponent
} from './object-collection/shared/object-collection-element/abstract-listable-element.component';
import { ObjectGridComponent } from './object-grid/object-grid.component';
import { ObjectCollectionComponent } from './object-collection/object-collection.component';
import { ErrorComponent } from './error/error.component';
import { LoadingComponent } from './loading/loading.component';
import { PaginationComponent } from './pagination/pagination.component';
import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
import { ThemedThumbnailComponent } from '../thumbnail/themed-thumbnail.component';
import { SearchFormComponent } from './search-form/search-form.component';
import { ThemedSearchFormComponent } from './search-form/themed-search-form.component';
import {
SearchResultGridElementComponent
} from './object-grid/search-result-grid-element/search-result-grid-element.component';
import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
import { VarDirective } from './utils/var.directive';
import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
import { ThemedAuthNavMenuComponent } from './auth-nav-menu/themed-auth-nav-menu.component';
import { LogOutComponent } from './log-out/log-out.component';
import { DragClickDirective } from './utils/drag-click.directive';
import { TruncatePipe } from './utils/truncate.pipe';
import { TruncatableComponent } from './truncatable/truncatable.component';
import { TruncatableService } from './truncatable/truncatable.service';
import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
import { MockAdminGuard } from './mocks/admin-guard.service.mock';
import { AlertComponent } from './alert/alert.component';
import {
SearchResultDetailElementComponent
} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
import { ObjectDetailComponent } from './object-detail/object-detail.component';
import { ObjNgFor } from './utils/object-ngfor.pipe';
import {
BrowseEntryListElementComponent
} from './object-list/browse-entry-list-element/browse-entry-list-element.component';
import { DebounceDirective } from './utils/debounce.directive';
import { ClickOutsideDirective } from './utils/click-outside.directive';
import { EmphasizePipe } from './utils/emphasize.pipe';
import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
import { CapitalizePipe } from './utils/capitalize.pipe';
import { ObjectKeysPipe } from './utils/object-keys-pipe';
import { LangSwitchComponent } from './lang-switch/lang-switch.component';
import {
PlainTextMetadataListElementComponent
} from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
import {
BrowseLinkMetadataListElementComponent
} from './object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
import {
ItemMetadataListElementComponent
} from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
import {
MetadataRepresentationListElementComponent
} from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
import { ObjectValuesPipe } from './utils/object-values-pipe';
import { InListValidator } from './utils/in-list-validator.directive';
import { AutoFocusDirective } from './utils/auto-focus.directive';
import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
import {
CreateCommunityParentSelectorComponent
} from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
import {
ThemedCreateCommunityParentSelectorComponent
} from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
import {
CreateItemParentSelectorComponent
} from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
import {
ThemedCreateItemParentSelectorComponent
} from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
import {
CreateCollectionParentSelectorComponent
} from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
import {
ThemedCreateCollectionParentSelectorComponent
} from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
import {
CommunitySearchResultListElementComponent
} from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
import {
CollectionSearchResultListElementComponent
} from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
import {
EditItemSelectorComponent
} from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
import {
ThemedEditItemSelectorComponent
} from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
import {
EditCommunitySelectorComponent
} from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
import {
ThemedEditCommunitySelectorComponent
} from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
import {
EditCollectionSelectorComponent
} from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
import {
ThemedEditCollectionSelectorComponent
} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
import { RoleDirective } from './roles/role.directive';
import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
import {
CollectionSearchResultGridElementComponent
} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
import {
CommunitySearchResultGridElementComponent
} from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
import {
ComcolMetadataComponent
} from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
import { ItemSelectComponent } from './object-select/item-select/item-select.component';
import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
import {
FilterInputSuggestionsComponent
} from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
import {
DsoInputSuggestionsComponent
} from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
import { TypeBadgeComponent } from './object-collection/shared/badges/type-badge/type-badge.component';
import { AccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/access-status-badge.component';
import {
MetadataRepresentationLoaderComponent
} from './metadata-representation/metadata-representation-loader.component';
import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
import {
ListableObjectComponentLoaderComponent
} from './object-collection/shared/listable-object/listable-object-component-loader.component';
import {
ItemSearchResultListElementComponent
} from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
import {
ItemMetadataRepresentationListElementComponent
} from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
import {
SelectableListItemControlComponent
} from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
import {
ImportableListItemControlComponent
} from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
import { LogInContainerComponent } from './log-in/container/log-in-container.component';
import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
import { LogInComponent } from './log-in/log-in.component';
import { ThemedLogInComponent } from './log-in/themed-log-in.component';
import { MissingTranslationHelper } from './translate/missing-translation.helper';
import { FileValidator } from './utils/require-file.validator';
import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
import {
ModifyItemOverviewComponent
} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
import { ThemedFileDownloadLinkComponent } from './file-download-link/themed-file-download-link.component';
import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
import { CurationFormComponent } from '../curation-form/curation-form.component';
import {
PublicationSidebarSearchListElementComponent
} from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
import {
SidebarSearchListElementComponent
} from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
import {
CollectionSidebarSearchListElementComponent
} from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
import {
CommunitySidebarSearchListElementComponent
} from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
import {
BundleListElementComponent
} from './object-list/bundle-list-element/bundle-list-element.component';
import {
AuthorizedCollectionSelectorComponent
} from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
import { HoverClassDirective } from './hover-class.directive';
import {
ValidationSuggestionsComponent
} from './input-suggestions/validation-suggestions/validation-suggestions.component';
import {
ItemSearchResultGridElementComponent
} from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
import { DsSelectComponent } from './ds-select/ds-select.component';
import { ContextHelpDirective } from './context-help.directive';
import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
import { RSSComponent } from './rss-feed/rss.component';
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
import { ThemedLoadingComponent } from './loading/themed-loading.component';
import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
import {
ItemPageTitleFieldComponent
} from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
import { MarkdownPipe } from './utils/markdown.pipe';
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
import { MenuModule } from './menu/menu.module';
import {
ListableNotificationObjectComponent
} from './object-list/listable-notification-object/listable-notification-object.component';
import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
import { BadgesComponent } from './object-collection/shared/badges/badges.component';
import { ThemedBadgesComponent } from './object-collection/shared/badges/themed-badges.component';
import { ThemedStatusBadgeComponent } from './object-collection/shared/badges/status-badge/themed-status-badge.component';
import { ThemedTypeBadgeComponent } from './object-collection/shared/badges/type-badge/themed-type-badge.component';
import { ThemedMyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component';
import { ThemedAccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
import { MyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
import { ShortNumberPipe } from './utils/short-number.pipe';
import {
LogInExternalProviderComponent
} from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
import {
AdvancedClaimedTaskActionSelectReviewerComponent
} from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
import {
AdvancedClaimedTaskActionRatingComponent
} from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
import { EpersonSearchBoxComponent } from './eperson-group-list/eperson-search-box/eperson-search-box.component';
import { GroupSearchBoxComponent } from './eperson-group-list/group-search-box/group-search-box.component';
import {
ThemedItemPageTitleFieldComponent
} from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
import { NgxPaginationModule } from 'ngx-pagination';
import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
const MODULES = [
CommonModule,
FormsModule,
InfiniteScrollModule,
NgbNavModule,
NgbTypeaheadModule,
NgbPaginationModule,
NgbDropdownModule,
NgbTooltipModule,
ReactiveFormsModule,
RouterModule,
DragDropModule,
GoogleRecaptchaModule,
MenuModule,
NgxPaginationModule
];
const ROOT_MODULES = [
TranslateModule.forChild({
missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
useDefaultLang: true
})
];
const PIPES = [
// put shared pipes here
EnumKeysPipe,
FileSizePipe,
SafeUrlPipe,
TruncatePipe,
EmphasizePipe,
CapitalizePipe,
ObjectKeysPipe,
ObjectValuesPipe,
ConsolePipe,
ObjNgFor,
BrowserOnlyPipe,
MarkdownPipe,
ShortNumberPipe
];
const COMPONENTS = [
// put shared components here
AlertComponent,
AuthNavMenuComponent,
ThemedAuthNavMenuComponent,
UserMenuComponent,
ThemedUserMenuComponent,
DsSelectComponent,
ErrorComponent,
LangSwitchComponent,
ThemedLangSwitchComponent,
LoadingComponent,
ThemedLoadingComponent,
LogInComponent,
ThemedLogInComponent,
LogOutComponent,
ObjectListComponent,
ThemedObjectListComponent,
ObjectDetailComponent,
ObjectGridComponent,
AbstractListableElementComponent,
ObjectCollectionComponent,
PaginationComponent,
RSSComponent,
SearchFormComponent,
ThemedSearchFormComponent,
PageWithSidebarComponent,
SidebarDropdownComponent,
ThumbnailComponent,
ThemedThumbnailComponent,
MyDSpaceStatusBadgeComponent,
ThemedMyDSpaceStatusBadgeComponent,
ViewModeSwitchComponent,
TruncatableComponent,
TruncatablePartComponent,
InputSuggestionsComponent,
FilterInputSuggestionsComponent,
ValidationSuggestionsComponent,
DsoInputSuggestionsComponent,
DSOSelectorComponent,
SearchExportCsvComponent,
PageSizeSelectorComponent,
ListableObjectComponentLoaderComponent,
AbstractTrackableComponent,
ComcolMetadataComponent,
TypeBadgeComponent,
AccessStatusBadgeComponent,
ThemedAccessStatusBadgeComponent,
ThemedTypeBadgeComponent,
StatusBadgeComponent,
ThemedStatusBadgeComponent,
BadgesComponent,
ThemedBadgesComponent,
ItemSelectComponent,
CollectionSelectComponent,
MetadataRepresentationLoaderComponent,
SelectableListItemControlComponent,
ImportableListItemControlComponent,
LogInContainerComponent,
ModifyItemOverviewComponent,
ImpersonateNavbarComponent,
EntityDropdownComponent,
ExportMetadataSelectorComponent,
ImportBatchSelectorComponent,
ExportBatchSelectorComponent,
ConfirmationModalComponent,
AuthorizedCollectionSelectorComponent,
SearchNavbarComponent,
ItemPageTitleFieldComponent,
ThemedSearchNavbarComponent,
ListableNotificationObjectComponent,
MetadataFieldWrapperComponent,
ContextHelpWrapperComponent,
EpersonGroupListComponent,
EpersonSearchBoxComponent,
GroupSearchBoxComponent,
ThemedItemPageTitleFieldComponent,
];
const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator
BundleListElementComponent,
CollectionListElementComponent,
CommunityListElementComponent,
SearchResultListElementComponent,
CommunitySearchResultListElementComponent,
CollectionSearchResultListElementComponent,
CollectionGridElementComponent,
CommunityGridElementComponent,
CommunitySearchResultGridElementComponent,
CollectionSearchResultGridElementComponent,
SearchResultGridElementComponent,
ItemListElementComponent,
ItemGridElementComponent,
BitstreamListItemComponent,
ItemSearchResultListElementComponent,
ItemSearchResultGridElementComponent,
BrowseEntryListElementComponent,
SearchResultDetailElementComponent,
StartsWithDateComponent,
StartsWithTextComponent,
CreateCommunityParentSelectorComponent,
ThemedCreateCommunityParentSelectorComponent,
CreateCollectionParentSelectorComponent,
ThemedCreateCollectionParentSelectorComponent,
CreateItemParentSelectorComponent,
ThemedCreateItemParentSelectorComponent,
EditCommunitySelectorComponent,
ThemedEditCommunitySelectorComponent,
EditCollectionSelectorComponent,
ThemedEditCollectionSelectorComponent,
EditItemSelectorComponent,
ThemedEditItemSelectorComponent,
PlainTextMetadataListElementComponent,
BrowseLinkMetadataListElementComponent,
ItemMetadataListElementComponent,
MetadataRepresentationListElementComponent,
ItemMetadataRepresentationListElementComponent,
LogInPasswordComponent,
LogInExternalProviderComponent,
ClaimedTaskActionsDeclineTaskComponent,
CollectionDropdownComponent,
ThemedCollectionDropdownComponent,
FileDownloadLinkComponent,
ThemedFileDownloadLinkComponent,
CurationFormComponent,
ExportMetadataSelectorComponent,
ImportBatchSelectorComponent,
ExportBatchSelectorComponent,
ConfirmationModalComponent,
SidebarSearchListElementComponent,
PublicationSidebarSearchListElementComponent,
CollectionSidebarSearchListElementComponent,
CommunitySidebarSearchListElementComponent,
ScopeSelectorModalComponent,
ListableNotificationObjectComponent,
AdvancedClaimedTaskActionSelectReviewerComponent,
AdvancedClaimedTaskActionRatingComponent,
EpersonGroupListComponent,
EpersonSearchBoxComponent,
GroupSearchBoxComponent
];
const PROVIDERS = [
TruncatableService,
MockAdminGuard,
AbstractTrackableComponent
];
const DIRECTIVES = [
VarDirective,
DragClickDirective,
DebounceDirective,
ClickOutsideDirective,
InListValidator,
AutoFocusDirective,
RoleDirective,
MetadataRepresentationDirective,
ListableObjectDirective,
ClaimedTaskActionsDirective,
FileValueAccessorDirective,
FileValidator,
NgForTrackByIdDirective,
MetadataFieldValidator,
HoverClassDirective,
ContextHelpDirective,
];
@NgModule({
imports: [
...MODULES,
...ROOT_MODULES,
...PIPES,
...COMPONENTS,
...ENTRY_COMPONENTS,
...DIRECTIVES
],
providers: [
...PROVIDERS
],
exports: [
...MODULES,
...PIPES,
...COMPONENTS,
...ENTRY_COMPONENTS,
...DIRECTIVES,
TranslateModule,
]
})
/**
* This module handles all components and pipes that need to be shared among multiple other modules
*/
export class SharedModule {
/**
* NOTE: this method allows to resolve issue with components that using a custom decorator
* which are not loaded during SSR otherwise
*/
static withEntryComponents() {
return {
ngModule: SharedModule,
providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
};
}
}

View File

@@ -6,7 +6,6 @@ import { SubscriptionViewComponent } from './subscription-view/subscription-view
import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component'; import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { SharedModule } from '../shared.module';
import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
const COMPONENTS = [ const COMPONENTS = [
@@ -21,7 +20,6 @@ const COMPONENTS = [
ReactiveFormsModule, ReactiveFormsModule,
TranslateModule, TranslateModule,
RouterModule, RouterModule,
SharedModule,
...COMPONENTS ...COMPONENTS
], ],
exports: [ exports: [

View File

@@ -4,7 +4,8 @@ import { Pipe, PipeTransform } from '@angular/core';
* Support dsBrowserOnly in unit tests. * Support dsBrowserOnly in unit tests.
*/ */
@Pipe({ @Pipe({
name: 'dsBrowserOnly' name: 'dsBrowserOnly',
standalone: true
}) })
export class BrowserOnlyMockPipe implements PipeTransform { export class BrowserOnlyMockPipe implements PipeTransform {
transform(value: string): string | undefined { transform(value: string): string | undefined {

View File

@@ -4,6 +4,7 @@ import { Directive, Input } from '@angular/core';
@Directive({ @Directive({
// eslint-disable-next-line @angular-eslint/directive-selector // eslint-disable-next-line @angular-eslint/directive-selector
selector: '[ngComponentOutlet]', selector: '[ngComponentOutlet]',
standalone: true
}) })
export class NgComponentOutletDirectiveStub { export class NgComponentOutletDirectiveStub {
@Input() ngComponentOutlet: any; @Input() ngComponentOutlet: any;

View File

@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec'; import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
import { SharedModule } from '../shared.module';
import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub'; import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub';
import { QueryParamsDirectiveStub } from './query-params-directive.stub'; import { QueryParamsDirectiveStub } from './query-params-directive.stub';
import { RouterLinkDirectiveStub } from './router-link-directive.stub'; import { RouterLinkDirectiveStub } from './router-link-directive.stub';
@@ -16,9 +15,6 @@ import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule
],
declarations: [
QueryParamsDirectiveStub, QueryParamsDirectiveStub,
MySimpleItemActionComponent, MySimpleItemActionComponent,
RouterLinkDirectiveStub, RouterLinkDirectiveStub,

View File

@@ -7,7 +7,6 @@
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared.module';
import { FileUploadModule } from 'ng2-file-upload'; import { FileUploadModule } from 'ng2-file-upload';
import { UploaderComponent } from './uploader/uploader.component'; import { UploaderComponent } from './uploader/uploader.component';
import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component'; import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
@@ -20,7 +19,6 @@ const COMPONENTS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
FileUploadModule, FileUploadModule,
...COMPONENTS ...COMPONENTS
], ],

View File

@@ -9,7 +9,6 @@ import { Collection } from '../../core/shared/collection.model';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReport } from '../../core/statistics/models/usage-report.model';
import { SharedModule } from '../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
@@ -65,7 +64,6 @@ describe('CollectionStatisticsPageComponent', () => {
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
CommonModule, CommonModule,
SharedModule,
CollectionStatisticsPageComponent, CollectionStatisticsPageComponent,
StatisticsTableComponent StatisticsTableComponent
], ],

View File

@@ -9,7 +9,6 @@ import { Community } from '../../core/shared/community.model';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReport } from '../../core/statistics/models/usage-report.model';
import { SharedModule } from '../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
@@ -65,7 +64,6 @@ describe('CommunityStatisticsPageComponent', () => {
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
CommonModule, CommonModule,
SharedModule,
CommunityStatisticsPageComponent, CommunityStatisticsPageComponent,
StatisticsTableComponent StatisticsTableComponent
], ],

View File

@@ -9,7 +9,6 @@ import { Item } from '../../core/shared/item.model';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReport } from '../../core/statistics/models/usage-report.model';
import { SharedModule } from '../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
@@ -65,7 +64,6 @@ describe('ItemStatisticsPageComponent', () => {
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
CommonModule, CommonModule,
SharedModule,
ItemStatisticsPageComponent, ItemStatisticsPageComponent,
StatisticsTableComponent StatisticsTableComponent
], ],

View File

@@ -9,7 +9,6 @@ import { Site } from '../../core/shared/site.model';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { UsageReport } from '../../core/statistics/models/usage-report.model'; import { UsageReport } from '../../core/statistics/models/usage-report.model';
import { SharedModule } from '../../shared/shared.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
@@ -65,7 +64,6 @@ describe('SiteStatisticsPageComponent', () => {
imports: [ imports: [
TranslateModule.forRoot(), TranslateModule.forRoot(),
CommonModule, CommonModule,
SharedModule,
SiteStatisticsPageComponent, SiteStatisticsPageComponent,
StatisticsTableComponent StatisticsTableComponent
], ],

View File

@@ -1,7 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { StatisticsModule } from '../statistics/statistics.module'; import { StatisticsModule } from '../statistics/statistics.module';
import { UsageReportDataService } from '../core/statistics/usage-report-data.service'; import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component'; import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
@@ -29,7 +28,6 @@ const components = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
StatisticsModule.forRoot(), StatisticsModule.forRoot(),
...components ...components
], ],

View File

@@ -1,6 +1,5 @@
import { ModuleWithProviders, NgModule } from '@angular/core'; import { ModuleWithProviders, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '../shared/shared.module';
import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component'; import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
import { StatisticsEndpoint } from './statistics-endpoint.model'; import { StatisticsEndpoint } from './statistics-endpoint.model';
@@ -14,7 +13,6 @@ export const models = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
ViewTrackerComponent ViewTrackerComponent
], ],
exports: [ exports: [

View File

@@ -26,7 +26,6 @@ import { getMockTranslateService } from '../../../shared/mocks/translate.service
import { cold, hot } from 'jasmine-marbles'; import { cold, hot } from 'jasmine-marbles';
import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub'; import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service'; import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
import { SharedModule } from '../../../shared/shared.module';
import { createTestComponent } from '../../../shared/testing/utils.test'; import { createTestComponent } from '../../../shared/testing/utils.test';
import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model'; import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
@@ -53,7 +52,6 @@ describe('SubmissionUploadFilesComponent Component', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
SharedModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
SubmissionUploadFilesComponent, SubmissionUploadFilesComponent,
TestComponent TestComponent
@@ -203,8 +201,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
@Component({ @Component({
selector: 'ds-test-cmp', selector: 'ds-test-cmp',
template: ``, template: ``,
standalone: true, standalone: true
imports: [SharedModule]
}) })
class TestComponent { class TestComponent {

View File

@@ -5,7 +5,6 @@ import { of as observableOf } from 'rxjs';
import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service'; import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
import { DebugElement } from '@angular/core'; import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { SharedModule } from '../../../shared/shared.module';
import { SectionsService } from '../sections.service'; import { SectionsService } from '../sections.service';
import { SectionDataObject } from '../models/section-data.model'; import { SectionDataObject } from '../models/section-data.model';
import { SectionsType } from '../sections-type'; import { SectionsType } from '../sections-type';
@@ -171,7 +170,6 @@ describe('SubmissionSectionCcLicensesComponent', () => {
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
SharedModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
SubmissionSectionCcLicensesComponent SubmissionSectionCcLicensesComponent
], ],

View File

@@ -1,4 +1,3 @@
import { SharedModule } from '../../../shared/shared.module';
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub'; import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock'; import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
@@ -66,7 +65,6 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
} }
}), }),
NgbCollapseModule, NgbCollapseModule,
SharedModule,
SubmissionSectionSherpaPoliciesComponent SubmissionSectionSherpaPoliciesComponent
], ],
providers: [ providers: [

View File

@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { SubmissionSectionFormComponent } from './sections/form/section-form.component'; import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
import { SectionsDirective } from './sections/sections.directive'; import { SectionsDirective } from './sections/sections.directive';
@@ -110,7 +109,6 @@ const DECLARATIONS = [
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SharedModule,
StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>), StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
EffectsModule.forFeature(submissionEffects), EffectsModule.forFeature(submissionEffects),
JournalEntitiesModule.withEntryComponents(), JournalEntitiesModule.withEntryComponents(),

Some files were not shown because too many files have changed in this diff Show More