diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts index 50e6d83bd8..9b6883012e 100644 --- a/src/app/core/submission/submission-duplicate-data.service.ts +++ b/src/app/core/submission/submission-duplicate-data.service.ts @@ -34,7 +34,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service'; * or the workflow pooled/claimed task page. * */ -@Injectable() +@Injectable({ providedIn: 'root' }) @dataService(DUPLICATE) export class SubmissionDuplicateDataService extends BaseDataService implements SearchData { diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts deleted file mode 100644 index b51e5348ff..0000000000 --- a/src/app/my-dspace-page/my-dspace-page.module.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; - -import { SearchModule } from '../shared/search/search.module'; -import { UploadModule } from '../shared/upload/upload.module'; -import { CollectionSelectorComponent } from './collection-selector/collection-selector.component'; -import { MyDSpaceGuard } from './my-dspace.guard'; -import { MyDSpaceConfigurationService } from './my-dspace-configuration.service'; -import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component'; -import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component'; -import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component'; -import { MyDSpacePageComponent } from './my-dspace-page.component'; -import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component'; -import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component'; - -const DECLARATIONS = [ - MyDSpacePageComponent, - ThemedMyDSpacePageComponent, - MyDSpaceNewSubmissionComponent, - CollectionSelectorComponent, - MyDSpaceNewSubmissionDropdownComponent, - MyDSpaceNewExternalDropdownComponent, - MyDspaceQaEventsNotificationsComponent, -]; - -@NgModule({ - imports: [ - CommonModule, - SearchModule, - UploadModule, - ...DECLARATIONS, - ], - providers: [ - MyDSpaceGuard, - MyDSpaceConfigurationService, - ], - exports: DECLARATIONS, -}) - -/** - * This module handles all components that are necessary for the mydspace page - */ -export class MyDSpacePageModule { - -} diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts index 7c3d869a08..fc024944e8 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts @@ -25,6 +25,7 @@ import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/cl import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; +import { VarDirective } from '../../../../utils/var.directive'; import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; @@ -36,7 +37,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'], templateUrl: './claimed-approved-search-result-list-element.component.html', standalone: true, - imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective], }) @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement) export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts index 37e8c917b1..fa5f7a3a04 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts @@ -25,6 +25,7 @@ import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/cl import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; +import { VarDirective } from '../../../../utils/var.directive'; import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; @@ -36,7 +37,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'], templateUrl: './claimed-declined-search-result-list-element.component.html', standalone: true, - imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective], }) @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement) export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts index 3f243fdfb5..e7e72189f8 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts @@ -26,6 +26,7 @@ import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/cl import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../../truncatable/truncatable.service'; import { followLink } from '../../../../utils/follow-link-config.model'; +import { VarDirective } from '../../../../utils/var.directive'; import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-item-list-preview.component'; @@ -37,7 +38,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'], templateUrl: './claimed-declined-task-search-result-list-element.component.html', standalone: true, - imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective], }) @listableObjectComponent(ClaimedDeclinedTaskTaskSearchResult, ViewMode.ListElement) export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchResultListElementComponent implements OnInit { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts index af03a8d1f1..293ee040e3 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts @@ -49,6 +49,7 @@ import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claim import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; +import { VarDirective } from '../../../utils/var.directive'; import { Duplicate } from '../../duplicate-data/duplicate.model'; import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; @@ -58,7 +59,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'], templateUrl: './claimed-search-result-list-element.component.html', standalone: true, - imports: [NgIf, ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective], }) @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement) export class ClaimedSearchResultListElementComponent extends SearchResultListElementComponent implements OnInit, OnDestroy { diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts index 693979a792..98e9129b68 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts @@ -49,6 +49,7 @@ import { listableObjectComponent } from '../../../object-collection/shared/lista import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { followLink } from '../../../utils/follow-link-config.model'; +import { VarDirective } from '../../../utils/var.directive'; import { Duplicate } from '../../duplicate-data/duplicate.model'; import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component'; import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; @@ -61,7 +62,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'], templateUrl: './pool-search-result-list-element.component.html', standalone: true, - imports: [NgIf, ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule], + imports: [NgIf, ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective], }) @listableObjectComponent(PoolTaskSearchResult, ViewMode.ListElement) diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 6d07cc5f88..182a75944c 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -17,7 +17,6 @@ import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item import { ItemPageModule } from '../../app/item-page/item-page.module'; import { ItemSharedModule } from '../../app/item-page/item-shared.module'; import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module'; -import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module'; import { RootModule } from '../../app/root.module'; @@ -230,7 +229,6 @@ const DECLARATIONS = [ StoreRouterConnectingModule, TranslateModule, SubmissionModule, - MyDSpacePageModule, SearchModule, FormsModule, ResourcePoliciesModule, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index c3dbfe7133..5b56b281f4 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -17,7 +17,6 @@ import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module'; import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module'; import { ItemPageModule } from '../../app/item-page/item-page.module'; import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module'; -import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module'; import { NavbarModule } from '../../app/navbar/navbar.module'; import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module'; import { RootModule } from '../../app/root.module'; @@ -61,7 +60,6 @@ const DECLARATIONS = [ StoreRouterConnectingModule, TranslateModule, SubmissionModule, - MyDSpacePageModule, SearchModule, FormsModule, ResourcePoliciesModule,