Merge remote-tracking branch 'remotes/origin/master' into submission

# Conflicts:
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/auth/auth-response-parsing.service.ts
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/models/normalized-resource-policy.model.ts
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/config-response-parsing.service.spec.ts
#	src/app/core/data/config-response-parsing.service.ts
#	src/app/core/data/dso-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/search-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.spec.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/core/shared/resource-policy.model.ts
#	src/app/core/shared/resource-type.ts
#	src/app/shared/shared.module.ts
#	src/app/thumbnail/thumbnail.component.html
This commit is contained in:
Giuseppe
2018-10-15 19:21:01 +02:00
255 changed files with 7005 additions and 1317 deletions

View File

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NouisliderModule } from 'ng2-nouislider';
import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
@@ -72,6 +73,16 @@ import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/mode
import { MockAdminGuard } from './mocks/mock-admin-guard.service';
import { AlertsComponent } from './alerts/alerts.component';
import { ObjNgFor } from './utils/object-ngfor.pipe';
import { BrowseByModule } from '../+browse-by/browse-by.module';
import { BrowseByComponent } from './browse-by/browse-by.component';
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 { MomentModule } from 'angular2-moment';
import { ObjectKeysPipe } from './utils/object-keys-pipe';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -90,6 +101,8 @@ const MODULES = [
ReactiveFormsModule,
RouterModule,
TranslateModule,
NouisliderModule,
MomentModule,
TextMaskModule
];
@@ -99,6 +112,9 @@ const PIPES = [
FileSizePipe,
SafeUrlPipe,
TruncatePipe,
EmphasizePipe,
CapitalizePipe,
ObjectKeysPipe,
ConsolePipe,
ObjNgFor
];
@@ -141,6 +157,8 @@ const COMPONENTS = [
ViewModeSwitchComponent,
TruncatableComponent,
TruncatablePartComponent,
BrowseByComponent,
InputSuggestionsComponent
];
const ENTRY_COMPONENTS = [
@@ -153,6 +171,7 @@ const ENTRY_COMPONENTS = [
CollectionGridElementComponent,
CommunityGridElementComponent,
SearchResultGridElementComponent,
BrowseEntryListElementComponent
];
const PROVIDERS = [
@@ -162,7 +181,9 @@ const PROVIDERS = [
const DIRECTIVES = [
VarDirective,
DragClickDirective
DragClickDirective,
DebounceDirective,
ClickOutsideDirective
];
@NgModule({
@@ -189,6 +210,10 @@ const DIRECTIVES = [
...ENTRY_COMPONENTS
]
})
/**
* This module handles all components and pipes that need to be shared among multiple other modules
*/
export class SharedModule {
}