[DURACOM-191] merge fixes

src/app/app-routing.module.ts

@@ -43,7 +43,6 @@ import { storeModuleConfig } from './app.reducer';
 import { EffectsModule } from '@ngrx/effects';
 import { submissionReducers, SubmissionState } from './submission/submission.reducers';
 import { submissionEffects } from './submission/submission.effects';
-import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 
 @NgModule({
@@ -161,18 +160,19 @@ import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-c
               .then((m) => m.ROUTES),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
-          {
+          // TODO: switch routing modules to routing files
-            path: NOTIFICATIONS_MODULE_PATH,
+          // {
-            loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
+          //   path: NOTIFICATIONS_MODULE_PATH,
-              .then((m) => m.AdminNotificationsModule),
+          //   loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+          //     .then((m) => m.AdminNotificationsModule),
-          },
+          //   canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
-          {
+          // },
-            path: NOTIFICATIONS_MODULE_PATH,
+          // {
-            loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
+          //   path: NOTIFICATIONS_MODULE_PATH,
-              .then((m) => m.NotificationsPageModule),
+          //   loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+          //     .then((m) => m.NotificationsPageModule),
-          },
+          //   canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+          // },
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page-routes')

src/app/core/shared/listable.module.ts

@@ -266,9 +266,6 @@ import {
   ThemedMetadataRepresentationListComponent
 } from '../../item-page/simple/metadata-representation-list/themed-metadata-representation-list.component';
 import { ClaimedTaskActionsComponent } from '../../shared/mydspace-actions/claimed-task/claimed-task-actions.component';
-import {
-  ListableObjectDirective
-} from '../../shared/object-collection/shared/listable-object/listable-object.directive';
 import {
   ItemAdminSearchResultActionsComponent
 } from '../../admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component';
@@ -423,7 +420,6 @@ const ENTRY_COMPONENTS = [
     ThemedMetadataRepresentationListComponent,
     ClaimedTaskActionsComponent,
     WorkflowitemActionsComponent,
-    ListableObjectDirective,
     ItemAdminSearchResultActionsComponent,
     MetadataFieldWrapperComponent,
     ThemedThumbnailComponent,

src/app/notifications/suggestion-actions/suggestion-actions.component.ts

@@ -1,20 +1,30 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { Collection } from '../../core/shared/collection.model';
 import { take } from 'rxjs/operators';
 import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 import { Suggestion } from '../../core/notifications/models/suggestion.model';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-list-element.component';
+import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgIf } from '@angular/common';
 
 /**
  * Show and trigger the actions to submit for a suggestion
  */
 @Component({
   selector: 'ds-suggestion-actions',
-  styleUrls: [ './suggestion-actions.component.scss' ],
+  styleUrls: ['./suggestion-actions.component.scss'],
-  templateUrl: './suggestion-actions.component.html'
+  templateUrl: './suggestion-actions.component.html',
+  imports: [
+    EntityDropdownComponent,
+    TranslateModule,
+    NgIf,
+    NgbDropdownModule
+  ],
+  standalone: true
 })
 export class SuggestionActionsComponent {
 

src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts

@@ -1,6 +1,9 @@
 import { Component, Input } from '@angular/core';
 import { fadeIn } from '../../../shared/animations/fade';
 import { SuggestionEvidences } from '../../../core/notifications/models/suggestion.model';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgIf } from '@angular/common';
+import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
 
 
 /**
@@ -8,9 +11,15 @@ import { SuggestionEvidences } from '../../../core/notifications/models/suggesti
  */
 @Component({
   selector: 'ds-suggestion-evidences',
-  styleUrls: [ './suggestion-evidences.component.scss' ],
+  styleUrls: ['./suggestion-evidences.component.scss'],
   templateUrl: './suggestion-evidences.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
+  imports: [
+    TranslateModule,
+    NgIf,
+    ObjectKeysPipe
+  ],
+  standalone: true
 })
 export class SuggestionEvidencesComponent {
 

src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts

@@ -5,6 +5,12 @@ import { Suggestion } from 'src/app/core/notifications/models/suggestion.model';
 import { fadeIn } from '../../shared/animations/fade';
 import { Item } from '../../core/shared/item.model';
 import { isNotEmpty } from '../../shared/empty.util';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  ItemSearchResultListElementComponent
+} from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
+import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 
 
 
@@ -23,7 +29,14 @@ export interface SuggestionApproveAndImport {
   selector: 'ds-suggestion-list-item',
   styleUrls: ['./suggestion-list-element.component.scss'],
   templateUrl: './suggestion-list-element.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
+  imports: [
+    TranslateModule,
+    ItemSearchResultListElementComponent,
+    SuggestionActionsComponent,
+    SuggestionEvidencesComponent
+  ],
+  standalone: true
 })
 export class SuggestionListElementComponent implements OnInit {
 

src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts

@@ -15,7 +15,6 @@ import { ThemeService } from 'src/app/shared/theme-support/theme.service';
     styleUrls: ['./listable-object-component-loader.component.scss'],
     templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html',
     standalone: true,
-    imports: [ListableObjectDirective]
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)

src/app/suggestions-page/suggestions-page.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Data, Router } from '@angular/router';
+import { ActivatedRoute, Data, Router, RouterLink } from '@angular/router';
 
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
 import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
 import { SortDirection, SortOptions, } from '../core/cache/models/sort-options.model';
 import { PaginatedList } from '../core/data/paginated-list.model';
@@ -24,12 +24,33 @@ import { Suggestion } from '../core/notifications/models/suggestion.model';
 import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
 import { SuggestionBulkResult, SuggestionsService } from '../notifications/suggestions.service';
 import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
-import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import {
+  SuggestionApproveAndImport,
+  SuggestionListElementComponent
+} from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
+import { VarDirective } from '../shared/utils/var.directive';
+import { SuggestionActionsComponent } from '../notifications/suggestion-actions/suggestion-actions.component';
+import { LoadingComponent } from '../shared/loading/loading.component';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
 
 @Component({
   selector: 'ds-suggestion-page',
   templateUrl: './suggestions-page.component.html',
   styleUrls: ['./suggestions-page.component.scss'],
+  imports: [
+    AsyncPipe,
+    VarDirective,
+    NgIf,
+    RouterLink,
+    TranslateModule,
+    SuggestionActionsComponent,
+    LoadingComponent,
+    PaginationComponent,
+    SuggestionListElementComponent,
+    NgForOf
+  ],
+  standalone: true
 })
 
 /**

src/app/suggestions-page/suggestions-page.module.ts

@@ -1,20 +1,18 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { SuggestionsPageComponent } from './suggestions-page.component';
-import { SharedModule } from '../shared/shared.module';
 import { SuggestionsPageRoutingModule } from './suggestions-page-routing.module';
 import { NotificationsModule } from '../notifications/notifications.module';
 import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
 import { SuggestionsService } from '../notifications/suggestions.service';
+import { TranslateModule } from '@ngx-translate/core';
 
 @NgModule({
-  declarations: [SuggestionsPageComponent],
     imports: [
         CommonModule,
-    SharedModule,
         SuggestionsPageRoutingModule,
-    NotificationsModule
+        NotificationsModule,
+        TranslateModule
     ],
   providers: [
     SuggestionsDataService,

src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts

@@ -16,7 +16,6 @@ import { ThemeService } from '../../../shared/theme-support/theme.service';
     selector: 'ds-advanced-workflow-actions-loader',
     templateUrl: '../../../shared/abstract-component-loader/abstract-component-loader.component.html',
     standalone: true,
-    imports: [AdvancedWorkflowActionsDirective]
 })
 export class AdvancedWorkflowActionsLoaderComponent extends AbstractComponentLoaderComponent<Component> implements OnInit {
 
@@ -47,7 +46,7 @@ export class AdvancedWorkflowActionsLoaderComponent extends AbstractComponentLoa
   }
 
   public getComponent(): GenericConstructor<Component> {
-    return getAdvancedComponentByWorkflowTaskOption(this.type);
+    return getAdvancedComponentByWorkflowTaskOption(this.type) as GenericConstructor<Component>;
   }
 
 }

src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts

@@ -10,6 +10,7 @@ import { Context } from '../../../../../app/core/shared/context.model';
   styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
   // templateUrl: './browse-by-date.component.html',
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+  standalone: true
 })
 @rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom')
 export class BrowseByDateComponent extends BaseComponent {

src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts

@@ -10,6 +10,7 @@ import { Context } from '../../../../../app/core/shared/context.model';
   styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
   // templateUrl: './browse-by-metadata.component.html',
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+  standalone: true
 })
 @rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom')
 export class BrowseByMetadataComponent extends BaseComponent {

src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts

@@ -10,6 +10,7 @@ import { Context } from '../../../../../app/core/shared/context.model';
   templateUrl: '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html',
   // styleUrls: ['./browse-by-taxonomy.component.scss'],
   styleUrls: ['../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss'],
+  standalone: true
 })
 @rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom')
 export class BrowseByTaxonomyComponent extends BaseComponent {

src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts

@@ -1,5 +1,7 @@
 import { Component } from '@angular/core';
-import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
+import {
+  BrowseByTitleComponent as BaseComponent
+} from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
 import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
 import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
 import { Context } from '../../../../../app/core/shared/context.model';
@@ -10,6 +12,7 @@ import { Context } from '../../../../../app/core/shared/context.model';
   styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
   // templateUrl: './browse-by-title.component.html',
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+  standalone: true
 })
 @rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom')
 export class BrowseByTitleComponent extends BaseComponent {

src/themes/custom/app/community-page/community-page.component.ts

@@ -8,12 +8,6 @@ import { ErrorComponent } from '../../../../app/shared/error/error.component';
 import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component';
 import { AsyncPipe, NgIf } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
-import {
-  ThemedCommunityPageSubCommunityListComponent
-} from '../../../../app/community-page/sub-community-list/themed-community-page-sub-community-list.component';
-import {
-  ThemedCollectionPageSubCollectionListComponent
-} from '../../../../app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component';
 import {
   ThemedComcolPageBrowseByComponent
 } from '../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
@@ -27,6 +21,12 @@ import {
 } from '../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
 import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dspace/view-tracker.component';
 import { VarDirective } from '../../../../app/shared/utils/var.directive';
+import {
+  ThemedCommunityPageSubCommunityListComponent
+} from '../../../../app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
+import {
+  ThemedCollectionPageSubCollectionListComponent
+} from '../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
 
 
 @Component({

src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts

@@ -7,6 +7,7 @@ import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../
   styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'],
   // templateUrl: './community-page-sub-collection-list.component.html',
   templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html',
+  standalone: true
 })
 export class CommunityPageSubCollectionListComponent extends BaseComponent {
 }

src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts

@@ -7,6 +7,7 @@ import { CommunityPageSubCommunityListComponent as BaseComponent } from '../../.
   styleUrls: ['../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss'],
   // templateUrl: './community-page-sub-community-list.component.html',
   templateUrl: '../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html',
+  standalone: true
 })
 export class CommunityPageSubCommunityListComponent extends BaseComponent {
 }

src/themes/custom/lazy-theme.module.ts

@@ -164,7 +164,6 @@ import {
 import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
 import { FormModule } from '../../app/shared/form/form.module';
-import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
 import { NotificationsModule } from '../../app/notifications/notifications.module';
 import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component';
 import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
@@ -296,13 +295,9 @@ const DECLARATIONS = [
     SystemWideAlertModule,
     NgxGalleryModule,
     FormModule,
-    RequestCopyModule,
     NotificationsModule,
     ...DECLARATIONS
 ],
-    exports: [
-        CommunityPageSubCollectionListComponent
-    ]
 })
 
   /**

src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts

@@ -4,6 +4,7 @@ import { AsyncPipe, NgClass } from '@angular/common';
 import { ThemedNavbarComponent } from '../../../../app/navbar/themed-navbar.component';
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
+import { TranslateModule } from '@ngx-translate/core';
 
 /**
  * This component represents a wrapper for the horizontal navbar and the header
@@ -13,7 +14,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
   standalone: true,
-  imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe],
+  imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule],
   animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {

src/themes/dspace/app/header/header.component.ts

@@ -11,6 +11,7 @@ import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component';
 import { Observable } from 'rxjs';
+import { AsyncPipe } from '@angular/common';
 
 /**
  * Represents the header with the logo and simple navigation
@@ -20,7 +21,7 @@ import { Observable } from 'rxjs';
     styleUrls: ['header.component.scss'],
     templateUrl: 'header.component.html',
     standalone: true,
-    imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule]
+  imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, LangSwitchComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe]
 })
 export class HeaderComponent extends BaseComponent implements OnInit {
   public isNavBarCollapsed$: Observable<boolean>;