mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-11 03:53:02 +00:00
Merge remote-tracking branch 'upstream/main' into w2p-94390_replace-dso-page-edit-buttons-with-a-menu
This commit is contained in:
Yana De Pauw
@@ -2,22 +2,15 @@ import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { CdkTreeModule } from '@angular/cdk/tree';
|
||||
import { DragDropModule } from '@angular/cdk/drag-drop';
|
||||
|
||||
import { NouisliderModule } from 'ng2-nouislider';
|
||||
import {
|
||||
NgbDatepickerModule,
|
||||
NgbDropdownModule,
|
||||
NgbNavModule,
|
||||
NgbPaginationModule,
|
||||
NgbTimepickerModule,
|
||||
NgbTooltipModule,
|
||||
NgbTypeaheadModule,
|
||||
} from '@ng-bootstrap/ng-bootstrap';
|
||||
import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
|
||||
import { NgxPaginationModule } from 'ngx-pagination';
|
||||
import { FileUploadModule } from 'ng2-file-upload';
|
||||
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
|
||||
import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
|
||||
import {
|
||||
@@ -29,7 +22,6 @@ import {
|
||||
import {
|
||||
ImportBatchSelectorComponent
|
||||
} from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
|
||||
import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
|
||||
import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
|
||||
import { EnumKeysPipe } from './utils/enum-keys-pipe';
|
||||
import { FileSizePipe } from './utils/file-size-pipe';
|
||||
@@ -72,33 +64,12 @@ import { TruncatePipe } from './utils/truncate.pipe';
|
||||
import { TruncatableComponent } from './truncatable/truncatable.component';
|
||||
import { TruncatableService } from './truncatable/truncatable.service';
|
||||
import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
|
||||
import { UploaderComponent } from './uploader/uploader.component';
|
||||
import { ChipsComponent } from './chips/chips.component';
|
||||
import { NumberPickerComponent } from './number-picker/number-picker.component';
|
||||
import { MockAdminGuard } from './mocks/admin-guard.service.mock';
|
||||
import { AlertComponent } from './alert/alert.component';
|
||||
import {
|
||||
SearchResultDetailElementComponent
|
||||
} from './object-detail/my-dspace-result-detail-element/search-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 {
|
||||
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 {
|
||||
@@ -110,7 +81,6 @@ import { EmphasizePipe } from './utils/emphasize.pipe';
|
||||
import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
|
||||
import { CapitalizePipe } from './utils/capitalize.pipe';
|
||||
import { ObjectKeysPipe } from './utils/object-keys-pipe';
|
||||
import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
|
||||
import { LangSwitchComponent } from './lang-switch/lang-switch.component';
|
||||
import {
|
||||
PlainTextMetadataListElementComponent
|
||||
@@ -169,21 +139,8 @@ import {
|
||||
import {
|
||||
ThemedEditCollectionSelectorComponent
|
||||
} from './dso-selector/modal-wrappers/edit-collection-selector/themed-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 {
|
||||
CollectionSearchResultGridElementComponent
|
||||
} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
|
||||
@@ -222,42 +179,28 @@ import {
|
||||
} from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
|
||||
import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
|
||||
import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
|
||||
import { SidebarFilterComponent } from './sidebar/filter/sidebar-filter.component';
|
||||
import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-filter-selected-option.component';
|
||||
import {
|
||||
SelectableListItemControlComponent
|
||||
} from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
|
||||
import {
|
||||
ImportableListItemControlComponent
|
||||
} from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
|
||||
import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
|
||||
import { SortablejsModule } from 'ngx-sortablejs';
|
||||
import { LogInContainerComponent } from './log-in/container/log-in-container.component';
|
||||
import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
|
||||
import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
|
||||
import { LogInComponent } from './log-in/log-in.component';
|
||||
import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
|
||||
import { MissingTranslationHelper } from './translate/missing-translation.helper';
|
||||
import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
|
||||
import { FileValidator } from './utils/require-file.validator';
|
||||
import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
|
||||
import { FileSectionComponent } from '../item-page/simple/field-components/file-section/file-section.component';
|
||||
import {
|
||||
ModifyItemOverviewComponent
|
||||
} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
|
||||
import {
|
||||
ClaimedTaskActionsLoaderComponent
|
||||
} from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
|
||||
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
|
||||
import {
|
||||
ClaimedTaskActionsEditMetadataComponent
|
||||
} from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
|
||||
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
|
||||
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
|
||||
import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
|
||||
import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
|
||||
import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
|
||||
import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
|
||||
import { CurationFormComponent } from '../curation-form/curation-form.component';
|
||||
import {
|
||||
PublicationSidebarSearchListElementComponent
|
||||
@@ -278,38 +221,15 @@ import { HoverClassDirective } from './hover-class.directive';
|
||||
import {
|
||||
ValidationSuggestionsComponent
|
||||
} from './input-suggestions/validation-suggestions/validation-suggestions.component';
|
||||
import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component';
|
||||
import {
|
||||
ItemSearchResultGridElementComponent
|
||||
} from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
|
||||
import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
|
||||
import {
|
||||
GenericItemPageFieldComponent
|
||||
} from '../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
|
||||
import {
|
||||
MetadataRepresentationListComponent
|
||||
} from '../item-page/simple/metadata-representation-list/metadata-representation-list.component';
|
||||
import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component';
|
||||
import { LinkMenuItemComponent } from './menu/menu-item/link-menu-item.component';
|
||||
import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.component';
|
||||
import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component';
|
||||
import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
|
||||
import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
|
||||
import {
|
||||
ItemVersionsSummaryModalComponent
|
||||
} from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
|
||||
import {
|
||||
ItemVersionsDeleteModalComponent
|
||||
} from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component';
|
||||
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
|
||||
import {
|
||||
BitstreamRequestACopyPageComponent
|
||||
} from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
|
||||
import { DsSelectComponent } from './ds-select/ds-select.component';
|
||||
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
|
||||
import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
|
||||
import { RSSComponent } from './rss-feed/rss.component';
|
||||
import { ExternalLinkMenuItemComponent } from './menu/menu-item/external-link-menu-item.component';
|
||||
import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
|
||||
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
|
||||
import { ThemedLoadingComponent } from './loading/themed-loading.component';
|
||||
@@ -326,27 +246,27 @@ import {
|
||||
DsoEditMenuExpandableSectionComponent
|
||||
} from './dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
|
||||
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
|
||||
import { MenuModule } from './menu/menu.module';
|
||||
import {
|
||||
ListableNotificationObjectComponent
|
||||
} from './object-list/listable-notification-object/listable-notification-object.component';
|
||||
import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
|
||||
import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
|
||||
|
||||
const MODULES = [
|
||||
CommonModule,
|
||||
SortablejsModule,
|
||||
FileUploadModule,
|
||||
FormsModule,
|
||||
InfiniteScrollModule,
|
||||
NgbNavModule,
|
||||
NgbDatepickerModule,
|
||||
NgbTimepickerModule,
|
||||
NgbTypeaheadModule,
|
||||
NgxPaginationModule,
|
||||
NgbPaginationModule,
|
||||
NgbDropdownModule,
|
||||
NgbTooltipModule,
|
||||
ReactiveFormsModule,
|
||||
RouterModule,
|
||||
NouisliderModule,
|
||||
DragDropModule,
|
||||
CdkTreeModule,
|
||||
GoogleRecaptchaModule,
|
||||
MenuModule,
|
||||
];
|
||||
|
||||
const ROOT_MODULES = [
|
||||
@@ -378,16 +298,13 @@ const COMPONENTS = [
|
||||
AuthNavMenuComponent,
|
||||
ThemedAuthNavMenuComponent,
|
||||
UserMenuComponent,
|
||||
ChipsComponent,
|
||||
DsSelectComponent,
|
||||
ErrorComponent,
|
||||
FileSectionComponent,
|
||||
LangSwitchComponent,
|
||||
LoadingComponent,
|
||||
ThemedLoadingComponent,
|
||||
LogInComponent,
|
||||
LogOutComponent,
|
||||
NumberPickerComponent,
|
||||
ObjectListComponent,
|
||||
ThemedObjectListComponent,
|
||||
ObjectDetailComponent,
|
||||
@@ -399,27 +316,7 @@ const COMPONENTS = [
|
||||
SearchFormComponent,
|
||||
PageWithSidebarComponent,
|
||||
SidebarDropdownComponent,
|
||||
SidebarFilterComponent,
|
||||
SidebarFilterSelectedOptionComponent,
|
||||
ThumbnailComponent,
|
||||
UploaderComponent,
|
||||
FileDropzoneNoUploaderComponent,
|
||||
ItemListPreviewComponent,
|
||||
ThemedItemListPreviewComponent,
|
||||
MyDSpaceItemStatusComponent,
|
||||
ItemSubmitterComponent,
|
||||
ItemDetailPreviewComponent,
|
||||
ItemDetailPreviewFieldComponent,
|
||||
ClaimedTaskActionsComponent,
|
||||
ClaimedTaskActionsApproveComponent,
|
||||
ClaimedTaskActionsRejectComponent,
|
||||
ClaimedTaskActionsReturnToPoolComponent,
|
||||
ClaimedTaskActionsEditMetadataComponent,
|
||||
ClaimedTaskActionsLoaderComponent,
|
||||
ItemActionsComponent,
|
||||
PoolTaskActionsComponent,
|
||||
WorkflowitemActionsComponent,
|
||||
WorkspaceitemActionsComponent,
|
||||
ViewModeSwitchComponent,
|
||||
TruncatableComponent,
|
||||
TruncatablePartComponent,
|
||||
@@ -429,90 +326,33 @@ const COMPONENTS = [
|
||||
ValidationSuggestionsComponent,
|
||||
DsoInputSuggestionsComponent,
|
||||
DSOSelectorComponent,
|
||||
CreateCommunityParentSelectorComponent,
|
||||
ThemedCreateCommunityParentSelectorComponent,
|
||||
CreateCollectionParentSelectorComponent,
|
||||
ThemedCreateCollectionParentSelectorComponent,
|
||||
CreateItemParentSelectorComponent,
|
||||
ThemedCreateItemParentSelectorComponent,
|
||||
EditCommunitySelectorComponent,
|
||||
ThemedEditCommunitySelectorComponent,
|
||||
EditCollectionSelectorComponent,
|
||||
ThemedEditCollectionSelectorComponent,
|
||||
EditItemSelectorComponent,
|
||||
ThemedEditItemSelectorComponent,
|
||||
CommunitySearchResultListElementComponent,
|
||||
CollectionSearchResultListElementComponent,
|
||||
BrowseByComponent,
|
||||
|
||||
CollectionSearchResultGridElementComponent,
|
||||
CommunitySearchResultGridElementComponent,
|
||||
SearchExportCsvComponent,
|
||||
PageSizeSelectorComponent,
|
||||
ListableObjectComponentLoaderComponent,
|
||||
CollectionListElementComponent,
|
||||
CommunityListElementComponent,
|
||||
CollectionGridElementComponent,
|
||||
CommunityGridElementComponent,
|
||||
BrowseByComponent,
|
||||
AbstractTrackableComponent,
|
||||
ComcolMetadataComponent,
|
||||
TypeBadgeComponent,
|
||||
AccessStatusBadgeComponent,
|
||||
BrowseByComponent,
|
||||
AbstractTrackableComponent,
|
||||
|
||||
ItemSelectComponent,
|
||||
CollectionSelectComponent,
|
||||
MetadataRepresentationLoaderComponent,
|
||||
SelectableListItemControlComponent,
|
||||
|
||||
ImportableListItemControlComponent,
|
||||
|
||||
LogInShibbolethComponent,
|
||||
LogInOidcComponent,
|
||||
LogInOrcidComponent,
|
||||
LogInPasswordComponent,
|
||||
LogInContainerComponent,
|
||||
ItemVersionsComponent,
|
||||
ItemSearchResultListElementComponent,
|
||||
ItemVersionsNoticeComponent,
|
||||
ModifyItemOverviewComponent,
|
||||
ImpersonateNavbarComponent,
|
||||
FileDownloadLinkComponent,
|
||||
BitstreamDownloadPageComponent,
|
||||
BitstreamRequestACopyPageComponent,
|
||||
CollectionDropdownComponent,
|
||||
EntityDropdownComponent,
|
||||
ExportMetadataSelectorComponent,
|
||||
ImportBatchSelectorComponent,
|
||||
ExportBatchSelectorComponent,
|
||||
ConfirmationModalComponent,
|
||||
VocabularyTreeviewComponent,
|
||||
AuthorizedCollectionSelectorComponent,
|
||||
CurationFormComponent,
|
||||
SearchResultListElementComponent,
|
||||
SearchResultGridElementComponent,
|
||||
ItemListElementComponent,
|
||||
ItemGridElementComponent,
|
||||
ItemSearchResultGridElementComponent,
|
||||
BrowseEntryListElementComponent,
|
||||
SearchResultDetailElementComponent,
|
||||
PlainTextMetadataListElementComponent,
|
||||
ItemMetadataListElementComponent,
|
||||
MetadataRepresentationListElementComponent,
|
||||
ItemMetadataRepresentationListElementComponent,
|
||||
BundleListElementComponent,
|
||||
StartsWithDateComponent,
|
||||
StartsWithTextComponent,
|
||||
SidebarSearchListElementComponent,
|
||||
PublicationSidebarSearchListElementComponent,
|
||||
CollectionSidebarSearchListElementComponent,
|
||||
CommunitySidebarSearchListElementComponent,
|
||||
SearchNavbarComponent,
|
||||
ScopeSelectorModalComponent,
|
||||
ItemPageTitleFieldComponent,
|
||||
ThemedSearchNavbarComponent,
|
||||
ListableNotificationObjectComponent,
|
||||
DsoPageEditButtonComponent,
|
||||
MetadataFieldWrapperComponent,
|
||||
];
|
||||
|
||||
const ENTRY_COMPONENTS = [
|
||||
@@ -555,46 +395,25 @@ const ENTRY_COMPONENTS = [
|
||||
LogInShibbolethComponent,
|
||||
LogInOidcComponent,
|
||||
LogInOrcidComponent,
|
||||
BundleListElementComponent,
|
||||
ClaimedTaskActionsApproveComponent,
|
||||
ClaimedTaskActionsRejectComponent,
|
||||
ClaimedTaskActionsReturnToPoolComponent,
|
||||
ClaimedTaskActionsEditMetadataComponent,
|
||||
CollectionDropdownComponent,
|
||||
ThemedCollectionDropdownComponent,
|
||||
FileDownloadLinkComponent,
|
||||
BitstreamDownloadPageComponent,
|
||||
BitstreamRequestACopyPageComponent,
|
||||
CurationFormComponent,
|
||||
ExportMetadataSelectorComponent,
|
||||
ImportBatchSelectorComponent,
|
||||
ExportBatchSelectorComponent,
|
||||
ConfirmationModalComponent,
|
||||
VocabularyTreeviewComponent,
|
||||
SidebarSearchListElementComponent,
|
||||
PublicationSidebarSearchListElementComponent,
|
||||
CollectionSidebarSearchListElementComponent,
|
||||
CommunitySidebarSearchListElementComponent,
|
||||
LinkMenuItemComponent,
|
||||
OnClickMenuItemComponent,
|
||||
TextMenuItemComponent,
|
||||
ScopeSelectorModalComponent,
|
||||
ListableNotificationObjectComponent,
|
||||
ExternalLinkMenuItemComponent,
|
||||
DsoEditMenuSectionComponent,
|
||||
DsoEditMenuExpandableSectionComponent,
|
||||
];
|
||||
|
||||
const SHARED_ITEM_PAGE_COMPONENTS = [
|
||||
MetadataFieldWrapperComponent,
|
||||
MetadataValuesComponent,
|
||||
ItemAlertsComponent,
|
||||
GenericItemPageFieldComponent,
|
||||
MetadataRepresentationListComponent,
|
||||
RelatedItemsComponent,
|
||||
DsoEditMenuSectionComponent,
|
||||
DsoEditMenuComponent,
|
||||
DsoEditMenuExpandableSectionComponent,
|
||||
];
|
||||
|
||||
const PROVIDERS = [
|
||||
TruncatableService,
|
||||
MockAdminGuard,
|
||||
@@ -606,7 +425,6 @@ const DIRECTIVES = [
|
||||
DragClickDirective,
|
||||
DebounceDirective,
|
||||
ClickOutsideDirective,
|
||||
AuthorityConfidenceStateDirective,
|
||||
InListValidator,
|
||||
AutoFocusDirective,
|
||||
RoleDirective,
|
||||
@@ -629,10 +447,8 @@ const DIRECTIVES = [
|
||||
declarations: [
|
||||
...PIPES,
|
||||
...COMPONENTS,
|
||||
...ENTRY_COMPONENTS,
|
||||
...DIRECTIVES,
|
||||
...SHARED_ITEM_PAGE_COMPONENTS,
|
||||
ItemVersionsSummaryModalComponent,
|
||||
ItemVersionsDeleteModalComponent,
|
||||
],
|
||||
providers: [
|
||||
...PROVIDERS
|
||||
@@ -641,9 +457,9 @@ const DIRECTIVES = [
|
||||
...MODULES,
|
||||
...PIPES,
|
||||
...COMPONENTS,
|
||||
...SHARED_ITEM_PAGE_COMPONENTS,
|
||||
...ENTRY_COMPONENTS,
|
||||
...DIRECTIVES,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
]
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user