mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-11 12:03:03 +00:00
Merge branch 'main' into CST-7755
# Conflicts: # src/app/shared/shared.module.ts
This commit is contained in:
@@ -71,7 +71,6 @@ import {
|
||||
} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
|
||||
import { ObjectDetailComponent } from './object-detail/object-detail.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';
|
||||
@@ -228,6 +227,8 @@ import { SearchNavbarComponent } from '../search-navbar/search-navbar.component'
|
||||
import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
|
||||
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
|
||||
import { DsSelectComponent } from './ds-select/ds-select.component';
|
||||
import { ContextHelpDirective } from './context-help.directive';
|
||||
import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
|
||||
import { RSSComponent } from './rss-feed/rss.component';
|
||||
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
|
||||
import { ThemedLoadingComponent } from './loading/themed-loading.component';
|
||||
@@ -250,6 +251,7 @@ import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata
|
||||
import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
|
||||
|
||||
|
||||
|
||||
const MODULES = [
|
||||
CommonModule,
|
||||
FormsModule,
|
||||
@@ -263,7 +265,7 @@ const MODULES = [
|
||||
RouterModule,
|
||||
DragDropModule,
|
||||
GoogleRecaptchaModule,
|
||||
MenuModule,
|
||||
MenuModule
|
||||
];
|
||||
|
||||
const ROOT_MODULES = [
|
||||
@@ -317,7 +319,6 @@ const COMPONENTS = [
|
||||
ViewModeSwitchComponent,
|
||||
TruncatableComponent,
|
||||
TruncatablePartComponent,
|
||||
BrowseByComponent,
|
||||
InputSuggestionsComponent,
|
||||
FilterInputSuggestionsComponent,
|
||||
ValidationSuggestionsComponent,
|
||||
@@ -350,6 +351,7 @@ const COMPONENTS = [
|
||||
ListableNotificationObjectComponent,
|
||||
DsoPageEditButtonComponent,
|
||||
MetadataFieldWrapperComponent,
|
||||
ContextHelpWrapperComponent,
|
||||
EpersonGroupListComponent,
|
||||
EpersonSearchBoxComponent,
|
||||
GroupSearchBoxComponent,
|
||||
@@ -436,7 +438,8 @@ const DIRECTIVES = [
|
||||
ClaimedTaskActionsDirective,
|
||||
NgForTrackByIdDirective,
|
||||
MetadataFieldValidator,
|
||||
HoverClassDirective
|
||||
HoverClassDirective,
|
||||
ContextHelpDirective,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
Reference in New Issue
Block a user