From 8bfb776eef448984a89226a6f1390a7701b77a8b Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Tue, 5 Mar 2024 09:55:31 +0100 Subject: [PATCH] [DURACOM-191] fix standalone components --- .../browse-by-page.component.ts | 4 ++++ .../browse-by-taxonomy.component.ts | 4 ++-- .../collection-page.component.ts | 6 ++--- .../community-page.component.ts | 19 ++++++++------- ...nity-page-sub-collection-list.component.ts | 8 +++---- ...unity-page-sub-community-list.component.ts | 14 +++++++---- .../overview/process-overview.component.ts | 12 +++++----- .../table/process-overview-table.component.ts | 24 ++++++++++++++++--- .../withdrawn-reinstate-modal.component.ts | 10 ++++++++ .../advanced-search.component.ts | 20 ++++++++++++---- .../search-filters.component.ts | 11 +++++---- 11 files changed, 91 insertions(+), 41 deletions(-) diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts index cff8ff0344..5bba344d53 100644 --- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts +++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts @@ -4,11 +4,15 @@ import { BrowseDefinition } from '../../core/shared/browse-definition.model'; import { ActivatedRoute } from '@angular/router'; import { Observable } from 'rxjs'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; +import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component'; @Component({ selector: 'ds-browse-by-page', templateUrl: './browse-by-page.component.html', styleUrls: ['./browse-by-page.component.scss'], + imports: [ + BrowseBySwitcherComponent + ], standalone: true }) export class BrowseByPageComponent implements OnInit { 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 35fc2ed945..25362b84bc 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 @@ -1,7 +1,7 @@ -import { Component, OnInit, OnChanges, OnDestroy, Input } from '@angular/core'; +import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model'; import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model'; -import { ActivatedRoute, RouterLink, Params } from '@angular/router'; +import { ActivatedRoute, Params, RouterLink } from '@angular/router'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { BrowseDefinition } from '../../core/shared/browse-definition.model'; import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts index 347e1babf8..f15fdec002 100644 --- a/src/app/collection-page/collection-page.component.ts +++ b/src/app/collection-page/collection-page.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; import { Observable } from 'rxjs'; import { filter, map, mergeMap, take } from 'rxjs/operators'; import { SortOptions } from '../core/cache/models/sort-options.model'; @@ -16,7 +16,6 @@ import { FeatureID } from '../core/data/feature-authorization/feature-id'; import { getCollectionPageRoute } from './collection-page-routing-paths'; import { redirectOn4xx } from '../core/shared/authorized.operators'; import { DSONameService } from '../core/breadcrumbs/dso-name.service'; -import { APP_CONFIG, AppConfig } from '../../../src/config/app-config.interface'; import { ComcolPageContentComponent } from '../shared/comcol/comcol-page-content/comcol-page-content.component'; import { ErrorComponent } from '../shared/error/error.component'; import { AsyncPipe, NgIf } from '@angular/common'; @@ -58,7 +57,8 @@ import { ObjectCollectionComponent } from '../shared/object-collection/object-co ThemedComcolPageHandleComponent, DsoEditMenuComponent, ThemedComcolPageBrowseByComponent, - ObjectCollectionComponent + ObjectCollectionComponent, + RouterOutlet ], standalone: true }) diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts index 89b7fb7a23..42cc86b8df 100644 --- a/src/app/community-page/community-page.component.ts +++ b/src/app/community-page/community-page.component.ts @@ -1,6 +1,6 @@ -import { mergeMap, filter, map } from 'rxjs/operators'; +import { filter, map, mergeMap } from 'rxjs/operators'; import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, RouterOutlet } from '@angular/router'; import { Observable } from 'rxjs'; import { RemoteData } from '../core/data/remote-data'; import { Bitstream } from '../core/shared/bitstream.model'; @@ -19,12 +19,6 @@ import { ErrorComponent } from '../shared/error/error.component'; import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component'; import { AsyncPipe, NgIf } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { - ThemedCommunityPageSubCommunityListComponent -} from './sub-community-list/themed-community-page-sub-community-list.component'; -import { - ThemedCollectionPageSubCollectionListComponent -} from './sub-collection-list/themed-community-page-sub-collection-list.component'; import { ThemedComcolPageBrowseByComponent } from '../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -36,6 +30,12 @@ import { ComcolPageLogoComponent } from '../shared/comcol/comcol-page-logo/comco import { ComcolPageHeaderComponent } from '../shared/comcol/comcol-page-header/comcol-page-header.component'; import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component'; import { VarDirective } from '../shared/utils/var.directive'; +import { + ThemedCollectionPageSubCollectionListComponent +} from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component'; +import { + ThemedCommunityPageSubCommunityListComponent +} from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component'; @Component({ selector: 'ds-community-page', @@ -58,7 +58,8 @@ import { VarDirective } from '../shared/utils/var.directive'; ComcolPageHeaderComponent, AsyncPipe, ViewTrackerComponent, - VarDirective + VarDirective, + RouterOutlet ], standalone: true }) diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts index 03112103a2..09f1b46871 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts @@ -12,12 +12,12 @@ import { CollectionDataService } from '../../../../core/data/collection-data.ser import { PaginationService } from '../../../../core/pagination/pagination.service'; import { switchMap } from 'rxjs/operators'; import { hasValue } from '../../../../shared/empty.util'; -import { ObjectCollectionComponent } from '../../shared/object-collection/object-collection.component'; -import { ErrorComponent } from '../../shared/error/error.component'; -import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { AsyncPipe, NgIf } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { VarDirective } from '../../shared/utils/var.directive'; +import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component'; +import { ErrorComponent } from '../../../../shared/error/error.component'; +import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; +import { VarDirective } from '../../../../shared/utils/var.directive'; @Component({ selector: 'ds-community-page-sub-collection-list', diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts index adf698f667..de275461c8 100644 --- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts +++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts @@ -13,12 +13,12 @@ import { CommunityDataService } from '../../../../core/data/community-data.servi import { switchMap } from 'rxjs/operators'; import { PaginationService } from '../../../../core/pagination/pagination.service'; import { hasValue } from '../../../../shared/empty.util'; -import { ErrorComponent } from '../../shared/error/error.component'; -import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; -import { VarDirective } from '../../shared/utils/var.directive'; import { AsyncPipe, NgIf } from '@angular/common'; -import { ObjectCollectionComponent } from '../../shared/object-collection/object-collection.component'; import { TranslateModule } from '@ngx-translate/core'; +import { ObjectCollectionComponent } from '../../../../shared/object-collection/object-collection.component'; +import { ErrorComponent } from '../../../../shared/error/error.component'; +import { ThemedLoadingComponent } from '../../../../shared/loading/themed-loading.component'; +import { VarDirective } from '../../../../shared/utils/var.directive'; @Component({ selector: 'ds-community-page-sub-community-list', @@ -32,7 +32,11 @@ import { TranslateModule } from '@ngx-translate/core'; NgIf, ObjectCollectionComponent, AsyncPipe, - TranslateModule + TranslateModule, + ObjectCollectionComponent, + ErrorComponent, + ThemedLoadingComponent, + VarDirective ], standalone: true }) diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts index 804a900a51..393797d400 100644 --- a/src/app/process-page/overview/process-overview.component.ts +++ b/src/app/process-page/overview/process-overview.component.ts @@ -3,20 +3,20 @@ import { Subscription } from 'rxjs'; import { ProcessBulkDeleteService } from './process-bulk-delete.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { hasValue } from '../../shared/empty.util'; -import { DSONameService } from '../../core/breadcrumbs/dso-name.service'; import { TranslateModule } from '@ngx-translate/core'; import { VarDirective } from '../../shared/utils/var.directive'; import { PaginationComponent } from '../../shared/pagination/pagination.component'; import { RouterLink } from '@angular/router'; -import { NgIf, NgFor, AsyncPipe, DatePipe } from '@angular/common'; +import { AsyncPipe, DatePipe, NgFor, NgIf, NgTemplateOutlet } from '@angular/common'; import { ProcessOverviewService, ProcessSortField } from './process-overview.service'; import { ProcessStatus } from '../processes/process-status.model'; +import { ProcessOverviewTableComponent } from './table/process-overview-table.component'; @Component({ - selector: 'ds-process-overview', - templateUrl: './process-overview.component.html', - standalone: true, - imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule] + selector: 'ds-process-overview', + templateUrl: './process-overview.component.html', + standalone: true, + imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent] }) /** * Component displaying a list of all processes in a paginated table diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts index 7bd5c02b43..9683cc25c6 100644 --- a/src/app/process-page/overview/table/process-overview-table.component.ts +++ b/src/app/process-page/overview/table/process-overview-table.component.ts @@ -20,11 +20,16 @@ import { EPerson } from '../../../core/eperson/models/eperson.model'; import { PaginationService } from 'src/app/core/pagination/pagination.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { redirectOn4xx } from '../../../core/shared/authorized.operators'; -import { Router } from '@angular/router'; +import { Router, RouterLink } from '@angular/router'; import { AuthService } from '../../../core/auth/auth.service'; -import { isPlatformBrowser } from '@angular/common'; +import { AsyncPipe, isPlatformBrowser, NgClass, NgForOf, NgIf } from '@angular/common'; import { RouteService } from '../../../core/services/route.service'; import { hasValue } from '../../../shared/empty.util'; +import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; +import { PaginationComponent } from '../../../shared/pagination/pagination.component'; +import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; +import { VarDirective } from '../../../shared/utils/var.directive'; const NEW_PROCESS_PARAM = 'new_process_id'; @@ -41,7 +46,20 @@ export interface ProcessOverviewTableEntry { @Component({ selector: 'ds-process-overview-table', styleUrls: ['./process-overview-table.component.scss'], - templateUrl: './process-overview-table.component.html' + templateUrl: './process-overview-table.component.html', + standalone: true, + imports: [ + NgClass, + NgbCollapseModule, + AsyncPipe, + TranslateModule, + PaginationComponent, + RouterLink, + NgForOf, + NgIf, + ThemedLoadingComponent, + VarDirective + ] }) export class ProcessOverviewTableComponent implements OnInit, OnDestroy { diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts index bd48fa873a..00570529dc 100644 --- a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts +++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts @@ -3,11 +3,21 @@ import { ModalBeforeDismiss } from '../interfaces/modal-before-dismiss.interface import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { BehaviorSubject } from 'rxjs'; import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service'; +import { TranslateModule } from '@ngx-translate/core'; +import { LoadingComponent } from '../loading/loading.component'; +import { FormsModule } from '@angular/forms'; +import { AsyncPipe } from '@angular/common'; @Component({ selector: 'ds-item-withdrawn-reinstate-modal', templateUrl: './item-withdrawn-reinstate-modal.component.html', styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'], + imports: [ + TranslateModule, + LoadingComponent, + FormsModule, + AsyncPipe + ], standalone: true }) /** diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts index ca6a7c9e28..e5e9710ccd 100644 --- a/src/app/shared/search/advanced-search/advanced-search.component.ts +++ b/src/app/shared/search/advanced-search/advanced-search.component.ts @@ -1,17 +1,29 @@ import { Component, Inject, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { slide } from '../../animations/slide'; -import { FormBuilder } from '@angular/forms'; -import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { SearchService } from '../../../core/shared/search/search.service'; import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service'; -import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component'; -import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface'; +import { APP_CONFIG, AppConfig } from 'src/config/app-config.interface'; +import { LowerCasePipe, NgClass, NgForOf } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { BrowserOnlyPipe } from '../../utils/browser-only.pipe'; +import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; + @Component({ selector: 'ds-advanced-search', templateUrl: './advanced-search.component.html', styleUrls: ['./advanced-search.component.scss'], animations: [slide], + imports: [ + NgClass, + TranslateModule, + ReactiveFormsModule, + BrowserOnlyPipe, + LowerCasePipe, + NgForOf + ], + standalone: true }) /** * This component represents the part of the search sidebar that contains advanced filters. diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts index c34275b90e..224089f9a7 100644 --- a/src/app/shared/search/search-filters/search-filters.component.ts +++ b/src/app/shared/search/search-filters/search-filters.component.ts @@ -16,13 +16,14 @@ import { SearchFilterComponent } from './search-filter/search-filter.component'; import { NgIf, NgFor, AsyncPipe } from '@angular/common'; import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { PaginatedSearchOptions } from '../models/paginated-search-options.model'; +import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component'; @Component({ - selector: 'ds-search-filters', - styleUrls: ['./search-filters.component.scss'], - templateUrl: './search-filters.component.html', - standalone: true, - imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule] + selector: 'ds-search-filters', + styleUrls: ['./search-filters.component.scss'], + templateUrl: './search-filters.component.html', + standalone: true, + imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent] }) /**