mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-08 18:44:14 +00:00
Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts: resources/i18n/en.json src/app/+collection-page/collection-page-routing.module.ts src/app/+collection-page/collection-page.module.ts src/app/+community-page/community-page.component.ts src/app/+item-page/edit-item-page/edit-item-page.component.ts src/app/+item-page/edit-item-page/edit-item-page.module.ts src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts src/app/+item-page/edit-item-page/item-private/item-private.component.ts src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts src/app/+item-page/edit-item-page/item-public/item-public.component.ts src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts src/app/+item-page/edit-item-page/item-status/item-status.component.ts src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts src/app/+item-page/item-page-routing.module.ts src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts src/app/+search-page/search-filters/search-filter/search-filter.component.ts src/app/+search-page/search-service/search.service.ts src/app/app.reducer.ts src/app/core/auth/auth-response-parsing.service.ts src/app/core/auth/auth.service.ts src/app/core/auth/server-auth.service.ts src/app/core/cache/builders/remote-data-build.service.ts src/app/core/cache/object-cache.service.ts src/app/core/core.module.ts src/app/core/data/collection-data.service.ts src/app/core/data/data.service.ts src/app/core/data/item-data.service.spec.ts src/app/core/data/item-data.service.ts src/app/core/data/request.models.ts src/app/core/data/request.reducer.ts src/app/core/data/request.service.spec.ts src/app/core/data/request.service.ts src/app/core/index/index.effects.ts src/app/core/index/index.reducer.ts src/app/core/metadata/metadata.service.spec.ts src/app/core/shared/operators.spec.ts src/app/core/shared/operators.ts src/app/header/header.component.spec.ts src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
@@ -4,16 +4,21 @@ 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';
|
||||
|
||||
import { NgxPaginationModule } from 'ngx-pagination';
|
||||
import { ItemTypeSwitcherComponent } from './items/switcher/item-type-switcher.component';
|
||||
import { OrgUnitMetadataListElementComponent } from './object-list/item-list-element/item-types/orgunit/orgunit-metadata-list-element.component';
|
||||
import { TypedItemSearchResultListElementComponent } from './object-list/item-list-element/item-types/typed-item-search-result-list-element.component';
|
||||
import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component';
|
||||
import { OrgUnitListElementComponent } from './object-list/item-list-element/item-types/orgunit/orgunit-list-element.component';
|
||||
import { PersonListElementComponent } from './object-list/item-list-element/item-types/person/person-list-element.component';
|
||||
import { ProjectListElementComponent } from './object-list/item-list-element/item-types/project/project-list-element.component';
|
||||
import { JournalListElementComponent } from './object-list/item-list-element/item-types/journal/journal-list-element.component';
|
||||
import { JournalVolumeListElementComponent } from './object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component';
|
||||
import { JournalIssueListElementComponent } from './object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component';
|
||||
|
||||
import { FileUploadModule } from 'ng2-file-upload';
|
||||
|
||||
@@ -30,7 +35,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';
|
||||
@@ -56,9 +60,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';
|
||||
@@ -70,12 +77,31 @@ 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 { MyDSpaceResultListElementComponent } from './object-list/my-dspace-result-list-element/my-dspace-result-list-element.component';
|
||||
import { MyDSpaceResultDetailElementComponent } from './object-detail/my-dspace-result-detail-element/my-dspace-result-detail-element.component';
|
||||
import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/claimed-task-actions.component';
|
||||
import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
|
||||
import { ObjectDetailComponent } from './object-detail/object-detail.component';
|
||||
import { WrapperDetailElementComponent } from './object-detail/wrapper-detail-element/wrapper-detail-element.component';
|
||||
import { ItemDetailPreviewComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
|
||||
import { MyDSpaceItemStatusComponent } from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
|
||||
import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
|
||||
import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
|
||||
import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
|
||||
import { ItemActionsComponent } from './mydspace-actions/item/item-actions.component';
|
||||
import { ClaimedTaskActionsApproveComponent } from './mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component';
|
||||
import { ClaimedTaskActionsRejectComponent } from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.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';
|
||||
@@ -85,9 +111,43 @@ 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';
|
||||
import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
|
||||
import { TooltipModule } from 'ngx-bootstrap';
|
||||
import { PersonMetadataListElementComponent } from './object-list/item-list-element/item-types/person/person-metadata-list-element.component';
|
||||
import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
|
||||
import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
|
||||
import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
|
||||
import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
|
||||
import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
|
||||
import { ObjectValuesPipe } from './utils/object-values-pipe';
|
||||
import { InListValidator } from './utils/in-list-validator.directive';
|
||||
import { AutoFocusDirective } from './utils/auto-focus.directive';
|
||||
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
|
||||
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 { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
|
||||
import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/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 { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-search-result-list-element.component';
|
||||
import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
|
||||
import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
|
||||
import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
|
||||
import { ItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
|
||||
import { MetadataFieldWrapperComponent } from '../+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component';
|
||||
import { MetadataValuesComponent } from '../+item-page/field-components/metadata-values/metadata-values.component';
|
||||
import { RoleDirective } from './roles/role.directive';
|
||||
import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
|
||||
import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
|
||||
import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
|
||||
import { ItemSelectComponent } from './object-select/item-select/item-select.component';
|
||||
import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
|
||||
import { MenuModule } from './menu/menu.module';
|
||||
|
||||
const MODULES = [
|
||||
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
||||
@@ -112,6 +172,10 @@ const MODULES = [
|
||||
MenuModule
|
||||
];
|
||||
|
||||
const ROOT_MODULES = [
|
||||
TooltipModule.forRoot()
|
||||
];
|
||||
|
||||
const PIPES = [
|
||||
// put shared pipes here
|
||||
EnumKeysPipe,
|
||||
@@ -121,35 +185,50 @@ const PIPES = [
|
||||
EmphasizePipe,
|
||||
CapitalizePipe,
|
||||
ObjectKeysPipe,
|
||||
ConsolePipe
|
||||
ObjectValuesPipe,
|
||||
ConsolePipe,
|
||||
ObjNgFor
|
||||
];
|
||||
|
||||
const COMPONENTS = [
|
||||
// put shared components here
|
||||
AlertComponent,
|
||||
AuthNavMenuComponent,
|
||||
UserMenuComponent,
|
||||
ChipsComponent,
|
||||
ComcolPageContentComponent,
|
||||
ComcolPageHeaderComponent,
|
||||
ComcolPageLogoComponent,
|
||||
ComColFormComponent,
|
||||
CreateComColPageComponent,
|
||||
EditComColPageComponent,
|
||||
DeleteComColPageComponent,
|
||||
ComcolPageBrowseByComponent,
|
||||
DsDynamicFormComponent,
|
||||
DsDynamicFormControlComponent,
|
||||
DsDynamicFormControlContainerComponent,
|
||||
DsDynamicListComponent,
|
||||
DsDynamicLookupComponent,
|
||||
DsDynamicScrollableDropdownComponent,
|
||||
DsDynamicTagComponent,
|
||||
DsDynamicTypeaheadComponent,
|
||||
DsDynamicGroupComponent,
|
||||
DsDynamicRelationGroupComponent,
|
||||
DsDatePickerComponent,
|
||||
DsDynamicFormGroupComponent,
|
||||
DsDynamicFormArrayComponent,
|
||||
DsDatePickerInlineComponent,
|
||||
ErrorComponent,
|
||||
FormComponent,
|
||||
LangSwitchComponent,
|
||||
LoadingComponent,
|
||||
LogInComponent,
|
||||
LogOutComponent,
|
||||
NumberPickerComponent,
|
||||
ObjectListComponent,
|
||||
ObjectDetailComponent,
|
||||
ObjectGridComponent,
|
||||
AbstractListableElementComponent,
|
||||
WrapperListElementComponent,
|
||||
ObjectGridComponent,
|
||||
WrapperDetailElementComponent,
|
||||
WrapperGridElementComponent,
|
||||
ObjectCollectionComponent,
|
||||
PaginationComponent,
|
||||
@@ -158,11 +237,37 @@ const COMPONENTS = [
|
||||
GridThumbnailComponent,
|
||||
UploaderComponent,
|
||||
WrapperListElementComponent,
|
||||
ItemListPreviewComponent,
|
||||
MyDSpaceItemStatusComponent,
|
||||
ItemSubmitterComponent,
|
||||
ItemDetailPreviewComponent,
|
||||
ItemDetailPreviewFieldComponent,
|
||||
ClaimedTaskActionsComponent,
|
||||
ClaimedTaskActionsApproveComponent,
|
||||
ClaimedTaskActionsRejectComponent,
|
||||
ClaimedTaskActionsReturnToPoolComponent,
|
||||
ItemActionsComponent,
|
||||
PoolTaskActionsComponent,
|
||||
WorkflowitemActionsComponent,
|
||||
WorkspaceitemActionsComponent,
|
||||
ViewModeSwitchComponent,
|
||||
TruncatableComponent,
|
||||
TruncatablePartComponent,
|
||||
BrowseByComponent,
|
||||
InputSuggestionsComponent,
|
||||
DSOSelectorComponent,
|
||||
CreateCommunityParentSelectorComponent,
|
||||
CreateCollectionParentSelectorComponent,
|
||||
CreateItemParentSelectorComponent,
|
||||
EditCommunitySelectorComponent,
|
||||
EditCollectionSelectorComponent,
|
||||
EditItemSelectorComponent,
|
||||
CommunitySearchResultListElementComponent,
|
||||
CollectionSearchResultListElementComponent,
|
||||
ItemSearchResultListElementComponent,
|
||||
TypedItemSearchResultListElementComponent,
|
||||
ItemTypeSwitcherComponent,
|
||||
BrowseByComponent,
|
||||
ItemSelectComponent,
|
||||
CollectionSelectComponent
|
||||
];
|
||||
@@ -172,35 +277,88 @@ const ENTRY_COMPONENTS = [
|
||||
ItemListElementComponent,
|
||||
CollectionListElementComponent,
|
||||
CommunityListElementComponent,
|
||||
MyDSpaceResultListElementComponent,
|
||||
SearchResultListElementComponent,
|
||||
CommunitySearchResultListElementComponent,
|
||||
CollectionSearchResultListElementComponent,
|
||||
ItemSearchResultListElementComponent,
|
||||
ItemGridElementComponent,
|
||||
CollectionGridElementComponent,
|
||||
CommunityGridElementComponent,
|
||||
SearchResultGridElementComponent,
|
||||
BrowseEntryListElementComponent
|
||||
PublicationListElementComponent,
|
||||
PersonListElementComponent,
|
||||
PersonMetadataListElementComponent,
|
||||
OrgUnitMetadataListElementComponent,
|
||||
OrgUnitListElementComponent,
|
||||
ProjectListElementComponent,
|
||||
JournalListElementComponent,
|
||||
JournalVolumeListElementComponent,
|
||||
JournalIssueListElementComponent,
|
||||
BrowseEntryListElementComponent,
|
||||
MyDSpaceResultDetailElementComponent,
|
||||
SearchResultGridElementComponent,
|
||||
DsDynamicListComponent,
|
||||
DsDynamicLookupComponent,
|
||||
DsDynamicScrollableDropdownComponent,
|
||||
DsDynamicTagComponent,
|
||||
DsDynamicTypeaheadComponent,
|
||||
DsDynamicRelationGroupComponent,
|
||||
DsDatePickerComponent,
|
||||
DsDynamicFormGroupComponent,
|
||||
DsDynamicFormArrayComponent,
|
||||
DsDatePickerInlineComponent,
|
||||
StartsWithDateComponent,
|
||||
StartsWithTextComponent,
|
||||
DSOSelectorComponent,
|
||||
CreateCommunityParentSelectorComponent,
|
||||
CreateCollectionParentSelectorComponent,
|
||||
CreateItemParentSelectorComponent,
|
||||
EditCommunitySelectorComponent,
|
||||
EditCollectionSelectorComponent,
|
||||
EditItemSelectorComponent,
|
||||
StartsWithTextComponent,
|
||||
PlainTextMetadataListElementComponent,
|
||||
ItemMetadataListElementComponent,
|
||||
MetadataRepresentationListElementComponent
|
||||
];
|
||||
|
||||
const SHARED_ITEM_PAGE_COMPONENTS = [
|
||||
MetadataFieldWrapperComponent,
|
||||
MetadataValuesComponent,
|
||||
];
|
||||
|
||||
const PROVIDERS = [
|
||||
TruncatableService,
|
||||
MockAdminGuard
|
||||
MockAdminGuard,
|
||||
{
|
||||
provide: DYNAMIC_FORM_CONTROL_MAP_FN,
|
||||
useValue: dsDynamicFormControlMapFn
|
||||
}
|
||||
];
|
||||
|
||||
const DIRECTIVES = [
|
||||
VarDirective,
|
||||
DragClickDirective,
|
||||
DebounceDirective,
|
||||
ClickOutsideDirective
|
||||
ClickOutsideDirective,
|
||||
AuthorityConfidenceStateDirective,
|
||||
InListValidator,
|
||||
AutoFocusDirective,
|
||||
RoleDirective
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
...MODULES
|
||||
...MODULES,
|
||||
...ROOT_MODULES
|
||||
],
|
||||
declarations: [
|
||||
...PIPES,
|
||||
...COMPONENTS,
|
||||
...DIRECTIVES,
|
||||
...ENTRY_COMPONENTS,
|
||||
...SHARED_ITEM_PAGE_COMPONENTS
|
||||
],
|
||||
providers: [
|
||||
...PROVIDERS
|
||||
@@ -209,6 +367,7 @@ const DIRECTIVES = [
|
||||
...MODULES,
|
||||
...PIPES,
|
||||
...COMPONENTS,
|
||||
...SHARED_ITEM_PAGE_COMPONENTS,
|
||||
...DIRECTIVES
|
||||
],
|
||||
entryComponents: [
|
||||
|
||||
Reference in New Issue
Block a user