Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete

This commit is contained in:
Art Lowel
2020-01-27 11:26:15 +01:00
153 changed files with 5144 additions and 633 deletions

View File

@@ -119,6 +119,7 @@ import { MetadatafieldParsingService } from './data/metadatafield-parsing.servic
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 { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service';
import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service';
import { ObjectSelectService } from '../shared/object-select/object-select.service';
import {EntityTypeService} from './data/entity-type.service';
@@ -137,6 +138,10 @@ import { SearchConfigurationService } from './shared/search/search-configuration
import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
import { RelationshipTypeService } from './data/relationship-type.service';
import { SidebarService } from '../shared/sidebar/sidebar.service';
import { NormalizedExternalSource } from './cache/models/normalized-external-source.model';
import { NormalizedExternalSourceEntry } from './cache/models/normalized-external-source-entry.model';
import { ExternalSourceService } from './data/external-source.service';
import { LookupRelationService } from './data/lookup-relation.service';
/**
* When not in production, endpoint responses can be mocked for testing purposes
@@ -242,6 +247,7 @@ const PROVIDERS = [
ClaimedTaskDataService,
PoolTaskDataService,
EntityTypeService,
ContentSourceResponseParsingService,
SearchService,
SidebarService,
SearchFilterService,
@@ -249,6 +255,8 @@ const PROVIDERS = [
SearchConfigurationService,
SelectableListService,
RelationshipTypeService,
ExternalSourceService,
LookupRelationService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,
@@ -294,7 +302,9 @@ export const normalizedModels =
NormalizedPoolTask,
NormalizedRelationship,
NormalizedRelationshipType,
NormalizedItemType
NormalizedItemType,
NormalizedExternalSource,
NormalizedExternalSourceEntry
];
@NgModule({