hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-62589_Item-mapper-update

Browse Source 
Conflicts:
	resources/i18n/en.json
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
This commit is contained in:
Kristof De Langhe
2019-08-12 15:23:43 +02:00
parent cc389e1149 0ad505ba30
commit 2f0a5a4065
476 changed files with 6780 additions and 5048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/app/core/core.module.ts
View File

@@ -1,14 +1,13 @@
import {
ModuleWithProviders,
NgModule,
Optional,
SkipSelf
} from '@angular/core';
import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
import { CommonModule } from '@angular/common';
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
import {
DynamicFormLayoutService,
DynamicFormService,
DynamicFormValidationService
} from '@ng-dynamic-forms/core';
import { coreEffects } from './core.effects';
import { coreReducers } from './core.reducers';
@@ -60,11 +59,12 @@ import { HALEndpointService } from './shared/hal-endpoint.service';
import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service';
import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
import { ResourcePolicyService } from './data/resource-policy.service';
import { RegistryService } from './registry/registry.service';
import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
import { WorkflowitemDataService } from './submission/workflowitem-data.service';
import { WorkflowItemDataService } from './submission/workflowitem-data.service';
import { NotificationsService } from '../shared/notifications/notifications.service';
import { UploaderService } from '../shared/uploader/uploader.service';
import { FileService } from './shared/file.service';
@@ -81,12 +81,42 @@ import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
import { SearchService } from '../+search-page/search-service/search.service';
import { NormalizedCollection } from './cache/models/normalized-collection.model';
import { NormalizedCommunity } from './cache/models/normalized-community.model';
import { NormalizedDSpaceObject } from './cache/models/normalized-dspace-object.model';
import { NormalizedBitstream } from './cache/models/normalized-bitstream.model';
import { NormalizedBundle } from './cache/models/normalized-bundle.model';
import { NormalizedBitstreamFormat } from './cache/models/normalized-bitstream-format.model';
import { NormalizedItem } from './cache/models/normalized-item.model';
import { NormalizedEPerson } from './eperson/models/normalized-eperson.model';
import { NormalizedGroup } from './eperson/models/normalized-group.model';
import { NormalizedResourcePolicy } from './cache/models/normalized-resource-policy.model';
import { NormalizedMetadataSchema } from './metadata/normalized-metadata-schema.model';
import { NormalizedMetadataField } from './metadata/normalized-metadata-field.model';
import { NormalizedLicense } from './cache/models/normalized-license.model';
import { NormalizedWorkflowItem } from './submission/models/normalized-workflowitem.model';
import { NormalizedWorkspaceItem } from './submission/models/normalized-workspaceitem.model';
import { NormalizedSubmissionDefinitionsModel } from './config/models/normalized-config-submission-definitions.model';
import { NormalizedSubmissionFormsModel } from './config/models/normalized-config-submission-forms.model';
import { NormalizedSubmissionSectionModel } from './config/models/normalized-config-submission-section.model';
import { NormalizedAuthStatus } from './auth/models/normalized-auth-status.model';
import { NormalizedAuthorityValue } from './integration/models/normalized-authority-value.model';
import { RoleService } from './roles/role.service';
import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
import { ClaimedTaskDataService } from './tasks/claimed-task-data.service';
import { PoolTaskDataService } from './tasks/pool-task-data.service';
import { TaskResponseParsingService } from './tasks/task-response-parsing.service';
import { NormalizedClaimedTask } from './tasks/models/normalized-claimed-task-object.model';
import { NormalizedTaskObject } from './tasks/models/normalized-task-object.model';
import { NormalizedPoolTask } from './tasks/models/normalized-pool-task-object.model';
import { NormalizedRelationship } from './cache/models/items/normalized-relationship.model';
import { NormalizedRelationshipType } from './cache/models/items/normalized-relationship-type.model';
import { NormalizedItemType } from './cache/models/items/normalized-item-type.model';
import { MetadatafieldParsingService } from './data/metadatafield-parsing.service';
import { NormalizedSubmissionUploadsModel } from './config/models/normalized-config-submission-uploads.model';
import { NormalizedBrowseEntry } from './shared/normalized-browse-entry.model';
import { BrowseDefinition } from './shared/browse-definition.model';
import { MappingCollectionsReponseParsingService } from './data/mapping-collections-reponse-parsing.service';
import { ObjectSelectService } from '../shared/object-select/object-select.service';
@@ -96,13 +126,9 @@ const IMPORTS = [
EffectsModule.forFeature(coreEffects)
];
const DECLARATIONS = [
const DECLARATIONS = [];
];
const EXPORTS = [
];
const EXPORTS = [];
const PROVIDERS = [
ApiService,
@@ -127,6 +153,7 @@ const PROVIDERS = [
MetadataService,
ObjectCacheService,
PaginationComponentOptions,
ResourcePolicyService,
RegistryService,
NormalizedObjectBuildService,
RemoteDataBuildService,
@@ -159,11 +186,12 @@ const PROVIDERS = [
AuthorityService,
IntegrationResponseParsingService,
MetadataschemaParsingService,
MetadatafieldParsingService,
UploaderService,
UUIDService,
NotificationsService,
WorkspaceitemDataService,
WorkflowitemDataService,
WorkflowItemDataService,
UploaderService,
FileService,
DSpaceObjectDataService,
@@ -190,6 +218,42 @@ const PROVIDERS = [
{ provide: NativeWindowService, useFactory: NativeWindowFactory }
];
/**
* Declaration needed to make sure all decorator functions are called in time
*/
export const normalizedModels =
[
NormalizedDSpaceObject,
NormalizedBundle,
NormalizedBitstream,
NormalizedBitstreamFormat,
NormalizedItem,
NormalizedCollection,
NormalizedCommunity,
NormalizedEPerson,
NormalizedGroup,
NormalizedResourcePolicy,
NormalizedMetadataSchema,
NormalizedMetadataField,
NormalizedLicense,
NormalizedWorkflowItem,
NormalizedWorkspaceItem,
NormalizedSubmissionDefinitionsModel,
NormalizedSubmissionFormsModel,
NormalizedSubmissionSectionModel,
NormalizedSubmissionUploadsModel,
NormalizedAuthStatus,
NormalizedAuthorityValue,
NormalizedBrowseEntry,
BrowseDefinition,
NormalizedClaimedTask,
NormalizedTaskObject,
NormalizedPoolTask,
NormalizedRelationship,
NormalizedRelationshipType,
NormalizedItemType
];
@NgModule({
imports: [
...IMPORTS
@@ -204,8 +268,8 @@ const PROVIDERS = [
...PROVIDERS
]
})
export class CoreModule {
export class CoreModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: CoreModule,
@@ -215,10 +279,9 @@ export class CoreModule {
};
}
constructor( @Optional() @SkipSelf() parentModule: CoreModule) {
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
if (isNotEmpty(parentModule)) {
throw new Error('CoreModule is already loaded. Import it in the AppModule only');
}
}
}