diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts index a400742f01..9649277cdf 100644 --- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts +++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Input, @@ -59,15 +55,13 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; AsyncPipe, NgbAccordionModule, TranslateModule, - NgIf, NgbNavModule, ThemedSearchComponent, BrowserOnlyPipe, - NgForOf, NgxPaginationModule, SelectableListItemControlComponent, - ListableObjectComponentLoaderComponent, - ], + ListableObjectComponentLoaderComponent +], standalone: true, }) export class BulkAccessBrowseComponent implements OnInit, OnDestroy { diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts index 264cefc708..12d501c7d6 100644 --- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts +++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { Component, ViewChild, @@ -16,9 +16,8 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont imports: [ NgbAccordionModule, TranslateModule, - NgIf, - AccessControlFormContainerComponent, - ], + AccessControlFormContainerComponent +], standalone: true, }) export class BulkAccessSettingsComponent { diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts index 6b62a13ecf..80aeab3417 100644 --- a/src/app/access-control/epeople-registry/epeople-registry.component.ts +++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts @@ -1,9 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass } from '@angular/common'; import { Component, OnDestroy, @@ -72,14 +67,12 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component'; TranslateModule, RouterModule, AsyncPipe, - NgIf, EPersonFormComponent, ReactiveFormsModule, ThemedLoadingComponent, PaginationComponent, - NgClass, - NgForOf, - ], + NgClass +], standalone: true, }) /** diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts index c7b57c986d..586339a4d6 100644 --- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts +++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts @@ -1,9 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgFor, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -84,8 +79,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator'; templateUrl: './eperson-form.component.html', imports: [ FormComponent, - NgIf, - NgFor, AsyncPipe, TranslateModule, NgClass, @@ -93,8 +86,8 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator'; PaginationComponent, RouterLink, HasNoValuePipe, - BtnDisabledDirective, - ], + BtnDisabledDirective +], standalone: true, }) /** diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html index 7e8c1ed1b4..060cc5b86d 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.html +++ b/src/app/access-control/group-registry/group-form/group-form.component.html @@ -2,13 +2,7 @@
-
- - -

{{messagePrefix + '.head.create' | translate}}

- - - + @if (activeGroup$ | async) {

+ > {{messagePrefix + '.head.edit' | translate}}

- + } @else { +

{{messagePrefix + '.head.create' | translate}}

+ } - - - - - - - + + + @if ((activeGroup$ | async); as groupBeingEdited) { + @if (groupBeingEdited?.permanent) { + + } + @if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) { + @if ((canEdit$ | async) !== true) { + + + } + } + } + [formModel]="formModel" + [formGroup]="formGroup" + [formLayout]="formLayout" + [displayCancel]="false" + (submitForm)="onSubmit()">
-
-
- -
- + class="btn btn-outline-secondary"> {{messagePrefix + '.return' | translate}} +
+ @if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) { +
+ +
+ } + - -
- -
- - + @if ((activeGroup$ | async); as groupBeingEdited) { +
+ @if (groupBeingEdited !== undefined) { + + } +
+ @if (groupBeingEdited !== undefined) { + + } + } +
- diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts index d2ddb3266b..ca83c0af7e 100644 --- a/src/app/access-control/group-registry/group-form/group-form.component.ts +++ b/src/app/access-control/group-registry/group-form/group-form.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -92,13 +89,12 @@ import { ValidateGroupExists } from './validators/group-exists.validator'; imports: [ FormComponent, AlertComponent, - NgIf, AsyncPipe, TranslateModule, ContextHelpDirective, MembersListComponent, - SubgroupsListComponent, - ], + SubgroupsListComponent +], standalone: true, }) /** diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html index 82e07a898d..44a3775c05 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html @@ -3,63 +3,70 @@

{{messagePrefix + '.headMembers' | translate}}

- + @if ((ePeopleMembersOfGroup | async)?.totalElements > 0) { + +
+ + + + + + + + + + + @for (epersonDTO of (ePeopleMembersOfGroup | async)?.page; track epersonDTO) { + + + + + + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{epersonDTO.eperson.id}} + + {{ dsoNameService.getName(epersonDTO.eperson) }} + + + {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}
+ {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }} + 		+
+ @if (epersonDTO.ableToDelete) { + + } + @if (!epersonDTO.ableToDelete) { + + } +
+
+
+ + } -
- - - - - - - - - - - - - - - - - -
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{epersonDTO.eperson.id}} - - {{ dsoNameService.getName(epersonDTO.eperson) }} - - - {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}
- {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }} - 		-
- - -
-
+ @if ((ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0) { + - - - - + } @@ -78,68 +85,72 @@
+ class="form-control" aria-label="Search input"> - - + + +
-
-
- -
- +
+ +
+ - + @if ((ePeopleSearch | async)?.totalElements > 0) { + +
+ + + + + + + + + + + @for (eperson of (ePeopleSearch | async)?.page; track eperson) { + + + + + + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{eperson.id}} + + {{ dsoNameService.getName(eperson) }} + + + {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}
+ {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }} + 		+
+ +
+
+
+ + } -
- - - - - - - - - - - - - - - - - -
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.identity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{eperson.id}} - - {{ dsoNameService.getName(eperson) }} - - - {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}
- {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }} - 		-
- -
-
-
+ @if ((ePeopleSearch | async)?.totalElements === 0 && searchDone) { + + } - - - - - + diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts index 22934394c8..84782ad0eb 100644 --- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts +++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts @@ -1,9 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass } from '@angular/common'; import { Component, Input, @@ -109,13 +104,11 @@ export interface EPersonListActionConfig { ContextHelpDirective, ReactiveFormsModule, PaginationComponent, - NgIf, AsyncPipe, RouterLink, NgClass, - NgForOf, - BtnDisabledDirective, - ], + BtnDisabledDirective +], standalone: true, }) /** diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html index 32525fb2b5..d09ab08c42 100644 --- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html +++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html @@ -3,51 +3,56 @@

{{messagePrefix + '.headSubgroups' | translate}}

- - -
- - - - - - - - - - - - - - - + + } + +
{{messagePrefix + '.table.id' | translate}}{{messagePrefix + '.table.name' | translate}}{{messagePrefix + '.table.collectionOrCommunity' | translate}}{{messagePrefix + '.table.edit' | translate}}
{{group.id}} - - {{ dsoNameService.getName(group) }} - - {{ dsoNameService.getName((group.object | async)?.payload)}} -
- +
+
+
+ + } - + @if ((subGroups$ | async)?.payload?.totalElements === 0) { + + } + } - + @if (!reports) { - + } - - - -
- {{ 'statistics.page.no-data' | translate }} -
- + @if (reports) { + @for (report of reports; track report) { + + + } + @if ((hasData$ | async) !== true) { +
+ {{ 'statistics.page.no-data' | translate }} +
+ } + } diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html index efa9ce43d9..4a0f87076c 100644 --- a/src/app/statistics-page/statistics-table/statistics-table.component.html +++ b/src/app/statistics-page/statistics-table/statistics-table.component.html @@ -1,36 +1,35 @@ -
- -

- {{ 'statistics.table.title.' + report.reportType | translate }} -

- - - - - - - - - - - - - - - - - -
- {{ header }} -
- {{ getLabel(point) | async }} - - {{ point.values[header] }} -
- -
+@if (hasData) { +
+

+ {{ 'statistics.table.title.' + report.reportType | translate }} +

+ + + + + @for (header of headers; track header) { + + } + + @for (point of report.points; track point) { + + + @for (header of headers; track header) { + + } + + } + +
+ {{ header }} +
+ {{ getLabel(point) | async }} + + {{ point.values[header] }} +
+
+} diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts index cd71730568..9f59e33fa8 100644 --- a/src/app/statistics-page/statistics-table/statistics-table.component.ts +++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgFor, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Input, @@ -38,7 +34,7 @@ import { isEmpty } from '../../shared/empty.util'; templateUrl: './statistics-table.component.html', styleUrls: ['./statistics-table.component.scss'], standalone: true, - imports: [NgIf, NgFor, AsyncPipe, TranslateModule], + imports: [AsyncPipe, TranslateModule], }) export class StatisticsTableComponent implements OnInit { diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html index 563044d270..5f2a26b8a1 100644 --- a/src/app/submission/form/section-add/submission-form-section-add.component.html +++ b/src/app/submission/form/section-add/submission-form-section-add.component.html @@ -1,26 +1,30 @@
- - - + #sectionAdd="ngbDropdown" + placement="bottom-right" + class="d-inline-block" + [ngClass]="{'w-100': windowService.isXs()}"> + @if (hasSections$ | async) { + + }
- - + class="sections-dropdown-menu" + aria-labelledby="sectionControls" + [ngClass]="{'w-100': (windowService.isXs() | async)}"> + @if ((hasSections$ | async) !== true) { + + } + @for (listItem of (sectionList$ | async); track listItem) { + + }
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html index dfad8c422e..a8c8b9ca48 100644 --- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html +++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html @@ -1,8 +1,10 @@ - +@if (uploadFilesOptions.url) { + +} diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts index 3632ec6760..218e56de92 100644 --- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts +++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { Component, Input, @@ -39,9 +39,8 @@ import parseSectionErrors from '../../utils/parseSectionErrors'; selector: 'ds-base-submission-upload-files', templateUrl: './submission-upload-files.component.html', imports: [ - UploaderComponent, - NgIf, - ], + UploaderComponent +], standalone: true, }) export class SubmissionUploadFilesComponent implements OnChanges, OnDestroy { diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html index 234fbe9233..c1de983b38 100644 --- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html +++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html @@ -4,11 +4,13 @@
- + @if (isLoading()) { + + } + (selectionChange)="selectObject($event)" + (searchComplete)="searchComplete()" + [entityType]="entityType">
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts index 03bd10cfc2..b5651c8f3f 100644 --- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts +++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts @@ -1,7 +1,4 @@ -import { - NgClass, - NgIf, -} from '@angular/common'; +import { NgClass } from '@angular/common'; import { Component, EventEmitter, @@ -25,9 +22,8 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c ThemedLoadingComponent, ThemedCollectionDropdownComponent, TranslateModule, - NgClass, - NgIf, - ], + NgClass +], standalone: true, }) export class SubmissionImportExternalCollectionComponent { diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts index c7f434b23c..353a298a6e 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts @@ -1,4 +1,4 @@ -import { NgFor } from '@angular/common'; + import { Component, Input, @@ -30,9 +30,8 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external- styleUrls: ['./submission-import-external-preview.component.scss'], templateUrl: './submission-import-external-preview.component.html', imports: [ - NgFor, - TranslateModule, - ], + TranslateModule +], standalone: true, }) export class SubmissionImportExternalPreviewComponent implements OnInit { diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html index 21783f9a2e..3d0580f37e 100644 --- a/src/app/submission/import-external/submission-import-external.component.html +++ b/src/app/submission/import-external/submission-import-external.component.html @@ -8,43 +8,59 @@ -
-
- -

{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}

- - - -
- {{ 'search.results.empty' | translate }} + @if (reload$.value.entity) { +
+ @if (reload$.value.sourceId !== '') { +
+ + @if (entriesRD && entriesRD?.payload?.page?.length !== 0) { +

{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}

+ } + @if (entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0) { + + + } + @if ((isLoading$ | async)) { + + } + @if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0) { +
+ {{ 'search.results.empty' | translate }} +
+ } + @if ((isLoading$ | async) !== true && entriesRD.statusCode === 500) { +
+ {{ 'search.results.response.500' | translate }} +
+ } +
-
- {{ 'search.results.response.500' | translate }} + } + @if (reload$.value.sourceId === '') { +
+ +

{{'submission.import-external.page.hint' | translate}}

+
- + }
-
- -

{{'submission.import-external.page.hint' | translate}}

- -
-
+ }
- - {{'submission.import-external.back-to-my-dspace' | translate}} - + + {{'submission.import-external.back-to-my-dspace' | translate}} + +
-
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts index 47b5c09d66..b78f398830 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnDestroy, @@ -72,13 +69,12 @@ import { ObjectCollectionComponent, ThemedLoadingComponent, AlertComponent, - NgIf, AsyncPipe, SubmissionImportExternalSearchbarComponent, TranslateModule, VarDirective, - RouterLink, - ], + RouterLink +], standalone: true, }) export class SubmissionImportExternalComponent implements OnInit, OnDestroy { diff --git a/src/app/submission/sections/accesses/section-accesses.component.html b/src/app/submission/sections/accesses/section-accesses.component.html index 1ba2d4fe6d..009a0ca675 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.html +++ b/src/app/submission/sections/accesses/section-accesses.component.html @@ -1,7 +1,9 @@ - +@if (!!formModel) { + +} diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts index b47f1cf8ff..8f98f68660 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.ts +++ b/src/app/submission/sections/accesses/section-accesses.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { Component, Inject, @@ -78,9 +78,8 @@ import { SectionAccessesService } from './section-accesses.service'; templateUrl: './section-accesses.component.html', styleUrls: ['./section-accesses.component.scss'], imports: [ - FormComponent, - NgIf, - ], + FormComponent +], standalone: true, }) export class SubmissionSectionAccessesComponent extends SectionModelComponent { diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts index a633e640ab..21a1885f92 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -65,17 +61,15 @@ import { SectionsType } from '../sections-type'; styleUrls: ['./submission-section-cc-licenses.component.scss'], imports: [ TranslateModule, - NgIf, ThemedLoadingComponent, AsyncPipe, VarDirective, - NgForOf, DsSelectComponent, NgbDropdownModule, FormsModule, InfiniteScrollModule, - BtnDisabledDirective, - ], + BtnDisabledDirective +], standalone: true, }) export class SubmissionSectionCcLicensesComponent extends SectionModelComponent { diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts index 6f4126a173..02a6d4e557 100644 --- a/src/app/submission/sections/container/section-container.component.ts +++ b/src/app/submission/sections/container/section-container.component.ts @@ -1,10 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgComponentOutlet, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass, NgComponentOutlet } from '@angular/common'; import { Component, Injector, @@ -30,15 +24,13 @@ import { rendersSectionType } from '../sections-decorator'; styleUrls: ['./section-container.component.scss'], imports: [ AlertComponent, - NgForOf, NgbAccordionModule, NgComponentOutlet, TranslateModule, NgClass, - NgIf, AsyncPipe, - SectionsDirective, - ], + SectionsDirective +], standalone: true, }) export class SubmissionSectionContainerComponent implements OnInit { diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html index d9e33a70f7..d8c9467efe 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.html +++ b/src/app/submission/sections/duplicates/section-duplicates.component.html @@ -3,18 +3,26 @@ Template for the detect duplicates submission section component @author Kim Shepherd -->
- + @if (data?.potentialDuplicates.length === 0) {
{{ 'submission.sections.duplicates.none' | translate }}
- - -
{{ 'submission.sections.duplicates.detected' | translate }}
-
+ } + @if (data?.potentialDuplicates.length > 0) { +
{{ 'submission.sections.duplicates.detected' | translate }}
+ @for (dupe of data?.potentialDuplicates; track dupe) { +
{{dupe.title}} -
- {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}} -
-

{{ 'submission.sections.duplicates.in-workspace' | translate }}

-

{{ 'submission.sections.duplicates.in-workflow' | translate }}

+ @for (metadatum of Metadata.toViewModelList(dupe.metadata); track metadatum) { +
+ {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}} +
+ } + @if (dupe.workspaceItemId) { +

{{ 'submission.sections.duplicates.in-workspace' | translate }}

+ } + @if (dupe.workflowItemId) { +

{{ 'submission.sections.duplicates.in-workflow' | translate }}

+ }
- + } + }
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts index 501a60e3b8..a86d44ab17 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts @@ -255,11 +255,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => { selector: 'ds-test-cmp', template: ``, standalone: true, - imports: [BrowserModule, - CommonModule, - FormsModule, - ReactiveFormsModule, - NgxPaginationModule], + imports: [BrowserModule, FormsModule, ReactiveFormsModule, NgxPaginationModule], }) class TestComponent { diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts index 885511ca52..5471dbc78c 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, @@ -41,11 +37,9 @@ import { SectionsService } from '../sections.service'; changeDetection: ChangeDetectionStrategy.Default, imports: [ VarDirective, - NgIf, AsyncPipe, - TranslateModule, - NgForOf, - ], + TranslateModule +], standalone: true, }) diff --git a/src/app/submission/sections/form/section-form.component.html b/src/app/submission/sections/form/section-form.component.html index cd7b45bb00..58032131af 100644 --- a/src/app/submission/sections/form/section-form.component.html +++ b/src/app/submission/sections/form/section-form.component.html @@ -1,11 +1,15 @@ - - +@if (isLoading) { + +} +@if (!isLoading && formModel) { + +} diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts index efd410713f..4cce0daa7b 100644 --- a/src/app/submission/sections/form/section-form.component.spec.ts +++ b/src/app/submission/sections/form/section-form.component.spec.ts @@ -659,6 +659,6 @@ describe('SubmissionSectionFormComponent test suite', () => { selector: 'ds-test-cmp', template: ``, standalone: true, - imports: [CommonModule, FormsModule, ReactiveFormsModule], + imports: [FormsModule, ReactiveFormsModule], }) class TestComponent {} diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index 26285320b0..553bcf2d5c 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { ChangeDetectorRef, Component, @@ -77,9 +77,8 @@ import { SectionFormOperationsService } from './section-form-operations.service' templateUrl: './section-form.component.html', imports: [ FormComponent, - ThemedLoadingComponent, - NgIf, - ], + ThemedLoadingComponent +], standalone: true, }) export class SubmissionSectionFormComponent extends SectionModelComponent { diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html index dd0b5d2930..e86742caf1 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.html +++ b/src/app/submission/sections/identifiers/section-identifiers.component.html @@ -4,17 +4,17 @@ Template for the identifiers submission section component --> - -
- {{'submission.sections.identifiers.info' | translate}} -
    - - -
  • {{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}} - {{identifier.value}}
    • -     -     -
-
- + @if (identifierData && identifierData.identifiers) { +
+ {{'submission.sections.identifiers.info' | translate}} +
    + @for (identifier of identifierData.identifiers; track identifier) { + @if (identifierData.displayTypes.includes(identifier.identifierType) && identifier.value) { +
  • {{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}} + {{identifier.value}}
    • + } + } +
+
+ } diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts index 8aa760bb3e..42aeb8719f 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts @@ -276,10 +276,10 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => { template: ``, standalone: true, imports: [ - CommonModule, FormsModule, ReactiveFormsModule, - NgxPaginationModule], + NgxPaginationModule +], }) class TestComponent { diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts index e297c795df..cc42066534 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectionStrategy, Component, @@ -40,11 +36,9 @@ import { SectionsService } from '../sections.service'; changeDetection: ChangeDetectionStrategy.Default, imports: [ TranslateModule, - NgForOf, - NgIf, AsyncPipe, - VarDirective, - ], + VarDirective +], standalone: true, }) diff --git a/src/app/submission/sections/license/section-license.component.html b/src/app/submission/sections/license/section-license.component.html index ed10203596..4918a3e32a 100644 --- a/src/app/submission/sections/license/section-license.component.html +++ b/src/app/submission/sections/license/section-license.component.html @@ -1,9 +1,11 @@

- +@if (formModel) { + +} diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts index 95b2e7f50a..14d7cb51ad 100644 --- a/src/app/submission/sections/license/section-license.component.spec.ts +++ b/src/app/submission/sections/license/section-license.component.spec.ts @@ -377,11 +377,10 @@ describe('SubmissionSectionLicenseComponent test suite', () => { standalone: true, imports: [ SubmissionSectionLicenseComponent, - CommonModule, FormsModule, FormComponent, - ReactiveFormsModule, - ], + ReactiveFormsModule +], }) class TestComponent { diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts index 86a0455c30..88f36875f6 100644 --- a/src/app/submission/sections/license/section-license.component.ts +++ b/src/app/submission/sections/license/section-license.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { AfterViewChecked, ChangeDetectorRef, @@ -67,9 +64,8 @@ import { providers: [], imports: [ FormComponent, - NgIf, - AsyncPipe, - ], + AsyncPipe +], standalone: true, }) export class SubmissionSectionLicenseComponent extends SectionModelComponent implements AfterViewChecked { diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts index c47e4c644d..842108a1b0 100644 --- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts +++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts @@ -1,9 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -59,14 +54,12 @@ import { LdnPattern } from './submission-coar-notify.config'; styleUrls: ['./section-coar-notify.component.scss'], standalone: true, imports: [ - NgIf, - NgForOf, AsyncPipe, TranslateModule, NgbDropdownModule, NgClass, - InfiniteScrollModule, - ], + InfiniteScrollModule +], providers: [NgbDropdown], }) export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent { diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts index 2fde4f37cd..5c10a0b259 100644 --- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts +++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts @@ -1,8 +1,4 @@ -import { - NgForOf, - NgIf, - TitleCasePipe, -} from '@angular/common'; +import { TitleCasePipe } from '@angular/common'; import { Component, Input, @@ -20,12 +16,10 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol templateUrl: './content-accordion.component.html', styleUrls: ['./content-accordion.component.scss'], imports: [ - NgForOf, TranslateModule, - NgIf, NgbCollapseModule, - TitleCasePipe, - ], + TitleCasePipe +], standalone: true, }) export class ContentAccordionComponent { diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts index 4eb9567abb..e7f8e22aa1 100644 --- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts @@ -1,7 +1,4 @@ -import { - DatePipe, - NgIf, -} from '@angular/common'; +import { DatePipe } from '@angular/common'; import { Component, Input, @@ -18,10 +15,9 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det templateUrl: './metadata-information.component.html', styleUrls: ['./metadata-information.component.scss'], imports: [ - NgIf, TranslateModule, - DatePipe, - ], + DatePipe +], standalone: true, }) export class MetadataInformationComponent { diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts index 8f256700a0..df7daf75e9 100644 --- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts @@ -1,7 +1,4 @@ -import { - NgForOf, - NgIf, -} from '@angular/common'; + import { Component, Input, @@ -18,10 +15,8 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta templateUrl: './publication-information.component.html', styleUrls: ['./publication-information.component.scss'], imports: [ - NgIf, - TranslateModule, - NgForOf, - ], + TranslateModule +], standalone: true, }) export class PublicationInformationComponent { diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts index 8cbe2f6904..c827555a2b 100644 --- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts +++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts @@ -1,8 +1,4 @@ -import { - KeyValuePipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { KeyValuePipe } from '@angular/common'; import { Component, Input, @@ -23,10 +19,8 @@ import { ContentAccordionComponent } from '../content-accordion/content-accordio imports: [ ContentAccordionComponent, TranslateModule, - KeyValuePipe, - NgForOf, - NgIf, - ], + KeyValuePipe +], standalone: true, }) export class PublisherPolicyComponent { diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts index 86d55ce8d0..950fe1b4dc 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Inject, @@ -47,12 +43,10 @@ import { PublisherPolicyComponent } from './publisher-policy/publisher-policy.co AlertComponent, TranslateModule, PublisherPolicyComponent, - NgIf, PublicationInformationComponent, AsyncPipe, - VarDirective, - NgForOf, - ], + VarDirective +], standalone: true, }) export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent { diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts index 84eff58f72..eb167f5501 100644 --- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts +++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts @@ -1,7 +1,4 @@ -import { - NgForOf, - NgIf, -} from '@angular/common'; + import { Component, Input, @@ -22,10 +19,7 @@ import { isEmpty } from '../../../../shared/empty.util'; @Component({ selector: 'ds-submission-section-upload-access-conditions', templateUrl: './submission-section-upload-access-conditions.component.html', - imports: [ - NgForOf, - NgIf, - ], + imports: [], standalone: true, }) export class SubmissionSectionUploadAccessConditionsComponent implements OnInit { diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html index 761ac9537e..9187915dcf 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html @@ -5,15 +5,17 @@
- + @if (formModel) { + + }
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts index 015ccd4ae4..7082e38d7b 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts @@ -403,11 +403,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => { standalone: true, imports: [ SubmissionSectionUploadFileEditComponent, - CommonModule, FormsModule, FormComponent, - ReactiveFormsModule, - ], + ReactiveFormsModule +], }) class TestComponent { } diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts index 79b3d3a565..cf577bf6f5 100644 --- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts +++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts @@ -1,4 +1,4 @@ -import { NgIf } from '@angular/common'; + import { ChangeDetectorRef, Component, @@ -79,10 +79,9 @@ import { templateUrl: './section-upload-file-edit.component.html', imports: [ FormComponent, - NgIf, TranslateModule, - BtnDisabledDirective, - ], + BtnDisabledDirective +], standalone: true, }) export class SubmissionSectionUploadFileEditComponent diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts index c1487b0559..a1edfefb65 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts +++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts @@ -286,9 +286,9 @@ describe('SubmissionSectionUploadFileComponent test suite', () => { standalone: true, imports: [ ThemedSubmissionSectionUploadFileComponent, - CommonModule, AsyncPipe, - NgbModule], + NgbModule +], }) class TestComponent { diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts index 09ea3cb112..eccdf9b949 100644 --- a/src/app/submission/sections/upload/file/section-upload-file.component.ts +++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, Input, @@ -51,12 +48,11 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload- imports: [ TranslateModule, SubmissionSectionUploadFileViewComponent, - NgIf, AsyncPipe, ThemedFileDownloadLinkComponent, FileSizePipe, - BtnDisabledDirective, - ], + BtnDisabledDirective +], standalone: true, }) export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy { diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html index dc72fbdad0..73e18afeb5 100644 --- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html +++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html @@ -1,38 +1,46 @@
- - - + @if (metadata) { + @for (entry of getAllMetadataValue(fileTitleKey); track entry) { + @if (entry.value !== '') {

{{entry.value}} ({{fileData?.sizeBytes | dsFileSize}})

- - -
- {{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}} -
- + } + @if (entry.value === '') { + @if (metadata[fileTitleKey].indexOf(entry) === 0) { +
+ {{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}} +
+ } + } - - - + } + @for (entry of getAllMetadataValue(fileDescrKey); track entry) { + @if (entry.value !== '') { {{entry.value | dsTruncate:['150']}} - - - {{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}} - + } + @if (entry.value === '') { + @if (metadata[fileDescrKey].indexOf(entry) === 0) { + {{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}} + } + } - - + } + } -
- {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }} -
-
- Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}} -
+ @if (fileFormat) { +
+ {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }} +
+ } + @if (fileCheckSum) { +
+ Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}} +
+ }
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts index f065fc9e19..0a7871fa35 100644 --- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts +++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts @@ -1,7 +1,4 @@ -import { - NgForOf, - NgIf, -} from '@angular/common'; + import { Component, Input, @@ -30,10 +27,8 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo SubmissionSectionUploadAccessConditionsComponent, TranslateModule, TruncatePipe, - NgIf, - NgForOf, - FileSizePipe, - ], + FileSizePipe +], standalone: true, }) export class SubmissionSectionUploadFileViewComponent implements OnInit { diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html index 9d916a4f98..a9fd762f89 100644 --- a/src/app/submission/sections/upload/section-upload.component.html +++ b/src/app/submission/sections/upload/section-upload.component.html @@ -1,23 +1,24 @@ + [dismissible]="true" +[type]="AlertTypeEnum.Info"> - - -
-
- - - {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }} - - - {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }} - - - - +@if (fileList.length > 0) { + @if (collectionDefaultAccessConditions.length > 0) { +
+
+ + @if (collectionPolicyType === 1) { + {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }} + } + @if (collectionPolicyType === 2) { + {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }} + } + + + +
-
+ }
{{ 'bitstream.edit.form.primaryBitstream.label' | translate }} @@ -28,30 +29,29 @@
- + @for (fileEntry of fileList; track fileEntry; let i = $index) { + [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null" + [availableAccessConditionOptions]="availableAccessConditionOptions" + [collectionId]="collectionId" + [collectionPolicyType]="collectionPolicyType" + [configMetadataForm]="(configMetadataForm$ | async)" + [fileId]="fileEntry.uuid" + [fileIndex]="i" + [fileName]="fileNames[i]" + [sectionId]="sectionData.id" + [submissionId]="submissionId">
- - - - + } +} @else {
{{'submission.sections.upload.no-file-uploaded' | translate}}
- +} + diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts index 61db6c6885..36f1bd4a4d 100644 --- a/src/app/submission/sections/upload/section-upload.component.spec.ts +++ b/src/app/submission/sections/upload/section-upload.component.spec.ts @@ -382,8 +382,7 @@ describe('SubmissionSectionUploadComponent test suite', () => { selector: 'ds-test-cmp', template: ``, standalone: true, - imports: [ - CommonModule], + imports: [], }) class TestComponent { diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 58008c9dfb..11a0ca4077 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { ChangeDetectorRef, Component, @@ -74,12 +70,10 @@ export interface AccessConditionGroupsMapEntry { imports: [ ThemedSubmissionSectionUploadFileComponent, SubmissionSectionUploadAccessConditionsComponent, - NgIf, AlertComponent, TranslateModule, - NgForOf, - AsyncPipe, - ], + AsyncPipe +], standalone: true, }) export class SubmissionSectionUploadComponent extends SectionModelComponent { diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html index e8dfc8fc6a..b3489ce66c 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.html +++ b/src/app/subscriptions-page/subscriptions-page.component.html @@ -4,39 +4,47 @@

{{'subscriptions.title' | translate}}

- + @if (loading$ | async) { + + } - -
- - - - - - - - - - - - - -
{{'subscriptions.table.dso' | translate}}{{'subscriptions.table.subscription_type' | translate}}{{'subscriptions.table.subscription_frequency' | translate}}{{'subscriptions.table.action' | translate}}
-
- + @if (subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true) { + +
+ + + + + + + + + + + @for (subscription of subscriptions?.page; track subscription) { + + + } + +
{{'subscriptions.table.dso' | translate}}{{'subscriptions.table.subscription_type' | translate}}{{'subscriptions.table.subscription_frequency' | translate}}{{'subscriptions.table.action' | translate}}
+
+ + } - - {{ 'subscriptions.table.empty.message' | translate }} - + @if (subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true) { + + {{ 'subscriptions.table.empty.message' | translate }} + + }
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts index 5d0b4b258d..1d967d3332 100644 --- a/src/app/subscriptions-page/subscriptions-page.component.ts +++ b/src/app/subscriptions-page/subscriptions-page.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgFor, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnDestroy, @@ -49,7 +45,7 @@ import { VarDirective } from '../shared/utils/var.directive'; templateUrl: './subscriptions-page.component.html', styleUrls: ['./subscriptions-page.component.scss'], standalone: true, - imports: [NgIf, ThemedLoadingComponent, VarDirective, PaginationComponent, NgFor, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule], + imports: [ThemedLoadingComponent, VarDirective, PaginationComponent, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule], }) /** * List and allow to manage all the active subscription for the current user diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html index 1fe3ffb4ce..452f47f9b6 100644 --- a/src/app/suggestions-page/suggestions-page.component.html +++ b/src/app/suggestions-page/suggestions-page.component.html @@ -1,50 +1,62 @@
- - -
- + + @if ((processing$ | async)) { + + } + @if ((processing$ | async) !== true && suggestionsRD?.pageInfo?.totalElements > 0) { +

{{'suggestion.suggestionFor' | translate}} {{researcherName}} {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}

-
({{ getSelectedSuggestionsCount() }}) - - + @if (getSelectedSuggestionsCount() > 0) { + + } + @if (isBulkOperationPending) { + + }
- -
    -
  • - -
    • -
- + @if ((processing$ | async) !== true) { + +
    + @for (object of suggestionsRD?.page; track object; let i = $index; let last = $last) { +
  • + +
    • + } +
+ + }
- + } + @if ((processing$ | async) !== true && (suggestionsRD?.pageInfo?.totalElements === 0 || !suggestionsRD)) { + {{'suggestion.count.missing' | translate}} - + } +
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts index 0fc790a125..9e411e8336 100644 --- a/src/app/suggestions-page/suggestions-page.component.ts +++ b/src/app/suggestions-page/suggestions-page.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgForOf, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnInit, @@ -70,16 +66,14 @@ import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowit imports: [ AsyncPipe, VarDirective, - NgIf, RouterLink, TranslateModule, SuggestionActionsComponent, ThemedLoadingComponent, PaginationComponent, SuggestionListElementComponent, - NgForOf, - AlertComponent, - ], + AlertComponent +], standalone: true, }) diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts index 79ecf2117a..364d721aa1 100644 --- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts +++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - isPlatformBrowser, - NgIf, -} from '@angular/common'; +import { AsyncPipe, isPlatformBrowser } from '@angular/common'; import { Component, Inject, @@ -42,7 +38,7 @@ import { SystemWideAlert } from '../system-wide-alert.model'; styleUrls: ['./system-wide-alert-banner.component.scss'], templateUrl: './system-wide-alert-banner.component.html', standalone: true, - imports: [NgIf, AsyncPipe, TranslateModule], + imports: [AsyncPipe, TranslateModule], }) export class SystemWideAlertBannerComponent implements OnInit, OnDestroy { diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts index 73517e5b0d..bc8e8fa49d 100644 --- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts +++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnInit, @@ -60,7 +57,7 @@ import { SystemWideAlert } from '../system-wide-alert.model'; styleUrls: ['./system-wide-alert-form.component.scss'], templateUrl: './system-wide-alert-form.component.html', standalone: true, - imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective], + imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective], }) export class SystemWideAlertFormComponent implements OnInit { diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html index e151684a01..de569270e0 100644 --- a/src/app/thumbnail/thumbnail.component.html +++ b/src/app/thumbnail/thumbnail.component.html @@ -1,19 +1,25 @@
-
-
-
- + @if (isLoading) { +
+
+
+ +
-
+ } - -
-
-
- {{ placeholder | translate }} + @if (src !== null) { + + } + @if (src === null && !isLoading) { +
+
+
+ {{ placeholder | translate }} +
-
+ }
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts index b8620e7d89..6ee9c8d500 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts @@ -1,8 +1,4 @@ -import { - AsyncPipe, - NgClass, - NgIf, -} from '@angular/common'; +import { AsyncPipe, NgClass } from '@angular/common'; import { Component, OnInit, @@ -35,14 +31,13 @@ export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction'; preserveWhitespaces: false, imports: [ ModifyItemOverviewComponent, - NgIf, AsyncPipe, TranslateModule, NgbRatingModule, NgClass, ReactiveFormsModule, - VarDirective, - ], + VarDirective +], standalone: true, }) export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit { diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html index d4ac620811..2d7a7ff8cd 100644 --- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html +++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html @@ -1,22 +1,32 @@
-

{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}

-

{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}

+ @if (multipleReviewers) { +

{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}

+ } + @if (!multipleReviewers) { +

{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}

+ } - - - {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }} - + @if (groupId !== undefined) { + + } + @if (displayError) { + + {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }} + + } - - + @if (item$ | async) { + + + }
- +

{{'workflow-item.' + type + '.header' | translate}}

+ @if (item) { + + } + +
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts index 0352eba098..9fdb123566 100644 --- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts +++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts @@ -1,7 +1,4 @@ -import { - CommonModule, - Location, -} from '@angular/common'; +import { CommonModule, Location } from '@angular/common'; import { Component } from '@angular/core'; import { ActivatedRoute, diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html index 059d3b7e3b..8b8dda97b7 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html @@ -1,6 +1,8 @@

{{ 'workspace-item.delete.header' | translate }}

- + @if ((dso$ | async)) { + + }
@@ -16,8 +18,8 @@
+ (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }} + (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts index 00ab6e969c..2f9ac81308 100644 --- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts +++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts @@ -1,7 +1,4 @@ -import { - CommonModule, - Location, -} from '@angular/common'; +import { CommonModule, Location } from '@angular/common'; import { Component, OnInit, diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html index d2b977ff84..4fa423d1ef 100644 --- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html +++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -1,9 +1,11 @@
-
- -
+ @if ((isMobile$ | async)) { +
+ +
+ }
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts index 1931838923..791959dd9c 100644 --- a/src/themes/dspace/app/header/header.component.ts +++ b/src/themes/dspace/app/header/header.component.ts @@ -1,7 +1,4 @@ -import { - AsyncPipe, - NgIf, -} from '@angular/common'; +import { AsyncPipe } from '@angular/common'; import { Component, OnInit, @@ -27,7 +24,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n styleUrls: ['header.component.scss'], templateUrl: 'header.component.html', standalone: true, - imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe, NgIf], + imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe], }) export class HeaderComponent extends BaseComponent implements OnInit { public isNavBarCollapsed$: Observable; diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html index d828206e7a..8ecb8c5667 100644 --- a/src/themes/dspace/app/navbar/navbar.component.html +++ b/src/themes/dspace/app/navbar/navbar.component.html @@ -1,9 +1,9 @@ - +@if ((isMobile$ | async) && (isAuthenticated$ | async)) { - +}