diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index 48b80328e0..7bbf48e3fe 100644 --- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -58,11 +58,11 @@ export const BBM_PAGINATION_ID = 'bbm'; ThemedComcolPageHandleComponent, ComcolPageContentComponent, DsoEditMenuComponent, - ThemedBrowseByComponent, ThemedComcolPageBrowseByComponent, BrowseByComponent, TranslateModule, - ThemedLoadingComponent + ThemedLoadingComponent, + ThemedBrowseByComponent ], standalone: true }) diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts index 25362b84bc..9c58ce1c48 100644 --- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts +++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts @@ -12,15 +12,40 @@ import { TranslateModule } from '@ngx-translate/core'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; import { Context } from '../../core/shared/context.model'; import { hasValue } from '../../shared/empty.util'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; +import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-taxonomy', templateUrl: './browse-by-taxonomy.component.html', styleUrls: ['./browse-by-taxonomy.component.scss'], imports: [ - VocabularyTreeviewComponent, - RouterLink, - TranslateModule + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent ], standalone: true }) diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts index 7b603af48b..ac732b6c2f 100644 --- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -10,11 +10,43 @@ import { map } from 'rxjs/operators'; import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; +import { VarDirective } from '../../shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-title', styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'], - templateUrl: '../browse-by-metadata/browse-by-metadata.component.html' + templateUrl: '../browse-by-metadata/browse-by-metadata.component.html', + standalone: true, + imports: [ + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent + ] }) /** * Component for browsing items by title (dc.title) diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts index d091f1fb46..3dc53a5cef 100644 --- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts +++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts @@ -8,7 +8,7 @@ import { NotifyStatuses } from '../notify-requests-status.model'; import { RequestStatusEnum } from '../notify-status.enum'; import { TruncatablePartComponent } from '../../../../shared/truncatable/truncatable-part/truncatable-part.component'; import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component'; -import { NgForOf } from '@angular/common'; +import { NgClass, NgForOf } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; @Component({ @@ -21,7 +21,8 @@ import { TranslateModule } from '@ngx-translate/core'; TruncatablePartComponent, TruncatableComponent, NgForOf, - TranslateModule + TranslateModule, + NgClass ] }) /** diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts index 2ece96dfb4..f5db584c17 100644 --- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts +++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts @@ -4,22 +4,18 @@ import { Observable, Subscription } from 'rxjs'; import { distinctUntilChanged, map, take, tap } from 'rxjs/operators'; import { SortOptions } from '../../../core/cache/models/sort-options.model'; -import { - QualityAssuranceTopicObject -} from '../../../core/notifications/qa/models/quality-assurance-topic.model'; +import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model'; import { hasValue } from '../../../shared/empty.util'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { NotificationsStateService } from '../../notifications-state.service'; import { PaginationService } from '../../../core/pagination/pagination.service'; -import { ActivatedRoute, RouterLink } from '@angular/router'; -import { QualityAssuranceTopicsService } from './quality-assurance-topics.service'; +import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { LoadingComponent } from '../../../shared/loading/loading.component'; -import { NgIf, NgFor, AsyncPipe } from '@angular/common'; +import { AsyncPipe, NgFor, NgIf } from '@angular/common'; import { AlertComponent } from '../../../shared/alert/alert.component'; -import { ActivatedRoute, Router } from '@angular/router'; import { ItemDataService } from '../../../core/data/item-data.service'; import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../../../core/shared/operators'; import { Item } from '../../../core/shared/item.model'; diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts index f42b077e2b..b1069d5ab0 100644 --- a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts +++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { QualityAssuranceEventsComponent } from '../../../notifications/qa/events/quality-assurance-events.component'; +import { QualityAssuranceEventsComponent } from '../../notifications/qa/events/quality-assurance-events.component'; /** * Component for the page that show the QA events related to a specific topic. diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts index fac0b60ae3..e698d9eedf 100644 --- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts +++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts @@ -1,19 +1,6 @@ -import { - Component, - ComponentFactoryResolver, - EventEmitter, - Input, - OnChanges, - OnInit, - Output, - SimpleChanges, - Type, - ViewChild, -} from '@angular/core'; +import { Component, EventEmitter, Input, Output, Type, } from '@angular/core'; import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator'; import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model'; -import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive'; -import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util'; import { MyDSpaceActionsResult } from '../../mydspace-actions'; import { Item } from '../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; @@ -27,7 +14,6 @@ import { GenericConstructor } from '../../../../core/shared/generic-constructor' selector: 'ds-claimed-task-actions-loader', templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html', standalone: true, - imports: [ClaimedTaskActionsDirective] }) /** * Component for loading a ClaimedTaskAction component depending on the "option" input @@ -75,7 +61,7 @@ export class ClaimedTaskActionsLoaderComponent extends AbstractComponentLoaderCo ]; public getComponent(): GenericConstructor { - return getComponentByWorkflowTaskOption(this.option) as Type; + return getComponentByWorkflowTaskOption(this.option); } } diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts index 405ab0b774..bcc64c0ee0 100644 --- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -3,6 +3,26 @@ import { BrowseByDateComponent as BaseComponent } from '../../../../../app/brows 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'; +import { VarDirective } from '../../../../../app/shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { + ComcolPageHeaderComponent +} from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { + ComcolPageContentComponent +} from '../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-date', @@ -10,7 +30,22 @@ 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 + standalone: true, + imports: [ + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent + ] }) @rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom') export class BrowseByDateComponent extends BaseComponent { diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index 5c7c40b724..c073dfefde 100644 --- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -3,6 +3,26 @@ import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/b 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'; +import { VarDirective } from '../../../../../app/shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { + ComcolPageHeaderComponent +} from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { + ComcolPageContentComponent +} from '../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-metadata', @@ -10,7 +30,22 @@ 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 + standalone: true, + imports: [ + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent + ] }) @rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom') export class BrowseByMetadataComponent extends BaseComponent { diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts index 6591bd0471..86abf48b72 100644 --- a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts @@ -3,6 +3,26 @@ import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/b 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'; +import { VarDirective } from '../../../../../app/shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { + ComcolPageHeaderComponent +} from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { + ComcolPageContentComponent +} from '../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-taxonomy', @@ -10,7 +30,22 @@ 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 + standalone: true, + imports: [ + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent + ] }) @rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom') export class BrowseByTaxonomyComponent extends BaseComponent { diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts index 88189b524f..ea8b665e30 100644 --- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -5,6 +5,26 @@ import { 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'; +import { VarDirective } from '../../../../../app/shared/utils/var.directive'; +import { AsyncPipe, NgIf } from '@angular/common'; +import { + ComcolPageHeaderComponent +} from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { + ThemedComcolPageHandleComponent +} from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { + ComcolPageContentComponent +} from '../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component'; +import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component'; +import { + ThemedComcolPageBrowseByComponent +} from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component'; +import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; @Component({ selector: 'ds-browse-by-title', @@ -12,7 +32,22 @@ 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 + standalone: true, + imports: [ + VarDirective, + AsyncPipe, + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + NgIf, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + DsoEditMenuComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + TranslateModule, + ThemedLoadingComponent, + ThemedBrowseByComponent + ] }) @rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom') export class BrowseByTitleComponent extends BaseComponent {