Merge branch 'master' into w2p-61493_Configurable-entities-master-merge

Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html

src/app/shared/shared.module.ts

@@ -4,12 +4,7 @@ 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';
+import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -39,7 +34,6 @@ import { ItemListElementComponent } from './object-list/item-list-element/item-l
 import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
 import { WrapperListElementComponent } from './object-list/wrapper-list-element/wrapper-list-element.component';
 import { ObjectListComponent } from './object-list/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 { ItemGridElementComponent } from './object-grid/item-grid-element/item-grid-element.component';
@@ -65,9 +59,12 @@ import { LogOutComponent } from './log-out/log-out.component';
 import { FormComponent } from './form/form.component';
 import { DsDynamicTypeaheadComponent } from './form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component';
 import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicFormControlComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component';
+import {
+  DsDynamicFormControlContainerComponent,
+  dsDynamicFormControlMapFn
+} from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
-import { DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
+import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TextMaskModule } from 'angular2-text-mask';
 import { DragClickDirective } from './utils/drag-click.directive';
@@ -79,12 +76,17 @@ import { UploaderComponent } from './uploader/uploader.component';
 import { ChipsComponent } from './chips/chips.component';
 import { DsDynamicTagComponent } from './form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
 import { DsDynamicListComponent } from './form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
-import { DsDynamicGroupComponent } from './form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components';
+import { DsDynamicFormGroupComponent } from './form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
+import { DsDynamicFormArrayComponent } from './form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
+import { DsDynamicRelationGroupComponent } from './form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
+import { DsDatePickerInlineComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
 import { SortablejsModule } from 'angular-sortablejs';
 import { NumberPickerComponent } from './number-picker/number-picker.component';
 import { DsDatePickerComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
 import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
 import { MockAdminGuard } from './mocks/mock-admin-guard.service';
+import { AlertComponent } from './alert/alert.component';
+import { ObjNgFor } from './utils/object-ngfor.pipe';
 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';
@@ -94,6 +96,7 @@ import { InputSuggestionsComponent } from './input-suggestions/input-suggestions
 import { CapitalizePipe } from './utils/capitalize.pipe';
 import { ObjectKeysPipe } from './utils/object-keys-pipe';
 import { MomentModule } from 'ngx-moment';
+import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
 import { MenuModule } from './menu/menu.module';
 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';
@@ -160,11 +163,13 @@ const PIPES = [
   CapitalizePipe,
   ObjectKeysPipe,
   ObjectValuesPipe,
-  ConsolePipe
+  ConsolePipe,
+  ObjNgFor
 ];
 
 const COMPONENTS = [
   // put shared components here
+  AlertComponent,
   AuthNavMenuComponent,
   ChipsComponent,
   ComcolPageContentComponent,
@@ -176,14 +181,17 @@ const COMPONENTS = [
   DeleteComColPageComponent,
   ComcolPageBrowseByComponent,
   DsDynamicFormComponent,
-  DsDynamicFormControlComponent,
+  DsDynamicFormControlContainerComponent,
   DsDynamicListComponent,
   DsDynamicLookupComponent,
   DsDynamicScrollableDropdownComponent,
   DsDynamicTagComponent,
   DsDynamicTypeaheadComponent,
-  DsDynamicGroupComponent,
+  DsDynamicRelationGroupComponent,
   DsDatePickerComponent,
+  DsDynamicFormGroupComponent,
+  DsDynamicFormArrayComponent,
+  DsDatePickerInlineComponent,
   ErrorComponent,
   FormComponent,
   LangSwitchComponent,
@@ -245,6 +253,16 @@ const ENTRY_COMPONENTS = [
   JournalVolumeListElementComponent,
   JournalIssueListElementComponent,
   BrowseEntryListElementComponent,
+  DsDynamicListComponent,
+  DsDynamicLookupComponent,
+  DsDynamicScrollableDropdownComponent,
+  DsDynamicTagComponent,
+  DsDynamicTypeaheadComponent,
+  DsDynamicRelationGroupComponent,
+  DsDatePickerComponent,
+  DsDynamicFormGroupComponent,
+  DsDynamicFormArrayComponent,
+  DsDatePickerInlineComponent,
   StartsWithDateComponent,
   StartsWithTextComponent,
   DSOSelectorComponent,
@@ -262,7 +280,11 @@ const ENTRY_COMPONENTS = [
 
 const PROVIDERS = [
   TruncatableService,
-  MockAdminGuard
+  MockAdminGuard,
+  {
+    provide: DYNAMIC_FORM_CONTROL_MAP_FN,
+    useValue: dsDynamicFormControlMapFn
+  }
 ];
 
 const DIRECTIVES = [
@@ -270,6 +292,7 @@ const DIRECTIVES = [
   DragClickDirective,
   DebounceDirective,
   ClickOutsideDirective,
+  AuthorityConfidenceStateDirective,
   InListValidator,
   AutoFocusDirective
 ];